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

src/xt_pages/data/components/addInspection.vue

@@ -155,7 +155,7 @@
             <template slot-scope="scope">
               <div v-if="scope.row.type == 2">{{ scope.row.unit }}</div>
               <div v-if="scope.row.type == 3">
-                {{ getUnit(scope.row.unit) }}
+               {{ scope.row.unit }}
               </div>
             </template>
           </el-table-column>
@@ -251,7 +251,6 @@ export default {
       }
     },
     changeProject(val) {
-      console.log("i23232323323",val.id)
       this.form.number = 1;
     },
     querySearch(queryString, cb) {
@@ -272,7 +271,7 @@ export default {
       };
     },
     handleSelect(val) {
-      console.log("val3223322323232323",val)
+     
       this.project_name = val.project_name;
       this.form.project_detail = val.id;
     },
@@ -314,7 +313,7 @@ export default {
         saveTeam(data, params).then((response) => {
           if (response.data.state == 1) {
             var projectTeam = response.data.data.projectTeam;
-            // console.log('projectTeam', projectTeam)
+           
             this.$message.success("保存成功");
             this.visible = false;
             (this.form.project_team = ""),
@@ -341,12 +340,12 @@ export default {
         if (response.data.state == 1) {
           var projectList = response.data.data.projectList;
           var goodInfos = response.data.data.good_info;
-
+    
           for (let i = 0; i < projectList.length; i++) {
             let obj = {
               id: projectList[i].id,
               statistical_classification:
-                projectList[i].statistical_classification,
+              projectList[i].statistical_classification,
               number: "1",
               project_name: projectList[i].project_name,
               unit: projectList[i].unit,
@@ -363,12 +362,10 @@ export default {
           for (let i = 0; i < goodInfos.length; i++) {
             let obj = {
               id: goodInfos[i].id,
-              statistical_classification:
-                goodInfos[i].statistical_classification,
+              statistical_classification:goodInfos[i].statistical_classification,
               number: "1",
-              project_name:
-                goodInfos[i].good_name + " " + goodInfos[i].specification_name,
-              unit: goodInfos[i].good_unit,
+              project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
+              unit: goodInfos[i].packing_unit,
               price: goodInfos[i].retail_price,
               type: 3,
               new_id: Math.floor(
@@ -379,7 +376,7 @@ export default {
             this.projectList.push(obj);
           }
 
-          console.log("项目2323332", this.projectList);
+         
         }
       });
     },
@@ -416,6 +413,7 @@ export default {
             }
           }
         }
+        console.log("project_232332323232323232",this.projectList)
         for (let i = 0; i < this.projectList.length; i++) {
           if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number

src/xt_pages/data/components/editInspection.vue

@@ -80,7 +80,7 @@
                     <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">
                             <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
-                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+                            <div v-if="scope.row.type == 3">{{scope.row.unit}}</div>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -209,7 +209,7 @@
          
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info
-
+            console.log("332323232323232",goodInfos)
             for (let i = 0; i < projectList.length; i++) {
               let obj = {
                 id: projectList[i].id,
@@ -233,7 +233,7 @@
                 statistical_classification: goodInfos[i].statistical_classification,
                 number: '1',
                 project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
-                unit: goodInfos[i].good_unit,
+                unit: goodInfos[i].packing_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
                 m_id: 0,
@@ -274,7 +274,7 @@
 
               } else {
                 obj['project_name'] = hisList[i].good_info.good_name
-                obj['unit'] = hisList[i].good_info.good_unit
+                obj['unit'] = hisList[i].good_info.packing_unit
                 obj['price'] = hisList[i].good_info.retail_price
               }
               this.tableData.push(obj)

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -111,8 +111,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -87,7 +87,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -98,7 +98,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 ">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"
@@ -369,7 +369,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46)"
+                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46 || this.$store.getters.xt_user.template_info.template_id == 53)"
                             v-show="zhiShow">
                         <el-form-item label="置换量(ml)：">
                             <el-input
@@ -379,7 +379,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 46"
+                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 46 && this.$store.getters.xt_user.template_info.template_id != 53"
                             v-show="zhiShow">
                         <el-form-item label="置换量(L)：">
                             <el-input
@@ -401,12 +401,11 @@
 
                     <el-col
                             :span="8"
-                            v-if="anticoagulant.gaimingcheng != -1 && isShows('钙名称')"
+                            v-if="isShows('钙名称')"
                     >
                         <el-form-item label="钙名称 : ">
                             <el-input
                                     v-model="dialysisPrescription.anticoagulant_gaimingcheng"
-                                    :disabled="anticoagulant.gaimingcheng == 1 ? false : true"
                                     placeholder="钙名称"
                             ></el-input>
                         </el-form-item>
@@ -613,7 +612,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24)"
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)">
                             <el-input
@@ -622,7 +621,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24"
+                            v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(L)">
                             <el-input

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

@@ -231,6 +231,7 @@
                 template_id == 47 ||
                 template_id == 48 ||
                 template_id == 51 ||
+                template_id == 53 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -282,7 +283,8 @@
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
-               template_id != 51 &&
+              template_id != 51 &&
+              template_id != 53 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -328,6 +330,7 @@
                 template_id == 44 ||
                 template_id == 46 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -370,6 +373,7 @@
               template_id != 43 &&
               template_id != 44 &&
               template_id != 46 &&
+              template_id != 53 &&
               template_id != 48 &&
               template_id != 47
             "
@@ -426,6 +430,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -448,6 +453,7 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 48 &&
+              template_id != 53 &&
               template_id != 47
             "
           >
@@ -487,6 +493,7 @@
                 template_id == 20 ||
                 template_id == 26 ||
                 template_id == 29 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >
@@ -513,6 +520,7 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 43 &&
+              template_id != 53 &&
               template_id != 48
             "
           >
@@ -986,6 +994,7 @@
                 template_id == 44 ||
                 template_id == 46 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -1022,6 +1031,7 @@
               template_id != 44 &&
               template_id != 46 &&
               template_id != 48 &&
+              template_id != 53 &&
               template_id != 47
             "
           >
@@ -1065,6 +1075,7 @@
                 template_id == 47 ||
                 template_id == 48 ||
                 template_id == 51 ||
+                template_id == 53 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1109,7 +1120,7 @@
               template_id != 47 &&
               template_id != 51 &&
               template_id == 48 &&
-             
+              template_id == 53 &&
               org_id !=  10210 &&
               org_id != 9555
             "
@@ -1144,7 +1155,8 @@
               template_id != 29 &&
               template_id != 46 &&
               template_id != 47 &&
-              template_id != 48 
+              template_id != 48 &&
+              template_id != 53
             "
           >
             <el-form-item label="置换率(L/h)：">
@@ -1163,6 +1175,7 @@
                 template_id == 29 ||
                 template_id == 46 ||
                 template_id == 47 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >
@@ -1187,6 +1200,7 @@
               template_id != 29 &&
               template_id != 43 &&
               template_id != 46 &&
+              template_id != 53 &&
               template_id != 48
             "
           >
@@ -1208,6 +1222,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 46 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,17 +14,17 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -677,6 +677,17 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="org_template_info.template_id == 54">
+        <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"-->
@@ -1073,6 +1084,12 @@
             v-if="org_template_info.template_id == 53"
           >
           </DialysisPrintOrderFiftyThree>
+           <DialysisPrintOrderFiftyFour
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 54"
+          >
+          </DialysisPrintOrderFiftyFour>
+          
         </div>
       </el-container>
     </div>
@@ -1144,9 +1161,11 @@ import DialysisPrintOrderFifty from "./template/DialysisPrintOrderFifty";
 import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
 import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
+import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyFour,
     DialysisPrintOrderFiftyThree,
     DialysisPrintOrderFiftyTwo,
     DialysisPrintOrderFiftyOne,
@@ -1385,6 +1404,8 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:100px 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:30px;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:15px}.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;}';
       // 漳浦天福样式
       const style12 ='@page {margin-top:5px;}@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} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .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;}@page {margin-left:30px;margin-right:40px;}';
+      // 金乡宏大样式
+      const style13 ='@page {margin-top:5px;}@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} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .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;}@page {margin-left:30px;margin-right:40px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1430,7 +1451,8 @@ export default {
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51
+        this.org_template_info.template_id == 51 ||
+        this.org_template_info.template_id == 54
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1732,6 +1754,15 @@ export default {
           style: style12,
           scanStyles: false,
         });
+      }else if (
+        this.org_template_info.template_id == 54
+      ) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style13,
+          scanStyles: false,
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1042,8 +1042,9 @@ export default {
             this.afterdialysis.txqnx = 3;
           }
 
+
           this.afterdialysis.complications =
-            this.afterdialysis.complication.split(",");
+          this.afterdialysis.complication.split(",");
           this.afterdialysis.complications_other = [];
           this.afterdialysis.complications_index = [];
           var acllen = this.afterdialysis.complications.length;
@@ -1070,21 +1071,19 @@ export default {
             }
           }
           this.afterdialysis.complications_other =
-            this.afterdialysis.complications_other.join(",");
+          this.afterdialysis.complications_other.join(",");
+
 
           this.prescription = response.data.data.dialysisPrescription;
           this.receiverTreatmentAccess =
-            response.data.data.receiverTreatmentAccess;
+          response.data.data.receiverTreatmentAccess;
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
+
           this.sick_condition_arr.forEach((o) => {
-            // console.log(o,'hh')
             if (this.receiverTreatmentAccess.sick_condition == o.id) {
               this.sick_condition = o.name;
             }
           });
-          console.log(this.sick_condition, "hh");
-
-          console.log("上次透后体重", this.assessmentafter);
 
           this.prescription.mode = this.modeName(this.prescription.mode_id);
           var rwLen = this.replacementWays.length;
@@ -1099,6 +1098,7 @@ export default {
             }
           }
 
+
           this.prescription.dialysate_formulation_name =
             this.dialysateFormulationName(
               this.prescription.dialysate_formulation
@@ -1110,13 +1110,14 @@ export default {
             if (
               this.perfusionApparatus[index].id ==
               this.prescription.perfusion_apparatus
-            ) {
+               ) {
               this.prescription.perfusion_apparatus_name =
                 this.perfusionApparatus[index].name;
               break;
             }
           }
 
+
           var acLen = this.anticoagulantsConfit.length;
           var thisALID = this.prescription.anticoagulant;
           this.prescription.anticoagulant_name = "";

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -119,9 +119,8 @@
                 <TR>
                   <TD>报销类别费用合计</TD>
                   <TD>甲类：{{ getJaiTotal() ? getJaiTotal() : "0.00" }}</TD>
-                  <TD>乙类药品：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
+                  <TD>乙类：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
                   <TD>丙类：{{ getBingTotal() ? getBingTotal() : "0.00" }}</TD>
-                  <TD>非药品：0.00</TD>
                   <TD></TD>
                   <TD>其他：0.00</TD>
                 </TR>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2890,7 +2890,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {

src/xt_pages/outpatientCharges/summary.vue

@@ -424,11 +424,6 @@ export default {
 
  
   methods: {
-    // watchtoute() {
-    //   console.log(this.$router, "iiii");
-    //   console.log(this.$route, "iiii");
-    // },
-
     setStorage() {
       this.$store.commit("SET_PAGEDATA", {
         page: this.page,

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -19,7 +19,7 @@
           org_id != 9671 &&
           org_id != 0 &&
           org_id != 10164 &&
-          org_id == 10188 &&
+          org_id != 10188 &&
           org_id != 10318
         "
         ref="printOne"
@@ -144,7 +144,7 @@ export default {
       const style2 =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;padding-bottom: 10px;border-bottom: 1px solid;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot {width: 300px;display: flex;}.name_slot span {display: inline-block;min-width: 70px;border-bottom: 1px solid;} .infoTitle .name_slot_2 {width: 250px;display: flex;} .name_slot_2 .name_slot_1{  display: inline-block;min-width: 70px;border-bottom: 1px solid;} .infoTitle .full_slot {width: 100%;}.infoTitle .full_slot .id_card{border: 1px solid;display: inline-block;width: 18px;height: 18px;text-align: center;margin-right: 6px;} .address_slot_1 span {display: inline-block;min-width: 60px;border-bottom: 1px solid;} .otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
 
-      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675 && this.org_id != 10318) {
+      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675 && this.org_id != 10318 &&this.org_id != 10188) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -153,7 +153,8 @@ export default {
         });
       } else if (
         this.org_id == 10217 ||
-        this.org_id == 9675
+        this.org_id == 9675 ||
+        this.org_id == 10188
       ) {
         printJS({
           printable: "prescription-print",

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -238,26 +238,26 @@ export default {
       }
     },
     searchAction() {
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.getHisSummaryDetailList();
     },
     changeDate() {
@@ -267,26 +267,26 @@ export default {
     },
     changeItem(id) {
       this.id = id;
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.getHisSummaryDetailList();
     },
     getHisSummaryDetailList() {
@@ -330,8 +330,21 @@ export default {
 
           var new_arr = [];
 
-          
+          let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.keywords == undefined) {
+            this.keywords = "";
+          } else {
+            this.keywords = list_1.keywords;
+          }
+          this.id = list_1.type_id;
+          this.item_type = this.id;
+          if(this.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
 
+          
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i].index != "合计") {
@@ -491,26 +504,26 @@ export default {
       // start_time: this.chargeDate[0],
       // end_time: this.chargeDate[1],
       // patient_id:this.patient_id
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
     },
     getPrice(val) {
       var total_price = 0;
@@ -521,17 +534,17 @@ export default {
     },
   },
   created() {
-    // let list_1 = this.$store.getters.pagedata.list;
-    //       if (list_1.start_time == "") {
-    //         this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
-    //       } else {
-    //         this.chargeDate[0] = list_1.start_time;
-    //       }
-    //        if (list_1.end_time == "") {
-    //         this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
-    //       } else {
-    //         this.chargeDate[1] = list_1.end_time;
-    //       }
+    let list_1 = this.$store.getters.pagedata.list;
+          if (!list_1.start_time ||list_1.start_time == "") {
+            this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
+          } else {
+            this.chargeDate[0] = list_1.start_time;
+          }
+           if (!list_1.end_time ||list_1.end_time == "") {
+            this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
+          } else {
+            this.chargeDate[1] = list_1.end_time;
+          }
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.getHisSummaryDetailList();

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -234,29 +234,29 @@ export default {
   },
   methods: {
     searchAction() {
-    //  let table_id = this.$store.getters.pagedata.list.table_id;
-    //   if (table_id == undefined) {
-    //     this.$store.commit("SET_PAGEDATA", {
-    //       table_id: 0,
-    //       type_id: this.id,
-    //       keywords: this.keywords,
-    //       start_time: this.chargeDate[0],
-    //       end_time: this.chargeDate[1],
-    //       patient_id: this.patient_id,
-    //     });
-    //   } else {
-    //     this.$store.commit("SET_PAGEDATA", {
-    //       table_id: table_id,
-    //       type_id: this.id,
-    //       keywords: this.keywords,
-    //       start_time: this.chargeDate[0],
-    //       end_time: this.chargeDate[1],
-    //       patient_id: this.patient_id,
-    //     });
-    //   }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.tableList = [];
       this.getGatherDetailList();
-      console.log(this.tableList, "查看条约");
+      // console.log(this.tableList, "查看条约");
     },
     getPrice(val) {
       var total_price = 0;
@@ -272,26 +272,26 @@ export default {
     },
     changeItem(id) {
       this.id = id;
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.tableList = [];
       this.getGatherDetailList();
     },
@@ -440,26 +440,33 @@ export default {
           this.medicalInsuranceLevelList =
             response.data.data.medicalInsuranceLevelList;
 
-          // let list_1 = this.$store.getters.pagedata.list;
-          // if (list_1.keywords == undefined) {
-          //   this.keywords = "";
-          // } else {
-          //   this.keywords = list_1.keywords;
-          // }
-          // this.id = list_1.type_id;
-          // this.item_type = this.id
+          let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.keywords == undefined) {
+            this.keywords = "";
+          } else {
+            this.keywords = list_1.keywords;
+          }
+          this.id = list_1.type_id;
+          this.item_type = this.id;
+          if(this.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
+          console.log(this.item_type,'this.item_type')
+          
 
-          if(this.keywords!=""){
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].name.indexOf(this.keywords) >-1){
-              new_arr.push(this.tableList[i])
+          if (this.keywords != "") {
+            for (let i = 0; i < this.tableList.length; i++) {
+              if (this.tableList[i].name.indexOf(this.keywords) > -1) {
+                new_arr.push(this.tableList[i]);
+              }
+            }
+            var obj = { index: "合计", is_total: 1, total: 0 };
+            obj.total = this.getPrice(new_arr);
+            this.tableList = [];
+            this.tableList = new_arr;
           }
-        }
-        var obj ={index:"合计",is_total:1,total:0}
-        obj.total = this.getPrice(new_arr)
-        this.tableList = []
-        this.tableList = new_arr
-      }
           if (this.id == 1) {
             var new_arr = [];
             for (let i = 0; i < this.tableList.length; i++) {
@@ -820,26 +827,26 @@ export default {
           "&id=" +
           this.id,
       });
-      //   let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
     },
     toPrintInvoice() {
       this.$router.push({
@@ -1245,27 +1252,27 @@ export default {
       return name;
     },
   },
-  created() {  
-    // let list_1 = this.$store.getters.pagedata.list;
-    //       if (list_1.start_time == "") {
-    //         this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
-    //       } else {
-    //         this.chargeDate[0] = list_1.start_time;
-    //       }
-    //        if (list_1.end_time == "") {
-    //         this.chargeDate[1] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
-    //       } else {
-    //         this.chargeDate[1] = list_1.end_time;
-    // }
+  created() {
+    let list_1 = this.$store.getters.pagedata.list;
+    if (!list_1.start_time || list_1.start_time == "") {
+      this.chargeDate[0] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[0] = list_1.start_time;
+    }
+    if (!list_1.end_time || list_1.end_time == "") {
+      this.chargeDate[1] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[1] = list_1.end_time;
+    }
 
-    console.log(this.chargeDate[0],'测试测试')  
-    
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.tableList = [];
     this.getGatherDetailList();
-    // console.log(this.start_time,this.end_time,'ooooooo')
-    
   },
   watch: {
     patient_id: function () {

src/xt_pages/outpatientTool/detailPrint.vue

@@ -4,48 +4,94 @@
       <el-button type="primary" @click="printtpage">打印</el-button>
     </div>
     <div id="list-print" class="list-print">
-      <div class="listTitle">
+      <table class="listTable"
+        border="0"
+        cellspacing="0"
+        style="font-size: 14px"
+        align="center">
+        <thead style="display: table-header-group; font-weight: bold;border-bottom: 1px solid;">
+          <tr
+            ><td colspan="4" align="center" style="font-size: 20px"
+              >{{ $store.getters.xt_user.org.org_name }}费用清单</td
+            ></tr
+          >
+          <tr>
+            <td>患者姓名：{{ patient.name }}</td>
+            <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
+            <td>结算类别：
+          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          {{getType(his_record_patient.balance_accounts_type)}}</td>
+            <td>发票号码：{{order.fa_piao_number}}</td>
+          </tr>
+          <tr>
+            <td>住院/门诊号：
+          <!-- {{his_patient.number}} -->
+          {{his_record_patient.ipt_otp_no}}</td>
+            <td>科室：
+          <!-- {{ getDepartment(his_patient.departments) }} -->
+          {{ getDepartment(his_record_patient.departments) }}</td>
+            <td>就诊流水号：
+          <!-- {{ his_patient.number }} -->
+          {{his_record_patient.number}}</td>
+          </tr>
+          <tr>
+            <td>总费用：{{ getAllPice() }}</td>
+            <td>个人支付：
+          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
+          
+          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+            </td>
+            <td>基金支付记账：{{ getFundPaySumamt() }}</td>
+            <td>补充医疗支付记账：{{ getHifesPay() }}</td>
+          </tr>
+          <tr>
+            <td>
+              救助支付金额：{{ getMafPay() }}
+            </td>
+          </tr>
+        </thead>
+      </table>
+
+      <!-- <div class="listTitle">
         {{ $store.getters.xt_user.org.org_name }}费用清单
-      </div>
-      <div class="listInfo">
+      </div> -->
+
+      <!-- <div class="listInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>住院/门诊号：
-          <!-- {{his_patient.number}} -->
           {{his_record_patient.ipt_otp_no}}
         </div>
         <div>科室：
-          <!-- {{ getDepartment(his_patient.departments) }} -->
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-          <!-- {{ his_patient.number }} -->
+       
           {{his_record_patient.number}}
         </div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
-          
           <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
           <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
 
         </div>
         <div>基金支付记账：{{ getFundPaySumamt() }}</div>
         <div style="min-width:300px;">补充医疗支付记账：{{ getHifesPay() }}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>救助支付金额：{{ getMafPay() }}</div>
-      </div>
+      </div> -->
       <table class="listTable" border="1">
         <tr style="height:45px">
           <td width="100" style="text-align: center">序号</td>

src/xt_pages/outpatientTool/statistics.vue

@@ -167,11 +167,10 @@ export default {
 
     onRowClick(row, event, column) {
       this.currentRowIndex = row.row_index;
-      console.log(this.currentRowIndex, "this.currentRowIndex");
       this.$store.commit("SET_PAGEDATA", {
         table_id: this.currentRowIndex,
       });
-      console.log(this.$store.getters.pagedata.list.table_id, "kk");
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
     },
     searchAction() {
       this.getPatientList();

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -195,6 +195,7 @@
                     filterable
                     placeholder="请选择单位"
                     style="width: 80px"
+                    @change="changeUnit(scope.row,scope.$index)"
                   >
                     <el-option
                       v-for="(option, index) in unitList"
@@ -251,9 +252,7 @@
 
           <el-table-column label="总价(元)" align="center" width="80">
             <template slot-scope="scope">
-              {{
-                calculate(scope.row.last_price * scope.row.warehousing_count)
-              }}
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
 
@@ -682,6 +681,8 @@ export default {
       tempObj["dose_unit"] = "";
       tempObj["dealer"] = "";
       tempObj["last_price"] = "";
+      tempObj["count_unit"] = "";
+      tempObj["min_number"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -961,6 +962,8 @@ export default {
           this.recordInfo.recordData[i].number = val.number;
           this.recordInfo.recordData[i].max_unit = val.max_unit;
           this.recordInfo.recordData[i].min_unit = val.min_unit;
+          this.recordInfo.recordData[i].count_unit = val.max_unit;
+          this.recordInfo.recordData[i].min_number = val.min_number
           if (val.dealer == 0) {
             this.recordInfo.recordData[i].dealer = "";
           } else {
@@ -969,6 +972,19 @@ export default {
         }
       }
     },
+    changeUnit(val,index){
+    // console.log("val3232323232",val)
+    //  for(let i=0;i<this.recordInfo.recordData.length;i++){
+    //    if(i == index){
+    //      if(this.recordInfo.recordData[i].max_unit == this.recordInfo.recordData[i].count_unit){
+           
+    //      }
+    //      if(this.recordInfo.recordData[i].min_unit == this.recordInfo.recordData[i].count_unit){
+
+    //      }
+    //    }
+    //  }
+    }
   },
   created() {
     if (this.$route.path == "/Pharmacy/in/add") {
@@ -996,7 +1012,8 @@ export default {
     tempObj["drug_name"] = "";
     tempObj["dosage"] = "";
     tempObj["max_unit"] = "";
-    (tempObj["min_unit"] = ""), (tempObj["lot_number"] = "");
+    tempObj["min_unit"] = "", 
+    tempObj["lot_number"] = "";
     tempObj["product_date"] = "";
     tempObj["expiry_date"] = "";
     tempObj["warehousing_count"] = "";
@@ -1009,6 +1026,8 @@ export default {
     tempObj["drug_type"] = "";
     tempObj["dealer"] = "";
     tempObj["number"] = "";
+    tempObj["count_unit"] = "";
+    tempObj["min_number"] = "";
     this.recordInfo.recordData.push(tempObj);
 
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -570,6 +570,7 @@ export default {
       tempObj["total_count"] = 0;
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
+      tempObj["total_price"] = 0;
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -664,60 +665,42 @@ export default {
             return;
           }
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
-            this.recordInfo.recordData[i].price =
-              this.recordInfo.recordData[i].price.toString();
+            this.recordInfo.recordData[i].total_price = (this.recordInfo.recordData[i].count * this.recordInfo.recordData[i].price).toString()
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString();
 
             for (let j = 0; j < this.manufacturerList.length; j++) {
-              if (
-                this.recordInfo.recordData[i].manufacturer ==
-                this.manufacturerList[j].manufacturer_name
-              ) {
-                this.recordInfo.recordData[i].manufacturer =
-                  this.manufacturerList[j].id;
+              if (this.recordInfo.recordData[i].manufacturer ==  this.manufacturerList[j].manufacturer_name) {
+                this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id;
               }
             }
             if (this.recordInfo.recordData[i].dealer == "") {
-              this.recordInfo.recordData[i].dealer = 0;
+                this.recordInfo.recordData[i].dealer = 0;
             }
             for (let z = 0; z < this.dealerList.length; z++) {
-              if (
-                this.recordInfo.recordData[i].dealer ==
-                this.dealerList[z].dealer_name
-              ) {
+              if (this.recordInfo.recordData[i].dealer ==this.dealerList[z].dealer_name) {
                 this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
               }
             }
 
             for (let y = 0; y < this.numberList.length; y++) {
-              if (
-                this.recordInfo.recordData[i].batch_number ==
-                this.numberList[y].id
-              ) {
-                this.recordInfo.recordData[i].batch_number =
-                  this.numberList[y].batch_number;
-                this.recordInfo.recordData[i].warehouse_info_id =
-                  this.numberList[y].id;
+              if (this.recordInfo.recordData[i].batch_number ==this.numberList[y].id) {
+                this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number;
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
               }
             }
             for (let s = 0; s < this.doctorList.length; s++) {
-              if (
-                this.recordInfo.recordData[i].admin_user_id ==
-                this.doctorList[s].user_name
-              ) {
-                this.recordInfo.recordData[i].admin_user_id =
-                  this.doctorList[s].admin_user_id;
+              if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
+                 this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
               }
             }
 
-            this.recordInfo.recordData[i].last_price =
-              this.recordInfo.recordData[i].last_price.toString();
-            this.recordInfo.recordData[i].stock_count =
-              this.recordInfo.recordData[i].stock_count.toString();
+            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString();
+            this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
           }
           const params = {
             stockOut: this.recordInfo.recordData,
           };
-
+          console.log("param22222222",params)
           const loading = this.$loading({
             lock: true,
             text: "Loading",
@@ -917,7 +900,6 @@ export default {
     },
     changeUnit(val, index) {
       console.log("vla33232233232323232", val);
-
       this.getDrugBatchNumber(val.drug_id);
       for (let i = 0; i < this.recordInfo.recordData.length; i++) {
         if (this.recordInfo.recordData[i].drug_id == val.drug_id) {
@@ -926,16 +908,12 @@ export default {
             this.recordInfo.recordData[i].price = val.retail_price;
           }
           if (this.recordInfo.recordData[i].max_unit == val.min_unit) {
-            this.recordInfo.recordData[i].price =
-              this.recordInfo.recordData[i].min_price;
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price;
           }
         }
         for (let j = 0; j < this.numberList.length; j++) {
-          if (
-            this.recordInfo.recordData[i].batch_number == this.numberList[j].id
-          ) {
-            this.recordInfo.recordData[i].batch_number =
-              this.numberList[j].batch_number;
+          if (this.recordInfo.recordData[i].batch_number == this.numberList[j].id) {
+            this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number;
           }
         }
       }
@@ -1094,6 +1072,7 @@ export default {
     tempObj["total_count"] = 0;
     tempObj["max_unit_fisrt"] = 0;
     tempObj["min_unit_fisrt"] = 0;
+    tempObj["total_price"] = 0;
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="org_id!=9671 && org_id!=10210">
+        <div v-if="orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="org_id == 9671 || org_id == 10210">
+      <div v-if="orgId == 9675 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -117,16 +117,21 @@
                   {{item.price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.price).toFixed(2)}}
+                <span v-if="item.count_unit == item.min_unit">
+                   {{(item.count/item.min_number * item.price).toFixed(2)}}
+                </span>
+                <span v-else> {{(item.count * item.price).toFixed(2)}}</span>
+               
              </td>
              <td>{{item.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
-             <td>{{(getTime(item.expire_date))}}</td>
+             <td>{{(getTime(item.expiry_date))}}</td>
             </tr>
+
              <tr>
                <td style="line-height:50px">合计</td>
                <td colspan="7"></td>
-               <td>{{getTotalPrince(it.xt_drug_warehouse_out_info).toFixed(2)}}</td>
+               <td>{{getTotalPrice(it.xt_drug_warehouse_out_info)}}</td>
              </tr>
             </tbody>
           </table>
@@ -401,9 +406,10 @@
             var manufacturerList = response.data.data.manufacturerList
            
             this.manufactureList = manufacturerList
-
+            
             this.tableList = info
             this.tableData = response.data.data.drug_warhouse_out
+            console.log("nfo32323223323223232323",this.tableData)
             this.loading = false
           }
         })

src/xt_pages/stock/stockInOrder.vue

@@ -277,6 +277,11 @@
             {{ scope.row.license_number}}
           </template>
         </el-table-column>
+        <el-table-column label="注册编码" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.register_number}}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}

src/xt_pages/stock/stockInOrderAdd.vue

@@ -201,6 +201,16 @@
               </el-form-item>
             </template>
           </el-table-column>
+         <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
@@ -544,6 +554,7 @@
         tempObj['name'] = ''
         tempObj['license_number'] = ""
         tempObj["packing_price"] = ""
+        tempObj['register_number'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -795,6 +806,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("al32323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -805,7 +817,7 @@
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
               this.recordInfo.recordData[i].license_number = val.number
-           
+              this.recordInfo.recordData[i].register_number = val.register_number
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""
               }else{
@@ -861,6 +873,7 @@
       tempObj['name'] = ''
       tempObj['license_number'] = ''
       tempObj['packing_price']= ''
+      tempObj['register_number'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -245,8 +245,6 @@
             </template>
           </el-table-column>
 
-         
-        
            <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>批准文号</span>
@@ -261,6 +259,16 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
@@ -785,6 +793,7 @@ export default {
             tempObj["dealer"] = "";
             tempObj["manufacturer"] = "";
             tempObj["license_number"] = ""
+            tempObj["register_number"] = ""
             this.recordInfo.recordData.push(tempObj);
           }
         }
@@ -837,6 +846,7 @@ export default {
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].license_number = val.number
+            this.recordInfo.recordData[i].register_number = val.register_number
             if(val.buy_price == 0){
                this.recordInfo.recordData[i].price= ""
             }else{

src/xt_pages/stock/stockOutOrder.vue

@@ -294,6 +294,11 @@
               {{ scope.row.license_number}}
             </template>
           </el-table-column> -->
+            <el-table-column label="注册编码" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.register_number}}
+            </template>
+          </el-table-column>
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{ scope.row.remark }}

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -277,7 +277,17 @@
               <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
           </template>
         </el-table-column>
-
+       
+        <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+        </el-table-column>
 
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
@@ -515,6 +525,7 @@ export default {
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
       tempObj["buy_price"]= ""
       tempObj["stock_count"] = ""
+      tempObj['register_number'] = ''
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -799,6 +810,7 @@ export default {
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
             this.recordInfo.recordData[i].license_number = val.number
+            this.recordInfo.recordData[i].register_number = val.register_number
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price =""
             }else{
@@ -890,6 +902,7 @@ export default {
     tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
     tempObj["buy_price"]= ""
     tempObj["stock_count"] = ""
+    tempObj['register_number'] = ''
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
   

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -261,6 +261,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+        </el-table-column>
+
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="stockShow">
@@ -492,6 +503,7 @@
         tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
         tempObj["buy_price"]= ""
         tempObj["stock_count"] = ""
+        tempObj['register_number'] = ''
         this.recordInfo.recordData.push(tempObj)
       },
       handleDelete: function(index, row) {

src/xt_pages/stock/stockPrint.vue

@@ -49,7 +49,7 @@
                                    <td v-if="end_time == ''">
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
                                         <span>
-                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info)}}
                                         </span>
                                       </span>
                                       <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
@@ -64,11 +64,11 @@
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
                                      </span>
                                      <span v-else>
-                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
+                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)}}
                                      </span>
                                    </td>
                                    <td v-if="end_time!=''">
-                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
+                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)  }}
                                    </td>
                                 </tr>
                             </tbody>

src/xt_pages/user/dialysisSolution.vue

@@ -1586,7 +1586,9 @@ export default {
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
       this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
-
+      this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang
+      this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji
+      this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi
       // this.addPlan.oxygen_uptake = row.oxygen_uptake
       // this.addPlan.hemodialysis_pipelines = row.hemodialysis_pipelines
       // this.addPlan.hemodialysis_pipelines_count = row.hemodialysis_pipelines_count
@@ -1751,7 +1753,7 @@ export default {
     },
     isShows(name) {
       var filedList = store.getters.xt_user.fileds
-      console.log("filedList2323232",filedList)
+      
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 1 &&