新分支

src/router/modules/dialysis.js

@@ -370,18 +370,18 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/print/batch/sixtyFive',
-      component: () =>
-        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysis_batch_sixtyFive',
-      meta: {
-        title: '批量打印',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/print/batch/sixtyFive',
+    //   component: () =>
+    //     import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysis_batch_sixtyFive',
+    //   meta: {
+    //     title: '批量打印',
+    //     noCache: true
+    //   }
+    // },
     // {
     //   path: '/dialysis/print/batch/fiftythree',
     //   component: () =>

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

@@ -1471,7 +1471,7 @@ export default {
           selected_date:this.selected_date,
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.date,
-          module:2,
+          module:9,
           remark:this.remark,
         }
         saveInformation(params).then(response=>{

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

@@ -1,5 +1,4 @@
 <template>
- <div>
   <div>
   <el-dialog
     title="接诊评估"
@@ -142,7 +141,7 @@
           >{{ item.name }}
         </el-radio>
       </el-radio-group>
-
+     
       </el-form-item>
 
       <el-form-item
@@ -210,28 +209,33 @@
           >高风险</el-radio
         >
       </el-radio-group>
-
-      </el-form-item>
-
-      <el-form-item
-        label-width="150px"
-        label="跌倒风险预防措施: "
-        :prop="isName('跌倒风险预防措施')"
-        :rules="isCheckmust('跌倒风险预防措施')"
-        v-if="isShow('跌倒风险预防措施')"
-      >
-        <!-- isFalldown prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施') :prop="isName('跌倒风险预防措施')" :rules="isCheckmust('跌倒风险预防措施')"
-           [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
-        <el-checkbox-group v-model="precautionTwo" @change="precautionchange">
-          <el-checkbox
-            v-for="item in precaution_arr"
-            :label="item.name"
-            :key="item.id"
-            >{{ item.name }}</el-checkbox
-          >
-        </el-checkbox-group>
+ 
       </el-form-item>
 
+      <div style="position: relative;">
+        <span v-if="isrequired" style="color: red;position: absolute;top: 10px;">*</span>
+        <el-form-item
+          label-width="138px"
+          label="跌倒风险预防措施: "
+          prop="precautionTwo"
+          :rules="isCheckmust('跌倒风险预防措施')"
+          v-if="isShow('跌倒风险预防措施')"
+          style="display: inline-block;"
+        >
+          <!--v-if="isShow('跌倒风险预防措施')" isFalldown prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施')
+            :prop="isName('跌倒风险预防措施')" :rules="isCheckmust('跌倒风险预防措施')"
+            [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
+            
+          <el-checkbox-group v-model="precautionTwo" @change="precautionchange" >
+            <el-checkbox
+              v-for="item in precaution_arr"
+              :label="item.name"
+              :key="item.id"
+              >{{ item.name }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-form-item>
+      </div>
       <el-form-item
         label-width="200px"
         label="其他跌倒风险预防措施 : "
@@ -337,50 +341,47 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <!--v-if="hasPermission" -->
-      <el-button type="primary"  @click="handleComfirm('receiveTreatmentAsses')"
+      <!-- v-if="hasPermission"-->
+      <el-button type="primary"   @click="handleComfirm('receiveTreatmentAsses')"
         >保 存</el-button
       >
     </div>
   </el-dialog>
 
-
- <el-dialog
-          title="提示"
-          :visible.sync="infoDialogVisible"
-          width="30%">
-          <span>
-           <el-form>
-             <el-row>
-               <span>申请日期:</span>
-                <span>
-                    <el-date-picker
-                      type="datetime"
-                      format="yyyy-MM-dd HH:mm"
-                      value-format="yyyy-MM-dd HH:mm"
-                      placeholder="选择时间"
-                      v-model="selected_date"
-                  ></el-date-picker>
-                </span>
-             </el-row>
-             <el-row>
-               <span>备注:</span>
-                <span>
-                   <el-input v-model="remark" style="width:200px"></el-input>
-                </span>
-             </el-row>
-           </el-form>
-
-          </span>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="infoDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="saveInformation">确 定</el-button>
-          </span>
-        </el-dialog>
-
-  </div>
-
-
+  
+  <el-dialog
+      title="提示"
+      :visible.sync="infoDialogVisible"
+      width="30%">
+      <span>
+        <el-form>
+          <el-row>
+            <span>申请日期:</span>
+            <span>
+                <el-date-picker
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                  placeholder="选择时间"
+                  v-model="selected_date"
+              ></el-date-picker>
+            </span>
+          </el-row>
+          <el-row>
+            <span>备注:</span>
+            <span>
+                <el-input v-model="remark" style="width:200px"></el-input>
+            </span>
+          </el-row>
+        </el-form>
+         
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="infoDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveInformation">确 定</el-button>
+      </span>
+    </el-dialog>
+   </div>
 </template>
 
 <script>
@@ -430,12 +431,13 @@ export default {
         tumble: "",
         his_department: "",
         his_bed: "",
+        falldown:[],
       },
       precautionTwo: [],
+      arr:[],
       infoDialogVisible:false,
       selected_date:"",
-      remark:"",
-      arr:[]
+      remark:""
     };
   },
   methods: {
@@ -459,22 +461,21 @@ export default {
       }
       this.accepts = accepts;
       // console.log("accepts", accepts);
-      var arr = [];
-      if (this.accepts.precaution) {
-        var precaution = this.accepts.precaution.split(",");
-        // console.log("precaution", precaution);
-        // console.log("hhh", this.precaution_arr);
-        for (let i = 0; i < precaution.length; i++) {
-          for (let j = 0; j < this.precaution_arr.length; j++) {
-            if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
-              // console.log("aaaa");
-              arr.push(this.precaution_arr[j].name);
-            }
-          }
-        }
-        this.precautionTwo = arr;
-        // console.log("arr", arr);
-      }
+      // var arr = [];
+      // if (this.accepts.precaution) {
+      //   var precaution = this.accepts.precaution.split(",");
+      //   // console.log("precaution", precaution);
+      //   // console.log("hhh", this.precaution_arr);
+      //   for (let i = 0; i < precaution.length; i++) {
+      //     for (let j = 0; j < this.precaution_arr.length; j++) {
+      //       if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+      //         // console.log("aaaa");
+      //         this.arr.push(this.precaution_arr[j].name);
+      //       }
+      //     }
+      //   }
+      //   this.precautionTwo = this.arr;
+      // }
 
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {
@@ -500,7 +501,7 @@ export default {
     },
     // 复选框跌倒风险措施
     precautionchange(){
-
+     
       if(this.precautionTwo.length>0){
         this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
       }
@@ -508,38 +509,18 @@ export default {
 
     handleComfirm: function (formName) {
       // var arr = [];
-        if(this.precaution_arr!=null && this.precaution_arr.length >0){
-        for (let i = 0; i < this.precaution_arr.length; i++) {
-          for (let j = 0; j < this.precautionTwo.length; j++) {
-            if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-              this.arr.push(this.precaution_arr[i].id);
-            }
+      for (let i = 0; i < this.precaution_arr.length; i++) {
+        for (let j = 0; j < this.precautionTwo.length; j++) {
+          if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+            this.arr.push(this.precaution_arr[i].id);
           }
         }
-        var obj = this.arr.join(",");
-      }
-
+      } 
+      // this.precautionchange()
+      var obj = this.arr.join(",");
       this.receiveTreatmentAsses.precaution = obj;
-
-
-      if(this.precaution_arr!=null){
-        for (let i = 0; i < this.precaution_arr.length; i++) {
-               for (let j = 0; j < this.precautionTwo.length; j++) {
-                 if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-                   this.arr.push(this.precaution_arr[i].id);
-                 }
-               }
-             }
-         if(this.arr!=null && this.arr.length > 0){
-          var obj = this.arr.join(",");
-          this.receiveTreatmentAsses.precaution = obj;
-         }
-
-      }
-
-
       let ParamsQuery = this.receiveTreatmentAsses;
-
+      
       console.log("ParamsQuery", ParamsQuery);
       ParamsQuery["patient"] = this.patient.id;
       ParamsQuery["record_date"] = this.record_date;
@@ -560,9 +541,6 @@ export default {
           postAccepts(ParamsQuery).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
-               if(response.data.code == 600000008){
-                 this.infoDialogVisible = true
-               }
               return false;
             } else {
               this.$notify({
@@ -606,13 +584,13 @@ export default {
     isCheckmust(name) {
       let filedList = store.getters.xt_user.fileds;
       for (let i = 0; i < filedList.length; i++) {
-
+        
         if (
           filedList[i].module == 2 &&
           filedList[i].filed_name_cn == name &&
           filedList[i].is_write == 1
         ) {
-          // name == '跌倒风险预防措施' && this.precautionTwo.length<=0
+          // name == '跌倒风险预防措施' && filedList[i].is_write == 1
           if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
             return [
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
@@ -623,21 +601,21 @@ export default {
                 trigger: ['blur','change']
               },
             ];
-          }
+          } 
           else if(name == "跌倒风险预防措施"){
             if(this.precautionTwo.length<=0){
               this.isrequired=false
               return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
-
+              
             }
             this.precautionchange()
             this.isrequired=true
             // return [{ required: true, message: '',trigger: ['blur','change'] }];
           }else{
             return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
-
+            
           }
-
+          
         }
       }
     },
@@ -646,20 +624,28 @@ export default {
     //   for (let i = 0; i < filedList.length; i++) {
     //     if (
     //       filedList[i].module == 2 &&
-    //       filedList[i].filed_name_cn == name &&
-    //       filedList[i].is_write == 1
+    //       filedList[i].filed_name_cn == name 
+          
     //     ) {
-    //       if (name == "跌倒风险预防措施" && this.precautionTwo.length<=0) {
-    //         return [
-    //           { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
-    //           {
-    //             required: true,
-    //             pattern: /^[1-9]\d*$/,
-    //             message: `请选择${name}`,
-    //             trigger: ['blur','change']
-    //           },
-    //         ];
-    //       }
+    //       // &&filedList[i].is_write == 1
+    //       if (name == "跌倒风险预防措施") {
+    //         if(this.precautionTwo.length<=0){
+    //             return [
+    //             { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
+    //             {
+    //               required: true,
+    //               pattern: /^[1-9]\d*$/,
+    //               message: `请选择${name}`,
+    //               trigger: ['blur','change']
+    //             },
+    //           ];
+    //         }
+    //         this.precautionchange()
+    //         return[{ required: true, message: '',trigger: ['blur','change'] }]
+    //         // this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
+             
+    //       } 
+          
     //     }
     //   }
     // },
@@ -703,8 +689,7 @@ export default {
           }
         });
     },
-
-   saveInformation(){
+    saveInformation(){
         var params = {
           selected_date:this.selected_date,
           patient_id:this.$route.query.patient_id,
@@ -749,6 +734,7 @@ export default {
     },
   },
   created() {
+    
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
     this.record_date = date
@@ -765,7 +751,11 @@ export default {
     // console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
+    
   },
+  // mounted(){
+  //   this.isFalldown()
+  // }
 };
 </script>
 

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

@@ -577,7 +577,7 @@
           selected_date:this.selected_date,
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.date,
-          module:1,
+          module:8,
           remark:this.remark,
         }
         console.log("params32222222222----",params)

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

@@ -525,7 +525,7 @@ export default {
           selected_date:this.selected_date,
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.date,
-          module:1,
+          module:10,
           remark:this.remark,
         }
        

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))