Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -172,11 +172,11 @@
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') != 1">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
           <span class="content" v-if="getValueStr('anticoagulant','anticoagulant') == 1"></span>
 
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 2">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 3">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 1">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
         </li>
 
         <li v-if="isShow('钙')">

src/xt_pages/dialysis/details/NavIgation.vue

@@ -67,6 +67,7 @@
                                   :admin_users="admin_users" :targetAdvices="longAdvices"
                                   :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
 
+
                                   :predialysis="predialysis_evaluation"
                                   :last_predialysis="last_predialysis_evaluation"
                                   :record="assessment_after_dislysis"

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

@@ -558,6 +558,9 @@
     name: 'dialysisPrescriptionDialog',
     components: { MsgTip },
     props: {
+      schedual: {
+        type: Object
+      },
       is_open: {
         type: Number,
         default: () => {
@@ -738,6 +741,11 @@
         default: () => {
           return { id: 0 }
         }
+      },last_prescription: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
       },
 
     },
@@ -1985,6 +1993,32 @@
 
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
+
+
+
+      if (this.prescription != null && typeof (this.prescription.id) != 'undefined' && this.prescription.id > 0) {
+        for (const key in this.prescription) {
+          this.dialysisPrescription[key] = this.prescription[key]
+        }
+      } else if (this.solution != null && typeof this.solution.id != 'undefined' && this.solution.id) {
+        for (const key in this.solution) {
+          if(key != "target_ultrafiltration") {
+            this.dialysisPrescription[key] = this.solution[key]
+          }
+        }
+      } else if (this.last_prescription != null && typeof this.last_prescription.id != 'undefined' && this.last_prescription.id) {
+        for (const key in this.last_prescription) {
+          if(key != "target_ultrafiltration") {
+            this.dialysisPrescription[key] = this.last_prescription[key]
+          }
+        }
+      } else {
+        this.dialysisPrescription.mode_id = this.schedual.mode_id
+
+      }
+
+
+
     },
     watch: {
       "dialysisPrescription.dialysis_duration_hour":function(){
@@ -2057,13 +2091,11 @@
         let  dialysis_duration_minute = 0
         let dialysis_duration_hour = 0
         let duration = 0
-
         if (this.dialysisPrescription.dialysis_duration_minute == ''){
           dialysis_duration_minute = 0
         }else{
           dialysis_duration_minute = this.dialysisPrescription.dialysis_duration_minute
         }
-
         if (this.dialysisPrescription.dialysis_duration_hour == ''){
           dialysis_duration_hour = 0
 
@@ -2073,10 +2105,6 @@
 
         }
         duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
-
-
-        console.log(duration)
-
         this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           duration,
@@ -2107,8 +2135,6 @@
         }
         duration = parseFloat(dialysis_duration_hour) * 60 + parseFloat(dialysis_duration_minute)
 
-        console.log(duration)
-
         this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           duration,
@@ -2123,25 +2149,16 @@
             this.dialysisPrescription[index] = this.prescription[index]
           }
 
-          // console.log(this.prescription['dialysate_formulation'])
 
           if (this.prescription['dialysate_formulation'] == 0) {
             this.dialysisPrescription['dialysate_formulation'] = ''
           }
 
-          // else{
-          //   this.dialysisPrescription['dialysate_formulation']  = this.prescription['dialysate_formulation']
-          //
-          // }
-          //
-          //
+
           if (this.prescription['anticoagulant'] == 0) {
             this.dialysisPrescription['anticoagulant'] = ''
           }
-          // else{
-          //   this.dialysisPrescription['anticoagulant']  = this.prescription['anticoagulant']
-          //
-          // }
+
 
           if (this.prescription['dialysis_duration_hour'] == 0) {
             this.dialysisPrescription['dialysis_duration_hour'] = ''
@@ -2208,21 +2225,9 @@
             if (this.prescription['dialysate_formulation'] == 0) {
               this.dialysisPrescription['dialysate_formulation'] = ''
             }
-
-            // else{
-            //   this.dialysisPrescription['dialysate_formulation']  = this.prescription['dialysate_formulation']+''
-            //
-            // }
-            //
-            //
             if (this.prescription['anticoagulant'] == 0) {
               this.dialysisPrescription['anticoagulant'] = ''
             }
-            //
-            // else{
-            //   this.dialysisPrescription['anticoagulant']  = this.prescription['anticoagulant']+''
-            //
-            // }
 
             if (this.prescription['dialysis_duration_hour'] == 0) {
               this.dialysisPrescription['dialysis_duration_hour'] = ''
@@ -2286,10 +2291,7 @@
             if (this.solution['dialysate_formulation'] == 0) {
               this.dialysisPrescription['dialysate_formulation'] = ''
             }
-            // else{
-            //   this.dialysisPrescription['dialysate_formulation']  = this.solution['dialysate_formulation']+''
-            //
-            // }
+
 
             if (this.solution['anticoagulant'] == 0) {
               this.dialysisPrescription['anticoagulant'] = ''

src/xt_pages/role/components/AdminInfoForm.vue

@@ -19,9 +19,9 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色 : ">
+                <el-form-item label="角色 : " prop="role">
                     <el-select v-model="form.role" placeholder="角色">
-                        <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        <el-option v-for="(item,index) in roles" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -107,11 +107,14 @@ export default {
       },
       rules: {
         mobile: [
-          { validator: checkMobile, trigger: 'blur' }
+          { required: true,validator: checkMobile, trigger: 'blur' }
         ],
         name: [
-          { validator: checkName, trigger: 'blur' }
-        ]
+          {required: true, validator: checkName, trigger: 'blur' }
+        ],
+        role: [
+          { required: true, message: '请选择角色', trigger: 'change' }
+        ],
       }
     }
   },

src/xt_pages/role/components/EditAdminInfo.vue

@@ -20,9 +20,9 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色">
-                    <el-select v-model="form.role" placeholder="角色">
-                        <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-form-item label="角色" prop="role">
+                    <el-select v-model="form.role" placeholder="角色" >
+                        <el-option v-for="(item,index) in roles" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -54,6 +54,7 @@ export default {
     },
     data() {
         var checkMobile = (rule, value, callback) => {
+           console.log(value)
             if (!value || value.length == 0) {
                 return callback(new Error('手机号不能为空'))
             }
@@ -109,7 +110,10 @@ export default {
                 ],
                 name: [
                     {validator: checkName, trigger: 'blur'}
-                ]
+                ],
+               role: [
+                  { required: true, message: '请选择角色', trigger: 'change' }
+                ],
             }
         }
     },
@@ -125,7 +129,6 @@ export default {
             this.loading = false
             return
         }
-
         this.form.id = this.admin_id
         if (this.admin_id === 0) {
             this.form.user_type = this.user_types[0].index
@@ -134,7 +137,9 @@ export default {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state === 1) {
-                    this.roles.push(...resp.data.roles)
+                  this.roles = []
+
+                  this.roles.push(...resp.data.roles)
                     this.qntoken = resp.data.qntoken
                     if (this.roles.length > 0) {
                         this.form.role = this.roles[0].id
@@ -148,15 +153,14 @@ export default {
                 this.loading = false
                 this.$message.error(err)
             })
-            
         } else {
-            getModifyAdminInitData(this.form.id).then(rs => {
+          getModifyAdminInitData(this.form.id).then(rs => {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state === 1) {
-                    this.roles.push(...resp.data.roles)
+                  this.roles = []
+                  this.roles.push(...resp.data.roles)
                     this.qntoken = resp.data.qntoken
-                    
                     var admin = resp.data.admin
                     this.form.name = admin.user_name
                     this.form.mobile = admin.mobile
@@ -164,11 +168,9 @@ export default {
                     this.form.user_title = admin.user_title
                     this.form.role = admin.role_id
                     this.form.intro = admin.intro
-                    
                 } else {
                     this.$message.error(resp.msg)
                 }
-
             }).catch(err => {
                 this.loading = false
                 this.$message.error(err)
@@ -180,6 +182,12 @@ export default {
             if (this.admin_id < 0) {
                 return
             }
+            console.log(this.form)
+
+            if (this.form.role <= 0 || this.form.role == '' ){
+              this.$message.error("请选择角色")
+              return
+            }
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true
@@ -194,7 +202,7 @@ export default {
                                     _this.$store.dispatch('RecoverAdminsChangeState')
                                 }, 500)
                                 _this.$router.back(-1)
-                                
+
                             } else {
                                 this.$message.error(resp.msg)
                             }
@@ -203,7 +211,7 @@ export default {
                             this.loading = false
                             this.$message.error(err)
                         })
-                        
+
                     } else {
                         modifyAdmin(this.form.id, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
                             this.loading = false
@@ -215,7 +223,7 @@ export default {
                                     _this.$store.dispatch('RecoverAdminsChangeState')
                                 }, 500)
                                 _this.$router.back(-1)
-                                
+
                             } else {
                                 this.$message.error(resp.msg)
                             }
@@ -225,7 +233,7 @@ export default {
                             this.$message.error(err)
                         })
                     }
-                    
+
                 } else {
                     return false
                 }