Merge branch '20200916_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200916_pc_vue_new_branch

src/router/modules/dialysis.js

@@ -38,15 +38,15 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/calling',
-      component: () => import('@/xt_pages/dialysis/calling'),
-      name: '透析叫号',
-      meta: {
-        title: '透析叫号',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/calling',
+    //   component: () => import('@/xt_pages/dialysis/calling'),
+    //   name: '透析叫号',
+    //   meta: {
+    //     title: '透析叫号',
+    //     noCache: true
+    //   }
+    // },
 
     {
       path: '/dialysis/consumableDrugs',

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -94,7 +94,7 @@
                     > 
                     <label-box
                       :isChecked="
-                         record.prescription.mode_id == 3 ? true : false
+                         record.prescription.mode_id == 3 ? true : record.prescription.mode_id == 4 ? true : false
                       "
                       showValue="HP"
                     ></label-box

src/xt_pages/dialysis/components/allSummary.vue

@@ -55,7 +55,7 @@
             >
             <el-table-column  align="center" type="selection" width="55">
             </el-table-column>
-            <el-table-column align="center" prop="name" label="姓名" width="180">
+            <el-table-column align="center" prop="name" label="姓名" width="80">
                <template slot-scope="scope">
                    <!-- {{scope.row.patient.name}} -->
                     {{scope.row.patient_name}}
@@ -90,7 +90,7 @@
                      {{scope.row.good_type[index].name}}
                </template>
             </el-table-column>
-            <el-table-column align="center" prop="address" label="抗凝剂(首剂)(维持)(总量)">
+            <el-table-column align="center" prop="address" label="抗凝剂(首剂)(维持)(总量)" width="300">
              <template slot-scope="scope">
                    <span v-if="getAnticoagulant(scope.row.patient_id) == 0"></span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 1">无肝素</span>

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -59,42 +59,42 @@
                    {{scope.row.patient.name?scope.row.patient.name:""}}
                </template>
             </el-table-column>
-            <el-table-column align="center"  label="透析模式" width="100">
+            <el-table-column align="center"  label="透析模式" width="90">
                 <template slot-scope="scope">
                    {{scope.row.treatment_mode.name?scope.row.treatment_mode.name:""}}
                 </template>
             </el-table-column>
-            <el-table-column align="center" label="上次透后体重(kg)" width="280">
+            <el-table-column align="center" :label="'上次透后体重\n(kg)'" width="110">
                 <template slot-scope="scope">
                   {{getLastWeight(scope.row.patient.id)?getLastWeight(scope.row.patient.id):""}}
                 </template>
             </el-table-column>
-            <el-table-column align="center" label="透前体重(kg)" width="120">
+            <el-table-column align="center" :label="'透前体重\n(kg)'" width="100">
                <template slot-scope="scope">
                   {{getWeightBefor(scope.row.patient_id)?getWeightBefor(scope.row.patient_id):""}}
                </template>
             </el-table-column>
-            <el-table-column align="center" label="干体重(kg)" width="140">
+            <el-table-column align="center" label="干体重(kg)" width="100">
                <template slot-scope="scope">
                  {{getDryWeight(scope.row.patient_id)?getDryWeight(scope.row.patient_id):""}}
                </template>
             </el-table-column>
-            <el-table-column align="center" label="透前血压(mmhg)" width="180">
+            <el-table-column align="center" :label="'透前血压\n(mmhg)'" width="100">
               <template slot-scope="scope">
                   {{getSysBloodPressure(scope.row.patient_id)?getSysBloodPressure(scope.row.patient_id):""}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="目标超滤量" width="120">
+            <el-table-column align="center" label="目标超滤量" width="100">
                <template slot-scope="scope">
                  {{getTargetUltrafiltration(scope.row.patient_id)?getTargetUltrafiltration(scope.row.patient_id):""}}
                </template>
             </el-table-column>
-            <el-table-column align="center" label="血流量(ml/min)" width="180">
+            <el-table-column align="center" :label="'血流量\n(ml/min)'" width="100">
                <template slot-scope="scope">
                  {{getBloodFlowVolume(scope.row.patient_id)?getBloodFlowVolume(scope.row.patient_id):""}}
                </template>
             </el-table-column>
-             <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)" width="300">
+             <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)">
                 <template slot-scope="scope">
                    <span v-if="getAnticoagulant(scope.row.patient_id) == 0"></span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 1">无肝素</span>
@@ -148,7 +148,7 @@
                     </span>
                 </template>
             </el-table-column>
-             <el-table-column align="center" label="透析器/灌流器" width="200">
+             <el-table-column align="center" label="透析器/灌流器" width="120">
                <template slot-scope="scope">
                  {{getDialyzerPerfusionApparatus(scope.row.patient_id)?getDialyzerPerfusionApparatus(scope.row.patient_id):""}}
                </template>
@@ -438,3 +438,12 @@ export default {
    }
 }
 </style>
+<style lang="scss">
+.el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
+.el-table th .cell {
+  white-space: pre-line;/*保留换行符*/
+}
+</style>

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -7,14 +7,14 @@
     >
     <div>
         <el-date-picker
-        style="width:140px;margin-right:10px"
+        style="width:150px;margin-right:10px"
         v-model="startTime"
         type="date"
         placeholder="选择日期"
         @change="selectStartime">
         </el-date-picker>
         <el-date-picker
-        style="width:140px;margin-right:10px"
+        style="width:150px;margin-right:10px"
         v-model="endTime"
         type="date"
         placeholder="选择日期">

src/xt_pages/dialysis/dialysisParameters_print.vue

@@ -12,7 +12,7 @@
             <div id="print_content">
                 <div class="print_main_content">
                     <div class="order_title_panl">
-                        <span class="main_title">透析参数统计表</span>
+                        <span class="main_title">透析参数打印单</span>
                     </div>
                     <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
                         <p>印单日期：{{nowDate}}</p>
@@ -299,7 +299,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 20px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -309,7 +309,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
 
             .proj {

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -80,7 +80,7 @@
             <span style="display:inline-block;margin-left:15px;">治疗方式:</span>
             <label-box :isChecked="prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;
-            <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>&nbsp;
+            <label-box :isChecked="prescription.mode_id == 3 ? true : prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
           </td>

src/xt_pages/stock/stockOutOrder.vue

@@ -88,7 +88,7 @@
           color: '#606266'
         }"
       >
-        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
 
         <el-table-column label="单据日期" align="center">
           <template slot-scope="scope">
@@ -144,6 +144,7 @@
               <el-button
                 size="mini"
                 type="danger"
+                :disabled="scope.row.is_sys == 1"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index, scope.row)"
               >

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -23,8 +23,8 @@
       </div>
 
       <div class="filter-container" style="margin-top: 10px">
-        <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -195,7 +195,7 @@
         }
         getWarehouseOutInfo(params).then(response => {
           if (response.data.state == 0) {
-           
+
             this.$message.error(response.data.msg)
             return false
           } else {