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

src/api/stock.js

@@ -922,3 +922,19 @@ export function getInventoryDetailPrintList(params) {
     params: params
   })
 }
+
+export function getGoodWarehouseList(params) {
+  return request({
+    url: '/api/stock/getgoodwarehouselist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function proofInventory(params) {
+  return request({
+    url: '/api/stock/proofinventory',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -58,8 +58,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
@@ -142,8 +142,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
@@ -238,8 +238,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
@@ -388,6 +388,13 @@
             <span>{{this.prescription.oxygen_time}}</span>
            </span>
         </li>
+
+         <li v-if="isShow('最大超滤率')">
+          <label>最大超滤率(ml/h):</label>
+          <span class="content">
+            <span>{{this.prescription.max_ultrafiltration_rate}}</span>
+           </span>
+        </li>
        
       </ul>
     </div>

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -2549,7 +2549,7 @@
       this.getSelfMedicalList()
     },mounted(){
       console.log("~~~~~")
-      console.log(this.his_is_open)
+      console.log(this.doctor_advices)
       console.log("~~~~~")
 
 

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -203,7 +203,7 @@
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 '
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 '
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -212,7 +212,7 @@
                             </el-form-item>
 
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -257,14 +257,14 @@
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -309,7 +309,7 @@
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -317,7 +317,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987'
                                     :label="'总量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -805,6 +805,13 @@
                     </el-col>
 
 
+                     <el-col :span="8" v-if="isShows('最大超滤率')">
+                        <el-form-item label="最大超滤率(ml/h)">
+                            <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="dialysisPrescription.max_ultrafiltration_rate"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+
                 </el-row>
 
 
@@ -1318,7 +1325,7 @@
           puncture_needle_count: '',
           epo: '',
           epo_count: '',
-
+          max_ultrafiltration_rate:'',
           hemodialysisPipelinesOptions: [],
           punctureNeedleOptions: [],
           epoOptions: []
@@ -1530,7 +1537,7 @@
       getBeforeWeight(predialysis) {
         if (predialysis.id > 0) {
           if (predialysis.weight_before > 0) {
-            return predialysis.weight_before - predialysis.additional_weight
+            return parseFloat(predialysis.weight_before - predialysis.additional_weight).toFixed(1)
           } else {
             return ''
           }
@@ -1539,7 +1546,7 @@
       getAfterWeight(record) {
         if (record.id > 0) {
           if (record.weight_after > 0) {
-            return record.weight_after - this.predialysis.additional_weight
+            return parseFloat(record.weight_after - this.predialysis.additional_weight).toFixed(1)
           } else {
             return ''
           }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -440,6 +440,67 @@
            </template>
           </el-table-column>
 
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="累计血容量"
+            width="140"
+            v-if="isShow('累计血容量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.accumulated_blood_volume}}
+           </template>
+          </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="血温监测"
+            width="140"
+            v-if="isShow('血温监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_temperature}}
+           </template>
+          </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="尿素监测"
+            width="140"
+            v-if="isShow('尿素监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.urea_monitoring}}
+           </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="血浓量"
+            width="140"
+            v-if="isShow('血浓量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_thickness}}
+           </template>
+          </el-table-column>
+
+         <el-table-column
+            prop="heparin"
+            align="center"
+            label="血压监测"
+            width="140"
+            v-if="isShow('血压监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_monitor}}
+           </template>
+          </el-table-column>
+
+
 
            <el-table-column
             prop="heparin"
@@ -714,7 +775,35 @@
             </el-form-item>
          </el-col>
 
+          <el-col :span="8" v-if=" isShow('累计血容量')">
+            <el-form-item label="累计血容量：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('血温监测')">
+            <el-form-item label="血温监测">
+              <el-input v-model="form.blood_temperature"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('尿素监测')">
+            <el-form-item label="尿素监测">
+              <el-input v-model="form.urea_monitoring"></el-input>
+            </el-form-item>
+          </el-col>
 
+          <el-col :span="8" v-if=" isShow('血浓量')">
+            <el-form-item label="血浓量">
+              <el-input v-model="form.blood_thickness"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('血压监测')">
+            <el-form-item label="血压监测">
+              <el-input v-model="form.blood_monitor"></el-input>
+            </el-form-item>
+          </el-col>
 
           <!-- </el-row>
 
@@ -907,7 +996,12 @@ export default {
         monitor_anticoagulant:'',
         monitor_anticoagulant_value:"",
         blood_pressure_monitoring_site:"",
-        complication:""
+        complication:"",
+        accumulated_blood_volume:"",
+        blood_temperature:"",
+        urea_monitoring:"",
+        blood_thickness:"",
+        blood_monitor:"",
       },
 
       table_current_row: null,
@@ -1126,7 +1220,11 @@ export default {
         this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:'';
         this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:"";
         this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:""
-
+        this.form.accumulated_blood_volume  = resp.monitor.accumulated_blood_volume?resp.monitor.accumulated_blood_volume:""
+        this.form.blood_temperature = resp.monitor.blood_temperature?resp.monitor.blood_temperature:""
+        this.form.urea_monitoring = resp.monitor.urea_monitoring?resp.monitor.urea_monitoring:""
+        this.form.blood_thickness = resp.monitor.blood_thickness?resp.monitor.blood_thickness:""
+        this.form.blood_monitor = resp.monitor.blood_monitor?resp.monitor.blood_monitor:""
       })
     },
 
@@ -1152,6 +1250,7 @@ export default {
       // console.log("tableCurrentRowChange", currentRow)
     },
     setEditMonitor: function(monitor) {
+      console.log("monitor23223322332",monitor)
       if (monitor == null || monitor == undefined) {
         this.form.id = 0;
         // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
@@ -1190,6 +1289,11 @@ export default {
         this.form.blood_sugar = '';
         this.form.monitor_anticoagulant = '';
         this.form.monitor_anticoagulant_value = ''
+        this.form.accumulated_blood_volume  = ""
+        this.form.blood_temperature = ""
+        this.form.urea_monitoring = ""
+        this.form.blood_thickness = ""
+        this.form.blood_monitor = ""
       } else {
         (this.form.id = monitor.id),
         // this.form.operate_date = monitor.operate_date
@@ -1227,6 +1331,11 @@ export default {
         this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:'';
         this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:'';
         this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:"";
+        this.form.accumulated_blood_volume  = monitor.accumulated_blood_volume?monitor.accumulated_blood_volume:""
+        this.form.blood_temperature = monitor.blood_temperature?monitor.blood_temperature:""
+        this.form.urea_monitoring = monitor.urea_monitoring?monitor.urea_monitoring:""
+        this.form.blood_thickness = monitor.blood_thickness?monitor.blood_thickness:""
+        this.form.blood_monitor = monitor.blood_monitor?monitor.blood_monitor:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -1269,6 +1378,11 @@ export default {
       this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
       this.form.blood_pressure_monitoring_site = parseInt(this.form.blood_pressure_monitoring_site);
       this.form.complication = parseInt(this.form.complication);
+      this.form.blood_temperature = parseFloat(this.form.blood_temperature) == NaN ? 0 : parseFloat(this.form.blood_temperature);
+      this.form.accumulated_blood_volume = parseFloat(this.form.accumulated_blood_volume) == NaN ? 0 : parseFloat(this.form.accumulated_blood_volume);
+      this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
+      this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
+      this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
       let mode = '1';
       if (this.form.id > 0) {
         mode = '2';
@@ -1329,6 +1443,11 @@ export default {
             this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
             this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site;
             this.form.complication = this.form.complication;
+            this.form.blood_temperature = parseFloat(this.form.blood_temperature) == NaN ? 0 : parseFloat(this.form.blood_temperature);
+            this.form.accumulated_blood_volume = parseFloat(this.form.accumulated_blood_volume) == NaN ? 0 : parseFloat(this.form.accumulated_blood_volume);
+            this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
+            this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
+            this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
             this.$message.error(resp.msg)
           }
         }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -31,6 +31,11 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量</th>
+          <th v-if="isShow('血温监测')" width="92px">血温监测</th>
+          <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
+          <th v-if="isShow('血浓量')" width="92px">血浓量</th>
+          <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <!-- <th v-if="isShow('血压监测部位')" width="92px">血压监测部位</th>
           <th v-if="isShow('并发症')" width="92px">并发症</th> -->
           <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
@@ -74,6 +79,11 @@
           </td>
           <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>
           <th v-if="isShow('并发症')">{{getComplication(monitor.complication)}}</th> -->
+          <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
+          <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
+          <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
+          <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>
+          <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
           <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1140,7 +1140,7 @@ export default {
       const style8 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto;font-size:10px;}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:10px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.widthLength25{width: 25%;}.lineHeight{line-height: 20px;display: flex;justify-content: space-between;}';
       const style9 =
-        '@media print {.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 940px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
+        '@media print {#dialysis-print-box-1{margin:0 auto;}.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 940px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="dialysis-print-box-1" style="width:920px">
+  <div id="dialysis-print-box-1" style="width:940px">
     <div
       id="dialysis-print-box-1-1"
       class="dialysis-print-order print-template-two print_page_main_content"
@@ -39,31 +39,22 @@
           </div>
         </div>
         <div class="inline_block">
-          门诊：
-          <div class="under_line" style="width: 30px;text-align: center;">
-            <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
-          </div>
-        </div>
-        
-
-      </div>
-      <div class="row">
-        <div class="inline_block">
-          病区：
-          <div class="under_line" style="width: 120px;text-align: center;">
-            {{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}
+          <div class="under_line" style="width: 50px;text-align: center;">
+            <!-- <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box> -->
+            <span v-if="receiverTreatmentAccess.condition == 2">门诊</span>
+            <span v-if="receiverTreatmentAccess.condition == 1">住院</span>
           </div>
         </div>
         <div class="inline_block">
           床号：
-          <div class="under_line" style="width: 120px;text-align: center;">
+          <div class="under_line" style="width: 90px;text-align: center;">
             {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
           </div>
         </div>
         
         <div class="inline_block">
           透析次数：
-          <div class="under_line" style="width: 60px;text-align: left">
+          <div class="under_line" style="width: 50px;text-align: left">
             {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }} 次
           </div>
         </div>
@@ -73,7 +64,17 @@
             {{ queryParams.xtdate }}
           </div>
         </div>
+
       </div>
+      <!-- <div class="row">
+        <div class="inline_block">
+          病区：
+          <div class="under_line" style="width: 120px;text-align: center;">
+            {{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}
+          </div>
+        </div>
+        
+      </div> -->
 
       <div class="row">
         <table class="proj_table">
@@ -321,17 +322,10 @@
                     </div>
                     L
                   </div>
-                  <div class="inline_block" style="flex:1;">
-                    超滤总量：
-                    <div class="under_line" style="width: 50px;text-align: center">
-                      {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
-                    </div>
-                    L
-                  </div>
                   <div class="inline_block" style="flex:1;">
                     透析时长：
                     <div class="under_line" style="width: 50px;text-align: center">
-                      {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour + prescription.dialysis_duration_minute / 60 : "0" }}
+                      {{ prescription.dialysis_duration_hour ? (prescription.dialysis_duration_hour + prescription.dialysis_duration_minute / 60).toFixed(2) : "0" }}
                     </div>
                     h
                   </div>
@@ -506,6 +500,13 @@
                     </div>
                     mmol/L
                   </div>
+                  <div class="inline_block" style="margin-left:10px;">
+                    最大超滤率
+                    <div class="under_line" style="width: 70px;text-align: center;">
+                      {{ prescription.max_ultrafiltration_rate ? prescription.max_ultrafiltration_rate : "/" }}
+                    </div>
+                    ml/h
+                  </div>
                 </div>
               </td>
             </tr>
@@ -583,7 +584,7 @@
                 <table class="inside_table">
                   <tbody>
                     <tr>
-                      <td colspan="9" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
+                      <td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
                         监测记录
                       </td>
                     </tr>
@@ -613,6 +614,7 @@
                         {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                       </td>
+                      <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
                       <td style="padding:1px 5px;" height="30px">
                         <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
                           {{ getAdminUser(monitor.monitoring_nurse) }}
@@ -621,7 +623,6 @@
                           <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
                         </span>
                       </td>
-                      <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
@@ -633,7 +634,7 @@
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="9" style="line-height:25px;text-align:left;">
+                      <td colspan="11" style="line-height:25px;text-align:left;">
                         医师记录：{{ summary.special_record ? summary.special_record : '' }}
                       </td>
                     </tr>
@@ -660,12 +661,6 @@
                     </div>
                     min
                   </div>
-                  <div class="inline_block" style="flex:1;margin-left:50px;">
-                    透后宣教：
-                    <div class="under_line" style="width: 550px;text-align: left;">
-                      {{ summary.mission ? summary.mission : '' }}
-                    </div>
-                  </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                   <div class="inline_block" style="flex:1">
@@ -675,6 +670,14 @@
                     </div>
                   </div>
                 </div>
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="inline_block" style="flex:1;">
+                    透后宣教：
+                    <div class="under_line" style="width: 90%;text-align: left;white-space: initial;">
+                      {{ summary.mission ? summary.mission : '' }}
+                    </div>
+                  </div>
+                </div>
               </td>
             </tr>
             <tr>
@@ -727,10 +730,10 @@
                   <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                     治疗医生：
                     <div class="under_line" style="width: 80px;text-align: center">
-                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.prescription_doctor) == ''">
-                        {{ getAdminUser(prescription.prescription_doctor) }}
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
+                        {{ getAdminUser(prescription.creater) }}
                       </span>
-                      <img style="height:30px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
+                      <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
                     </div>
                   </div>
                 </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -578,17 +578,19 @@
                       <td v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && ( dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}
                       </td>
-                      <td style="width:50px">
+                      <!-- <td style="width:50px">
                         <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
                           {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
                         </span>
                         <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))">
                           {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
                         </span>
-                      </td>
-                      <!-- <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))" style="width:50px">
-                        {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
                       </td> -->
+                      <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12)" style="width:50px">
+                        <span>
+                        {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
+                        </span>
+                      </td>
                       <td width="200" v-if="org_id == 9919">{{monitor.ktv}}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

@@ -368,6 +368,9 @@
             <td width="60">时间</td>
             <td width="60" style="height:20px;line-height:20px">血流量<br />ml/分</td>
             <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
+            <td width="60" style="height:20px;line-height:20px">透析<br />温度<br />℃</td>
+            <td width="40" style="height:20px;line-height:20px">kt/v</td>
+            <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
             <td width="60" style="height:20px;line-height:20px">置换液<br />速度<br />ml/h</td>
             <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
             <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
@@ -382,6 +385,9 @@
             <td style="height:40px;line-height:40px;">&nbsp;{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
             <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
             <td>&nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
+            <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+            <td>&nbsp;{{ monitor.ktv ? monitor.ktv : "" }}</td>
+            <td>&nbsp;{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "" }}</td>
             <td>&nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}</td>
             <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
             <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>

src/xt_pages/outpatientCharges/summary.vue

@@ -205,7 +205,8 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
-  import NewStatementPrint from './newStatementPrint'
+  // import NewStatementPrint from './newStatementPrint'
+  import NewStatementPrint from './statementPrint.vue'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
   import NewStatementPrintTwo from './newStatementPrintTwo'

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1474,7 +1474,23 @@
       }, changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
-      selectChange(row) {
+      selectChange(selection, row) {
+        console.log('row',row)
+        if(row.total <= 0){
+          if(row.type == 3){
+            if (selection) {
+              selection.forEach(row => {
+                if(row.total <= 0){
+                  this.$refs.tables.toggleRowSelection(row);
+                }
+              });
+            } else {
+              this.$refs.tables.clearSelection();
+            }
+            this.$message.error(row.project_name + '库存不足')
+            return
+          }
+        }
         this.teamList = row
       }, getPrescriptionTemplateInfo() {
         let params = {
@@ -1640,6 +1656,7 @@
                 price: good_info[i].retail_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
+                total: good_info[i].total,
                 type: 3
               }
               this.tabProject.push(obj)
@@ -1715,6 +1732,7 @@
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
             this.teamList = []
+            let num = 0
             var project = response.data.data.project
             for (let i = 0; i < project.length; i++) {
               if (project[i].type == 2) {
@@ -1740,6 +1758,17 @@
 
                 this.teamList.push(obj)
               } else if (project[i].type == 3) {
+                if(project[i].good_info.total <= 0){
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row);
+                  setTimeout(() => {
+                    this.$message.error(project[i].good_info.good_name + '库存不足')
+                  },100)
+                }
+                if(num > 0){
+                  this.$refs.tabProjectTeam.clearSelection();
+                }
+
                 let obj = {
                   id: project[i].project_id,
                   project_name: project[i].good_info.good_name,

src/xt_pages/stock/inventory.vue

@@ -2,7 +2,7 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <el-select v-model="inventory_status" size="small" placeholder="请选择">
+                <el-select v-model="inventory_status" size="small" placeholder="请选择" @change="changeInventory">
                     <el-option
                     v-for="item in inventoryList"
                     :key="item.id"
@@ -15,7 +15,7 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
@@ -26,6 +26,7 @@
                 >搜索</el-button
                 >
                 <el-date-picker
+                @change="changeStartTime"
                 size="small"
                 v-model="start_time"
                 type="date"
@@ -37,14 +38,15 @@
                 v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
+                placeholder="选择日期"
+                @change="changeEndTime">
                 </el-date-picker>
             </div>
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
@@ -64,6 +66,16 @@
                 {{scope.row.count}}
               </template>  
             </el-table-column>
+            <el-table-column prop="name" label="库存" width="100" align="center">
+                  <template slot-scope="scope">
+                   {{scope.row.total}}
+                 </template> 
+            </el-table-column>
+            <el-table-column prop="name" label="批次" width="100" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.number}}
+                </template> 
+            </el-table-column>
             <el-table-column prop="name" label="盘点人" align="center">
              <template slot-scope="scope" >
               {{scope.row.user_name}}
@@ -81,12 +93,13 @@
             </el-table-column>
             <el-table-column prop="name" label="状态"  align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.checker_status == 1">已审核</span>
-                <span v-if="scope.row.checker_status == 2">未审核</span>
+                <span v-if="scope.row.checker_status == 1">盘点完成</span>
+                <span v-if="scope.row.checker_status == 2">正在盘点</span>
              </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="300">
                 <template slot-scope="scope">
+                  <el-button type="primary" size="small" @click="getInventory(scope.row.id,scope.row.checker_status)">校对</el-button>
                   <el-button type="primary" size="small" @click="getInventoryDetail(scope.row.id,scope.row.checker_status)">编辑</el-button>
                   <el-button type="danger" size="small" @click="deleteInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
@@ -132,6 +145,17 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name"></el-input>
                 </el-form-item>
+                <el-form-item label="批号">
+                  <el-select v-model="form.number" filterable placeholder="请选择">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.number"
+                        :value="item.number">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
                 <el-form-item label="单位">
                     <el-input v-model="form.warehousing_unit"></el-input>
                 </el-form-item>
@@ -189,6 +213,7 @@
                    {{scope.row.count}}
                  </template> 
                 </el-table-column>
+              
                 <el-table-column prop="name" label="原进货价" width="100" align="center">
                     <template slot-scope="scope">
                     {{scope.row.buy_price}}
@@ -355,13 +380,63 @@
             <el-button @click="modefiyePriceDialogVisible = false">取 消</el-button>
             <el-button type="primary" @click="modifyInventory">保存</el-button>
         </span>
-    </el-dialog>
+      </el-dialog>
+
+
+      <el-dialog
+        title="校对"
+        :visible.sync="proofPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+                 <el-form-item label="耗材名称:">
+                 <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        style="width:160px;"
+                        :disabled="true"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>   
+               <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>  
+               <el-form-item label="盘点数量：">
+                 <el-input v-model="form.count" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+               <el-form-item label="库存数量：">
+                 <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+               <el-form-item label="校对数量：">
+                 <el-input v-model="form.proof_count" style="width:200px"></el-input>
+               </el-form-item>
+             </el-col> 
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="proofPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="proofInventory">保存</el-button>
+        </span>
+      </el-dialog>
     </div>
 </template>
 
 <script> 
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory } from "@/api/stock"
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -398,7 +473,10 @@ export default {
                 good_origin_place:"",
                 report_count:"",
                 total:"",
-
+                expiry_date:"",
+                product_date:"",
+                number:"",
+                proof_count:"",
             },
          manufacturerList:[],
          dealerList:[],
@@ -416,7 +494,9 @@ export default {
          checkDialogVisible:false,
          editPriceDialogVisible:false,
          modefiyePriceDialogVisible:false,
+         proofPriceDialogVisible:false,
          id:0,
+         numberList:[],
         }
     },
     methods:{
@@ -462,6 +542,8 @@ export default {
         },
          handleSelect(val){
             console.log("val232323223",val)
+            this.getStockBatchNumber(val.good_id)
+            this.getGoodWarehouseList(val.good_id)
             this.form.id = val.id
             this.form.good_id = val.good_id,
             this.form.good_name = val.good_name
@@ -475,10 +557,12 @@ export default {
             this.form.buy_price = val.buy_price
             this.form.warehousing_unit = val.packing_unit  
             this.form.total = val.total
-           
+            this.form.number = val.number
+            this.form.expiry_date = val.expiry_date
+            this.form.product_date = val.product_date
         },
         search(){
-
+          this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -512,7 +596,7 @@ export default {
             good_name:this.form.good_name,
             specification_name:this.form.specification_name,
             warehousing_unit:this.form.warehousing_unit,
-            count:parseInt(this.form.count),
+            count:this.form.count,
             buy_price:this.form.buy_price.toString(),
             packing_price:this.form.packing_price.toString(),
             manufacturer:this.form.manufacturer,
@@ -522,12 +606,27 @@ export default {
             warehousing_order:this.form.warehousing_order,
             dealer:this.form.dealer,
             start_time:this.getTime(new Date()),
+            product_date:this.form.product_date,
+            expiry_date:this.form.expiry_date,
+            number:this.form.number,
+            warehousing_info_id:0,
+            total:this.form.total,
+
            } 
            this.tableData.push(obj)
         },
       saveInventory(){
         for(let i=0;i<this.tableData.length;i++){
+           for(let j=0;j<this.numberList.length;j++){
+              if(this.tableData[i].number == this.numberList[j].number){
+                this.tableData[i].warehousing_info_id = this.numberList[j].id
+              }
+              this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
+              this.tableData[i].product_date = parseInt(this.tableData[i].product_date)
+           }
+          
           this.tableData[i].count = parseInt(this.tableData[i].count)
+          this.tableData[i].total = parseInt(this.tableData[i].total)
           if(this.tableData[i].manufacturer == 0){
             this.tableData[i].manufacturer = ""
           }
@@ -537,12 +636,15 @@ export default {
         }
         var params = {
          tableData:this.tableData,
-        }  
+        } 
+        console.log("params",params)
+       
        saveInventory(params).then(response=>{
          if(response.data.state == 1){
            var msg = response.data.data.msg
            this.$message.success("保存成功")
            this.dialogVisible = false
+           this.getlist()
          }
        })
       },
@@ -555,6 +657,7 @@ export default {
           page:this.page,
           limit:this.limit,
          }
+        console.log("parasm",params)
        getInventoryList(params).then(response=>{
           if(response.data.state ==1 ){
            var list =  response.data.data.list
@@ -636,6 +739,24 @@ export default {
        this.form.count = ""
        this.form.remark = ""
      },
+     getInventory(id){
+       getInventoryDetail(id).then(response=>{
+          if(response.data.state == 1){
+            var detail =  response.data.data.detail
+            console.log("detial",detail)
+            this.form.good_name = detail.good_name
+            this.form.specification_name = detail.specification_name
+            this.form.count = detail.count
+            this.form.remark = detail.remark
+            this.form.total = detail.total
+            this.form.warehousing_info_id = detail.warehousing_info_id
+            this.form.good_id  = detail.good_id
+            this.id = detail.id
+            this.proofPriceDialogVisible = true
+
+          }
+       })
+     },
      getInventoryDetail(id,check_status){
         if(check_status == 1){
           this.$message.error("已核对的不能编辑")
@@ -722,6 +843,65 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     
+     getStockBatchNumber(id){
+       var params = {
+         id:id
+       }
+      getStockBatchNumber(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("批号列表",list)
+          this.numberList = list
+        }
+      })
+     },
+     getGoodWarehouseList(id){
+       var params = {
+          id:id,
+       }
+      getGoodWarehouseList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.form.total =  list.stock_count
+           console.log("list23232",list)
+         }
+      })
+     },
+     proofInventory(){
+        var params = {
+          id:this.id,
+          good_id:this.form.good_id,
+          warehousing_info_id:this.form.warehousing_info_id,
+          proof_count:parseInt(this.form.proof_count),
+          total:parseInt(this.form.total)
+        }
+        console.log("parasm",params)
+       proofInventory(params).then(response=>{
+          if(response.data.state == 1){
+             var info = response.data.data.info
+             this.$message.success("保存成功!")
+             this.proofPriceDialogVisible = false
+             this.form.good_name = ""
+             this.form.specification_name = ""
+             this.form.proof_count = ""
+             this.form.total = ""
+             this.form.good_id = ""
+             this.getlist()
+          }
+       })
+     },
+     changeInventory(){
+       this.getlist()
+     },
+     changeStartTime(val){
+       this.start_time = this.getTime(val)
+       this.getlist()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getlist()
+     }
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryDetails.vue

@@ -25,23 +25,21 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
                 class="filter-item"
                 type="primary"
                 icon="el-icon-search"
-                @click="search"
-                >搜索</el-button
-                >
+                @click="search">搜索</el-button>
             </div>
-            <div>
+            <!-- <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
-            </div>
+            </div> -->
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" style="width:100%">
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
             <el-table-column prop="date" label="耗材名称"  width="100" align="center">
                 <template slot-scope="scope">
@@ -83,7 +81,7 @@
             <!-- <el-table-column prop="name" label="产地"  width="100">
               {{scope.row.now_g}}
             </el-table-column> -->
-            <el-table-column  prop="name" label="生产厂商" width="100" align="center">
+            <el-table-column  prop="name" label="生产厂商" width="260" align="center">
               <template slot-scope="scope">
                 {{scope.row.manufacturer}}
              </template>
@@ -93,11 +91,17 @@
                     {{scope.row.count}}
                 </template>
             </el-table-column>
-            <el-table-column  prop="name" label="亏损价格" width="100" align="center">
-            </el-table-column>
+            <!-- <el-table-column  prop="name" label="亏损价格" width="100" align="center">
+            </el-table-column> -->
             <el-table-column prop="name" label="生产日期" width="100" align="center">
+              <template slot-scope="scope">
+               {{getTime(scope.row.expire_date)}}
+               </template>
             </el-table-column>
             <el-table-column  prop="name" label="有效日期" width="100" align="center">
+               <template slot-scope="scope">
+                 {{getTime(scope.row.product_date)}}
+               </template>
             </el-table-column>
         </el-table>
         <el-pagination
@@ -115,6 +119,7 @@
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
 export default {
     name: "inventory",
@@ -136,7 +141,7 @@ export default {
     },
     methods:{
         search(){
-
+         this.getlist()
         },
         print(){
            if(this.ids == ""){
@@ -190,6 +195,17 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+
+      getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+       },
     },
     created(){
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -11,17 +11,17 @@
                 style="width: 200px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
                 class="filter-item"
                 type="primary"
                 icon="el-icon-search"
-                @click="search"
-                placeholder="请输入单据编号或操作人姓名">搜索</el-button>
+                @click="search">搜索</el-button>
                 <el-date-picker
                 size="small"
+                @change="changeStartTime"
                 v-model="start_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
@@ -29,6 +29,7 @@
                 </el-date-picker>
                 <el-date-picker
                 size="small"
+                @change="changeEndTime"
                 v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
@@ -38,8 +39,8 @@
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
@@ -130,6 +131,16 @@
             <el-form-item label="规格">
                 <el-input v-model="form.specification_name"></el-input>
             </el-form-item>
+            <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="单位">
                 <el-input v-model="form.warehousing_unit"></el-input>
             </el-form-item>
@@ -139,9 +150,6 @@
             <el-form-item label="零售价">
                 <el-input v-model="form.packing_price"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="新零售价">
-                <el-input v-model="form.new_price"></el-input>
-            </el-form-item> -->
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
@@ -165,62 +173,57 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column prop="date" label="耗材ID" width="100">
+            <el-table-column prop="date" label="耗材ID" width="100" align="center">
                <template  slot-scope="scope">
                  {{scope.row.good_id}}
                </template>
             </el-table-column>
-            <el-table-column prop="date" label="耗材名称" width="100">
+            <el-table-column prop="date" label="耗材名称" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.good_name}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="规格" width="100">
+            <el-table-column  prop="name" label="规格" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.specification_name}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100">
+            <el-table-column prop="name" label="单位" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="报损数量" width="100">
+            <el-table-column prop="name" label="报损数量" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.count}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="原进货价" width="100">
+            <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.buy_price}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="原零售价" width="100">
+            <el-table-column prop="name" label="原零售价" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.packing_price}}
                </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="新零售价" width="100">
-               <template  slot-scope="scope">
-                {{scope.row.new_price}}
-               </template>
-            </el-table-column> -->
-            <el-table-column prop="name" label="生产厂商" width="100">
+            <el-table-column prop="name" label="生产厂商" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.manufacturer}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="产地" width="100">
+            <el-table-column prop="name" label="产地" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.good_origin_place}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="批准文号" width="100">
+            <el-table-column prop="name" label="批准文号" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.license_number}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="备注" width="100">
+            <el-table-column  prop="name" label="备注" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.remark}}
                </template>
@@ -364,7 +367,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage,getStockBatchNumber,getGoodWarehouseList} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -401,6 +404,9 @@ export default {
                 good_origin_place:"",
                 report_count:"",
                 total:"",
+                number:"",
+                expiry_date:"",
+                product_date:"",
             },
             currentIndex: 0,
             manufacturerList:[],
@@ -420,11 +426,12 @@ export default {
             editPriceDialogVisible:false,
             modifyPriceDialogVisible:false,
             id:0,
+            numberList:[]
         }
     },
     methods:{
         search(){
-
+           this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -484,7 +491,9 @@ export default {
          })
         },
         handleSelect(val){
-          console.log("val23232323",val)
+          //获取当前耗材的批号
+          this.getStockBatchNumber(val.good_id)
+          this.getGoodWarehouseList(val.good_id)
           this.form.id = val.id
           this.form.good_id = val.good_id,
           this.form.good_name = val.good_name
@@ -499,6 +508,8 @@ export default {
           this.form.warehousing_unit = val.packing_unit  
           this.form.total = val.total
           this.form.new_price = val.new_price
+          this.form.expiry_date = val.expiry_date
+          this.form.product_date = val.product_date
       },
       addStock(){
         var obj = {
@@ -506,19 +517,37 @@ export default {
           good_name:this.form.good_name,
           specification_name:this.form.specification_name,
           warehousing_unit:this.form.warehousing_unit,
-          count:parseInt(this.form.count),
+          count:this.form.count,
           buy_price:this.form.buy_price.toString(),
           packing_price:this.form.packing_price.toString(),
           manufacturer:this.form.manufacturer,
           good_origin_place:this.form.good_origin_place,
           license_number:this.form.license_number,
           remark:this.form.remark,
-          // new_price:this.form.new_price.toString(),
           warehousing_order:this.form.warehousing_order,
           dealer:this.form.dealer,
           start_time:this.getTime(new Date()),
+          number:this.form.number,
+          warehousing_info_id:0,
+          product_date:this.form.product_date,
+          expiry_date:this.form.expiry_date,
         } 
         this.tableData.push(obj)
+        this.form.good_id = 0
+        this.form.good_name = ""
+        this.form.specification_name = ""
+        this.form.warehousing_unit = ""
+        this.form.count = ""
+        this.form.buy_price = ""
+        this.form.packing_price = ""
+        this.form.manufacturer = ""
+        this.form.good_origin_place = ""
+        this.form.license_number = ""
+        this.form.remark  = ""
+        this.form.warehousing_order = ""
+        this.form.dealer = ""
+        this.form.number = ""
+        this.form.good_id = ""
       },
       saveReportStock(){
          for(let i = 0;i<this.tableData.length;i++){
@@ -528,6 +557,19 @@ export default {
            if(this.tableData[i].dealer == 0){
               this.tableData[i].dealer = ""   
            }
+         }
+         console.log("比阿哥",this.tableData)
+         console.log("numberlist",this.numberList)
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].count =  parseInt(this.tableData[i].count)
+           this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
+           this.tableData[i].product_date = parseInt(this.tableData[i].product_date)
+           this.tableData[i].total = parseInt(this.tableData[i].total)
+           for(let j=0;j<this.numberList.length;j++){
+              if(this.tableData[i].number == this.numberList[j].number){
+                this.tableData[i].warehousing_info_id = this.numberList[j].id
+              }
+           }
          }
           var params = {
             tableData:this.tableData,
@@ -539,6 +581,7 @@ export default {
              this.$message.success("保存成功")
              this.dialogVisible = false
              this.getlist()
+            this.tableData = []
             this.form.good_name = ""
             this.form.packing_price = ""
             this.form.warehousing_order = ""
@@ -550,6 +593,7 @@ export default {
             this.form.buy_price = ""
             this.form.warehousing_unit = ""
             this.form.total = ""
+            this.form.number = ""
            
            }
         })
@@ -593,18 +637,12 @@ export default {
        }
      },
     changePrice(val){
-       console.log("val23232322323",val)
-      
        var arr = []
-      
        for(let i=0;i<val.length;i++){
          arr.push(val[i].id)
        }
       var str = arr.join(",")
-    
-      console.log("str",str)
-      this.ids = str
-     
+      this.ids = str 
      },
      SaveCheckedDamage(){
          var params = {
@@ -681,7 +719,6 @@ export default {
        modifyPrice(params).then(response=>{
          if(response.data.state ==1){
            var adjust = response.data.data.adjust
-
            this.modifyPriceDialogVisible = false
            this.$message.success("保存成功")
            this.getlist()
@@ -742,6 +779,38 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     getStockBatchNumber(id){
+       var params = {
+         id:id
+       }
+      getStockBatchNumber(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("批号列表",list)
+          this.numberList = list
+        }
+      })
+     },
+     getGoodWarehouseList(id){
+       var params = {
+          id:id,
+       }
+      getGoodWarehouseList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.form.total =  list.stock_count
+           console.log("list23232",list)
+         }
+      })
+     },
+     changeStartTime(val){
+        this.start_time = this.getTime(val)
+        this.getlist()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getlist()
+     }
     },
     created(){
         // var nowDate = new Date();

src/xt_pages/stock/stockFlow.vue

@@ -65,6 +65,7 @@
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
              <span v-if="scope.row.consumable_type == 4">手动退库</span>
+             <span v-if="scope.row.consumable_type == 5">报损数量</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -73,6 +74,7 @@
             <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>  
+            <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -212,6 +214,7 @@
           {id:2,name:"手动出库"},
           {id:3,name:"自动出库"},
           {id:4,name:"手动退库"},
+          {id:5,name:"报损数量"},
         ],
         countList:[],
         outCountList:[],

src/xt_pages/stock/stockModifyPrice.vue

@@ -39,8 +39,8 @@
         <div>
             <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
             <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-            <el-button size="small" type="primary" @click="print">打印</el-button>
-            <el-button size="small" type="primary" @click="toExport">导出</el-button>
+            <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+            <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
         </div>
       </div>
       <div>
@@ -67,11 +67,11 @@
                          {{scope.row.packing_unit}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="调价数量" width="100" align="center">
+                    <!-- <el-table-column label="调价数量" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.count}}
                       </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="原进货价" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.buy_price}}
@@ -142,80 +142,6 @@
                   :total="total">
                </el-pagination>
             </div>
-                <!-- <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                    <el-table-column
-                    fixed="left"
-                    prop="date"
-                    label="药品ID"
-                    width="80">
-                    </el-table-column>
-                    <el-table-column
-                    prop="date"
-                    label="药品名称"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="规格"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="生产厂家"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="批准文书"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="经销商"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="数量"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="原零价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="现零价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="进货价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="零售总价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="批号"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="生产日期"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="有效日期"
-                    width="100">
-                    </el-table-column>
-                </el-table> -->
-         
         </div>
     </div>
     <el-dialog
@@ -248,9 +174,9 @@
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
             </el-form-item>
-            <el-form-item label="调价数量">
-                <el-input v-model="form.count"></el-input>
-            </el-form-item>
+            <!-- <el-form-item label="调价数量">
+                <el-input v-model="form.count" type="number"></el-input>
+            </el-form-item> -->
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -279,11 +205,11 @@
                {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="调价数量" width="100" align="center">
+            <!-- <el-table-column prop="name" label="调价数量" width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.count}}
               </template> 
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.buy_price}}
@@ -370,7 +296,7 @@
                 </el-form-item>
              </el-col> 
             </el-row>
-            <el-row>
+            <!-- <el-row>
              <el-col>
                <el-form-item label="调价数量：">
                     <el-input v-model="form.count"  style="width:200px"></el-input>
@@ -381,7 +307,7 @@
                     </div>
                 </el-form-item>
               </el-col>  
-            </el-row>
+            </el-row> -->
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
@@ -435,19 +361,44 @@
 
 
     <el-dialog
-        title="耗材调价核对"
+        title="耗材调价编辑"
         :visible.sync="modifyDialogVisible"
         width="30%"
         >
         <span>
           <el-form :model="form">
-            <el-row>
-              <el-col>
-                <el-form-item label="现价格">
-                  <el-input v-model="form.new_price" style="width:100px"></el-input>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
+         <el-row>
+               <el-col>
+                <el-form-item label="耗材名称:">
+                    <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        :disabled="true"
+                        style="width:160px;"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>
+               <el-form-item label="原价格：">
+                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="现价格：">
+                    <el-input v-model="form.new_price" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="备注：">
+                    <el-input v-model="form.remark" style="width:200px"></el-input>
+                </el-form-item>
+             </el-col> 
+            </el-row>
           </el-form>  
         </span>
         <span slot="footer" class="dialog-footer">
@@ -578,8 +529,16 @@ export default {
           this.form.packing_price = val.packing_price
           this.form.warehousing_order = val.warehousing_order
           this.form.license_number = val.license_number
-          this.form.dealer = val.dealer
-          this.form.manufacturer = val.manufacturer
+          if(val.dealer == 0){
+            this.form.dealer = ""
+          }else{
+            this.form.dealer = val.dealer
+          }
+          if(this.form.manufacturer == 0){
+            this.form.manufacturer = ""
+          }else{
+            this.form.manufacturer = val.manufacturer
+          }
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
@@ -666,7 +625,8 @@ export default {
            this.tableData[i].buy_price = this.tableData[i].buy_price.toString()
            this.tableData[i].packing_price = this.tableData[i].packing_price.toString()
            this.tableData[i].new_price = this.tableData[i].new_price.toString()
-           this.tableData[i].count =  parseInt(this.tableData[i].count)
+          //  this.tableData[i].count =  parseInt(this.tableData[i].count)
+            this.tableData[i].count = 0
            if(this.tableData[i].dealer == 0){
              this.tableData[i].dealer = ""
            }
@@ -677,6 +637,7 @@ export default {
          var params= {
            tableData:this.tableData,
          }
+      
       console.log("parasm222",params)
       saveAdjustPrice(params).then(response=>{
         if(response.data.state == 1){
@@ -684,6 +645,7 @@ export default {
           console.log("msg",msg)
           this.$message.success("保存成功!")
           this.dialogVisible = false
+          this.tableData = []
           this.getAllStockPrice()
         }
       })  
@@ -800,7 +762,16 @@ export default {
            var info =  response.data.data.detail
            console.log("info",info)
            this.id = info.id
-           this.form.new_price = info.new_price
+           this.good_id = info.good_id,
+           this.form.good_name = info.good_name
+           if(info.new_price == 0){
+            this.form.new_price = ""
+           }else{
+             this.form.new_price = info.new_price
+           }
+          
+           this.form.packing_price = info.packing_price
+           this.form.remark = info.remark
            this.modifyDialogVisible = true
          }
        })
@@ -808,7 +779,11 @@ export default {
      updateStockPrice(){
          var params = {
            new_price:this.form.new_price.toString(),
-           id:this.id
+           id:this.id,
+           packing_price:this.form.packing_price.toString(),
+           remark:this.form.remark,
+           good_id:this.form.good_id,
+           good_name:this.form.good_name,
          }
          console.log("params",params)
        updateStockPrice(params).then(response=>{

src/xt_pages/stock/stockOutOrder.vue

@@ -185,11 +185,11 @@
               {{ scope.row.good_name }}
             </template>
           </el-table-column>
-          <el-table-column label="耗材类型" align="center">
+          <!-- <el-table-column label="耗材类型" align="center">
             <template slot-scope="scope">
               {{  getTypeName(scope.row.good_type_id)}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="规格&单位" align="center">
             <template slot-scope="scope">
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}

src/xt_pages/user/dialysisSolution.vue

@@ -687,6 +687,12 @@
             </el-form-item>
           </el-col>
 
+         <el-col :span="8" v-if="isShows('最大超滤率')">
+            <el-form-item label="最大超滤率(ml/h)">
+              <el-input v-model="addPlan.max_ultrafiltration_rate"></el-input>
+            </el-form-item>
+          </el-col>
+
         </el-row>
 
 
@@ -893,7 +899,7 @@ export default {
         puncture_needle_count:"",
         epo:"",
         epo_count:"",
-
+        max_ultrafiltration_rate:"",
 
       },
       childPlan: {
@@ -1568,6 +1574,7 @@ export default {
       this.addPlan.dialysis_duration_minute = '' + row.dialysis_duration_minute
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
+      this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
       }
@@ -1674,6 +1681,7 @@ export default {
       this.dialysis_irrigation = row.dialysis_irrigation
       this.dialysis_dialyszers = row.dialysis_dialyszers
       this.addPlan.oxygen_uptake = row.oxygen_uptake
+      this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
       if(row.oxygen_uptake == 1){
         this.oxygenShow = true
       }

src/xt_pages/user/templateSummary.vue

@@ -60,8 +60,8 @@
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">阶段小结内容</div>
-                <div style="padding:10px;border-bottom:1px solid #DCDFE6;"><span v-if="editObj.record_time!=''">阶段小结时间:{{getTime(editObj.record_time)}}</span></div>  
-                <!-- <div style="padding: 10px 10px 0;">阶段小结概要:</div>  
+                <div style="padding:10px;border-bottom:1px solid #DCDFE6;"><span v-if="editObj.record_time!=''">阶段小结时间:{{getTime(editObj.record_time)}}</span></div>
+                <!-- <div style="padding: 10px 10px 0;">阶段小结概要:</div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">
                   <span style="margin-right:10px;line-height:30px;">干体重(kg):{{editObj.dry_weight}}</span>
                   <span style="margin-right:10px;line-height:30px;">共透析:{{editObj.dialysis_count}}次</span>
@@ -99,23 +99,23 @@
                          {{it.inspect_value}}
                         <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
                            ↓
-                          </span> 
+                          </span>
                           <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
                            ↑
-                        </span> 
+                        </span>
                       </div>
                     </div>
                   </div>
                   </div>
-                </div>  
-               
+                </div>
+
                 <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:{{editObj.template_plan_content}}</div>
               </div>
             </el-col>
           </el-row>
         </div>
       </div>
-     
+
       <el-dialog title="新增阶段小结" width="80%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
@@ -138,7 +138,7 @@
                             value-format="yyyy"
                             placeholder="选择年">
                         </el-date-picker>
-                    </el-form-item> 
+                    </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item>
@@ -146,9 +146,9 @@
                         <el-radio :label="1" >月份</el-radio>
                         <el-radio :label="2" >季度</el-radio>
                      </el-radio-group>
-                    </el-form-item> 
+                    </el-form-item>
                   </el-col>
-                  
+
                   <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
                       <el-date-picker
@@ -158,7 +158,7 @@
                         type="month"
                         placeholder="选择月">
                       </el-date-picker>
-                    </el-form-item> 
+                    </el-form-item>
                   </el-col>
                   <el-col :span="8" v-if="form.radio == 2">
                     <el-form-item>
@@ -170,10 +170,10 @@
                           :value="item.id">
                         </el-option>
                       </el-select>
-                    </el-form-item> 
-                  </el-col> 
+                    </el-form-item>
+                  </el-col>
                  </el-row>   -->
-                
+
               </el-form>
             </div>
 
@@ -184,57 +184,57 @@
                     <el-col :span="8">
                      <el-form-item label="干体重">
                       <el-input v-model="form.dry_weight"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="共透析(次)">
                       <el-input v-model="form.dialysis_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="HD(次)">
                       <el-input v-model="form.hd_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="HDF(次)">
                       <el-input v-model="form.hdf_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="HP(次)">
                       <el-input v-model="form.hp_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="其他(次)">
                       <el-input v-model="form.other_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row>
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透析器">
                        <el-input v-model="form.dialzer_apparatus" @focus="showInnerDialog('7')"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                       <el-form-item label="灌流器">
                         <el-input v-model="form.perfusion_apparatus" @focus="showInnerDialog('8')"></el-input>
-                      </el-form-item>  
+                      </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                      <el-form-item label="抗凝剂">
-                    
+
                        <el-select v-model="form.anticoagulant" placeholder="请选择" style="width:100%;">
                           <el-option :key="0" label="请选择" :value="0"></el-option>
                           <el-option v-for="(item, index) in anticoagulantList" :label="item.name" :key="index + 'e'"
                            :value="item.id"></el-option>
                        </el-select>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row>
                    <div>透析液</div>
@@ -242,17 +242,17 @@
                     <el-col :span="8">
                      <el-form-item label="钾">
                       <el-input v-model="form.kalium"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="钙">
                       <el-input v-model="form.autunite"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="钠">
                       <el-input v-model="form.natrium"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row>
                    <div>透析时长</div>
@@ -260,39 +260,39 @@
                     <el-col :span="8">
                      <el-form-item label="时">
                       <el-input v-model="form.hour"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="分">
                       <el-input v-model="form.minute"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前体重(kg)">
                       <el-input v-model="form.befor_weight"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="透后体重(kg)">
                       <el-input v-model="form.after_weight"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row>
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前血压(mmHg)">
                       <el-input v-model="form.befor_pressure"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="透后血压(mmHg)">
                       <el-input v-model="form.after_pressure"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
-                 
+
                   <el-row>
                     <label class="title"><span class="name">阶段小结总结</span> : </label>
                      <el-select v-model="form.template_summary_id" placeholder="请选择" @change="changeSummary">
@@ -320,7 +320,7 @@
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
-                
+
                      <div class="borderBox">
                        <div v-for="item in form.template_inspection_content">
                         <p>{{ item.project_name }}</p>
@@ -330,10 +330,10 @@
                             {{it.inspect_value}}
                              <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
                              ↓
-                           </span> 
+                           </span>
                            <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
                             ↑
-                          </span> 
+                          </span>
                           </div>
                         </div>
                       </div>
@@ -374,7 +374,7 @@
         </div>
       </el-dialog>
 
-      
+
       <!-- 编辑阶段小结 -->
        <el-dialog title="编辑阶段小结" width="80%" top="5vh" :visible.sync="edit_show_dialog">
         <div>
@@ -397,7 +397,7 @@
                             value-format="yyyy-MM-dd"
                             placeholder="选择年">
                         </el-date-picker>
-                    </el-form-item> 
+                    </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item>
@@ -405,9 +405,9 @@
                         <el-radio :label="1" >月份</el-radio>
                         <el-radio :label="2" >季度</el-radio>
                      </el-radio-group>
-                    </el-form-item> 
+                    </el-form-item>
                   </el-col>
-                  
+
                   <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
                       <el-date-picker
@@ -417,7 +417,7 @@
                         type="month"
                         placeholder="选择月">
                       </el-date-picker>
-                    </el-form-item> 
+                    </el-form-item>
                   </el-col>
                   <el-col :span="8" v-if="form.radio == 2">
                     <el-form-item>
@@ -429,10 +429,10 @@
                           :value="item.id">
                         </el-option>
                       </el-select>
-                    </el-form-item> 
-                  </el-col> 
+                    </el-form-item>
+                  </el-col>
                  </el-row>   -->
-                
+
               </el-form>
             </div>
 
@@ -443,46 +443,46 @@
                     <el-col :span="8">
                      <el-form-item label="干体重">
                       <el-input v-model="form.dry_weight"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="共透析(次)">
                       <el-input v-model="form.dialysis_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="HD(次)">
                       <el-input v-model="form.hd_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
                   <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="HDF(次)">
                       <el-input v-model="form.hdf_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="HP(次)">
                       <el-input v-model="form.hp_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="其他(次)">
                       <el-input v-model="form.other_count"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
                    <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透析器">
                        <el-input v-model="form.dialzer_apparatus" @focus="showInnerDialog('7')"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                       <el-form-item label="灌流器">
                         <el-input v-model="form.perfusion_apparatus" @focus="showInnerDialog('8')"></el-input>
-                      </el-form-item>  
+                      </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
@@ -492,7 +492,7 @@
                           <el-option v-for="(item, index) in anticoagulantList" :label="item.name" :key="index + 'e'"
                            :value="item.id"></el-option>
                        </el-select>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
                    <!-- <div>透析液</div>
@@ -500,17 +500,17 @@
                     <el-col :span="8">
                      <el-form-item label="钾">
                       <el-input v-model="form.kalium"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="钙">
                       <el-input v-model="form.autunite"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="钠">
                       <el-input v-model="form.natrium"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
                    <!-- <div>透析时长</div>
@@ -518,39 +518,39 @@
                     <el-col :span="8">
                      <el-form-item label="时">
                       <el-input v-model="form.hour"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="分">
                       <el-input v-model="form.minute"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
                   <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前体重(kg)">
                       <el-input v-model="form.befor_weight"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="透后体重(kg)">
                       <el-input v-model="form.after_weight"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
                    <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前血压(mmHg)">
                       <el-input v-model="form.befor_pressure"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="透后血压(mmHg)">
                       <el-input v-model="form.after_pressure"></el-input>
-                     </el-form-item>  
+                     </el-form-item>
                     </el-col>
                   </el-row> -->
-                 
+
                   <el-row>
                     <label class="title"><span class="name">阶段小结总结</span> : </label>
                      <el-select v-model="form.template_summary_id" placeholder="请选择" @change="changeSummaryOne">
@@ -578,7 +578,7 @@
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
-                   
+
                      <div class="borderBox">
                        <div v-for="item in form.template_inspection_content">
                         <p>{{ item.project_name }}</p>
@@ -588,10 +588,10 @@
                              {{it.inspect_value}}
                              <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
                             ↓
-                           </span> 
+                           </span>
                            <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
                              ↑
-                          </span> 
+                          </span>
                           </div>
                         </div>
                       </div>
@@ -648,26 +648,26 @@
                    prop="startYear"
                    style="width:100%;"
                  >
-                 <el-date-picker 
+                 <el-date-picker
                     @change="changeYear"
-                    v-model="startYear" 
-                    class="timePicker" 
-                    type="month" 
+                    v-model="startYear"
+                    class="timePicker"
+                    type="month"
                     placeholder=""
-                    format="yyyy-MM" 
+                    format="yyyy-MM"
                     value-format="yyyy-MM">
 	               </el-date-picker>
                  </el-form-item>
                  <!-- <el-form-item  label="月份:"
                    prop="startYear"
-                   style="width:100%;">     
+                   style="width:100%;">
                   <el-date-picker
                     v-model="startMonth"
                     type="month"
                     format="MM"
                     value-format="MM"
                     placeholder="请选择">
-                  </el-date-picker>  
+                  </el-date-picker>
                  </el-form-item> -->
                 </div>
               </el-form-item>
@@ -684,12 +684,12 @@
                         :row-style="{ color: '#303133' }"
                         ref="single_table"
                         :data="tableList"
-                        border highlight-current-row 
+                        border highlight-current-row
                         @current-change="changeCurrentRecord"
                         @selection-change="selectionChangeOne"
                         :row-class-name="tableRow"
                         @row-click="onRowClick"
-                      
+
                       >
                         <el-table-column type="selection" width="60" align="center"></el-table-column>
                         <el-table-column label="检验项目" align="center">
@@ -709,7 +709,7 @@
                                 border highlight-current-row @current-change="didChangeCurrentRecord"
                                 @selection-change="selectionChange"
                                 :row-class-name="tableRow"
-                                
+
                       >
                         <el-table-column label="检验项目" align="center">
                           <template slot-scope="scope">
@@ -721,10 +721,10 @@
                             {{scope.row.inspect_value}}
                            <span v-if="parseInt(scope.row.inspect_value) < parseInt(scope.row.range_min)">
                             ↓
-                          </span> 
+                          </span>
                            <span v-if="parseInt(scope.row.inspect_value) > parseInt(scope.row.range_max)">
                              ↑
-                          </span> 
+                          </span>
                           </template>
                         </el-table-column>
                         <el-table-column label="参考值" align="center">
@@ -751,9 +751,9 @@
           <el-button type="primary" @click="toContent">确 定</el-button>
         </span>
       </el-dialog>
-      
-       
-  
+
+
+
 
       <multi-select-box
         :propsForm="InnerDialogProps"
@@ -770,7 +770,7 @@
 <script>
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
- 
+
   import { getInitDataList,getInspectionMajorItem,getInspectionDetail,getInspectionItemList,saveCreation,getTemplateSummaryList,getTemplateSummaryDetail,UpdateTemplateSummary,deleteSummary } from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -778,7 +778,7 @@
   import { getDataConfig } from '@/utils/data'
   import multiSelectBox from '../dialysis/details/dialog/MultiSelectBox'
  import MsgTip from '../dialysis/details/dialog/MsgTip'
- 
+
   const moment = require('moment')
   export default {
     name: 'templateSummary',
@@ -922,7 +922,7 @@
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1
-      
+
       var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
@@ -951,12 +951,12 @@
 
       this.anticoagulantList = arrFour
       console.log("抗凝剂量",this.anticoagulantList)
-      var endtime= moment(new Date()).endOf('month').subtract('month', +1).endOf('month').format("YYYY-MM-DD") 
+      var endtime= moment(new Date()).endOf('month').subtract('month', +1).endOf('month').format("YYYY-MM-DD")
       console.log("endtime",endtime)
       this.getlist()
       this.getInspectionMajor()
       this.getTemplateSummaryList()
-     
+
     },
     methods: {
       getTime(val) {
@@ -984,7 +984,7 @@
          }
       },
       showEdit(){
-       
+
         this.getCurrentRecordDetailOne()
       },
       onRowClick(){
@@ -994,7 +994,7 @@
 
       },
       changeCurrentRecord(val){
-       
+
         this.getInspectionDetai(val)
       },
       selectionChangeOne(val){
@@ -1019,7 +1019,7 @@
       getQuarter(year,quarter){
         var start_time = ""
         if(quarter == 1){
-           
+
         }
       },
       didSelectionChange(){
@@ -1056,11 +1056,11 @@
              this.form.natrium = prescription_list.sodium
              this.form.autunite = prescription_list.calcium
              var beforlist = response.data.data.beforlist
-             console.log("透前数据565665565656",beforlist)
+             // console.log("透前数据565665565656",beforlist)
              this.form.befor_weight = beforlist.weight_before
              this.form.dry_weight = beforlist.dry_weight
              var afterlist =  response.data.data.after_list
-             console.log("透后数据232332323232",afterlist)
+             // console.log("透后数据232332323232",afterlist)
              this.form.after_weight = afterlist.weight_after
              this.form.after_pressure = afterlist.systolic_blood_pressure + "/"+afterlist.diastolic_blood_pressure
              this.form.befor_pressure = beforlist.systolic_blood_pressure +"/"+beforlist.diastolic_blood_pressure
@@ -1117,7 +1117,7 @@
 
              }
              this.form.other_count = count
-             
+
              this.form.dialysis_count = total_count
             //  console.log("modelist",modelist)
              var summaryList = response.data.data.summaryList
@@ -1130,7 +1130,7 @@
        })
       },
       toInspection(){
-        
+
         this.dialogVisibleInspection = true
       },
 
@@ -1149,7 +1149,7 @@
             console.log("列表23232232323",list)
             // this.$refs.single_table.setCurrentRow(list[0])
             this.tableList = list
-           
+
           }
         })
       },
@@ -1165,7 +1165,7 @@
           if(response.data.state ==1){
             var list = response.data.data.list
             // console.log("详情222",list)
-           
+
             this.tableData = list
           }
        })
@@ -1183,10 +1183,10 @@
         this.projectList.push(val[i].project_id)
         this.inspectDataList.push(val[i].inspect_date)
       }
-    
+
       },
       toContent(){
-      
+
          var str = this.projectList.join(",")
          this.projectStr = str
          var inspe_date = this.inspectDataList.join(",")
@@ -1202,15 +1202,15 @@
              var list = response.data.data.list
             let arr = this.unique(list,'project_name')
             // console.log("选择检验检查",arr)
-           
+
             this.form.template_inspection_content = arr
             this.dialogVisibleInspection = false
-           
+
            }
-        })  
+        })
       },
       saveCreation(){
-   
+
         if (this.form.dry_weight == ""){
           this.form.dry_weight = 0
         }
@@ -1294,7 +1294,7 @@
             radio:this.form.radio,
          }
           console.log("parawm232323223",params)
-    
+
         saveCreation(params).then(response=>{
            if(response.data.state ==1){
              var summary =  response.data.data.summary
@@ -1443,7 +1443,7 @@
               }else{
                 this.form.dialysis_count = list.dialysis_count
               }
-             
+
               this.form.dialzer_apparatus = list.dialzer_apparatus
               this.form.dry_weight = list.dry_weight
                this.form.hd_count= list.hd_count
@@ -1461,14 +1461,14 @@
                }else{
                  this.form.template_inspection_id = list.template_inspection_id
                }
-              
+
                this.form.template_plan_content = list.template_plan_content
                if(list.template_plan_id == 0){
                  this.form.template_plan_id  = ""
                }else{
                  this.form.template_plan_id = list.template_plan_id
                }
-             
+
                console.log("hhhhhhhhh",list.template_plan_id)
                this.form.template_summary_content =list.template_summary_content
                if(list.template_summary_id == 0){
@@ -1476,11 +1476,11 @@
                }else{
                  this.form.template_summary_id = list.template_summary_id
                }
-              
+
                this.projectIndate = list.inspect_date
                this.projectStr = list.project_id
            }
-        })  
+        })
       },
       changeSummary(){
        for(let i=0;i<this.summaryList.length;i++){
@@ -1537,7 +1537,7 @@
             inspect_date:this.projectIndate,
          }
          console.log("parawm232323223",params)
-        
+
         UpdateTemplateSummary(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
@@ -1647,13 +1647,13 @@
           end = this.start_year +"-"+ this.form.start_month + "-"+"30"
         }
         var start = this.start_year +"-"+ this.form.start_month+"-"+"01"
-       
+
         this.start_date  = start
-        this.end_date = end 
+        this.end_date = end
         console.log("开始时间",this.start_date)
         console.log("结束时间",this.end_date)
         this.getlist()
-       
+
       },
       changeQuarter(val){
         this.form.title = ""
@@ -1677,7 +1677,7 @@
         this.form.template_summary_content = ""
         this.form.template_plan_content = ""
         this.form.template_inspection_content = ""
-       
+
         this.form.after_pressure = ""
         this.form.template_summary_id = ""
         this.form.template_plan_id = ""
@@ -1701,7 +1701,7 @@
         this.getlist()
       },
       getAnticoagulant(id){
-        
+
         var name = ""
         for(let i=0;i<this.anticoagulantList.length;i++){
           if(id == this.anticoagulantList[i].id){
@@ -1717,7 +1717,7 @@
         }else{
           this.startYear = val+"-" + "30"
         }
-       
+
         this.lastYear = val+"-"+"01"
         this.getInspectionMajor()
       },
@@ -1727,7 +1727,7 @@
         for( let i=0;i<val.length;i++){
            arr.push(val[i].id)
         }
-     
+
         var str = arr.join(",")
        console.log("str",str)
        this.ids = str
@@ -1736,7 +1736,7 @@
        if(this.ids == ""){
          this.$message.error("请勾选需要删除的数据")
          return
-       } 
+       }
        this.$confirm('确认删除这条记录?', '删除记录', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1746,7 +1746,7 @@
               ids: this.ids,
             }
             console.log("params2323",params)
-            
+
             deleteSummary(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1754,7 +1754,7 @@
               } else {
                 var msg =response.data.data.msg
                 this.getTemplateSummaryList()
-                
+
               }
             })
           })
@@ -1769,7 +1769,7 @@
   //       this.$refs.inspection_table.setCurrentRow(this.inspectionList[0])
   //     })
   //   },
-   
+
   //  },
   }
 </script>

src/xt_pages/user/templateSummaryPrint.vue

@@ -47,7 +47,7 @@
         </div>
       </div> -->
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
-        <span style="font-weight:bold;">阶段小结总结:</span><div>{{patientList.template_summary_content}}</div>  
+        <span style="font-weight:bold;">阶段小结总结:</span><div style="line-height:24px;">{{patientList.template_summary_content}}</div>  
       </div>
      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:250px;">
         <span style="font-weight:bold;">阶段小结化验结果:</span>
@@ -71,7 +71,7 @@
       </div>
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结个性化方案:</span>
-        <div>{{patientList.template_plan_content}}</div>
+        <div style="line-height:24px;">{{patientList.template_plan_content}}</div>
       </div>
      <div style="margin-top:10px;">
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
@@ -288,7 +288,7 @@ export default {
     printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
-        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
+        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
         printJS({
             printable: 'dialysis-print-box',
             type: 'html',

src/xt_pages/workforce/next_remind_print.vue

@@ -64,8 +64,8 @@
                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
-                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
+                         <!-- <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>