Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

config/dev.env.js

@@ -7,7 +7,7 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  //  BASE_API: '"https://api.xt.test.sgjyun.com"',
+  // BASE_API: '"https://api.xt.test.sgjyun.com"',
   BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

config/index.js

@@ -29,7 +29,7 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
+    //  host: 'xt.test.sgjyun.com',
     host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,

src/api/dialysis.js

@@ -182,7 +182,7 @@ export function postDoubleCheck(params) {
 }
 
 export function postAccepts(params) {
-  console.log('params', params)
+
   return request({
     url: '/api/dialysis/accepts',
     method: 'Post',
@@ -195,7 +195,7 @@ export function postAccepts(params) {
 }
 
 export function postAssessmentBeforeDislysis(params) {
-  console.log('params', params)
+
   return request({
     url: '/api/dialysis/assessmentbeforedislysis',
     method: 'Post',
@@ -208,7 +208,7 @@ export function postAssessmentBeforeDislysis(params) {
 }
 
 export function postTreatmentsummary(params) {
-  console.log('param223322323', params)
+
   return request({
     url: '/api/dialysis/treatmentsummary',
     method: 'Post',
@@ -414,7 +414,7 @@ export function SaveDialysisInformationSetting(params) {
 }
 
 export function getDialysisInformationSetting(params){
-  
+
   return request({
     url:"/api/patient/getdialyisinformationsetting",
     method:"get",
@@ -423,7 +423,7 @@ export function getDialysisInformationSetting(params){
 }
 
 export function checkDialysisInformation(params){
-  
+
   return request({
     url:"/api/patient/checkdialysisinformation",
     method:"Get",
@@ -439,4 +439,13 @@ export function getSchedualPatientFlow(params) {
     method: 'get',
     params: params
   })
-}
+}
+
+export function saveInformation(params){
+
+  return request({
+    url:"/api/patient/saveinformation",
+    method:"get",
+    params:params
+  })
+}

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

@@ -12,7 +12,8 @@
         <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('实际治疗时长')">
             <el-form-item label="实际治疗时长(时):" prop="actualTreatmentHourShow" :rules="isCheckmust('实际治疗时长')">
-              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> :prop="isName('实际治疗时长')"-->
+
+              <!-- <el-input v-model="form.actualTreatmentHourShow" @change="hours"></el-input>  :prop="isName('实际治疗时长')" -->
               <el-time-picker
                 v-model="form.actualTreatmentHourShow"
                 placeholder="透析时长"
@@ -98,7 +99,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('透析过程')">
-            <el-form-item label="透析过程: " :prop="isName('透析过程')" :rules="isCheckmust('透析过程')">
+            <el-form-item label="透析过程: " :prop="isName('透析过程')" :rules="isCheckmust('透析过程')" placeholder='请选择'>
               <el-select v-model="form.dialysis_process">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -146,7 +147,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('内瘘管拔针后压迫止血操作')">
-            <el-form-item label="内瘘管拔针后压迫止血操作: " :prop="isName('内瘘管拔针后压迫止血操作')" :rules="isCheckmust('内瘘管拔针后压迫止血操作')">
+            <el-form-item label="内瘘管拔针后压迫止血操作: " :prop="isName('内瘘管拔针后压迫止血操作')" :rules="isCheckmust('内瘘管拔针后压迫止血操作')" placeholder='请选择'>
               <el-select v-model="form.hemostasis_opera">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -161,7 +162,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('动脉管道')">
-            <el-form-item label="动脉管道: " :prop="isName('动脉管道')" :rules="isCheckmust('动脉管道')">
+            <el-form-item label="动脉管道: " :prop="isName('动脉管道')" :rules="isCheckmust('动脉管道')" placeholder='请选择'>
               <el-select v-model="form.arterial_tube">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -177,7 +178,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('静脉管道')">
-            <el-form-item label="静脉管道: " :prop="isName('静脉管道')" :rules="isCheckmust('静脉管道')">
+            <el-form-item label="静脉管道: " :prop="isName('静脉管道')" :rules="isCheckmust('静脉管道')" placeholder='请选择'>
               <el-select v-model="form.intravenous_tube">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -212,8 +213,8 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('患者去向')">
-            <el-form-item label="患者去向: " :prop="isName('患者去向')" :rules="isCheckmust('患者去向')">
-              <el-select v-model="form.patient_gose">
+            <el-form-item label="患者去向: " :prop="isName('患者去向')" :rules="isCheckmust('患者去向')" >
+              <el-select v-model="form.patient_gose" placeholder='请选择'>
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option
                   v-for="item in patientGoseOptions"
@@ -255,7 +256,7 @@
           "
         >
           <el-col :span="24">
-            <el-form-item label="交待病房护士/患者/陪人观察内容: " :prop="isName('交待病房护士/患者/陪人观察内容')" :rules="isCheckmust('交待病房护士/患者/陪人观察内容')">
+            <el-form-item label="交待病房护士/患者/陪人观察内容: " :prop="isName('交待病房护士/患者/陪人观察内容')" :rules="isCheckmust('交待病房护士/患者/陪人观察内容')" >
               <el-input
                 placeholder="交待病房护士/患者/陪人观察内容"
                 v-model="form.observation_content"
@@ -271,11 +272,13 @@
           :gutter="20"
           v-show="form.patient_gose == 3 && isShow('其他观察内容')"
         >
+        <!--   :prop="isName('其他观察内容')"-->
           <el-col :span="24">
-            <el-form-item label="其他观察内容: " :prop="isName('其他观察内容')" :rules="isCheckmust('其他观察内容')">
+            <el-form-item label="其他观察内容: "  prop="observation_content_other" :rules="isOther('其他观察内容')">
               <el-input
                 v-model="form.observation_content_other"
                 :rows="5"
+                @change="others"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -353,8 +356,8 @@
         </el-col>
 
         <el-col :span="8" v-if="isShow('透析中入量单位')">
-          <el-form-item label="透析中入量单位: " :prop="isName('透析中入量单位')" :rules="isCheckmust('透析中入量单位')">
-            <el-select v-model="form.dialysis_intakes_unit">
+          <el-form-item label="透析中入量单位: " :prop="isName('透析中入量单位')" :rules="isCheckmust('透析中入量单位')" >
+            <el-select v-model="form.dialysis_intakes_unit" placeholder='请选择'>
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in unit"
@@ -394,8 +397,8 @@
         </el-col>
 
         <el-col :span="8" v-if="isShow('血流量')">
-          <el-form-item label="血流量: " :prop="isName('血流量')" :rules="isCheckmust('血流量')">
-            <el-select v-model="form.blood_flow">
+          <el-form-item label="血流量: " :prop="isName('血流量')" :rules="isCheckmust('血流量')" >
+            <el-select v-model="form.blood_flow" placeholder='请选择'>
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option v-for="item in this.bloodFlowOptions" :label="item.name" :value="item.id" :key="item.id"></el-option>
             </el-select>
@@ -437,8 +440,8 @@
 
 
         <el-col :span="8" v-if="isShow('失衡综合症')">
-          <el-form-item label="失衡综合症: " :prop="isName('失衡综合症')" :rules="isCheckmust('失衡综合症')">
-            <el-select v-model="form.disequilibrium_syndrome">
+          <el-form-item label="失衡综合症: " :prop="isName('失衡综合症')" :rules="isCheckmust('失衡综合症')" >
+            <el-select v-model="form.disequilibrium_syndrome" placeholder='请选择'>
               <el-option :key="0" label="请选择" :value="0"></el-option>
 
               <el-option
@@ -473,8 +476,8 @@
         </el-col>
 
         <el-col :span="8" v-if="isShow('管路')">
-          <el-form-item label="管路: " :prop="isName('管路')" :rules="isCheckmust('管路')">
-            <el-select v-model="form.channel">
+          <el-form-item label="管路: " :prop="isName('管路')" :rules="isCheckmust('管路')" >
+            <el-select v-model="form.channel" placeholder='请选择'>
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in channels"
@@ -505,23 +508,24 @@
             </el-form-item>
         </el-col>
         <el-col :span="8" v-if="isShow('透析相关高血压')">
-            <el-form-item label="透析相关高血压：" :prop="isName('透析相关高血压')" :rules="isCheckmust('透析相关高血压')">
+            <el-form-item label="透析相关高血压：" :prop="isName('透析相关高血压')" :rules="isCheckmust('透析相关高血压')" >
 
-             <el-select v-model="form.hypertenison">
+             <el-select v-model="form.hypertenison" placeholder='请选择' >
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in option"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
-              ></el-option>
+              >{{ item.name }}</el-option>
             </el-select>
             </el-form-item>
         </el-col>
 
          <el-col :span="8" v-if="isShow('透析相关低血压')">
-            <el-form-item label="透析相关低血压" :prop="isName('透析相关低血压')" :rules="isCheckmust('透析相关低血压')">
-             <el-select v-model="form.hypopiesia">
+            <el-form-item label="透析相关低血压" :prop="isName('透析相关低血压')" :rules="isCheckmust('透析相关低血压')" >
+             <el-select v-model="form.hypopiesia" placeholder='请选择'>
+              <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in optionOne"
                 :label="item.name"
@@ -532,8 +536,9 @@
             </el-form-item>
         </el-col>
         <el-col :span="8" v-if="isShow('离科方式')">
-            <el-form-item label="离科方式" :prop="isName('离科方式')" :rules="isCheckmust('离科方式')">
-               <el-select v-model="form.leave_office_method">
+            <el-form-item label="离科方式" :prop="isName('离科方式')" :rules="isCheckmust('离科方式')" >
+               <el-select v-model="form.leave_office_method" placeholder='请选择'>
+                <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option
                   v-for="item in leaveOfficeMethod"
                   :label="item.name"
@@ -544,8 +549,9 @@
             </el-form-item>
         </el-col>
          <el-col :span="8" v-if="isShow('转归')">
-            <el-form-item label="转归" :prop="isName('转归')" :rules="isCheckmust('转归')">
-             <el-select v-model="form.lapse">
+            <el-form-item label="转归" :prop="isName('转归')" :rules="isCheckmust('转归')" >
+             <el-select v-model="form.lapse" placeholder='请选择'>
+              <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in lapseList"
                 :label="item.name"
@@ -557,19 +563,23 @@
         </el-col>
         <el-col :span="8" v-if="isShow('意识')">
             <el-form-item label="意识" :prop="isName('意识')" :rules="isCheckmust('意识')">
-             <el-select v-model="form.consciousness">
+             <el-select v-model="form.consciousness "    > 
+             <!-- v-if="form.consciousness ==' ' ? placeholder='请选择': form.consciousness " -->
+             <el-option label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in consciousnessList"
                 :label="item.name"
-                :value="item.id"
+                :value="item.id "
                 :key="item.id"
               ></el-option>
              </el-select>
+             
             </el-form-item>
         </el-col>
         <el-col :span="8" v-if="isShow('跌倒风险')">
-            <el-form-item label="跌倒风险" :prop="isName('跌倒风险')" :rules="isCheckmust('跌倒风险')">
-             <el-select v-model="form.fallrisk">
+            <el-form-item label="跌倒风险" :prop="isName('跌倒风险')" :rules="isCheckmust('跌倒风险')" >
+             <el-select v-model="form.fallrisk" placeholder='请选择'>
+              <el-option label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in fallriskList"
                 :label="item.name"
@@ -581,8 +591,8 @@
         </el-col>
 
       <el-col :span="8" v-if="isShow('机器运行')">
-            <el-form-item label="机器运行: " :prop="isName('机器运行')" :rules="isCheckmust('机器运行')">
-              <el-select v-model="form.machine_run">
+            <el-form-item label="机器运行: " :prop="isName('机器运行')" :rules="isCheckmust('机器运行')" >
+              <el-select v-model="form.machine_run" placeholder='请选择'>
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
                 <el-option
@@ -592,6 +602,7 @@
                   :key="item.value"
                 ></el-option>
               </el-select>
+              
             </el-form-item>
        </el-col>
 
@@ -750,7 +761,7 @@ export default {
         catheter: '',
         complication: '',
         puncture_point_oozing_blood: 2,
-        puncture_point_haematoma: 2,
+        puncture_point_haematoma: '',
         internal_fistula_tremor_ac: '',
         patient_gose: '',
         inpatient_department: '',
@@ -766,7 +777,7 @@ export default {
         hemostasis_minute: '',
         hemostasis_opera: '',
         tremor_noise: '',
-        disequilibrium_syndrome: '',
+        disequilibrium_syndrome: 0,
         disequilibrium_syndrome_option: '',
         arterial_tube: '',
         intravenous_tube: '',
@@ -775,12 +786,12 @@ export default {
         dialysis_intakes_unit: 0,
         cvc_a: 0,
         cvc_v: 0,
-        channel: '',
+        channel: 0,
         return_blood: '',
         rehydration_volume: '',
         dialysis_during: '',
         stroke_volume: '',
-        blood_flow: '',
+        blood_flow: 0,
         sealing_fluid_dispose: '',
         sealing_fluid_special: '',
         dosage_of_anticoagulants:'',
@@ -792,13 +803,13 @@ export default {
         other_complication:'',
         ktv:"",
         urr:"",
-        hypertenison:"",
-        hypopiesia:"",
-        leave_office_method:"",
-        lapse:"",
-        consciousness:"",
-        fallrisk:"",
-        machine_run:"",
+        hypertenison:0,
+        hypopiesia:0,
+        leave_office_method:0,
+        lapse:0,
+        consciousness:0,
+        fallrisk:0,
+        machine_run:0,
         after_urea:"",
         accumulated_blood_volume:"",
       },
@@ -807,6 +818,7 @@ export default {
       consciousnessList:[],
       fallriskList:[],
       machineList:[],
+      
     }
   },
   watch: {
@@ -894,6 +906,9 @@ export default {
         if (this.assessment_after_dislysis['sealing_fluid_dispose'] == 0) {
           this.form['sealing_fluid_dispose'] = ''
         }
+        // if (this.assessment_after_dislysis['actualTreatmentHourShow'] == 0) {
+        //   this.form['actualTreatmentHourShow'] = ''
+        // }
         this.form.actualTreatmentHourShow = new Date(
           2018,
           1,
@@ -936,27 +951,67 @@ export default {
         if (
           filedList[i].module == 5 &&
           filedList[i].filed_name_cn == name &&
-          filedList[i].is_write == 1&&
+          filedList[i].is_write == 1 &&
           filedList[i].is_show == 1
         ) {
-          console.log(filedList[i],'false')
-          // if(name == "实际治疗时长"){
-          //   return [
-          //     { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
-          //     {
-          //       required: true,
-          //       pattern: /^[1-9]\d*$/,
-          //       message: `请选择${name}`,
-          //       trigger: ['change']
-          //     },
-          //   ];
-          // }
-        
+          
+          if(name == "穿刺处血肿" || name == '拔针后穿刺点渗血' || name == '透析期间进食' ){
+            return [
+              { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
+              {
+                required: true,
+                pattern: /^[1-9]\d*$/,
+                message: `请选择${name}`,
+                trigger: ['change']
+              },
+            ];
+          }
+            
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
           
         }
       }
     },
+    others(){
+      // console.log('asdfasfd',this.form.observation_content_other.length);
+      if(this.form.observation_content_other.length>0){
+        this.$refs.form.clearValidate('observation_content_other');
+      }
+    },
+    // hours(){
+    //   if(this.form.actualTreatmentHourShow.length>0){
+    //     this.$refs.form.clearValidate('actualTreatmentHourShow');
+    //   }
+    // },
+    isOther(name){
+      if(this.form.patient_gose == 3){
+        let filedList = store.getters.xt_user.fileds;
+
+        for (let i = 0; i < filedList.length; i++) {
+          if (
+            filedList[i].module == 5 &&
+            filedList[i].filed_name_cn == name &&
+            filedList[i].is_write == 1 &&
+            filedList[i].is_show == 1
+          ) {
+            
+            // if(name == "其他观察内容"){
+            //   return [
+            //     { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
+            //     {
+            //       required: true,
+            //       pattern: /^[1-9]\d*$/,
+            //       message: `请输入${name}`,
+            //       trigger: ['change']
+            //     },
+            //   ];
+            // }
+            return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
+            
+          }
+        }
+      }
+    },
     isShow(name) {
       var filedList = store.getters.xt_user.fileds
 
@@ -971,6 +1026,7 @@ export default {
       }
       return false
     },
+   
     submitForm(formName) {
       this.$refs[formName].validate((valid)=>{
         if(valid){
@@ -1026,7 +1082,7 @@ export default {
           data['puncture_point_oozing_blood'] = this.form.puncture_point_oozing_blood ? parseFloat(this.form.puncture_point_oozing_blood) : 0
           data['puncture_point_haematoma'] = this.form.puncture_point_haematoma ? parseFloat(this.form.puncture_point_haematoma) : 0
           data['internal_fistula_tremor_ac'] = this.form.internal_fistula_tremor_ac ? parseFloat(this.form.internal_fistula_tremor_ac) : 0
-          data['patient_gose'] = this.form.patient_gose ? parseFloat(this.form.patient_gose) : 0
+          data['patient_gose'] = this.form.patient_gose ? parseFloat(this.form.patient_gose) : ' '
           data['inpatient_department'] = this.form.inpatient_department
           data['observation_content'] = this.form.observation_content
           data['observation_content_other'] = this.form.observation_content_other
@@ -1238,11 +1294,13 @@ export default {
     // 数据开始
     show(predialysis,last_after) {
       console.log("透后体重2332233223wo",predialysis)
+      // console.log('asdfadsfdasf',this.form.consciousness);
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
       this.form.inpatient_department = predialysis.inpatient_department
       this.form.observation_content_other = predialysis.observation_content_other
+      // 5.15
       if(predialysis.id > 0){
         this.form.hypertenison = predialysis.hypertenison.toString()
       }
@@ -1255,7 +1313,7 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
-
+        // 5.15
       //针对长沙南雅 ，透后体重 - 目标超滤量
       // if(predialysis.id > 0){
       //  if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340){
@@ -1286,12 +1344,14 @@ export default {
             }
           }
         }
+        // 5.15
         if(last_after.id > 0){
          this.form.hypertenison = last_after.hypertenison.toString()
         }
         if(last_after.id > 0){
           this.form.hypopiesia = last_after.hypopiesia.toString()
         }
+          // 5.15
         //针对长沙南雅 ，透后体重 - 目标超滤量
         // if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340){
         //    if(this.prescription!=null && this.predialysis_evaluation!=null){
@@ -1301,9 +1361,6 @@ export default {
         // }
       }
 
-
-
-
       this.getPermission()
 
 
@@ -1336,7 +1393,7 @@ export default {
           }
         })
         .then(res => {
-          console.log(res)
+          // console.log(res)
           // console.log("透后", this.predialysis);
           if (res.data.state == 0) {
             this.hasPermission = false
@@ -1372,7 +1429,7 @@ export default {
     }
   },
   created() {
-    // console.log("this.form", this.form);
+    // console.log("this.form", this.form.consciousness);
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')
     this.symptomsOptions = getDataConfig('hemodialysis', 'symptoms')
@@ -1388,7 +1445,7 @@ export default {
     this.consciousnessList = getDataConfig("hemodialysis","consciousness")
     this.fallriskList = getDataConfig("hemodialysis","fallrisk")
      this.machineList = getDataConfig("hemodialysis","machine_run")
-     console.log("机器运行",this.machineList)
+     
     this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
     this.patientGoseOptions = this.$store.getters.patient_gose
     this.observationContentOptions = this.$store.getters.observation_content

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

@@ -223,7 +223,7 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-        
+
       >
       <!-- @selection-change="handleSelectionChange" -->
         <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
@@ -257,7 +257,6 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
-               
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -291,7 +290,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6 && org_id!=10223 && org_id!=10445 && org_id!=0"
+          v-if="template_id != 6 && org_id!=10223 && org_id!=10445"
           prop="checker"
           min-width="30px"
           align="center"
@@ -305,7 +304,7 @@
         </el-table-column>
       </el-table>
 
-     
+
 
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
@@ -360,7 +359,6 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
-                 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -608,6 +606,40 @@
       v-on:add-new-order="addNewOrder"
       :admin_users="admin_users"
     ></edit-group-advice>
+
+
+      <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>
 
@@ -783,7 +815,9 @@
         src_type:"",
         org_id:0,
         schedulePatient:{},
-        tempArrOne:[],
+        infoDialogVisible:false,
+        selected_date:"",
+        remark:""
       }
     },
     watch: {
@@ -798,40 +832,12 @@
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
 
-      'doctor_advices': function() {
-      
-        this.handleSpanTempArrOne();
-      },
-     
     },
     methods: {
-      handleSpanTempArrOne() {
-          this.tempArrOne = [];
-         
-          for (let i = 0; i < this.doctor_advices.length; i++) {
-            if (i === 0) {
-              this.tempArrOne.push(1);
-              this.pos = 0;
-            } else {
-              // 判断当前元素与上一个元素是否相同
-              if (
-                this.doctor_advices[i].groupno ===
-                this.doctor_advices[i - 1].groupno
-              ) {
-                this.tempArrOne[this.pos] += 1;
-                this.tempArrOne.push(0);
-              } else {
-                this.tempArrOne.push(1);
-                this.pos = i;
-              }
-            }
-          }
-      },
       handleSelectionChange(){
 
       },
-     
-    
+
       //调试
       lili(index,row){
         // console.log("==index==",index)
@@ -915,6 +921,9 @@
               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({
@@ -949,7 +958,6 @@
           return ''
         }
       },
-     
       submitEditAdvice() {
         // console.log()
         console.log("保存22222222222222")
@@ -975,6 +983,9 @@
           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({
@@ -1283,6 +1294,9 @@
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
+             if(response.data.code == 600000008){
+               this.infoDialogVisible = true
+             }
               this.exceLoading = false
               return false
             } else {
@@ -1377,6 +1391,9 @@
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
+              if(response.data.code == 600000008){
+               this.infoDialogVisible = true
+              }
               return false
             } else {
               this.$notify({
@@ -1650,7 +1667,9 @@
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
-
+                  if(response.data.code == 600000008){
+                    this.infoDialogVisible = true
+                  }
                   this.deleLoading = false
                   return false
                 } else {
@@ -1822,6 +1841,9 @@
             DeleteGroupAdvice(groupno, mode).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({
@@ -1870,6 +1892,9 @@
               this.deleLoading = false
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                if(response.data.code == 600000008){
+                   this.infoDialogVisible = true
+                }
                 return false
               } else {
                 this.$notify({
@@ -1911,6 +1936,9 @@
             DeleteDoctorAdvice(this.currentRow.id, mode).then(response => {
               this.deleLoading = false
               if (response.data.state == 0) {
+                 if(response.data.code == 600000008){
+                  this.infoDialogVisible = true
+                 }
                 this.$message.error(response.data.msg)
                 return false
               } else {
@@ -2126,8 +2154,17 @@
         return true
       }
       ,
-    
-      
+      mergeSpan({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex != 2) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      }
+      ,
       handleSpanTempArr() {
         this.tempArr = []
 
@@ -2290,45 +2327,34 @@
         // });
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        console.log("hhhhhhhhhh",this.tempArrOne)
-        //合并单元格
-        if (columnIndex === 0 || columnIndex === 1 ) {
-          const _row = this.tempArrOne[rowIndex];
-          const _col = _row > 0 ? 1 : 0;
-          console.log("_row====",_row)
-          console.log("_row----------",_col)
-          return {
-            rowspan: _row,
-            colspan: _col
-          };
-        }
-        // if (columnIndex === 0) {
-        //   if (rowIndex % 2 === 0) {
-        //     return {
-        //       rowspan: 2,
-        //       colspan: 1
-        //     }
-        //   } else {
-        //     return {
-        //       rowspan: 0,
-        //       colspan: 0
-        //     }
-        //   }
-        // }
 
-        // if (columnIndex === 1) {
-        //   if (rowIndex % 2 === 0) {
-        //     return {
-        //       rowspan: 2,
-        //       colspan: 1
-        //     }
-        //   } else {
-        //     return {
-        //       rowspan: 0,
-        //       colspan: 0
-        //     }
-        //   }
-        // }
+        if (columnIndex === 0) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
+
+        if (columnIndex === 1) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
@@ -2631,10 +2657,28 @@
          }
          console.log("nam e23233232322323wo",name)
          return name
+      },
+
+     saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:2,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
       }
+
     },
     created() {
-     
+
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date

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

@@ -140,7 +140,7 @@
           >{{ item.name }}
         </el-radio>
       </el-radio-group>
-     
+
       </el-form-item>
 
       <el-form-item
@@ -208,7 +208,7 @@
           >高风险</el-radio
         >
       </el-radio-group>
- 
+
       </el-form-item>
 
       <el-form-item
@@ -335,16 +335,54 @@
     </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>
+
+
 </template>
 
 <script>
-import { postAccepts } from "@/api/dialysis";
+import { postAccepts,saveInformation } from "@/api/dialysis";
 import { uParseTime } from "@/utils/tools";
 import store from "@/store";
 import { getDataConfig } from "@/utils/data";
@@ -355,6 +393,7 @@ export default {
   name: "acceptsTreatmentDialog",
   data() {
     return {
+      isrequired:false,
       showTxt: "",
       hasPermission: true,
       isVisibility: false,
@@ -389,10 +428,11 @@ export default {
         tumble: "",
         his_department: "",
         his_bed: "",
-        falldown:[],
       },
       precautionTwo: [],
-      arr:[]
+      infoDialogVisible:false,
+      selected_date:"",
+      remark:"",
     };
   },
   methods: {
@@ -416,21 +456,22 @@ 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");
-      //         this.arr.push(this.precaution_arr[j].name);
-      //       }
-      //     }
-      //   }
-      //   this.precautionTwo = this.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");
+              arr.push(this.precaution_arr[j].name);
+            }
+          }
+        }
+        this.precautionTwo = arr;
+        // console.log("arr", arr);
+      }
 
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {
@@ -456,25 +497,10 @@ export default {
     },
     // 复选框跌倒风险措施
     precautionchange(){
-      // 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.receiveTreatmentAsses.precaution = obj;
-
-      // this.receiveTreatmentAsses.falldown=this.precautionTwo
+
       if(this.precautionTwo.length>0){
         this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
       }
-      console.log('this.precaution_arr',this.precautionTwo);
-      // console.log('arr的数据',this.receiveTreatmentAsses.falldown);
-      // console.log('sadffdasfdg',this.receiveTreatmentAsses.falldown.length);
-      // this.$refs[fromName].resetFields();
-      
     },
 
     handleComfirm: function (formName) {
@@ -485,12 +511,12 @@ export default {
             this.arr.push(this.precaution_arr[i].id);
           }
         }
-      } 
+      }
       // this.precautionchange()
       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;
@@ -554,7 +580,7 @@ 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 &&
@@ -571,19 +597,21 @@ export default {
                 trigger: ['blur','change']
               },
             ];
-          } 
-          // 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']
-          //     },
-          //   ];
-          // }
+          }
+          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'] }];
+
+          }
+
         }
       }
     },
@@ -605,7 +633,7 @@ export default {
     //             trigger: ['blur','change']
     //           },
     //         ];
-    //       } 
+    //       }
     //     }
     //   }
     // },
@@ -649,6 +677,23 @@ export default {
           }
         });
     },
+
+   saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:2,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+      }
   },
   props: {
     receiver_treatment_access: {
@@ -678,7 +723,6 @@ export default {
     },
   },
   created() {
-    
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
     this.record_date = date
@@ -695,11 +739,7 @@ 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/assessmentBeforeDislysisDialog.vue

@@ -39,9 +39,10 @@
 
           <el-col :span="8">
             <el-form-item label="干体重(kg)："
-             :prop="isName('干体重')"
+              :prop="isName('干体重')"
               :rules="isCheckmust('干体重')"
                           v-if="isShow('干体重')">
+                          <!--  -->
               <el-input type="number" v-model="assessmentBeforeDislysis.dry_weight" readonly
                         @focus="showDryWeightDialog"></el-input>
             </el-form-item>
@@ -99,7 +100,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8">
             <el-form-item label="体温(℃)：" :prop="isName('体温')"
               :rules="isCheckmust('体温')" v-if="isShow('体温')">
@@ -184,7 +184,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8">
             <el-form-item label="内瘘: " :prop="isName('内瘘')"
               :rules="isCheckmust('内瘘')" v-if="isShow('内瘘')">
@@ -193,14 +192,10 @@
             </el-form-item>
           </el-col>
 
-
-
-
-
-
           <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('其他出血情况')">
-            <el-form-item label="其他出血情况： " :prop="isName('其他出血情况')"
+            <el-form-item label="其他出血情况： " prop="hemorrhage_other"
               :rules="isCheckmust('其他出血情况')">
+              <!-- :prop="isName('其他出血情况')" -->
               <el-input v-model="assessmentBeforeDislysis.hemorrhage_other"></el-input>
             </el-form-item>
           </el-col>
@@ -225,11 +220,6 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
-
-          <el-row :gutter="20"> -->
-
-
           <el-col :span="8">
             <el-form-item label="血管通路皮肤情况: " :prop="isName('血管通路皮肤情况')"
               :rules="isCheckmust('血管通路皮肤情况')" v-if="isShow('血管通路皮肤情况')">
@@ -269,8 +259,6 @@
             </el-form-item>
           </el-col>
 
-
-
           <!--<el-col :span="8">-->
           <!--<el-form-item label="附加物重(kg)： ">-->
           <!--<el-input type="number" v-model="assessmentBeforeDislysis.additional_weight"></el-input>-->
@@ -279,7 +267,6 @@
 
           <!-- </el-row>
 
-
           <el-row :gutter="20"> -->
           <el-col :span="8">
             <el-form-item label="导管打折： " :prop="isName('导管打折')"
@@ -302,11 +289,7 @@
             </el-form-item>
           </el-col>
 
-
-
           <!-- </el-row>
-
-
           <el-row :gutter="20"> -->
 
           <el-col :span="8">
@@ -349,7 +332,6 @@
           </el-col>
 
 
-
           <el-col :span="8">
             <el-form-item label="出血： " :prop="isName('出血')"
               :rules="isCheckmust('出血')" v-if="isShow('出血')">
@@ -361,7 +343,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('出血选项')">
             <el-form-item label="出血选项： " :prop="isName('出血选项')"
               :rules="isCheckmust('出血选项')">
@@ -371,8 +352,6 @@
             </el-form-item>
           </el-col>
 
-
-
            <el-col :span="8">
             <el-form-item label="血栓：" :prop="isName('血栓')"
               :rules="isCheckmust('血栓')" v-if="isShow('血栓')">
@@ -386,7 +365,7 @@
           
           <el-col :span="8">
             <el-form-item label="导管AV端约为(cm):" :prop="isName('导管AV端各约')"
-              :rules="isCheckmust('导管AV端各约')" v-show="thrombuShow" label-width="200px">
+              :rules="isCheckmust('导管AV端各约')" v-show="thrombuShow" label-width="150px">
               <el-input v-model="assessmentBeforeDislysis.thrombus_av" style="width:150px"></el-input>
             </el-form-item>
           </el-col>
@@ -421,7 +400,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8">
             <el-form-item label="并发症： " :prop="isName('并发症')"
               :rules="isCheckmust('并发症')" v-if="isShow('并发症')">
@@ -438,7 +416,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8">
             <el-form-item label="前次透析后症状：" :prop="isName('前次透析后症状')"
               :rules="isCheckmust('前次透析后症状')" v-if="isShow('前次透析后症状')">
@@ -446,7 +423,6 @@
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('急诊')">
             <el-form-item label="急诊： " :prop="isName('急诊')"
               :rules="isCheckmust('急诊')">
@@ -473,9 +449,6 @@
             </el-form-item>
           </el-col>
           
-
-          
-
           <el-col :span="8">
             <el-form-item label="透析期间： " :prop="isName('透析期间')"
               :rules="isCheckmust('透析期间')" v-if="isShow('透析期间')">
@@ -518,8 +491,6 @@
             </el-form-item>
           </el-col>
 
-
-
           <el-col :span="8" v-if="isShow('其他感染情况')">
             <el-form-item label="其他感染情况:" :prop="isName('其他感染情况')"
               :rules="isCheckmust('其他感染情况')">
@@ -527,9 +498,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
           <el-col :span="8" v-if="isShow('外露')">
             <el-form-item label="外露(cm):" :prop="isName('外露')"
               :rules="isCheckmust('外露')">
@@ -537,10 +505,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
-
           <el-col :span="8" v-if="isShow('其他皮肤情况')">
             <el-form-item label="其他皮肤情况:" :prop="isName('其他皮肤情况')"
               :rules="isCheckmust('其他皮肤情况')">
@@ -548,12 +512,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
-
-
-
           <el-col :span="8">
             <el-form-item label="导管缝线：" :prop="isName('导管缝线')"
               :rules="isCheckmust('导管缝线')" v-if="isShow('导管缝线')">
@@ -684,8 +642,8 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
                 <el-button @click="handleCancle">取 消</el-button>
-                 <!--  -->
-                <el-button type="primary" v-if="hasPermission" @click="handleComfirm('assessmentBeforeDislysis')">保 存</el-button>
+                 <!--v-if="hasPermission"  -->
+                <el-button type="primary"  @click="handleComfirm('assessmentBeforeDislysis')">保 存</el-button>
             </span>
     </el-dialog>
 
@@ -741,6 +699,40 @@
         <el-button type="primary" @click="submitDryWeight()">保 存</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>
 
 
@@ -750,7 +742,7 @@
   import axios from 'axios'
   import multiSelectBox from './MultiSelectBox'
   import { getDataConfig } from '@/utils/data'
-  import { postAssessmentBeforeDislysis, CreateDryWeight } from '@/api/dialysis'
+  import { postAssessmentBeforeDislysis, CreateDryWeight,saveInformation } from '@/api/dialysis'
   import store from '@/store'
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
@@ -893,7 +885,10 @@
         thrombuShow:false,
         body_weight_before:"",
         point_punctures:[],
-       
+        infoDialogVisible:false,
+        selected_date:"",
+        remark:""
+
       }
     },
     props: {
@@ -965,7 +960,9 @@
             filedList[i].is_show == 1
           ) {
             // console.log(filedList[i],'false')
-            if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管') {
+            if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||
+            name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管' 
+            ) {
             return [
               { required: true, message: `请输入${name}` },
               {
@@ -1428,6 +1425,9 @@
           
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
+            if(response.data.code == 600000008){
+              this.infoDialogVisible = true
+            }
             return false
           } else {
             this.$notify({
@@ -1562,6 +1562,23 @@
           }
         }
         return user_name
+      },
+    
+      saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:2,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
       }
       
     },

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

@@ -343,6 +343,41 @@
         </el-form-item>
       </el-form>
     </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>
 </template>
 
@@ -420,7 +455,10 @@ export default {
       irrigations: [],
       summary:[],
       blood_access_option_name:"",
-      value2:""
+      value2:"",
+      infoDialogVisible:false,
+      selected_date:"",
+      remark:""
     };
   },
   props: {
@@ -891,7 +929,11 @@ export default {
               this.$emit("monitor", resp.data.monitor);
               this.$message.success("上机成功");
             } else {
+
               this.$message.error(resp.msg);
+              if(response.data.code == 600000008){
+                this.infoDialogVisible = true
+              }
             }
           });
         } else {
@@ -941,6 +983,9 @@ export default {
           }
         } else {
           this.$message.error(resp.msg);
+          if(response.data.code == 600000008){
+            this.infoDialogVisible = true
+          }
         }
       });
         }else{
@@ -1094,7 +1139,23 @@ export default {
       }
 
       return name
-    }
+    },
+    saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:2,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+      }
   },
 };
 </script>

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

@@ -1,4 +1,5 @@
 <template>
+   <div>
   <el-dialog
     title="双人核对"
     :visible.sync="isVisibility"
@@ -291,10 +292,50 @@
       >
     </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>
+
+ 
+
+  
 </template>
 
 <script>
-import { postDoubleCheck, changeRole } from "@/api/dialysis";
+import { postDoubleCheck, changeRole,saveInformation } from "@/api/dialysis";
 import { uParseTime } from "@/utils/tools";
 import { parseTime } from "@/utils";
 import { getDataConfig } from "@/utils/data";
@@ -357,6 +398,9 @@ export default {
       displace_liqui_value: "置换液总量:",
       job_number: "",
       org_id: 0,
+      infoDialogVisible:false,
+      selected_date:"",
+      remark:""
     };
   },
   methods: {
@@ -510,6 +554,9 @@ export default {
           console.log(ParamsQuery, "提交参数");
           postDoubleCheck(ParamsQuery).then((response) => {
             if (response.data.state == 0) {
+               if(response.data.code == 600000008){
+                this.infoDialogVisible = true
+              }
               this.$message.error(response.data.msg);
               return false;
             } else {
@@ -1841,6 +1888,23 @@ export default {
           (nowMinutes < 10 ? "0" + nowMinutes : nowMinutes);
       }
     },
+
+   saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:5,
+          remark:this.remark,
+        }
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+      }
   },
   created() {
     var date = this.$route.query && this.$route.query.date;

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

@@ -98,13 +98,48 @@
       v-on:dialog-comfirm="innerDialogComfirm"
       v-on:dialog-cancle="innerDialogCancle"
     ></multi-select-box>
+    
 
+       <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>
   import axios from 'axios'
   import { finishDialysis,PostModifyFinishDialysis } from '@/api/dialysis_record'
+   import { saveInformation } from '@/api/dialysis'
   import { parseTime } from '@/utils'
   import multiSelectBox from './MultiSelectBox'
   import request from '@/utils/request'
@@ -149,6 +184,14 @@
         cruorOptions: [],
         required:false,
         education:[],
+        infoDialogVisible:false,
+        selected_date:"",
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now()
+          }
+        },
+        remark:""
        
       }
     },
@@ -378,7 +421,9 @@
             PostModifyFinishDialysis(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.$message.success("修改成功")
@@ -432,6 +477,9 @@
 
               } else {
                 this.$message.error(resp.msg)
+               if(response.data.code == 600000008){
+                  this.infoDialogVisible = true
+                }
               }
             })
           }else{
@@ -522,6 +570,24 @@
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       },
+
+      saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:1,
+          remark:this.remark,
+        }
+        console.log("params32222222222----",params)
+        saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+      }
     }
   }
 </script>

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

@@ -236,7 +236,7 @@
                 template_id == 56 ||
                 template_id == 60 ||
                 org_id == 10210 ||
-                org_id == 9555 
+                org_id == 9555
                 || org_id == 10432
                 || org_id == 10445
                 || org_id == 10410 ||
@@ -252,14 +252,14 @@
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
-              </span> 
+              </span>
                <span v-if="org_id != 10440 && org_id!=9671">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : ""
               }}
-              </span> 
+              </span>
             </template>
           </el-table-column>
           <el-table-column
@@ -307,7 +307,7 @@
               template_id != 56 &&
               template_id != 60 &&
               org_id!= 10210 &&
-              org_id != 9555 
+              org_id != 9555
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 )
@@ -414,7 +414,7 @@
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410 && org_id!=10495) || 
+              org_id!=10410 && org_id!=10495) ||
               org_id == 10387
             "
           >
@@ -473,10 +473,10 @@
                 template_id == 53 ||
                 template_id == 54 ||
                 template_id == 56 ||
-                org_id ==10432 || 
-                org_id ==10445 || 
+                org_id ==10432 ||
+                org_id ==10445 ||
                 org_id ==10410
-              
+
                )
             "
           >
@@ -502,7 +502,7 @@
               template_id != 53 &&
               template_id != 54 &&
               template_id != 56 &&
-              org_id !=10432 && 
+              org_id !=10432 &&
               org_id !=10445 &&
               org_id !=10410
             "
@@ -907,7 +907,7 @@
           </el-table-column>
 
           <el-table-column
-           
+
             align="center"
             label="病情变化"
             width="130"
@@ -915,8 +915,8 @@
           >
            <template slot-scope="scope">
              {{scope.row.symptom}}
-            
-            
+
+
              <span v-if="(scope.$index == monitors.length - 1) && (org_id == 0 || org_id == 9671 || org_id == 10340)">累计血容量:{{scope.row.accumulated_blood_volume }}L</span>
             </template>
           </el-table-column>
@@ -1130,7 +1130,7 @@
                 template_id == 56 ||
                 template_id == 47 ||
                 template_id == 60 ||
-                org_id== 10432 || 
+                org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410) &&
                 org_id!=10387
@@ -1175,7 +1175,7 @@
               template_id != 56 &&
               template_id != 47 &&
               template_id != 60 &&
-              org_id!=10432 && 
+              org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410)
               || org_id == 10387
@@ -1233,7 +1233,7 @@
                 org_id == 10445 ||
                 org_id == 10410 ||
                 org_id == 10495 ||
-                org_id == 10485) 
+                org_id == 10485)
                 && org_id!=10387
             "
           >
@@ -1285,8 +1285,8 @@
               org_id !=  10210 &&
               org_id !=  10340 &&
               org_id != 9555 &&
-              org_id!=10432 && 
-              org_id!=10445 && 
+              org_id!=10432 &&
+              org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10495 &&
               org_id!=10485
@@ -1387,8 +1387,8 @@
               template_id != 54 &&
               template_id != 56 &&
               template_id != 48 &&
-              org_id!=10340 && 
-              org_id!=10432 && 
+              org_id!=10340 &&
+              org_id!=10432 &&
               org_id!=10445
             "
           >
@@ -1895,7 +1895,7 @@ export default {
     );
     this.complicationList = getDataConfig("hemodialysis", "complication");
 
-   
+
   },
   methods: {
       isName(name) {
@@ -1912,13 +1912,13 @@ export default {
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 4
-          &&filedList[i].filed_name_cn == name 
+          &&filedList[i].filed_name_cn == name
           &&filedList[i].is_write == 1
         ) {
           // console.log(filedList[i].is_write,'false')
           // console.log(name,filedList[i].filed_name_cn,'难道不一样吗')
           return [{ required: true ,message:`请输入${name}` }];
-        } 
+        }
         // else {
         //   console.log(name,filedList[i].filed_name_cn,'难道不一样吗')
         //   // console.log(filedList[i].is_write,'true')
@@ -2060,7 +2060,7 @@ export default {
           ? (resp.monitor.operate_time + 3600) * 1000
           : Date.parse(new Date());
 
-      
+
         this.form.temperature = ""
 
         // this.last_monitor_record.pulse_frequency;
@@ -2125,7 +2125,7 @@ export default {
         this.form.dialysate_temperature = resp.monitor.dialysate_temperature
           ? resp.monitor.dialysate_temperature
           : "";
-        
+
          if(this.org_id == 9675 || this.org_id == 9671 || this.org_id == 10340 || this.org_id == 10469 || this.org_id == 10471){
             this.form.temperature = "36.5"
 
@@ -2168,7 +2168,7 @@ export default {
         }else{
            this.form.conductivity = resp.monitor.conductivity? resp.monitor.conductivity: "";
         }
-      
+
         this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant
           ? resp.monitor.monitor_anticoagulant
           : "";
@@ -2200,7 +2200,7 @@ export default {
           : "";
          if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
             this.form.dialysate_temperature = 36.5
-            
+
          }
       });
     },
@@ -2251,7 +2251,7 @@ export default {
         if(this.org_id != 9671 && this.org_id != 10440){
           this.form.ultrafiltration_volume = "";
         }
-       
+
         this.form.ultrafiltration_rate = "";
         this.form.arterial_pressure = "";
         this.form.arterial_pressure_type = 1;
@@ -2326,7 +2326,7 @@ export default {
             ? monitor.ultrafiltration_volume
             : "";
         }
-        
+
         this.form.ultrafiltration_rate = monitor.ultrafiltration_rate
           ? monitor.ultrafiltration_rate
           : "";
@@ -2339,7 +2339,7 @@ export default {
           ? monitor.arterial_pressure
           : "";
         }
-       
+
         this.form.arterial_pressure_type = monitor.arterial_pressure_type
           ? monitor.arterial_pressure_type
           : "";
@@ -2402,7 +2402,7 @@ export default {
           : "";
         this.form.filter_pressure = monitor.filter_pressure
         ? monitor.filter_pressure
-        : "";  
+        : "";
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -2546,7 +2546,6 @@ export default {
         parseFloat(this.form.dehydration) == NaN
           ? 0
           : parseFloat(this.form.dehydration);
-        
       this.form.filter_pressure = this.form.filter_pressure?this.form.filter_pressure:""
 
       this.form.replacement_speed =
@@ -2716,16 +2715,6 @@ export default {
               parseFloat(this.form.heparin_amount) == NaN
                 ? 0
                 : parseFloat(this.form.heparin_amount);
-
-                this.form.replacement_speed =
-            parseFloat(this.form.replacement_speed) == NaN
-          ? 0
-          : parseFloat(this.form.replacement_speed);
-
-          this.form.dicarbonate =
-        parseFloat(this.form.dicarbonate) == NaN
-          ? 0
-          : parseFloat(this.form.dicarbonate);
             this.$message.error(resp.msg);
           }
         }
@@ -2737,7 +2726,7 @@ export default {
           }
         });
 
-      
+
     },
 
     symptomTextareaBlur: function () {

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

@@ -1,4 +1,5 @@
 <template>
+ <div>
   <el-dialog
     class="newDialog"
     title="治疗小结"
@@ -152,11 +153,49 @@
         >保 存</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>
+
+
+
+
 </template>
 
 <script>
 import { getDataConfig } from "@/utils/data";
-import { postTreatmentsummary } from "@/api/dialysis";
+import { postTreatmentsummary,saveInformation } from "@/api/dialysis";
 import { uParseTime } from "@/utils/tools";
 import store from "@/store";
 import request from "@/utils/request";
@@ -208,6 +247,14 @@ export default {
       },
       //
       date: "",
+     infoDialogVisible:false,
+      selected_date:"",
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        }
+      },
+      remark:""
     };
   },
   methods: {
@@ -352,6 +399,9 @@ export default {
           postTreatmentsummary(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({
@@ -430,6 +480,24 @@ export default {
       }
       return false;
     },
+
+   saveInformation(){
+        var params = {
+          selected_date:this.selected_date,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
+          module:1,
+          remark:this.remark,
+        }
+        console.log("params32222222222----",params)
+      saveInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var information = response.data.data.information
+             this.$message.success("审核成功!")
+             this.infoDialogVisible = false
+           }
+        })
+     }
   },
   watch: {
     isVisibility(val) {},

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -9,13 +9,13 @@
       />
       <img
         style="width: 100%; height: 80px"
-        v-if="org_id == 10278"
+        v-if="org_id == 10278 || org_id == 0"
         src="https://kuyi.shengws.com/beierlog.png"
         alt=""
       />
       <div class="printTitle">检验申请单</div>
 
-      <div style="border: 1px solid #000">
+      <div style="border: 1px solid #000;margin-bottom: 10px;">
         <div
           style="
             display: flex;
@@ -132,19 +132,19 @@
           </div>
         </div>
       </div>
-    </div>
-    <img
+      <img
       style="width: 100%"
-      v-if="org_id == 10138"
+      v-if="org_id == 10138 "
       src="https://kuyi.shengws.com/bailin/blend.jpg"
       alt=""
     />
-    <img
-      style="width: 100%"
-      v-if="org_id == 10278"
-      src="https://kuyi.shengws.com/bailinbeier.png"
-      alt=""
-    />
+      <img
+        style="width: 100%"
+        v-if="org_id == 10278 || org_id == 0"
+        src="https://kuyi.shengws.com/bailinbeier.png"
+        alt=""
+      />
+    </div>
   </div>
 </template>
 <script>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -136,6 +136,7 @@
 
             <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
+          
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>