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

src/xt_pages/data/components/dialysisOff.vue

@@ -32,8 +32,8 @@
 
       <el-table-column align="center" label="是否必填">
         <template slot-scope="scope">
-          <span v-if="scope.row.is_write == 1">是</span>
-          <span v-if="scope.row.is_write == 0">否</span>
+          <span v-if="scope.row.is_write!=undefined &&scope.row.is_write == 1">是</span>
+          <span v-if="scope.row.is_write!=undefined &&scope.row.is_write == 0">否</span>
         </template>
       </el-table-column>
 
@@ -48,7 +48,7 @@
             >
             </el-button>
             <el-button
-              v-if="scope.row.is_write == 1"
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
               type="danger"
               icon="el-icon-remove-outline"
@@ -65,7 +65,7 @@
             >
             </el-button>
             <el-button
-              v-if="scope.row.is_write == 0"
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"
               type="primary"
               icon="el-icon-view"
@@ -267,7 +267,9 @@ export default {
         .catch(() => {});
     }
   },
- 
+  created(){
+    console.log("dialysis_off_data",this.dialysis_off_data)
+  }
 };
 </script>
 

src/xt_pages/data/showConfig.vue

@@ -179,7 +179,10 @@ export default {
      for (let i = 0; i < this.dialysis_off_data.length; i++) {
         if (this.dialysis_off_data[i].id == object.id) {
           this.dialysis_off_data[i].is_show = object.is_show;
-          this.dialysis_off_data[i].is_write = object.is_write
+          if(obj.is_write!=undefined){
+           this.dialysis_off_data[i].is_write = object.is_write
+          }
+          
         }
       }
     }
@@ -188,8 +191,11 @@ export default {
   created() {
     var filedList = store.getters.xt_user.fileds;
     console.log("地址32323232232332322我噢",filedList)
-  
+     
     for (let i = 0; i < filedList.length; i++) {
+      if(filedList[i].module == 9){
+        console.log("filedList222222",filedList)
+      }
       switch (filedList[i].module) {
         case 1:
           this.dialysis_prescription_data.push(filedList[i]);

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -5,7 +5,7 @@
     </h2>
     <div class="plate ">
       <ul>
-        <li v-if="isShow('透前体重')">
+        <li v-if="isShow('透前称重')">
           <label>透前体重 : </label>
           <span class="content" v-if="weight_before != '0'">{{
             weight_before
@@ -274,8 +274,8 @@
           <span class="unit"></span>
         </li>
 
-        <li v-if="isShow('血管通路操作')">
-          <label>血管通路操作:</label>
+        <li v-if="isShow('血管通路')">
+          <label>血管通路:</label>
           <span class="content">{{
             getBloodAccessOpera(this.record.blood_access_part_opera_id)
           }}</span>
@@ -316,7 +316,7 @@
           <span class="content">{{ this.record.special_treatment}}</span>
           <span class="unit"></span>
         </li>
-        
+
         <li v-if="isShow('血栓')">
           <label>血栓: </label>
           <span class="content" v-if="this.record.thromubus_type == 1">有</span>
@@ -329,7 +329,7 @@
           <span class="content">{{this.record.thrombus_av}}</span>
           <span class="unit"></span>
         </li>
-       
+
         <li v-if="isShow('血栓')">
           <label>导管A端约(cm): </label>
           <span class="content">{{this.record.thromubus_a}}</span>
@@ -355,7 +355,7 @@
           <span class="content">{{this.record.pre_dialysis_drugs}}</span>
           <span class="unit"></span>
         </li>
-       
+
         <li v-if="isShow('围手术期')">
           <label>围手术期: </label>
           <span class="content">
@@ -389,7 +389,7 @@
           <span class="content">{{this.record.suction}}</span>
           <span class="unit"></span>
         </li>
-       
+
       </ul>
     </div>
     <div class="note">
@@ -420,7 +420,7 @@ export default {
     console.log("血栓22222",this.record)
   },
   computed: {
-   
+
     weight_before: function() {
       if (this.record.id == 0) {
         return '-'

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

@@ -173,7 +173,7 @@
           if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
-          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_write == 1) {
+          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_write!=undefined &&  filedList[i].is_write == 1) {
              this.required = true
           }
         }
@@ -270,6 +270,10 @@
       modifyFinish:function(formName){
         this.$refs[formName].validate(valid=>{
           if(valid){
+            if(this.isWrite("穿刺处血肿") == true && this.form.puncture_point_haematoma == ""){
+              this.$message.error("请选择穿刺处血肿")
+              return
+             }
             if(this.isWrite("内瘘") == true && this.form.internal_fistula == ""){
               this.$message.error("请选择内瘘")
               return
@@ -316,6 +320,10 @@
         
         this.$refs[formName].validate(valid=>{
           if(valid){
+             if(this.isWrite("穿刺处血肿") == true && this.form.puncture_point_haematoma == ""){
+              this.$message.error("请选择穿刺处血肿")
+              return
+             }
              if(this.isWrite("内瘘") == true && this.form.internal_fistula == ""){
               this.$message.error("请选择内瘘")
               return

src/xt_pages/dialysis/schedualPatient.vue

@@ -609,10 +609,17 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           var resp = rs.data
           if (resp.state == 1) {
             var zones = resp.data.zones
+            var arr = []
+            for(let i=0;i<zones.length;i++){
+              if(zones[i].status == 1){
+                 arr.push(zones[i])
+              }
+            }
+            console.log("zone2w233323232wid",zones)
             var schedules = resp.data.schedules
             var zone_options = [{ id: 0, text: '全部分区' }]
-            for (let z_i = 0; z_i < zones.length; z_i++) {
-              const zone = zones[z_i]
+            for (let z_i = 0; z_i < arr.length; z_i++) {
+              const zone = arr[z_i]
               zone_options.push({ id: zone.id, text: zone.name })
             }
             this.zone_options = zone_options

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -425,13 +425,13 @@
                     <div class="inline_block" style="flex:1;">
                       置换方式：
                       <div class="under_line" style="width: 60px;text-align: center">
-                        <span v-if="prescription.mode_id != 2 && prescription.mode_id!=5 && prescription.mode_id!=12"> {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }} </span>
+                        <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id==12"> {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }} </span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       置换总量：
                       <div class="under_line" style="width: 50px;text-align: center">
-                         <span v-if="prescription.mode_id != 2 && prescription.mode_id!=5 && prescription.mode_id!=12"> {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
+                         <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id ==12"> {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
                       </div>
                       L
                     </div>
@@ -1102,7 +1102,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }
@@ -1458,7 +1458,7 @@ export default {
             }
           }
         }
-        
+
         console.log('this.monitors',this.monitors)
 
         this.jilurow = this.monitors.length + 1

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -18,6 +18,7 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-loading="loading"
           v-if="is_check == 2"
           class="filter-item"
           >保 存</el-button

src/xt_pages/stock/stockInOrderAdd.vue

@@ -7,7 +7,7 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item" v-loading="loading">保 存</el-button>
         <el-button size="small" type="primary" v-show="showCheck" @click="toCheck()" class="filter-item">审 核</el-button>
         <!-- <el-button size="small" type="primary" v-show="showReturnCheck" @click="toReturnCheck()" class="filter-item">反 审 核</el-button> -->
       </div>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -19,6 +19,7 @@
           type="primary"
           @click="submit()"
           v-if="is_check == 2"
+          v-loading="loading"
           class="filter-item"
           >保 存</el-button
         >