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

src/xt_pages/dialysis/details/NavIgation.vue

@@ -663,6 +663,7 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
+      console.log("prescirpiton+++++++++++",this.prescription)
       this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open,this.is_advice_open,this.admin_users);
     },
     showAccepts: function() {
@@ -686,6 +687,12 @@ export default {
         this.assessment_after_dislysis
       );
       this.$emit("assessmentAfterDislysis", this.assessment_after_dislysis);
+    },
+    showPre(){
+
+    },
+    getParentMethods:function(val){
+      this.$parent.getScheduleDetail()
     }
   }
 };

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -1118,9 +1118,18 @@
       },
       toStatistics(){
         this.tableList = []
+        var arr = this.zoneIdList.join(",")
+        var str = ""
+         if(this.partion_type == 0){
+            str = arr
+         }
+         if(this.partion_type != 0){
+            str = this.partion_type.join(',')
+         }
+        
          var params = {
           schedule_type:this.schedule_type,
-          partion_type:this.partion_type,
+          partion_type:str,
           selected_date:this.query.schedule_date,
         }
         getHisDialysisGoodCount(params).then(response=>{

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

@@ -1367,7 +1367,11 @@
               type: 'success',
               duration: 2000
             })
-
+            
+            if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id==3877 || this.$store.getters.xt_user.template_info.org_id ==10469){
+              this.$parent.getParentMethods()
+            }
+            
             const assessment_before_dislysis_resp = response.data.data.assessmentBeforeDislysis
            
             var predialysis_evaluation = this.predialysis_evaluation
@@ -1375,7 +1379,7 @@
               // predialysis_evaluation[index] = assessment_before_dislysis_resp[index];
               this.$set(predialysis_evaluation, index, assessment_before_dislysis_resp[index])
             }
-           
+             
            
             let orgId = parseInt(sessionStorage.getItem("org_id"));
             axios.get('/api/index/patientsign/'+ orgId + '/'+ this.patient.id).then((res) => {

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

@@ -121,6 +121,7 @@
           <el-checkbox :label="dialys_mode"></el-checkbox>
           <el-checkbox :label="long_time"></el-checkbox>
           <el-checkbox :label="target_ultrafiltration"></el-checkbox>
+          <el-checkbox :label="prescription_water"></el-checkbox>
           <el-checkbox :label="anticoagulant"></el-checkbox>
           <el-checkbox :label="anticoagulant_shouji"></el-checkbox>
           <el-checkbox :label="anticoagulant_weichi"></el-checkbox>
@@ -333,6 +334,7 @@ export default {
       dialys_mode: "透析模式:",
       long_time: "透析时长:",
       target_ultrafiltration: "目标超滤量:",
+      prescription_water:"处方脱水量:",
       anticoagulant: "抗凝剂:",
       anticoagulant_shouji: "首剂:",
       anticoagulant_weichi: "维持:",
@@ -818,9 +820,27 @@ export default {
               : "")
         );
       }
-      if (str.indexOf("目标超滤量") != -1 && this.prescription == null) {
+       if (str.indexOf("目标超滤量") != -1 && this.prescription == null) {
         arr.push("目标超滤量:");
       }
+      if (str.indexOf("处方脱水量") != -1 && this.prescription == null) {
+        arr.push("处方脱水量:");
+      }
+      
+      if (str.indexOf("处方脱水量") != -1 && this.prescription != null) {
+        arr.push(
+          "处方脱水量:" +
+            (this.prescription.prescription_water
+              ? this.prescription.prescription_water
+              : "")
+        );
+      }
+
+        if (str.indexOf("处方脱水量") != -1 && this.prescription == null) {
+        arr.push("处方脱水量:");
+      }
+     
+
       if (str.indexOf("抗凝剂") != -1 && this.prescription != null) {
         arr.push(
           "抗凝剂:" +
@@ -1333,6 +1353,17 @@ export default {
           this.target_ultrafiltration = this.target_ultrafiltration;
         }
 
+         if (this.prescription.prescription_water != "") {
+          this.prescription_water = "处方脱水量:";
+          this.prescription_water =
+            this.prescription_water +
+            (this.prescription.prescription_water
+              ? this.prescription.prescription_water
+              : "");
+        } else {
+          this.prescription_water = this.prescription_water;
+        }
+
         if (this.prescription.anticoagulant != "") {
           this.anticoagulant = "抗凝剂:";
           this.anticoagulant =
@@ -1490,6 +1521,17 @@ export default {
                 : "")
           );
         }
+
+         if (
+          this.double_check.dialysis_parameter_desc.indexOf("处方脱水量") != -1
+        ) {
+          this.checkListOne.push(
+            "处方脱水量:" +
+              (this.prescription.prescription_water
+                ? this.prescription.prescription_water
+                : "")
+          );
+        }
         if (this.double_check.dialysis_parameter_desc.indexOf("抗凝剂") != -1) {
           this.checkListOne.push(
             "抗凝剂:" +

src/xt_pages/dialysis/details/index.vue

@@ -1718,6 +1718,7 @@ export default {
       }
     },
     requestDialysisSchedules: function() {
+      console.log("时间人民站起来了呃")
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -149,8 +149,13 @@
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            <span v-if="orgId!=9583">{{ scope.row.count }}</span>
-            <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
+            <span v-if="scope.row.is_total == 0">
+              <span v-if="orgId!=9583">{{ scope.row.count }}</span>
+              <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
+            </span> 
+            <span v-if="scope.row.is_total == 1">
+              {{scope.row.count}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
@@ -341,7 +346,15 @@ export default {
           this.wareOutList =  response.data.data.list
           console.log("党的20大长长",this.wareOutList)
           var total = 0
-
+          var objOne = {
+            warehouse_out_order_number: "合计",
+            is_total: 1,
+            total:total.toFixed(2),
+            WarehouseOut: {
+              warehouse_out_time: 0
+            },
+            count:0
+          }
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
 
@@ -349,16 +362,10 @@ export default {
             total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-
+            objOne.count += response.data.data.list[i].count
           }
-          this.cancelStockDate.push({
-            warehouse_out_order_number: "合计",
-            is_total: 1,
-            total:total.toFixed(2),
-            WarehouseOut: {
-              warehouse_out_time: 0
-            }
-          });
+       
+          this.cancelStockDate.push(objOne);
 
         }
       });
@@ -399,6 +406,15 @@ export default {
           this.wareOutList =  response.data.data.list
           console.log("党的20大长长",this.wareOutList)
           var total = 0
+          var objOne = {
+            warehouse_out_order_number: "合计",
+            is_total: 1,
+            total: total.toFixed(2),
+            WarehouseOut: {
+              warehouse_out_time: 0
+            },
+            count:0,
+          }
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
@@ -408,21 +424,15 @@ export default {
             if(response.data.data.list[i].price == 0){
                total += response.data.data.list[i].GoodInfo.packing_price * response.data.data.list[i].count
             }
-
+            objOne.count +=response.data.data.list[i].count
             obj["is_total"] = 0;
+            
             this.cancelStockDate.push(obj);
           }
 
           this.tableDataList = response.data.data.list
 
-          this.cancelStockDate.push({
-            warehouse_out_order_number: "合计",
-            is_total: 1,
-            total: total.toFixed(2),
-            WarehouseOut: {
-              warehouse_out_time: 0
-            }
-          });
+          this.cancelStockDate.push(objOne);
 
         }
       });

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -252,39 +252,48 @@
       >
         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.drug_name }}
+            <span v-if="scope.row.is_total == 0">
+              {{ scope.row.drug.drug_name }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="药品类型" align="center">
           <template slot-scope="scope">
-            {{ getDrugType(scope.row.drug.drug_type) }}
+            <span v-if="scope.row.is_total == 0"> {{ getDrugType(scope.row.drug.drug_type) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.dose }}&nbsp;{{ scope.row.drug.dose_unit }}*{{
+            <span v-if="scope.row.is_total ==0">{{ scope.row.drug.dose }}&nbsp;{{ scope.row.drug.dose_unit }}*{{
               scope.row.drug.min_number
             }}{{ scope.row.drug.min_unit }}/{{ scope.row.drug.max_unit }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="国家编码" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.medical_insurance_number }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.drug.medical_insurance_number }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.batch_number }}
+            <span v-if="scope.row.is_total == 0"> {{ scope.row.batch_number }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            {{ getHouseName(scope.row.storehouse_id) }}
+            <span v-if="scope.row.is_total == 0">
+               {{ getHouseName(scope.row.storehouse_id) }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.warehousing_count }}{{ scope.row.max_unit }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.warehousing_count }}{{ scope.row.max_unit }}
+            </span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="拆零零售价" align="center">
@@ -294,43 +303,56 @@
         </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
-            {{ scope.row.price }}
+            <span v-if="scope.row.is_total == 0">{{ scope.row.price }}</span> 
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.total_price}} -->
-            {{ (scope.row.warehousing_count * scope.row.price).toFixed(2) }}
+            <span v-if="scope.row.is_total == 0">{{ (scope.row.warehousing_count * scope.row.price).toFixed(2) }}</span> 
+            <span v-if="scope.row.is_total == 1">
+              {{(scope.row.total_count).toFixed(2)}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufacturer(scope.row.manufacturer) }}
+            <span v-if="scope.row.is_total== 0">
+               {{ getManufacturer(scope.row.manufacturer) }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.product_date) }}
+           <span v-if="scope.row.is_total ==0">{{ getTime(scope.row.product_date) }} </span>  
           </template>
         </el-table-column>
         <el-table-column label="有效日期" align="center">
           <template slot-scope="scope">
+           <span v-if="scope.row.is_total == 0">
             {{ getTime(scope.row.expiry_date) }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="经销商" align="center">
           <template slot-scope="scope">
-            {{ getDealer(scope.row.dealer) }}
+            <span v-if="scope.row.is_total == 0">
+               {{ getDealer(scope.row.dealer) }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="批准文号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.number }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.number }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
-            {{ scope.row.remark }}
+           <span v-if="scope.row.is_total == 0">
+             {{ scope.row.remark }}
+           </span>
           </template>
         </el-table-column>
       </el-table>
@@ -774,12 +796,17 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          var obj = {total_count:0,is_total:1}
           for (let i = 0; i < response.data.data.info.length; i++) {
+            response.data.data.info[i].is_total = 0
             this.showOne = true;
             this.WarehouseInfo.warehouseInfoDate.push(
               response.data.data.info[i]
             );
+            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
           }
+          this.WarehouseInfo.warehouseInfoDate.push(obj)
+        
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
           this.getAllDrugList();
         }

src/xt_pages/stock/stockInOrder.vue

@@ -239,38 +239,50 @@
         >
         <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
+           <span v-if="scope.row.is_total == 0">
             {{ scope.row.GoodInfo.good_name }}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
-            {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
+            <span v-if="scope.row.is_total ==0">
+              {{ getTypeName(scope.row.GoodInfo.good_type_id)}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="国家编码" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.social_security_directory_code}}
+            <span v-if="scope.row.is_total == 0">
+              {{ scope.row.GoodInfo.social_security_directory_code}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.number}}
+            <span v-if="scope.row.is_total== 0">
+               {{ scope.row.number}}
+            </span>
           </template>
         </el-table-column>
          <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            {{getHouseName(scope.row.storehouse_id)}}
+            <span v-if="scope.row.is_total == 0">
+              {{getHouseName(scope.row.storehouse_id)}}
+            </span> 
           </template>
         </el-table-column>
 
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
+           <span v-if="scope.row.is_total == 0">{{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}} </span> 
           </template>
         </el-table-column>
          <!-- <el-table-column label="零售价" align="center">
@@ -280,47 +292,66 @@
         </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
-            {{ scope.row.price}}
+            <span v-if="scope.row.is_total == 0">
+              {{ scope.row.price}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
+            <span v-if="scope.row.is_total==0">
+               {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
+            </span>
+            <span v-if="scope.row.is_total== 1">
+              {{(scope.row.total_count).toFixed(2)}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.manufacturer)}}
+            <span v-if="scope.row.is_total == 0">
+              {{ getManufactuerName(scope.row.manufacturer)}}
+             </span> 
           </template>
         </el-table-column>
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
+           <span v-if="scope.row.is_total == 0">
+             {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
+            </span> 
           </template>
         </el-table-column>
         <el-table-column label="有效期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
+            <span v-if="scope.row.is_total == 0">
+               {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
+            </span>
           </template>
         </el-table-column>
        <el-table-column label="经销商" align="center">
           <template slot-scope="scope">
-            {{ getDealerName(scope.row.dealer)}}
+          <span v-if="scope.row.is_total == 0">
+             {{ getDealerName(scope.row.dealer)}}
+            </span>  
           </template>
         </el-table-column>
        <el-table-column label="批准文号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.license_number}}
+           <span v-if="scope.row.is_total ==0"> {{ scope.row.license_number}}</span>
           </template>
         </el-table-column>
         <el-table-column label="注册编码" align="center">
           <template slot-scope="scope">
-            {{ scope.row.register_number}}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.register_number}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
-            {{ scope.row.remark }}
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.remark }}
+            </span>
           </template>
         </el-table-column>
         </el-table>
@@ -423,6 +454,7 @@
           <el-table-column label="总价" min-width="20" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+             
             </template>
           </el-table-column>
 
@@ -1325,14 +1357,20 @@ export default {
           return false;
         } else {
           this.tableShow = true
+          var  obj = {name:"总计",total_count:0,is_total:1}
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
             response.data.data.info[i].price = response.data.data.info[i].price.toString();
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
-
+           
             this.recordInfo.recordData.push(response.data.data.info[i]);
+            console.log("tablelist+++==+",this.tableList)
+            response.data.data.info[i].total_count = (response.data.data.info[i].warehousing_count * response.data.data.info[i].price).toFixed(2)
+            response.data.data.info[i].is_total = 0
+            obj.total_count += (response.data.data.info[i].warehousing_count * response.data.data.info[i].price)
             this.tableList.push(response.data.data.info[i])
           }
+           this.tableList.push(obj)
            this.warehouse = response.data.data.warehousing;
            this.warehousing_time = this.getTime(this.warehouse.warehousing_time,"{y}-{m}-{d}");
 

src/xt_pages/user/firstDiseasePrint.vue

@@ -57,8 +57,13 @@
               </div>
 
              <div class="inline_block" style="float:right;margin-right:50px">
-               <span style="font-size:20px">医生签名： {{getDoctor(hosDetail.doctor)}}</span>
-               
+               <span style="font-size:20px">医生签名：</span>
+                <span v-if="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)) == ''">
+                  {{getDoctor(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))}}
+                  </span>
+                  <span v-else>
+                    <img style="height:30px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
+                  </span>
               </div>
           </div>
 
@@ -95,6 +100,8 @@ export default {
      patient:{},
      doctorList:[],
     educationOptions:[],
+    operators:[],
+    operatorMaps: {},
     }
   },
   methods: {
@@ -169,7 +176,18 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
         var list = response.data.data.list
-        this.doctorList = list
+         this.doctorList = list
+         this.operators = response.data.data.operators
+           if (this.operators.length > 0) {
+            var operatorsLen = this.operators.length
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.operators[index].creator,
+                this.operators[index]
+              )
+            }
+          }
         }
        })
      },
@@ -215,6 +233,16 @@ export default {
         }
        return name
      },
+    setAdminUserES(id) {
+      if (id === 0) {
+        return ''
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url
+      } else {
+        return ''
+      }
+    },
   },
  
   created() {