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

src/api/drug/drug.js

@@ -459,3 +459,11 @@ export function SaveDrugProofInventory(params) {
     params: params
   })
 }
+
+export function getDrugWarehouseInfoTotal(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseinfototal',
+    method: 'Get',
+    params: params
+  })
+}

src/api/patient.js

@@ -501,12 +501,12 @@ export function getInspectionItemList(params) {
   })
 }
 
-export function saveCreation(params) {
-  console.log('中国龚3223呃3额', params)
+export function saveCreation(data) {
+  console.log('中国龚3223呃3额', data)
   return request({
     url: '/api/patient/savecreationinspection',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 
@@ -534,11 +534,11 @@ export function getTemplateSummaryPrintDetail(params) {
   })
 }
 
-export function UpdateTemplateSummary(params) {
+export function UpdateTemplateSummary(data) {
   return request({
     url: '/api/patient/updatetemplatesummary',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 

src/api/stock.js

@@ -835,9 +835,9 @@ export function updateStockPrice(params) {
   })
 }
 
-export function deleteStockPrice(id, params) {
+export function deleteStockPrice(params) {
   return request({
-    url: '/api/stock/deletestockprice?id=' + id,
+    url: '/api/stock/deletestockprice',
     method: 'Get',
     params: params
   })
@@ -938,3 +938,11 @@ export function proofInventory(params) {
     params: params
   })
 }
+
+export function getWarehouseTotal(params) {
+  return request({
+    url: '/api/stock/getwarehousetotal',
+    method: 'Get',
+    params: params
+  })
+}

src/router/modules/dialysis.js

@@ -435,6 +435,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/fortyOne',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fortyOne'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_fortyOne',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirtyThree_one',
       component: () =>

src/utils/tools.js

@@ -153,7 +153,7 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
- 
+  console.log('t', type)
   var t = 0.5
   if (type == 1) {
     t = 0.5
@@ -168,34 +168,30 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0
   }
- console.log((shouji + (shichang - t) * weichi).toFixed(1))
+  console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
 
-
-
-
-
-export function formatDate (date, format) {
+export function formatDate(date, format) {
   if (/(y+)/.test(format)) {
-      format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
   }
-  let o = {
-      'M+': date.getMonth() + 1,
-      'd+': date.getDate(),
-      'h+': date.getHours(),
-      'm+': date.getMinutes(),
-      's+': date.getSeconds()
-  };
-  for (let k in o) {
-      if (new RegExp(`(${k})`).test(format)) {
-          let str = o[k] + '';
-          format= format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
-      }
+  const o = {
+    'M+': date.getMonth() + 1,
+    'd+': date.getDate(),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds()
   }
-  return format;
-};
+  for (const k in o) {
+    if (new RegExp(`(${k})`).test(format)) {
+      const str = o[k] + ''
+      format = format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str))
+    }
+  }
+  return format
+}
 
-function padLeftZero (str) {
-  return ('00' + str).substr(str.length);
-};
+function padLeftZero(str) {
+  return ('00' + str).substr(str.length)
+}

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -279,6 +279,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 41">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -869,6 +879,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
       } else if (this.template_id == 40) {
         this.$router.push({ path: "/dialysis/print/batch/forty" });
+      } else if (this.template_id == 41) {
+        this.$router.push({ path: "/dialysis/print/batch/fortyOne" });
       }
     },
     batchPrintActionOne: function() {

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

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

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

@@ -2118,7 +2118,7 @@
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
-
+        console.log("val",val)
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
@@ -2145,6 +2145,16 @@
           this.anticoagulant.weichi_unit = 'ml'
           this.anticoagulant.zongliang_unit = 'ml'
         }
+
+        console.log('首季9999', this.dialysisPrescription.anticoagulant_zongliang)
+        console.log("收集",this.dialysisPrescription.anticoagulant_shouji)
+        console.log("weichi",this.dialysisPrescription.anticoagulant_weichi)
+        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+          this.dialysisPrescription.anticoagulant_zongliang = ""
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        }
+
+
       },
       handleCommit: function() {
         if (this.dialysisPrescription.anticoagulant == '低分子肝素') {
@@ -3445,7 +3455,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
+        
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0
@@ -3477,6 +3487,11 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+          this.dialysisPrescription.anticoagulant_zongliang = ""
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+       }
+
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3502,8 +3517,13 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-        console.log('首季', this.dialysisPrescription.anticoagulant_zongliang)
-
+        console.log('首季9999', this.dialysisPrescription.anticoagulant_zongliang)
+        console.log("收集",this.dialysisPrescription.anticoagulant_shouji)
+        console.log("weichi",this.dialysisPrescription.anticoagulant_weichi)
+        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+         this.dialysisPrescription.anticoagulant_zongliang = ""
+         this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+       }
       },
       'prescription.id': {
         immediate: true,

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

@@ -443,7 +443,7 @@
            <el-table-column
             prop="heparin"
             align="center"
-            label="累计血容量"
+            label="累计血容量(ml)"
             width="140"
             v-if="isShow('累计血容量')"
           >
@@ -776,7 +776,7 @@
          </el-col>
 
           <el-col :span="8" v-if=" isShow('累计血容量')">
-            <el-form-item label="累计血容量：">
+            <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -31,7 +31,7 @@
           <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">累计血容量(ml)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -573,6 +573,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 42">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -858,6 +868,11 @@
             v-if="org_template_info.template_id == 41"
           >
           </DialysisPrintOrderFortyOne>
+          <DialysisPrintOrderFortyTwo
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 42"
+          >
+          </DialysisPrintOrderFortyTwo>
         </div>
       </el-container>
     </div>
@@ -918,9 +933,11 @@ import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEi
 import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNine";
 import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
 import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
+import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortyTwo,
     DialysisPrintOrderFortyOne,
     DialysisPrintOrderForty,
     DialysisPrintOrderThirtyNine,
@@ -1141,6 +1158,8 @@ export default {
         '@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-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;}';
+      const style10 =
+        '@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:40px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;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;line-height:35px} .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;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1415,6 +1434,13 @@ export default {
           style: style9,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 42) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style10,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/management/components/UserForm.vue

@@ -1041,7 +1041,8 @@ export default {
         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 4, name: "1500mg/l含氯消毒剂" },
+        { id: 5, name: "消毒湿巾" }
       ],
       // 夜路消毒方式
       sterilizeType: [
@@ -1292,6 +1293,9 @@ export default {
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
             }
+            if (information[index].disinfectant_type === 5) {
+               information[index].disinfectant_type = "消毒湿巾";
+            }
 
             if (information[index].disinfection === 1) {
               information[index].disinfection = "已消毒";
@@ -1817,6 +1821,9 @@ export default {
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
             }
+            if (information[index].disinfectant_type === 5) {
+              information[index].disinfectant_type = "消毒湿巾";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
@@ -2103,6 +2110,9 @@ export default {
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
             }
+           if (information[index].disinfectant_type === 5) {
+              information[index].disinfectant_type = "消毒湿巾";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";

src/xt_pages/management/home.vue

@@ -981,7 +981,7 @@
                                      </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                       <el-form-item label="患者:" required prop ="patient_name">
+                                       <el-form-item label="患者:">
                                            <el-autocomplete
                                                style="width:150px"
                                                popper-class="my-autocomplete"

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1,5 +1,8 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
+    <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
@@ -120,9 +123,7 @@
                                                                 type="primary"
                                                         >修改医疗类型
                                                         </el-button>
-                                                    </el-tab-pane>
-
-                                                    <div style="margin-bottom:10px;float: right">
+                                                        <div style="margin-bottom:10px;float: right">
                                                         <div>
                                                             <el-button
                                                                     v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
@@ -148,6 +149,9 @@
                                                             </el-button>
                                                         </div>
                                                     </div>
+                                                    </el-tab-pane>
+
+                                                    
 
                                                     <prescription-table ref="prescription_tables"
                                                                         :prescription="items.curPrescriptions"></prescription-table>
@@ -690,7 +694,8 @@
 
         temp_ids: '',
 
-        other_prescriptions: []
+        other_prescriptions: [],
+        newLoading:false
 
       }
     },
@@ -859,7 +864,7 @@
         })
 
       }, chargeConfirm(form) {
-
+        this.newLoading = true
         form['id'] = this.patientInfo.id
         form['his_patient_id'] = this.hisPatientInfo.id
         form['record_time'] = this.record_date
@@ -886,6 +891,7 @@
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.loadingtwo = false
+              this.newLoading = false
               this.$refs.charge.hide()
               return false
             } else {
@@ -898,6 +904,7 @@
               this.$message({ message: '收费成功', type: 'success' })
               this.$refs.charge.hide()
               this.loadingtwo = false
+              this.newLoading = false
             }
           })
 
@@ -921,8 +928,9 @@
                     confirmButtonText: '确 定',
                     type: 'warning'
                   }).then(() => {
-
+                    that.newLoading = false
                   }).catch(() => {
+                    that.newLoading = false
                   })
 
                 } else {
@@ -936,12 +944,12 @@
                   that.cal_one = this.cal_one - 1
                   that.cal_two = this.cal_two + 1
                   that.patientTableData.splice(this.current_index, 1)
-
+                  that.newLoading = false
                 }
               }
             })
             .catch(function(error) {
-
+              that.newLoading = false
             })
         }
       }, chargeCancel() {
@@ -2115,7 +2123,7 @@
           }
           var ids_str = ids.join(',')
           this.temp_ids = ids_str
-
+          this.newLoading = true
           var that = this
           let form = {}
           form['id'] = this.patientInfo.id
@@ -2148,14 +2156,16 @@
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
                   this.loadingtwo = false
+                  this.newLoading = false
                   return false
                 } else {
                   this.changeRadioAndPatient(1)
                   this.$message({ message: '预结算成功', type: 'success' })
+                  this.newLoading = false
                 }
               })
             }).catch(() => {
-
+              this.newLoading = false
             })
 
           } else {
@@ -2180,20 +2190,22 @@
                         confirmButtonText: '确 定',
                         type: 'warning'
                       }).then(() => {
-
+                        that.newLoading = false
                       }).catch(() => {
+                        that.newLoading = false
                       })
                     } else {
                       that.changeRadioAndPatient(1)
                       that.$message({ message: '预结算成功', type: 'success', duration: 5000 })
+                      that.newLoading = false
                     }
                   }
                 })
                 .catch(function(error) {
-
+                  that.newLoading = false
                 })
             }).catch(() => {
-
+              that.newLoading = false
             })
           }
 
@@ -4105,7 +4117,7 @@
         position: relative;
 
         overflow-y: auto;
-        height: 350px;
+        height: 450px;
 
 
     .el-tabs__item {

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -13,10 +13,10 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028">
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
           <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138"></printThree>
-          <printFour v-if="org_id == 9504 || org_id == 10028" :info="info"></printFour>
+          <printFour v-if="org_id == 9504 || org_id == 10028 || org_id == 0" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>
       </div>
@@ -300,58 +300,106 @@ export default {
           id: obj.order_id,
 
         }
-        getPrivateExpenses(params).then(response => {
-          if (response.data.state == 0) {
-            // this.$message.error(response.data.msg)
-
-            return false
-          } else {
-
-            this.balanceAccounts = response.data.data
-            let arr = []
-            let obj = {
-              type:1,
-              details: [],
-              total: 0
-            }
-            let obj2 = {
-              type:2,
-              details: [],
-              total: 0
-            }
-            let obj3 = {
-              type:3,
-              details: [],
-              total: 0
-            }
-            let num = 0
-            this.balanceAccounts.order_info.map(item => {
-
-              if(item.advice_id > 0){
-                obj.details.push(item)
-                obj.total += (item.pric * item.advice.prescribing_number)
-                num++
-              }else{
-                if(item.project.type == 2){
-                  obj2.details.push(item)
-                  obj2.total += (item.pric * item.project.count)
+        if(this.org_id == 10138){
+          getPrivateExpenses(params).then(response => {
+            if (response.data.state == 0) {
+              // this.$message.error(response.data.msg)
+
+              return false
+            } else {
+
+              this.balanceAccounts = response.data.data
+              let arr = []
+              let obj = {
+                type:1,
+                details: [],
+                total: 0
+              }
+              let obj2 = {
+                type:2,
+                details: [],
+                total: 0
+              }
+              let obj3 = {
+                type:3,
+                details: [],
+                total: 0
+              }
+              let num = 0
+              this.balanceAccounts.order_info.map(item => {
+
+                if(item.advice_id > 0){
+                  obj.details.push(item)
+                  obj.total += (item.pric * item.advice.prescribing_number)
                   num++
                 }else{
-                  obj3.details.push(item)
-                  obj3.total += (item.pric * item.project.count)
-                  num++
+                  if(item.project.type == 2){
+                    obj2.details.push(item)
+                    obj2.total += (item.pric * item.project.count)
+                    num++
+                  }else{
+                    obj3.details.push(item)
+                    obj3.total += (item.pric * item.project.count)
+                    num++
+                  }
                 }
+              })
+              this.balanceAccounts.new_detail_list = []
+              this.balanceAccounts.new_detail_list.push(obj)
+              this.balanceAccounts.new_detail_list.push(obj2)
+              this.balanceAccounts.new_detail_list.push(obj3)
+              console.log(111,this.balanceAccounts)
+              this.num = num
+              console.log('this.num',this.num)
+            }
+          })
+        }else if(this.org_id == 10028){
+          getPrivateExpenses(params).then(response => {
+            if (response.data.state == 0) {
+              // this.$message.error(response.data.msg)
+
+              return false
+            } else {
+
+              this.balanceAccounts = response.data.data
+              let obj = {
+                type:1,
+                details: [],
+                total: 0
               }
-            })
-            this.balanceAccounts.new_detail_list = []
-            this.balanceAccounts.new_detail_list.push(obj)
-            this.balanceAccounts.new_detail_list.push(obj2)
-            this.balanceAccounts.new_detail_list.push(obj3)
-            console.log(111,this.balanceAccounts)
-            this.num = num
-            console.log('this.num',this.num)
-          }
-        })
+              let obj2 = {
+                type:2,
+                details: [],
+                total: 0
+              }
+              let obj3 = {
+                type:3,
+                details: [],
+                total: 0
+              }
+              this.balanceAccounts.order_info.map(item => {
+
+                if(item.advice_id > 0){
+                  obj.details.push(item)
+                  obj.total += (item.pric * item.advice.prescribing_number)
+                }else{
+                  if(item.project.type == 2){
+                    obj2.details.push(item)
+                    obj2.total += (item.pric * item.project.count)
+                  }else{
+                    obj3.details.push(item)
+                    obj3.total += (item.pric * item.project.count)
+                  }
+                }
+              })
+              this.balanceAccounts.new_detail_list = []
+              this.balanceAccounts.new_detail_list.push(obj)
+              this.balanceAccounts.new_detail_list.push(obj2)
+              this.balanceAccounts.new_detail_list.push(obj3)
+              console.log(111,this.balanceAccounts)
+            }
+          })
+        }
 
 
       }else {

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div id='prescription-print' class="prescription-print">
+        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print">
             <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
                 <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
                 <div class="infoMain">
@@ -133,12 +133,118 @@
             </div>
 
         </div>
+        <div v-else id='prescription-print' class="prescription-print">
+          <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
+              <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
+              <div class="infoMain">
+                  <div class="infoP">医院(药店)编号：{{balanceAccounts.org_config.code}}</div>
+                  <div class="infoP">名称：{{balanceAccounts.org_config.org_name}}</div>
+                  <div class="infoP">医生工号：</div>
+                  <div class="infoP">门诊流水号：{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</div>
+                  <div class="infoP">科别: {{balanceAccounts.order.department_name ? balanceAccounts.order.department_name : ''}}</div>
+                  <div class="infoP">处方单据号：{{balanceAccounts.order.number ? balanceAccounts.order.number : ''}}</div>
+                  <div class="infoP">姓名：{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</div>
+                  <div class="infoP">医疗账号：</div>
+                  <div class="infoP">医疗类别：自费</div>
+              </div>
+              <div class="chargeBox">
+                  <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
+                      <div class="chargeUl" style="width:20%;">
+                          <p style="width:50%;border-right:1px solid #000;">费用类型</p>
+                          <p style="width:50%;border-right:1px solid #000;">金额</p>
+                      </div>
+                      <div class="chargeUl" style="width:80%;">
+                          <p style="width:40%;border-right:1px solid #000;">明细名称</p>
+                          <p style="width:15%;border-right:1px solid #000;">规格</p>
+                          <p style="width:15%;border-right:1px solid #000;">数量</p>
+                          <p style="width:15%;border-right:1px solid #000;">单价</p>
+                          <p style="width:15%;">金额</p>
+                      </div>
+                  </div>
+                  <div style="display:flex;justify-content: space-between;">
+                      <div style="width:20%;">
+                          <div class="chargeUl" v-for="(item,i) in balanceAccounts.new_detail_list" :key="i">
+                              <p style="width:50%;">
+                                <span v-if="item.type == 1">药品费</span>
+                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 3">耗材费</span>
+                              </p>
+                              <p style="width:50%;">{{item.total?item.total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" style="border-top:1px solid #000;">
+                              <p style="width:50%;">费用合计</p>
+                              <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                          </div>
+                          <div class="chargeUl" style="border-top:1px solid #000;">
+                              <p style="width:50%;">记账支付</p>
+                              <p style="width:50%;">0元</p>
+                          </div>
+                          <div class="chargeUl" style="border-top:1px solid #000;">
+                              <p style="width:50%;">个人账号</p>
+                              <p style="width:50%;">0元</p>
+                          </div>
+                          <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
+                              <p style="width:50%;">现金支付</p>
+                              <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                          </div>
+                      </div>
+                      <div style="width:80%;max-height:500px;">
+                          <div style="display:flex;" v-for="(item,i) in balanceAccounts.order_info.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
+                              <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
+                                  <p class="chargeP">
+                                      <span v-if='item.advice_id > 0'>{{item.advice.advice_name}}</span>
+                                      <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
+                                      <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
+                                  </p>
+                              </div>
+                              <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                  <p class="chargeP">
+                                      <span v-if='item.advice_id > 0'>{{item.advice.drug.drug_spec}}</span>
+                                      <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
+                                      <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
+                                  </p>
+                              </div>
+                              <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                  <p class="chargeP">
+                                      <span>{{item.cnt}}次</span>
+                                  </p>
+                              </div>
+                              <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                  <p class="chargeP">
+                                      <span>{{item.pric}}元</span>
+                                  </p>
+                              </div>
+                              <div style="width:15%;text-align:center;">
+                                  <p class="chargeP">
+                                      <span>{{item.cnt * item.pric}}元</span>
+                                  </p>
+                              </div>
+                          </div>
+                      </div>
+                  </div>
+
+              </div>
+              <div class="moneyBox">
+                  <p>实收金：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                  <p>记账前金额：{{0.00}}元</p>
+                  <p>扣款金额：{{0.00}}元</p>
+                  <p>记账后金额：{{0.00}}元</p>
+                  <p>找赎金：{{0.00}}元</p>
+              </div>
+              <div class="actionBar">
+                  <div>收费员：{{balanceAccounts.current_admin.user_name}}</div>
+                  <div>日期：{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</div>
+              </div>
+          </div>
+
+        </div>
     </div>
 
 </template>
 <script>
   import axios from 'axios'
   import { getChargePrint } from '@/api/project/project'
+  import { uParseTime } from '@/utils/tools'
 
   export default {
     data() {
@@ -166,7 +272,9 @@
       }
     },
     props: {
-      info: Object
+      paramsObj: Object,
+      info: Object,
+      balanceAccounts:Object
     },
     methods: {
       getItemName(number) {
@@ -278,22 +386,48 @@
 
       },
       getPage(){
-        this.page = 1
-        this.pageArr = []
-        if(this.info.order_infos.length <= 13){
-            this.page = 1
-            this.pageArr.push(this.info.order_infos.length)
-            console.log('this.pageArr',this.pageArr)
-        }else if(this.info.order_infos.length > 13){
-            this.page = parseInt(this.info.order_infos.length / 13)
-            let num = this.info.order_infos.length % 13
-            for (var i=0;i<this.page;i++){
-                this.pageArr.push(13)
-            }
-            if(num != 0){
-                this.pageArr.push(num)
-            }
+        if(this.paramsObj.balance_accounts_type != 2){
+          this.page = 1
+          this.pageArr = []
+          if(this.info.order_infos.length <= 13){
+              this.page = 1
+              this.pageArr.push(this.info.order_infos.length)
+              console.log('this.pageArr',this.pageArr)
+          }else if(this.info.order_infos.length > 13){
+              this.page = parseInt(this.info.order_infos.length / 13)
+              let num = this.info.order_infos.length % 13
+              for (var i=0;i<this.page;i++){
+                  this.pageArr.push(13)
+              }
+              if(num != 0){
+                  this.pageArr.push(num)
+              }
+          }
+        }else{
+          this.page = 1
+          this.pageArr = []
+          if(this.balanceAccounts.order_info.length <= 13){
+              this.page = 1
+              this.pageArr.push(this.balanceAccounts.order_info.length)
+              console.log('this.pageArr',this.pageArr)
+          }else if(this.balanceAccounts.order_info.length > 13){
+              this.page = parseInt(this.balanceAccounts.order_info.length / 13)
+              let num = this.balanceAccounts.order_info.length % 13
+              for (var i=0;i<this.page;i++){
+                  this.pageArr.push(13)
+              }
+              if(num != 0){
+                  this.pageArr.push(num)
+              }
+          }
+        }
+        
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
         }
+        return ''
       }
     },
     created() {
@@ -306,7 +440,11 @@
             this.getPage()
         },
         deep: true,
-      }
+      },
+      balanceAccounts(){
+        this.getPage()
+      },
+      deep: true
     }
 
   }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2655,7 +2655,7 @@
 
       comfirm() {
 
-        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+        if (this.curDrugs.length > 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
@@ -2666,8 +2666,35 @@
             }
           }
         }
+        if (this.teamList.length > 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
+            for (let i = 0; i < this.teamList.length; i++) {
+              if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
+                this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
+                // return
+              }
 
-        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
+            }
+          }
+          
+          if(this.$store.getters.xt_user.org_id == 10138){
+            let arr = this.teamList
+            let newArr = []
+            arr.map(item => {
+              if(this.curPrescriptions.med_type != 14){
+                newArr.push(item)
+              }
+              if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
+                newArr.push(item)
+              }
+            })
+            this.teamList = newArr
+          }
+        }
+        
+        
+
+        if (this.curDrugs.length == 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
@@ -2911,7 +2938,8 @@
                 cus_total: 1,
                 unit: project[i].unit,
                 type: 2,
-                total: project[i].total
+                total: project[i].total,
+                is_special_diseases: project[i].disease_directory
               }
 
               this.tabProject.push(obj)
@@ -2933,7 +2961,8 @@
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
-                total: good_info[i].total
+                total: good_info[i].total,
+                is_special_diseases: good_info[i].is_special_diseases
               }
               this.tabProject.push(obj)
             }
@@ -3027,7 +3056,8 @@
                   remark: '',
                   medical_code: project[i].project.medical_code,
                   unit: project[i].project.unit,
-                  type: project[i].type
+                  type: project[i].type,
+                  is_special_diseases: project[i].project.disease_directory
                 }
                 if (obj.cus_total == 0 || obj.cus_total == undefined) {
                   obj.cus_total = 1
@@ -3056,7 +3086,8 @@
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
                   unit: project[i].good_info.unit,
-                  type: project[i].type
+                  type: project[i].type,
+                  is_special_diseases: project[i].good_info.is_special_diseases
                 }
                 if (obj.cus_total == 0 || obj.cus_total == undefined) {
                   obj.cus_total = 1

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -41,8 +41,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">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
@@ -57,6 +57,16 @@
                   {{getTime(scope.row.start_time)}}
                 </template>
             </el-table-column>
+            <el-table-column prop="name" label="药品名称" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.drug_name}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="name" label="规格" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.specification_name}}
+                </template>
+            </el-table-column>
             <el-table-column prop="name" label="报损数量" align="center">
                <template slot-scope="scope">
                   {{scope.row.count}}
@@ -83,7 +93,7 @@
                 <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="200">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="moDrugDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
                   <el-button type="danger" size="small" @click="deleteDrugDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
@@ -102,12 +112,12 @@
         </el-pagination>
     </div>
     <el-dialog
-        title="库房报损"
+        title="药品报损"
         :visible.sync="dialogVisible"
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
               <el-autocomplete
@@ -119,7 +129,7 @@
                   placeholder="请输入药品名称"
                   @select="handleSelect"
                   @input="changeGoodName(scope.$index)"
-                  style="width:160px;"
+                  style="width:260px;"
                   >
                   <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -140,36 +150,28 @@
             </el-form-item>
          
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
-              <!-- <el-select v-model="scope.row.warehousing_unit" filterable placeholder="请选择单位" style="width:80px">
-                <el-option
-                  v-for="(option, index) in unitList"
-                  :key="index"
-                  :label="option.name"
-                  :value="option.name">
-                </el-option>
-              </el-select> -->
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.last_price"></el-input>
+                <el-input v-model="form.last_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></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.total"></el-input>
+                <el-input v-model="form.total" :disabled="true" ></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.drug_origin_place"></el-input>
+                <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.number"></el-input>
+                <el-input v-model="form.number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
@@ -214,11 +216,7 @@
                 {{scope.row.retail_price}}
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="新零售价" width="100" align="center">
-                <template slot-scope="scope">
-                {{scope.row.new_price}}
-               </template>
-            </el-table-column> -->
+        
             <el-table-column  prop="name"  label="生产厂商"  width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.manufacturer}}
@@ -245,7 +243,7 @@
             label="操作">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click="toDel(scope.$index)">删除</el-button>
-                    <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
+                    <el-button type="text" size="small" @click="toEdit(scope.row,scope.$index)">编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -257,7 +255,7 @@
    
 
     <el-dialog
-        title="耗材盘点核对"
+        title="药品盘点核对"
         :visible.sync="checkDialogVisible"
         width="30%"
         >
@@ -305,7 +303,7 @@
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
             <el-autocomplete
@@ -325,37 +323,46 @@
                 </template>
                 </el-autocomplete>  
             </el-form-item>
-            <!-- <el-form-item label="规格">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item> -->
+            <el-form-item label="批次">
+               <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.batch_number"
+                    :value="item.id">
+                  </el-option>
+               </el-select>
+            </el-form-item>
+            <el-form-item label="规格">
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.last_price"></el-input>
+                <el-input v-model="form.last_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></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.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.drug_origin_place"></el-input>
+                <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.number"></el-input>
+                <el-input v-model="form.number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
@@ -373,7 +380,7 @@
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
             <el-autocomplete
@@ -397,33 +404,32 @@
                 <el-input v-model="form.name"></el-input>
             </el-form-item> -->
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.last_price"></el-input>
+                <el-input v-model="form.last_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></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.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.drug_origin_place"></el-input>
+                <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.number"></el-input>
+                <el-input v-model="form.number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
@@ -439,7 +445,7 @@
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
-import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList } from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList,getDrugWarehouseInfoTotal } from "@/api/drug/drug"
 import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
 import { uParseTime } from '@/utils/tools'
 export default {
@@ -488,6 +494,8 @@ export default {
                 warehouse_info_id:"",
                 expiry_date:"",
                 product_date:"",
+                stock_max_number:"",
+                stock_min_number:"",
             },
             drugList:[],
             manufacturerList:[],
@@ -508,11 +516,12 @@ export default {
             modifyDialogVisible:false,
             id:"",
             numberList:[],
+            index:0,
         }
     },
     methods:{
         search(){
-
+          this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -596,14 +605,17 @@ export default {
                 this.form.dealer = val.dealer
                 this.form.manufacturer = val.manufacturer
                 this.form.remark = val.remark
-                this.form.warehousing_unit = val.max_unit  
-                this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
-                this.form.batch_number = val.batch_number
+                this.form.warehousing_unit = val.max_unit 
+                this.form.total = "" 
+                // this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
+                // this.form.batch_number = val.batch_number
                 this.form.last_price = val.last_price
                 this.form.expiry_date = val.expiry_date
                 this.form.product_date = val.product_date
                 this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
                 this.form.drug_origin_place = val.drug_origin_place
+                this.form.batch_number = ""
+                this.form.total = ""
              }
            }) 
         },
@@ -629,6 +641,7 @@ export default {
         changeNumber(val){
           console.log("val",val)
           this.form.warehousing_info_id = val
+          this.getDrugWarehouseInfoTotal(val)
         },
         getDrugBatchNumber(id){
             var params = {
@@ -653,6 +666,19 @@ export default {
          }
         },
         addPrice(){
+          console.log("批次号",this.form.batch_number)
+          if(this.form.drug_name == ""){
+             this.$message.error("请输入药品名称")
+             return
+          }
+          if(this.form.batch_number == ""){
+            this.$message.error("请选择批次号")
+            return false
+          }
+          if(this.form.count == ""){
+             this.$message.error("请输入报损数量")
+             return false
+          }
           var obj = {
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
@@ -674,7 +700,10 @@ export default {
             specification_name:this.form.specification_name,
             drug_origin_place:this.form.drug_origin_place,
             warehousing_info_id:this.form.warehousing_info_id,
-            batch_number:this.form.batch_number
+            batch_number:this.form.batch_number,
+            stock_max_number:this.form.stock_max_number,
+            stock_min_number:this.form.stock_min_number,
+            total:this.form.total,
           } 
           this.tableData.push(obj)   
           this.form.drug_name = ""
@@ -694,15 +723,25 @@ export default {
           this.form.product_date = ""
           this.form.specification_name = ""
           this.form.drug_origin_place = "" 
+          this.form.total = ""
         },
         saveDrugDamage(){
-          console.log("hhhh",this.tableData)
-          console.log("oooo",this.numberList)
+        
           for(let i=0;i<this.tableData.length;i++){
               this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
               this.tableData[i].last_price = this.tableData[i].last_price.toString()
               this.tableData[i].new_price = this.tableData[i].new_price.toString()
               this.tableData[i].count =  parseInt(this.tableData[i].count)
+              if(this.tableData[i].stock_max_number == ""){
+                this.tableData[i].stock_max_number = 0
+              }else{
+                this.tableData[i].stock_max_number = parseInt(this.tableData[i].stock_max_number)
+              }
+              if(this.tableData[i].stock_min_number == ""){
+                this.tableData[i].stock_min_number = 0
+              }else{
+                this.tableData[i].stock_min_number = parseInt(this.tableData[i].stock_min_number)
+              }
               if(this.tableData[i].expiry_date == undefined){
                 this.tableData[i].expiry_date  = 0
               }else{
@@ -723,7 +762,7 @@ export default {
             tableData:this.tableData,
           }
           console.log("parasm222",params)
- 
+   
         saveDrugDamage(params).then(response=>{
             if(response.data.state == 1){
             var msg =  response.data.data.msg
@@ -741,6 +780,7 @@ export default {
           page:this.page, 
           start_time:this.start_time,
           end_time:this.end_time,
+          keyword:this.searchKey,
         }
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
@@ -798,7 +838,8 @@ export default {
      toDel(index){
        this.tableList.splice(index,1)
      },
-     toEdit(val){
+     toEdit(val,index){
+       this.index = index
        this.form.drug_name = val.drug_name
        this.form.drug_origin_place = val.drug_origin_place
        this.form.last_price = val.last_price
@@ -810,6 +851,10 @@ export default {
        this.form.remark = val.remark
        this.form.id = val.id
        this.form.count = val.count
+       this.form.specification_name = val.specification_name
+       this.form.warehousing_unit = val.warehousing_unit
+       this.form.stock_max_number = val.stock_max_number
+       this.form.stock_min_number = val.stock_min_number,
        this.editDialogVisible = true
      },
      EditDrugDamage(){
@@ -823,6 +868,24 @@ export default {
             this.tableData[i].retail_price = this.form.retail_price
             this.tableData[i].remark = this.form.remark
             this.tableData[i].count = this.form.count
+            this.tableData[i].stock_max_number = this.form.stock_max_number
+            this.tableData[i].stock_min_number = this.form.stock_min_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].dealer = this.form.dealer
+          }
+          if(this.index == i){
+            this.tableData[i].drug_name = this.form.drug_name
+            this.tableData[i].drug_origin_place = this.form.drug_origin_place
+            this.tableData[i].last_price = this.form.last_price
+            this.tableData[i].new_price = this.form.new_price
+            this.tableData[i].number = this.form.number
+            this.tableData[i].retail_price = this.form.retail_price
+            this.tableData[i].remark = this.form.remark
+            this.tableData[i].count = this.form.count
+            this.tableData[i].stock_max_number = this.form.stock_max_number
+            this.tableData[i].stock_min_number = this.form.stock_min_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].dealer = this.form.dealer
           }
        }
        this.editDialogVisible = false
@@ -844,6 +907,7 @@ export default {
        getDrugDamageDetail(id).then(response=>{
          if(response.data.state ==1){
            var detail = response.data.data.detail
+           console.log("系准给",detail)
            this.form.drug_id = detail.drug_id
            this.form.drug_name = detail.drug_name
            this.form.drug_origin_place = detail.drug_origin_place
@@ -855,12 +919,26 @@ export default {
            this.form.remark = detail.remark
            this.form.count = detail.count
            this.id = detail.id
-           this.form.warehousing_unit = detail.warehouseing_unit
+           this.form.warehousing_unit = detail.warehousing_unit
+           this.form.stock_max_number = detail.stock_max_number
+           this.form.stock_min_number = detail.stock_min_number
+           this.form.total = detail.total
+           this.form.warehousing_info_id = detail.warehousing_info_id
            this.modifyDialogVisible = true
          }
        })
      },
      modifyDrugDamage(){
+       if(this.form.stock_max_number == ""){
+         this.form.stock_max_number = 0
+       }else{
+         this.form.stock_max_number = parseInt(this.form.stock_max_number)
+       }
+       if(this.form.stock_min_number == ""){
+         this.form.stock_min_number = 0
+       }else{
+         this.form.stock_min_number = parseInt(this.form.stock_min_number)
+       }
          var params = {
            drug_id:this.form.drug_id,
            drug_name:this.form.drug_name,
@@ -874,6 +952,9 @@ export default {
            count:parseInt(this.form.count),
            warehousing_unit:this.form.warehousing_unit,
            id:this.id,
+           total:this.form.total,
+           stock_max_number:this.form.stock_max_number,
+           stock_min_number:this.form.stock_min_number,
          }
        modifyDrugDamage(params).then(response=>{
           if(response.data.state == 1){
@@ -916,6 +997,27 @@ export default {
      changeEndTime(val){
        this.end_time = this.getTime(val)
        this.getlist()
+     },
+     getDrugWarehouseInfoTotal(val){
+        var params = {
+          id:val,
+        }
+      getDrugWarehouseInfoTotal(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list",list)
+          //  this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit + list.stock_min_number + list.XtBaseDrug.min_unit
+          if(list.stock_max_number > 0){
+            this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
+            this.form.stock_max_number = list.stock_max_number
+          }
+          if(list.stock_min_number >0 ){
+            this.form.total = list.stock_min_number + list.XtBaseDrug.min_unit
+            this.form.stock_min_number = list.stock_min_number
+          }
+          
+         }
+      })
      }
     },
     created(){

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -55,28 +55,38 @@
                     {{scope.row.warehousing_order}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="date" label="调价日期" width="200px"  align="center">
+                <el-table-column prop="date" label="调价日期" width="150px"  align="center">
                    <template slot-scope="scope">
                     {{getTime(scope.row.start_time)}}
                   </template>  
                 </el-table-column>
-                 <el-table-column prop="date" label="现价格" width="200px"  align="center">
+                <el-table-column prop="date" label="药品名称" width="200px"  align="center">
+                   <template slot-scope="scope">
+                    {{scope.row.drug_name}}
+                  </template>  
+                </el-table-column>
+                <el-table-column prop="date" label="药品规格" width="100px"  align="center">
+                   <template slot-scope="scope">
+                    {{scope.row.specification_name}}
+                  </template>  
+                </el-table-column>
+                 <el-table-column prop="date" label="现价格" width="100px"  align="center">
                    <template slot-scope="scope">
                     {{scope.row.new_price}}
                   </template>  
                 </el-table-column>
-                <el-table-column prop="name" label="操作人" width="200px"  align="center">
+                <el-table-column prop="name" label="操作人" width="100px"  align="center">
                  <template slot-scope="scope">
                     {{getDoctorName(scope.row.creater)}}
                   </template>  
                 </el-table-column>
-                <el-table-column prop="name" label="状态"  align="center">
+                <el-table-column prop="name" label="状态"  align="center" width="100px">
                   <template slot-scope="scope">
                      <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 prop="name" label="核对人"  align="center">
+                <el-table-column prop="name" label="核对人"  align="center" width="100px">
                   <template slot-scope="scope">
                     {{getDoctorName(scope.row.checker)}}
                   </template>  
@@ -102,7 +112,7 @@
         </div>
     </div>
     <el-dialog
-        title="库房调价"
+        title="药品调价"
         :visible.sync="dialogVisible"
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
@@ -117,7 +127,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:300px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -126,7 +136,7 @@
                  </el-autocomplete>  
             </el-form-item>
             <el-form-item label="原价格">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
@@ -142,22 +152,22 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column prop="date" label="单据编号" width="100">
+            <el-table-column prop="date" label="单据编号" width="100" align="center">
                <template slot-scope="scope">
                  {{scope.row.warehousing_order}}
                 </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.drug_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.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                 {{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>
@@ -167,37 +177,37 @@
               {{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.retail_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.retail_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.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.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.manufacturer}}
+                  {{scope.row.dealer}}
                 </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>      
@@ -281,7 +291,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:300px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -289,19 +299,25 @@
                   </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.retail_price" style="width:200px"></el-input>
+                 <el-input v-model="form.retail_price" style="width:200px" :disabled="true"></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.manufacturer" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
+               <el-form-item label="经销商:">
+                    <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
              </el-col> 
             </el-row>
             <el-row>
              <el-col>
-               <!-- <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item> -->
                 <el-form-item label="备注：">
                     <div style="display:flex;">
                         <el-input v-model="form.remark"  style="width:200px"></el-input>
@@ -336,7 +352,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:200px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -344,19 +360,31 @@
                   </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.warehousing_unit" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.retail_price" style="width:200px"></el-input>
+                 <el-input v-model="form.retail_price" style="width:200px" :disabled="true"></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.manufacturer" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号：">
+                    <el-input v-model="form.number" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="经销商：">
+                    <el-input v-model="form.number" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
              </el-col> 
             </el-row>
             <el-row>
              <el-col>
-               <!-- <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item> -->
                 <el-form-item label="备注：">
                     <div style="display:flex;">
                         <el-input v-model="form.remark"  style="width:200px"></el-input>
@@ -456,7 +484,16 @@ export default {
            }  
         },
         addPrice(){
+          if(this.form.drug_name == ""){
+            this.$message.error("请输入药品名称")
+            return
+          }
+          if(this.form.new_price == ""){
+            this.$message.error("请输入现价格")
+            return
+          }
           var obj = {
+            id:this.form.id,
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
             warehousing_unit:this.form.warehousing_unit,
@@ -471,7 +508,8 @@ export default {
             dealer:this.form.dealer,
             last_price:this.form.last_price,
             start_time:this.getTime(new Date()),
-            } 
+            specification_name:this.form.specification_name,
+          } 
           this.tableData.push(obj)     
         },
         querySearchAsync(keyword, cb) {
@@ -522,13 +560,19 @@ export default {
             this.form.retail_price = val.retail_price
             this.form.warehousing_order = val.warehousing_order
             this.form.number = val.number
-            this.form.dealer = val.dealer
+            if(val.dealer == 0){
+              this.form.dealer = ""
+            }else{
+               this.form.dealer = val.dealer
+            }
             this.form.manufacturer = val.manufacturer
             this.form.remark = val.remark
-            this.form.warehousing_unit = val.warehouseing_unit  
+            this.form.warehousing_unit = val.max_unit  
             this.form.total = val.total
             this.form.batch_number = val.batch_number
             this.form.last_price = val.last_price
+            this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+            this.form.new_price = ""
         },
         getTime(val) {
          if(val < 0){
@@ -545,7 +589,7 @@ export default {
            this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
            this.tableData[i].last_price = this.tableData[i].last_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)
            if(this.tableData[i].dealer == 0){
              this.tableData[i].dealer = ""
            }
@@ -633,12 +677,17 @@ export default {
        this.tableData.splice(index,1)
      },
      toEdit(row){
+      console.log("row2222",row)
       this.form.drug_name = row.drug_name
       this.form.retail_price = row.retail_price
       this.form.new_price = row.new_price
-      this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.last_price = row.last_price
+      this.form.number = row.number
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
@@ -649,6 +698,12 @@ export default {
             this.tableData[i].new_price = this.form.new_price
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+         }else{
+           this.tableData[i].drug_name = this.form.drug_name
+           this.tableData[i].retail_price = this.form.retail_price
+           this.tableData[i].new_price - this.form.new_price
+           this.tableData[i].count = this.form.count
+           this.tableData[i].remark = this.form.remark
          }
        }
        this.editPriceDialogVisible = false
@@ -666,12 +721,20 @@ export default {
        getDrugModiftyPrice(id).then(response=>{
           if(response.data.state == 1){
              var detail = response.data.data.detail
+             console.log("detail",detail)
              this.form.drug_name = detail.drug_name
+             this.form.specification_name = detail.specification_name
+             this.form.last_price = detail.last_price
+             this.form.dealer = detail.dealer
+             this.form.manufacturer = detail.manufacturer
              this.form.retail_price = detail.retail_price
              this.form.new_price = detail.new_price
              this.form.count = detail.count
              this.form.remark = detail.remark
              this.id = detail.id
+             this.form.warehousing_unit = detail.warehousing_unit
+             this.form.number = detail.number
+             this.form.drug_id = detail.drug_id
              this.modifyPriceDialogVisible = true
           }
        })
@@ -679,12 +742,18 @@ export default {
      modifyDrugPrice(){
         var params = {
           drug_name:this.form.drug_name,
+          specification_name:this.form.specification_name,
+          warehousing_unit:this.form.warehousing_unit,
           retail_price:this.form.retail_price.toString(),
           new_price:this.form.new_price.toString(),
+          manufacturer:this.form.manufacturer,
+          number:this.form.number,
           count:parseInt(this.form.count),
           remark:this.form.remark,
-          id:this.id
+          id:this.id,
+          drug_id:this.form.drug_id,
         }
+      
       modifyDrugPrice(params).then(response=>{
          if(response.data.state == 1){
            var adjustPrice = response.data.data.adjustPrice

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -352,7 +352,7 @@
         var count = 0
         for(let i=0;i<this.warehouseList.length;i++){
           if(id == this.warehouseList[i].warehousing_id){
-             count +=this.warehouseList[i].warehousing_count * this.warehouseList[i].last_price
+             count +=this.warehouseList[i].warehousing_count * this.warehouseList[i].price
           }
         }
         return count

src/xt_pages/stock/drugs/inventory.vue

@@ -100,12 +100,12 @@
         >
         </el-pagination>
         <el-dialog
-        title="库房调价"
+        title="药品盘点"
         :visible.sync="dialogVisible"
         width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id"></el-input>
+                <el-form-item label="药品ID">
+                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="药品名称">
                   <el-autocomplete
@@ -139,13 +139,13 @@
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
+                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="进货价">
-                    <el-input v-model="form.last_price"></el-input>
+                    <el-input v-model="form.last_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price"></el-input>
+                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="盘点数量">
                     <el-input v-model="form.count"></el-input>
@@ -154,13 +154,13 @@
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place"></el-input>
+                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="批准文号">
-                    <el-input v-model="form.number"></el-input>
+                    <el-input v-model="form.number" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
+                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <div style="display:flex;">
@@ -594,6 +594,7 @@ export default {
          handleSelect(val){
            console.log("val233223232332",val)
            this.getDrugBatchNumber(val.drug_id)
+           
             var params = {
               id:val.drug_id
             }
@@ -993,7 +994,7 @@ export default {
              warehouse_info_id:this.form.warehouse_info_id,
              total:this.total.toString(),
              remark:this.remark,
-             prof_count:parseInt(this.prof_count),
+             proof_count:parseInt(this.form.proof_count),
            }
           console.log("params",params)
          SaveDrugProofInventory(params).then(response=>{

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -25,7 +25,7 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+               placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"

src/xt_pages/stock/inventory.vue

@@ -60,6 +60,16 @@
               <template slot-scope="scope" >
                 {{getTime(scope.row.start_time)}}
               </template>  
+            </el-table-column>
+            <el-table-column  prop="date" label="耗材名称" align="center">
+              <template slot-scope="scope" >
+                {{scope.row.good_name}}
+              </template>  
+            </el-table-column>
+            <el-table-column  prop="date" label="耗材规格" align="center">
+              <template slot-scope="scope" >
+                {{scope.row.specification_name}}
+              </template>  
             </el-table-column>
              <el-table-column  prop="date" label="盘点数量" align="center">
               <template slot-scope="scope" >
@@ -97,9 +107,9 @@
                 <span v-if="scope.row.checker_status == 2">正在盘点</span>
              </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="300">
+            <el-table-column label="操作" align="center" width="200">
                 <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="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>
@@ -122,7 +132,7 @@
         width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
                 <el-form-item label="耗材ID">
-                    <el-input v-model="form.good_id"></el-input>
+                    <el-input v-model="form.good_id" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="耗材名称">
                    <el-autocomplete
@@ -143,42 +153,42 @@
                  </el-autocomplete>
                 </el-form-item>
                 <el-form-item label="规格">
-                    <el-input v-model="form.specification_name"></el-input>
+                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="批号">
-                  <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-select v-model="form.number" filterable placeholder="请选择" @change="changeNumber">
                       <el-option
                         v-for="(item,index) in numberList"
                         :key="index"
                         :label="item.number"
-                        :value="item.number">
+                        :value="item.id">
                       </el-option>
                   </el-select>
                 </el-form-item>
 
                 <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
+                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="进货价">
-                    <el-input v-model="form.buy_price"></el-input>
+                    <el-input v-model="form.buy_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
-                    <el-input v-model="form.packing_price"></el-input>
+                    <el-input v-model="form.packing_price" :disabled="true"></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.total"></el-input>
+                    <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="产地">
                     <el-input v-model="form.good_origin_place"></el-input>
                 </el-form-item>
                 <el-form-item label="批准文号">
-                    <el-input v-model="form.license_number"></el-input>
+                    <el-input v-model="form.license_number" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
+                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <div style="display:flex;">
@@ -329,6 +339,47 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
+               <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批号">
+                  <el-select v-model="form.number" filterable placeholder="请选择"  @change="changeNumber">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.number"
+                        :value="item.id">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.buy_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.packing_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.good_origin_place" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.license_number" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.manufacturer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="经销商">
+                    <el-input v-model="form.dealer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
                <el-form-item label="盘点数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
@@ -360,6 +411,65 @@
           <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;"
+                      >
+                          <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" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批号">
+                  <el-select v-model="form.number" filterable placeholder="请选择"  @change="changeNumber">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.number"
+                        :value="item.id">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.buy_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.packing_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.good_origin_place" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.license_number" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.manufacturer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="经销商">
+                    <el-input v-model="form.dealer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
                <el-form-item label="盘点数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
@@ -436,7 +546,7 @@
 
 <script> 
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory } from "@/api/stock"
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory,getWarehouseTotal } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -482,7 +592,7 @@ export default {
          dealerList:[],
          goodList:[],
          currentIndex: 0,
-         inventory_status:"",
+         inventory_status:0,
          limit:10,
          page:1,
          doctorList:[],
@@ -541,23 +651,28 @@ export default {
           this.currentIndex = val
         },
          handleSelect(val){
-            console.log("val232323223",val)
             this.getStockBatchNumber(val.good_id)
-            this.getGoodWarehouseList(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
             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
+            if(val.dealer == ""){
+              this.form.dealer = ""
+            }else{
+              this.form.dealer = val.dealer
+            }
             this.form.manufacturer = val.manufacturer
             this.form.specification_name = val.specification_name
             this.form.remark = val.remark
             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.total = ""
+            this.form.number = ""
+            // this.form.total = val.total
+            // this.form.number = val.number
             this.form.expiry_date = val.expiry_date
             this.form.product_date = val.product_date
         },
@@ -591,7 +706,26 @@ export default {
           this.getlist()
         },
         addInventory(){
+           if(this.form.good_name == ""){
+             this.$message.error("请输入耗材名称")
+             return 
+           }
+           if(this.form.count == ""){
+             this.$message.error("请输入盘点数量")
+             return
+           }
+           var number = ""
+           for(let i=0;i<this.numberList.length;i++){
+             if(this.form.number == this.numberList[i].id){
+                number = this.numberList[i].number
+             }
+           }
+           if(number == ""){
+             this.$message.error("请选择批次")
+             return
+           }
            var obj = {
+            id:this.form.id,
             good_id:this.form.good_id,
             good_name:this.form.good_name,
             specification_name:this.form.specification_name,
@@ -608,11 +742,11 @@ export default {
             start_time:this.getTime(new Date()),
             product_date:this.form.product_date,
             expiry_date:this.form.expiry_date,
-            number:this.form.number,
+            number:number,
             warehousing_info_id:0,
             total:this.form.total,
-
            } 
+           console.log("比阿哥",this.tableData)
            this.tableData.push(obj)
         },
       saveInventory(){
@@ -633,6 +767,12 @@ export default {
           if(this.tableData[i].dealer == 0){
             this.tableData[i].dealer = ""
           }
+          if(this.tableData[i].packing_price == 0){
+            this.tableData[i].packing_price = ""
+          }
+          if(this.tableData[i].buy_price == 0){
+            this.tableData[i].buy_price = ""
+          }
         }
         var params = {
          tableData:this.tableData,
@@ -643,7 +783,22 @@ export default {
          if(response.data.state == 1){
            var msg = response.data.data.msg
            this.$message.success("保存成功")
+           this.tableData = []
+           this.form.good_id = ""
+           this.form.good_name = ""
+           this.form.specification_name = ""
+           this.form.manufacturer = ""
+           this.form.dealer = ""
+           this.form.good_origin_place = ""
+           this.form.buy_price = ""
+           this.form.packing_price = ""
+           this.form.count = ""
+           this.form.remark = ""
+           this.form.number = ""
+           this.form.total = ""
+           this.form.warehousing_unit = ""
            this.dialogVisible = false
+           
            this.getlist()
          }
        })
@@ -719,23 +874,52 @@ export default {
      },
      toEdit(row){
       this.form.good_name = row.good_name
+      this.form.specification_name = row.specification_name
+      this.form.number = row.number
+      this.form.warehousing_unit = row.warehousing_unit
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
+      this.form.buy_price = row.buy_price
+      this.form.packing_price = row.packing_price
+      this.form.good_origin_place = row.good_origin_place
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
       this.editPriceDialogVisible = true  
      },
      upateInventory(){
+       console.log("hhhhhh",this.form.id)
+       console.log("999",this.tableData)
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
-            // this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].buy_price = this.form.buy_price
+            this.tableData[i].specification_name = this.form.specification_name
+            this.tableData[i].warehousing_unit = this.form.warehousing_unit
+            this.tableData[i].number = this.form.number
+            this.tableData[i].good_origin_place = this.form.good_origin_place
+            this.tableData[i].dealer = this.form.dealer
+            this.tableData[i].manufacturer = this.form.manufacturer
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+         }else{
+           this.tableData[i].id = this.form.id
+           this.tableData[i].good_name = this.form.good_name
+           this.tableData[i].packing_price = this.form.packing_price
+           this.tableData[i].buy_price = this.form.buy_price
+           this.tableData[i].specification_name = this.form.specification_name
+           this.tableData[i].warehousing_unit = this.form.warehousing_unit
+           this.tableData[i].number = this.form.number
+           this.tableData[i].good_origin_place = this.form.good_origin_place
+           this.tableData[i].dealer = this.form.dealer
+           this.tableData[i].manufacturer = this.form.manufacturer
+           this.tableData[i].count = this.form.count
+           this.tableData[i].remark = this.form.remark
          }
        }
        this.editPriceDialogVisible = false
        this.form.good_name = ""
-      //  this.form.packing_price = ""
        this.form.count = ""
        this.form.remark = ""
      },
@@ -766,9 +950,22 @@ export default {
           if(response.data.state == 1){
             var detail =  response.data.data.detail
             console.log("detial",detail)
+            this.form.good_name = detail.good_name
+            this.form.good_id = detail.good_id
+            this.form.specification_name = detail.specification_name
+            this.form.number = detail.number
+            this.form.license_number = detail.license_number
+            this.form.good_origin_place = detail.good_origin_place
+            this.form.dealer = detail.dealer
+            this.form.manufacturer = detail.manufacturer
             this.form.count = detail.count
             this.form.remark = detail.remark
+            this.form.warehousing_info_id = detail.warehousing_info_id
             this.id = detail.id
+            this.form.buy_price = detail.buy_price
+            this.form.packing_price = detail.packing_price
+            this.form.warehousing_unit = detail.warehousing_unit
+            this.form.total = detail.total
             this.modefiyePriceDialogVisible = true
 
           }
@@ -777,6 +974,18 @@ export default {
      modifyInventory(){
          var params = {
            id:this.id,
+           good_id:this.form.good_id,
+           good_name:this.form.good_name,
+           specification_name:this.form.specification_name,
+           number:this.form.number,
+           warehousing_unit:this.form.warehousing_unit,
+           buy_price:this.form.buy_price.toString(),
+           packing_price:this.form.packing_price.toString(),
+           total:parseInt(this.form.total),
+           good_origin_place:this.form.good_origin_place,
+           license_number:this.form.license_number,
+           dealer:this.form.dealer,
+           manufacturer:this.form.manufacturer,
            count:parseInt(this.form.count),
            remark:this.form.remark,
          }
@@ -901,7 +1110,23 @@ export default {
      changeEndTime(val){
        this.end_time = this.getTime(val)
        this.getlist()
-     }
+     },
+    changeNumber(val){
+     this.getWarehouseTotal(val)
+     this.form.warehousing_info_id = val
+     },
+    getWarehouseTotal(id){
+        var params = {
+          id:id,
+        }
+      getWarehouseTotal(params).then(response=>{
+         if(response.data.state == 1){
+           var list =  response.data.data.list
+           console.log("档期批次库促",list)
+           this.form.total = list.stock_count
+         }
+      })
+    }
     },
     created(){
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -54,6 +54,16 @@
               <template  slot-scope="scope">
                 {{getTime(scope.row.start_time)}}
                </template>    
+            </el-table-column>
+            <el-table-column prop="date" label="耗材名称"  align="center">
+              <template  slot-scope="scope">
+                {{scope.row.good_name}}
+               </template>    
+            </el-table-column>
+            <el-table-column prop="date" label="耗材规格"  align="center">
+              <template  slot-scope="scope">
+                {{scope.row.specification_name}}
+               </template>    
             </el-table-column>
              <el-table-column prop="date" label="报损数量"  align="center">
               <template  slot-scope="scope">
@@ -81,7 +91,7 @@
                 <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="200" >
                 <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
                 <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
@@ -108,7 +118,7 @@
         <el-form :model="form" class="modifyDialog" label-width="120px">
           
             <el-form-item label="耗材ID">
-                <el-input v-model="form.good_id"></el-input>
+                <el-input v-model="form.good_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="耗材名称">
                   <el-autocomplete
@@ -129,10 +139,10 @@
                  </el-autocomplete>
             </el-form-item>
             <el-form-item label="规格">
-                <el-input v-model="form.specification_name"></el-input>
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批号">
-                 <el-select v-model="form.number" filterable placeholder="请选择">
+                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
@@ -142,28 +152,31 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.buy_price"></el-input>
+                <el-input v-model="form.buy_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.packing_price"></el-input>
+                <el-input v-model="form.packing_price" :disabled="true"></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.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
                 <el-input v-model="form.good_origin_place"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.license_number"></el-input>
+                <el-input v-model="form.license_number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
+            </el-form-item>
+           <el-form-item label="供应商">
+                <el-input v-model="form.dealer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
@@ -284,7 +297,7 @@
 
 <!-- 编辑 -->
       <el-dialog
-        title="编辑"
+        title="编辑报损"
         :visible.sync="editPriceDialogVisible"
         width="50%">
         <span>
@@ -309,7 +322,44 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
-               <el-form-item label="报损数量：">
+               <el-form-item label="规格：">
+                 <el-input v-model="form.specification_name" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
+                  <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" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="进货价">
+                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="零售价">
+                  <el-input v-model="form.packing_price" 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.good_origin_place" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="批准文号">
+                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="生产厂商">
+                  <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="供应商">
+                  <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+                <el-form-item label="报损数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
              </el-col> 
@@ -339,7 +389,62 @@
         <span>
           <el-form  :model="form">
             <el-row>
-               <el-col>
+             <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;"
+                    >
+                        <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-select v-model="form.number" filterable placeholder="请选择" @change="chageNumberlist">
+                  <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" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="进货价">
+                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="零售价">
+                  <el-input v-model="form.packing_price" 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.good_origin_place" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="批准文号">
+                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="生产厂商">
+                  <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="供应商">
+                  <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
                <el-form-item label="报损数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
@@ -500,7 +605,11 @@ 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
+          if(this.form.dealer == 0){
+            this.form.dealer = ""
+          }else{
+            this.form.dealer = val.dealer
+          }
           this.form.manufacturer = val.manufacturer
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
@@ -512,6 +621,11 @@ export default {
           this.form.product_date = val.product_date
       },
       addStock(){
+
+        if(this.form.count == ""){
+          this.$message.error("请输入报损数量")
+          return 
+        }
         var obj = {
           good_id:this.form.good_id,
           good_name:this.form.good_name,
@@ -531,6 +645,7 @@ export default {
           warehousing_info_id:0,
           product_date:this.form.product_date,
           expiry_date:this.form.expiry_date,
+          total:this.form.total,
         } 
         this.tableData.push(obj)
         this.form.good_id = 0
@@ -548,6 +663,7 @@ export default {
         this.form.dealer = ""
         this.form.number = ""
         this.form.good_id = ""
+        this.form.total= ""
       },
       saveReportStock(){
          for(let i = 0;i<this.tableData.length;i++){
@@ -576,6 +692,7 @@ export default {
             tableData:this.tableData,
           }
           console.log("params",params)
+       
         saveReportStock(params).then(response=>{
            if(response.data.state == 1){
              var msg = response.data.data.msg
@@ -674,21 +791,40 @@ export default {
        this.tableData.splice(index,1)
      },
      toEdit(row){
+      console.log("row",row)
       this.form.good_name = row.good_name
-      this.form.packing_unit = row.packing_unit
+      this.form.warehousing_unit = row.warehousing_unit
       this.form.packing_price = row.packing_price
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.dealer = row.dealer
+      this.form.manufacturer = row.manufacturer
+      this.form.good_origin_place = row.good_origin_place
+      this.form.total = row.total
+      this.form.number = row.number
+      this.form.license_number = row.license_number
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
+       if(this.form.count == ""){
+         this.$message.error("请输入报损数量")
+         return false
+       }
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
             this.tableData[i].packing_price = this.form.packing_price
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+            this.tableData[i].good_name = this.form.specification_name
+            this.tableData[i].warehousing_unit  = this.form.warehousing_unit
+            this.tableData[i].total = this.form.total
+            this.tableData[i].number = this.form.number
+            this.tableData[i].license_number = this.form.license_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].good_origin_place = this.form.good_origin_place
          }
        }
        this.editPriceDialogVisible = false
@@ -705,8 +841,22 @@ export default {
        getStockDamageDetail(id).then(response=>{
          if(response.data.state == 1){
            var detail = response.data.data.detail
+           console.log("hhhhh32233223",detail)
            this.form.count = detail.count
+           this.form.good_name = detail.good_name
+           this.form.specification_name = detail.specification_name
+           this.form.total = detail.total
+           this.form.buy_price = detail.buy_price
+           this.form.packing_price = detail.packing_price
+           this.form.good_origin_place = detail.good_origin_place
+           this.form.warehousing_unit = detail.warehousing_unit
+           this.form.manufacturer = detail.manufacturer
+           this.form.dealer = detail.dealer
+           this.form.license_number = detail.license_number
+           this.form.number = detail.number
            this.id = detail.id
+           this.form.good_id = detail.good_id
+           this.form.warehousing_info_id = detail.warehousing_info_id
            this.modifyPriceDialogVisible = true
          }
        })
@@ -715,8 +865,21 @@ export default {
         var params = {
           count:parseInt(this.form.count),
           id:this.id,
+          good_name:this.form.good_name,
+          specification_name:this.form.specification_name,
+          number:this.form.number,
+          warehousing_unit:this.form.warehousing_unit,
+          buy_price:this.form.buy_price.toString(),
+          packing_price:this.form.packing_price.toString(),
+          good_origin_place:this.form.good_origin_place,
+          manufacturer:this.form.manufacturer,
+          dealer:this.form.dealer,
+          license_number:this.form.license_number,
+          warehousing_info_id:this.form.warehousing_info_id,
+          good_id:this.form.good_id,
         }
         console.log("param2323",params)
+       
        modifyPrice(params).then(response=>{
          if(response.data.state ==1){
            var adjust = response.data.data.adjust
@@ -811,6 +974,14 @@ export default {
      changeEndTime(val){
        this.end_time = this.getTime(val)
        this.getlist()
+     },
+     chageNumberlist(val){
+       console.log("val2323322",val)
+       for(let i=0;i<this.numberList.length;i++){
+         if(this.numberList[i].number == val){
+            this.form.warehousing_info_id = this.numberList[i].id
+         }
+       }
      }
     },
     created(){

src/xt_pages/stock/stockModifyPrice.vue

@@ -26,14 +26,16 @@
             v-model="start_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeStartTime">
             </el-date-picker>
             <el-date-picker
             size="small"
             v-model="end_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeEndTime">
             </el-date-picker>
         </div>
         <div>
@@ -168,15 +170,21 @@
                   </template>
                  </el-autocomplete>
             </el-form-item>
+            <el-form-item label="规格">
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="原价格">
-                <el-input v-model="form.packing_price"></el-input>
+                <el-input v-model="form.packing_price" :disabled="true"></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" type="number"></el-input>
-            </el-form-item> -->
+            <el-form-item label="生产商">
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="供应商">
+                <el-input v-model="form.dealer" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -205,11 +213,6 @@
                {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <!-- <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" align="center">
                <template slot-scope="scope">
                 {{scope.row.buy_price}}
@@ -288,26 +291,26 @@
                     </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.manufacturer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+              <el-form-item label="供应商">
+                 <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+                 <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></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-row>
-             <el-col>
-               <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item>
-                <el-form-item label="备注：">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
-                    </div>
-                </el-form-item>
-              </el-col>  
-            </el-row> -->
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
@@ -379,7 +382,6 @@
                         placeholder="请输入耗材名称"
                         @select="handleSelect"
                         @input="changeGoodName(scope.$index)"
-                        :disabled="true"
                         style="width:160px;"
                     >
                         <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -388,12 +390,21 @@
                     </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.packing_price" style="width:200px"></el-input>
+                 <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></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.manufacturer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+              <el-form-item label="供应商">
+                 <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                 <el-form-item label="备注：">
                     <el-input v-model="form.remark" style="width:200px"></el-input>
                 </el-form-item>
@@ -534,11 +545,12 @@ export default {
           }else{
             this.form.dealer = val.dealer
           }
-          if(this.form.manufacturer == 0){
-            this.form.manufacturer = ""
-          }else{
-            this.form.manufacturer = val.manufacturer
-          }
+          // if(this.form.manufacturer == 0){
+          //   this.form.manufacturer = ""
+          // }else{
+          //   this.form.manufacturer = val.manufacturer
+          // }
+          this.form.manufacturer = val.manufacturer
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
@@ -546,6 +558,10 @@ export default {
          
       },
       addPrice(){
+        if(this.form.new_price == ""){
+           this.$message.error("请输入现价格")
+           return
+        }
         var obj = {
          id:this.form.id,
          good_name:this.form.good_name,
@@ -601,9 +617,16 @@ export default {
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
+       if(this.form.new_price == ""){
+          this.$message.error("请输入现价格")
+          return false
+       }
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
@@ -769,21 +792,30 @@ export default {
            }else{
              this.form.new_price = info.new_price
            }
-          
+           this.form.specification_name = info.specification_name
            this.form.packing_price = info.packing_price
            this.form.remark = info.remark
+           this.form.manufacturer = info.manufacturer
+           this.form.dealer = info.dealer
            this.modifyDialogVisible = true
          }
        })
      },
      updateStockPrice(){
+         if(this.form.new_price == ""){
+           this.$message.error("请输入现价格")
+           return
+         }
          var params = {
+
            new_price:this.form.new_price.toString(),
            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,
+           manufacturer:this.form.manufacturer,
+           dealer:this.form.dealer,
          }
          console.log("params",params)
        updateStockPrice(params).then(response=>{
@@ -808,6 +840,7 @@ export default {
           let params = {
             id:id,
           }
+          console.log("id23232322332233223",id)
           deleteStockPrice(params).then(response => {
             if (response.data.state == 1) {
               var msg = response.data.data.msg
@@ -818,6 +851,14 @@ export default {
         }).catch(() => {
           this.loading = false
         });
+     },
+     changeStartTime(val){
+       this.start_time = this.getTime(val)
+       this.getAllStockPrice()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getAllStockPrice()
      }
     },
     created(){

src/xt_pages/user/courseOfDisease.vue

@@ -330,6 +330,7 @@
 
       createAction: function() {
         this.new_content = this.$refs.editor.content
+        console.log("hhhhh2h3h232323232",this.new_content)
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return

src/xt_pages/user/dialysisSolution.vue

@@ -1063,6 +1063,12 @@ export default {
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
       )
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      }
+      
     },
     'addPlan.anticoagulant_weichi': function() {
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
@@ -1071,6 +1077,11 @@ export default {
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
       )
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      }
     }
   },
 
@@ -1917,6 +1928,11 @@ export default {
         return false
       }
       this.anticoagulant = this.anticoagulantsConfit[thismode]
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      }
     },
 
     addPlanModeChange() {

src/xt_pages/user/templateSummary.vue

@@ -60,7 +60,7 @@
             <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;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>
@@ -87,7 +87,7 @@
                   <span style="margin-right:10px;line-height:30px;">透后血压（mmHg):{{editObj.after_pressure}}</span>
                 </div> -->
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结总结:
-                   {{editObj.template_summary_content}}
+                   <span v-html="editObj.template_summary_content"></span>
                  </div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结化验结果:
                   <div>
@@ -109,7 +109,9 @@
                   </div>
                 </div>
 
-                <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:{{editObj.template_plan_content}}</div>
+                <!-- <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:
+                  <span v-html="editObj.template_plan_content"></span>
+                </div> -->
               </div>
             </el-col>
           </el-row>
@@ -303,9 +305,16 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
+                     <keep-alive>
+                        <editor ref="edit_neditor"
+                                id="edit_editor1"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_summary_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
-                  <el-row>
+                  <!-- <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
                         <el-option
@@ -315,8 +324,15 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input>
-                  </el-row>
+                     <keep-alive>
+                        <editor ref="edit_neditorOne"
+                                id="edit_editor"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_plan_content">
+                        </editor>
+                    </keep-alive>
+                    
+                  </el-row> -->
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
@@ -561,9 +577,16 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
+                       <keep-alive>
+                        <editor ref="edit_neditor"
+                                id="edit_editor2"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_summary_content">
+                        </editor>
+                      </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
-                  <el-row>
+                  <!-- <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
                         <el-option
@@ -573,8 +596,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input>
-                  </el-row>
+                      <keep-alive>
+                        <editor ref="editorOne"
+                                id="edit_editor"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_plan_content">
+                        </editor>
+                    </keep-alive>
+                  </el-row> -->
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
@@ -850,7 +879,6 @@
           template_summary_id:"",
           template_summary_content:"",
           template_plan_id:"",
-          template_summary_content:"",
           template_inspection_id:0,
           template_inspection_content:"",
           admin_user_id:this.$store.getters.xt_user.user.id,
@@ -960,7 +988,8 @@
     },
     methods: {
       getTime(val) {
-         if(val == ""){
+         console.log("val2322332322323223",val)
+         if(val == "" || val == undefined){
           return ""
          }else {
           return uParseTime(val, '{y}-{m}-{d}')
@@ -1042,7 +1071,7 @@
           start_time:this.start_date,
           end_time:this.end_date,
         }
-        console.log("世纪时间",params)
+        // console.log("世纪时间",params)
         console.log(moment(moment(2020 + '-01-01').toDate()).quarter(2).format("YYYY-MM-DD"))
         getInitDataList(params).then(response=>{
           if(response.data.state == 1){
@@ -1253,10 +1282,18 @@
         if(this.form.befor_pressure == ""){
           this.form.befor_pressure = 0
         }
+        if(this.form.template_plan_id == ""){
+          this.form.template_plan_id = 0
+        }
+        if(this.form.template_summary_id == ""){
+          this.form.template_summary_id = 0
+        }
         var year = this.form.start_year+"-"+"01"+"-"+"01"
         console.log("年",year)
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
-        console.log("月",month)
+        console.log("月",this.$refs)
+      
+
          var params = {
             title:this.form.title,
             dry_weight:this.form.dry_weight.toString(),
@@ -1276,14 +1313,12 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            template_summary_content:this.form.template_summary_content,
-            template_plan_content:this.form.template_plan_content,
-            // template_inspection_content:JSON.stringify(this.form.template_inspection_content),
+            template_plan_content:"",
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
             template_summary_id:this.form.template_summary_id,
-            template_summary_content:this.form.template_summary_content,
+            template_summary_content:this.$refs.edit_neditor.content,
             template_plan_id:this.form.template_plan_id,
             template_inspection_id:this.form.template_inspection_id,
             patient_id:parseInt(this.patient_id),
@@ -1292,6 +1327,7 @@
             start_year:year,
             start_month:month,
             radio:this.form.radio,
+
          }
           console.log("parawm232323223",params)
 
@@ -1342,7 +1378,10 @@
               var list = response.data.data.list
               this.inspectionList = list
               this.$refs.inspection_table.setCurrentRow(this.inspectionList[0])
-              this.getCurrentRecordDetail(this.inspectionList[0].id)
+              if (list.length > 0) {
+               this.getCurrentRecordDetail(this.inspectionList[0].id)
+              }
+
            }
         })
       },
@@ -1454,6 +1493,7 @@
                this.form.minute = list.minute
                this.form.natrium =list.natrium
                this.form.perfusion_apparatus= list.perfusion_apparatus
+               this.form.other_count = list.other_count
                this.form.record_time = this.getTimeTwo(list.record_time)
                console.log("时间232233232",list.record_time)
                if(list.template_inspection_id == 0){
@@ -1469,7 +1509,6 @@
                  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){
                  this.form.template_summary_id = ""
@@ -1504,6 +1543,18 @@
        }
       },
       editCreation(){
+        if(this.form.template_summary_id == ""){
+           this.form.template_summary_id = 0
+        }
+        if(this.form.template_inspection_id == ""){
+           this.form.template_inspection_id = 0
+        }
+        if(this.form.template_plan_id == ""){
+           this.form.template_plan_id = 0
+        }
+        if(this.form.dialysis_count == ""){
+            this.form.dialysis_count = 0
+        }
         var params = {
             id:this.form.id,
             title:this.form.title,
@@ -1524,8 +1575,10 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            template_summary_content:this.form.template_summary_content,
-            template_plan_content:this.form.template_plan_content,
+            // template_summary_content:this.form.template_summary_content,
+            // template_plan_content:this.form.template_plan_content,
+            template_plan_content:"",
+            template_summary_content:this.$refs.edit_neditor.content,
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
@@ -1714,6 +1767,12 @@
         console.log("val2323323223",val)
         if(val == "2021-02"){
           this.startYear = val+"-" + "28"
+        }else if(val == "2021-08"){
+          this.startYear = val+"-" + "31"
+        }else if(val == "2021-10"){
+          this.startYear = val+"-" + "31"
+        }else if(val == "2021-12"){
+          this.startYear = val+"-" + "31"
         }else{
           this.startYear = val+"-" + "30"
         }

src/xt_pages/user/templateSummaryPrint.vue

@@ -6,7 +6,7 @@
   <div id="dialysis-print-box">
     <div class="dialysis-print-order">
       <div class="order-yy-name"></div>
-      <div class="order-title">{{ orgname }}&nbsp;&nbsp;&nbsp;血液透析患者诊疗阶段小结</div>
+      <div class="order-title">{{ orgname }}血液透析患者诊疗阶段小结</div>
       
       <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
          <span>姓名:{{patientList.patient.name}}</span>  
@@ -47,7 +47,9 @@
         </div>
       </div> -->
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
-        <span style="font-weight:bold;">阶段小结总结:</span><div style="line-height:24px;">{{patientList.template_summary_content}}</div>  
+        <span style="font-weight:bold;">阶段小结总结:</span>
+          <!-- {{patientList.template_summary_content}} -->
+          <div style="line-height:24px;" v-html="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>
@@ -69,10 +71,11 @@
           </div>
         </div> 
       </div>
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
+      <!-- <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结个性化方案:</span>
-        <div style="line-height:24px;">{{patientList.template_plan_content}}</div>
-      </div>
+      
+         <div v-html="patientList.template_plan_content"></div>
+      </div> -->
      <div style="margin-top:10px;">
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
        <span style="margin-left:20px;">记录时间:{{getTime(patientList.record_time)}}</span>  
@@ -288,7 +291,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;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;}'
+        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{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;}'
         printJS({
             printable: 'dialysis-print-box',
             type: 'html',

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -58,7 +58,7 @@
     </div>
     <div class="cell clearfix">
       <div  class="title"><span class="name">分区</span> :</div>
-      <div class="time">
+      <!-- <div class="time">
         <ul class>
           <li
             :class="item.id == zone ? 'active' : ''"
@@ -69,7 +69,15 @@
             {{ item.name }}
           </li>
         </ul>
-      </div>
+      </div> -->
+       <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
+          <el-option
+            v-for="item in zoneList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+       </el-select>
     </div>
     <el-table
       :row-style="{ color: '#303133' }"
@@ -260,7 +268,8 @@ export default {
         {id:2,name:"未确认"},
       ],
       zone:"",
-      zoneList:[{id:0,name:"全部"}],
+      // zoneList:[{id:0,name:"全部"}],
+      zoneList:[],
     };
   },
   watch: {
@@ -274,8 +283,21 @@ export default {
 
   methods: {
     printAction() {
+       var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
       this.$router.push({
-        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+this.zone+"&prestatus="+this.pre_status
+        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+str+"&prestatus="+this.pre_status
       });
     },
    compare(property) {
@@ -289,13 +311,25 @@ export default {
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         // console.log("start",moment(start).unix())
-      
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         const params = {
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
           week_type:this.week_type,
           week_time:this.week_time,
-          zone:this.zone,
+          zone:str,
         }
         // const params = {
         //   start_time:1609603200,
@@ -546,7 +580,7 @@ export default {
          if(response.data.state == 1){
             var zonelist = response.data.data.zoneList
             this.zoneList.push(...zonelist)
-           
+            this.getNextScheduleWeekDay()
          }
       })
     },
@@ -574,6 +608,10 @@ export default {
         }
        return name
     }, 
+    changeZone(val){
+      this.zone = val
+      this.getNextScheduleWeekDay()
+    }
   },
   components: {
     WeekItem
@@ -586,7 +624,6 @@ export default {
       this.week_type = 7;
     }
     this.getAllZoneList()
-    this.getNextScheduleWeekDay();
     this.org_id = this.$store.getters.xt_user.org.id
    
   }

src/xt_pages/workforce/components/tableWeeks.vue

@@ -75,10 +75,10 @@
         </div>
         <div class="cell clearfix">
             <div class="title"><span class="name">分区</span> :</div>
-            <div class="time">
+            <!-- <div class="time">
                 <ul class>
                     <li
-                            :class="item.id == zone ? 'active' : ''"
+                          :class="item.id == zone ? 'active' : ''"
                             @click="selectZoneList(item.id)"
                             v-for="item in zoneList"
                             :key="item.id"
@@ -86,7 +86,15 @@
                         {{ item.name }}
                     </li>
                 </ul>
-            </div>
+            </div> -->
+            <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
+              <el-option
+                v-for="item in zoneList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
         </div>
         <el-table
                 v-loading="isloading"
@@ -437,9 +445,11 @@
           anticoagulant_zongliang: '',
           doctor_advice: ''
         },
-        zone: 0,
-        zoneList: [{ id: 0, name: '全部' }],
-        summarySchData: []
+        // zone: 0,
+        // zoneList: [{ id: 0, name: '全部' }],
+        summarySchData: [],
+        zone:0,
+        zoneList:[],
       }
     },
     watch: {
@@ -844,14 +854,40 @@
       }
       ,
       printAction() {
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         this.$router.push({
-          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.zone
+          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str
         })
       }
       ,
       signPrint() {
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         this.$router.push({
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.zone + '&prestatus=' + this.pre_status
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
         })
       }
       ,
@@ -915,11 +951,26 @@
       ,
 
       getScheduleList() {
+        
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         const params = {
           week_type: this.week_type,
           week_time: this.week_time,
-          zone: this.zone
+          zone: str,
         }
+        console.log("param",params)
         this.scheduleData = []
         this.isloading = true
         getScheduleList(params).then(response => {
@@ -1433,7 +1484,7 @@
           if (response.data.state == 1) {
             var zonelist = response.data.data.zoneList
             this.zoneList.push(...zonelist)
-
+            this.getScheduleList()
           }
         })
       }
@@ -1464,6 +1515,10 @@
         }
         console.log('name', name)
         return name
+      },
+      changeZone(val){
+        this.zone = val
+        this.getScheduleList()
       }
     },
     components: {
@@ -1471,6 +1526,7 @@
     }
     ,
     created() {
+      this.getAllZoneList()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = new Date().getDay()
@@ -1478,8 +1534,8 @@
         this.week_type = 7
       }
       this.org_id = this.$store.getters.xt_user.org.id
-      this.getScheduleList()
-      this.getAllZoneList()
+     
+     
     }
   }
 </script>

src/xt_pages/workforce/remind_print_setting.vue

@@ -28,7 +28,7 @@
                 </div> 
                 <div>用量:  
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
@@ -209,7 +209,7 @@
 
       },
       printAction: function() {
-        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } @page {margin-top:10px;}}'
 
         printJS({
           printable: 'print_content',