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

config/dev.env.js

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

src/api/advice.js

@@ -64,19 +64,7 @@ export function CheckDoctorAdvice(patient, id,mode) {
 
   })
 }
-export function CheckGroupAdvice(groupno,mode) {
-  var params = {
-    groupno: groupno,
-    mode: mode,
-  }
-  return request({
-    url: '/api/patients/advice/checkgroup',
-    method: 'Post',
-    params: params,
-    headers:{"Permission":2},
 
-  })
-}
 
 export function getDoctorAdviceList(params) {
   return request({
@@ -86,29 +74,28 @@ export function getDoctorAdviceList(params) {
   })
 }
 
-export function StopDoctorAdvice(id, reason) {
-  return request({
-    url: '/api/patients/advice/stop?id=' + id,
-    method: 'Post',
-    data: reason
-  })
-}
+// export function StopDoctorAdvice(id, reason,mode) {
+//   return request({
+//     url: '/api/patients/advice/stop?id=' + id+"&mode="+mode,
+//     method: 'Post',
+//     data: reason,
+//     headers:{"Permission":3},
+//
+//   })
+// }
 
-export function StopGroupAdvice(groupno, reason) {
+export function StopGroupAdvice(groupno, reason,mode) {
   return request({
-    url: '/api/patients/advice/stopgroup?groupno=' + groupno,
+    url: '/api/patients/advice/stopgroup?groupno=' + groupno+"&mode="+mode,
     method: 'Post',
-    data: reason
-  })
-}
+    data: reason,
+    headers:{"Permission":3},
 
-export function ExecGroupAdvice(groupno, time) {
-  return request({
-    url: '/api/patients/advice/execgroup?groupno=' + groupno + '&execution_time=' + time,
-    method: 'Post'
   })
 }
 
+
+
 export function DeleteDoctorAdvice(id,mode) {
   return request({
     url: '/api/patients/advice/delete?id=' + id+"&mode="+mode,
@@ -317,3 +304,115 @@ export function getPrintInfo(data) {
     data: data
   })
 }
+
+
+
+
+
+export function EditNewDoctorAdvice(patient, id, advice,mode) {
+  return request({
+    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient+"&mode="+mode,
+    method: 'Put',
+    data: advice,
+    headers:{"Permission":2},
+
+  })
+}
+
+
+
+
+
+export function CreateNewDoctorAdvice(id, advice,mode) {
+  return request({
+    url: '/api/patients/advice/create?id=' + id+"&mode="+mode,
+    method: 'post',
+    data: advice,
+    headers:{"Permission":2},
+
+  })
+}
+
+
+
+export function CreateNewGroupAdvice(id, groupno, advices,mode) {
+  if (advices.remind > 0) {
+    return request({
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
+      method: 'post',
+      data: advices,
+      headers:{"Permission":3},
+
+    })
+  } else {
+    return request({
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
+      method: 'post',
+      data: advices,
+      headers:{"Permission":3},
+
+    })
+  }
+}
+
+
+
+export function DeleteNewDoctorAdvice(id,mode) {
+  return request({
+    url: '/api/patients/advice/delete?id=' + id+"&mode="+mode,
+    method: 'Delete',
+    headers:{"Permission":2},
+
+  })
+}
+
+
+
+export function DeleteNewGroupAdvice(groupno,mode) {
+  return request({
+    url: '/api/patients/advice/deletegroup?groupno=' + groupno+"&mode="+mode,
+    method: 'delete',
+    headers:{"Permission":3},
+
+  })
+}
+
+
+
+export function StopDoctorAdvice(id, reason,mode) {
+  return request({
+    url: '/api/patients/advice/stop?id=' + id+"&mode="+mode,
+    method: 'Post',
+    data: reason,
+    headers:{"Permission":2},
+
+  })
+}
+
+
+
+
+export function ExecGroupAdvice(groupno, time,mode) {
+  return request({
+    url: '/api/patients/advice/execgroup?groupno=' + groupno + '&execution_time=' + time+"&mode="+mode,
+    method: 'Post',
+    headers:{"Permission":2},
+
+  })
+}
+
+
+export function CheckGroupAdvice(groupno,mode) {
+  var params = {
+    groupno: groupno,
+    mode: mode,
+  }
+  return request({
+    url: '/api/patients/advice/checkgroup',
+    method: 'Post',
+    params: params,
+    headers:{"Permission":2},
+
+  })
+}
+

src/api/dialysis.js

@@ -158,7 +158,7 @@ export function postSoulution(params) {
     url: '/api/dialysis/soulution',
     method: 'Post',
     params: params,
-    headers:{"Permission":3},
+    headers:{"Permission":2},
 
   })
 }

src/api/patient.js

@@ -62,7 +62,7 @@ export function createPatientDialysisSolution(id, solution,mode) {
     url: '/api/patients/dialysissolution/create?patient=' + id +"&mode="+mode,
     method: 'post',
     data: solution,
-    headers:{"Permission":2},
+    headers:{"Permission":3},
 
 
   })
@@ -73,7 +73,7 @@ export function editPatientDialysisSolution(patient, id, solution,mode) {
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id+"&mode="+mode,
     method: 'put',
     data: solution,
-    headers:{"Permission":2},
+    headers:{"Permission":3},
 
   })
 }
@@ -317,7 +317,9 @@ export function UpdateDryWeightData(params) {
   return request({
     url: '/api/patient/updatedryweightdata',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":3},
+
   })
 }
 

src/router/modules/data_dict.js

@@ -16,7 +16,9 @@ export default {
     component: () => import('@/xt_pages/data/index'),
     name: 'dictionary',
     meta: {
-      title: 'field_config'
+      title: 'field_config',
+      noCache: true,
+
     }
   },
   {
@@ -24,7 +26,9 @@ export default {
     component: () => import('@/xt_pages/data/template'),
     name: 'template',
     meta: {
-      title: 'template'
+      title: 'template',
+      noCache: true,
+
     }
   },
   {
@@ -32,14 +36,18 @@ export default {
     component: () => import('@/xt_pages/data/druguseTemplate'),
     name: 'druguse',
     meta: {
-      title: 'druguse'
+      title: 'druguse',
+      noCache: true,
+
     }
   }, {
       path: '/data/showconfig',
       component: () => import('@/xt_pages/data/showConfig'),
       name: 'showconfig',
       meta: {
-        title: 'showconfig'
+        title: 'showconfig',
+        noCache: true,
+
       }
     }
   ]

src/router/modules/data_upload.js

@@ -16,7 +16,9 @@ export default {
       component: () => import('@/xt_pages/upload/fast_upload'),
       name: 'fast_upload',
       meta: {
-        title: 'fast_upload'
+        title: 'fast_upload',
+        noCache: true,
+
       }
     },
     {
@@ -24,7 +26,9 @@ export default {
       component: () => import('@/xt_pages/upload/data_upload'),
       name: 'data_upload',
       meta: {
-        title: 'data_upload'
+        title: 'data_upload',
+        noCache: true,
+
       }
     },
     {
@@ -32,14 +36,18 @@ export default {
       component: () => import('@/xt_pages/upload/export'),
       name: 'export',
       meta: {
-        title: 'export'
+        title: 'export',
+        noCache: true,
+
       }
     }, {
       path: '/upload/config',
       component: () => import('@/xt_pages/upload/config'),
       name: 'upload_config',
       meta: {
-        title: 'upload_config'
+        title: 'upload_config',
+        noCache: true,
+
       }
     },
   ]

src/router/modules/device.js

@@ -18,7 +18,9 @@ export default {
       component: () => import('@/xt_pages/device/zone_main'),
       name: 'deviceZoneManage',
       meta: {
-        title: 'deviceZoneManage'
+        title: 'deviceZoneManage',
+        noCache: true,
+
       }
     },
     {
@@ -26,7 +28,9 @@ export default {
       component: () => import('@/xt_pages/device/group_main'),
       name: 'deviceGroupManage',
       meta: {
-        title: 'deviceGroupManage'
+        title: 'deviceGroupManage',
+        noCache: true,
+
       }
     },
     {
@@ -34,7 +38,9 @@ export default {
       component: () => import('@/xt_pages/device/number_main'),
       name: 'deviceNumberManage',
       meta: {
-        title: 'deviceNumberManage'
+        title: 'deviceNumberManage',
+        noCache: true,
+
       }
     },
     {
@@ -42,7 +48,9 @@ export default {
       component: () => import('@/xt_pages/mode/index'),
       name: 'modemanagement',
       meta: {
-        title: 'modemanagement'
+        title: 'modemanagement',
+        noCache: true,
+
       }
     },
     {
@@ -51,7 +59,9 @@ export default {
       // component: () => import("@/xt_pages/device/main"),
       name: 'dialysisMachineManage',
       meta: {
-        title: 'dialysisMachineManage'
+        title: 'dialysisMachineManage',
+        noCache: true,
+
       }
     },
     {
@@ -61,7 +71,9 @@ export default {
       is_menu: false,
       hidden: true,
       meta: {
-        title: '设备管理详情页'
+        title: '设备管理详情页',
+        noCache: true,
+
       }
     }
 

src/router/modules/dialysis.js

@@ -15,7 +15,9 @@ export default {
       component: () => import('@/xt_pages/dialysis/schedualPatient'),
       name: '透析记录',
       meta: {
-        title: '透析记录'
+        title: '透析记录',
+        noCache: true,
+
       }
     },
     {
@@ -23,7 +25,9 @@ export default {
       component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
       name: 'watch',
       meta: {
-        title: 'watch'
+        title: 'watch',
+        noCache: true,
+
       }
     },
     {
@@ -31,7 +35,9 @@ export default {
       component: () => import('@/xt_pages/dialysis/bulletinBoard'),
       name: '数据看板',
       meta: {
-        title: '数据看板'
+        title: '数据看板',
+        noCache: true,
+
       }
     },
     {
@@ -68,7 +74,9 @@ export default {
         title: 'details'
       },
       hidden: true,
-      is_menu: false
+      is_menu: false,
+      noCache: true
+
     },
     {
       path: '/dialysis/print/batch',

src/router/modules/integration.js

@@ -16,7 +16,9 @@ export default {
       component: () => import('@/xt_pages/integration/his_config'),
       name: 'his_config',
       meta: {
-        title: 'his_config'
+        title: 'his_config',
+        noCache: true,
+
       }
     },
 

src/router/modules/qcd.js

@@ -15,7 +15,9 @@ export default {
     component: () => import('@/xt_pages/statistics/index'),
     name: 'statistics',
     meta: {
-      title: 'statistics'
+      title: 'statistics',
+      noCache: true,
+
     }
   },
   {
@@ -23,7 +25,9 @@ export default {
     component: () => import('@/xt_pages/qcd/dialysisTotal'),
     name: 'dialysistotal',
     meta: {
-      title: '透析总量'
+      title: '透析总量',
+      noCache: true,
+
     }
   },
   {
@@ -31,7 +35,9 @@ export default {
     component: () => import('@/xt_pages/qcd/processIndicators'),
     name: 'processIndicators',
     meta: {
-      title: '过程指标'
+      title: '过程指标',
+      noCache: true,
+
     }
   },
   {
@@ -39,7 +45,9 @@ export default {
     component: () => import('@/xt_pages/qcd/outcomeIndicators/control'),
     name: 'outcomeIndicatorsControl',
     meta: {
-      title: '结果指标'
+      title: '结果指标',
+      noCache: true,
+
     }
   },
   {
@@ -49,7 +57,9 @@ export default {
     component: () => import('@/xt_pages/qcd/outcomeIndicators/query'),
     name: 'outcomeIndicatorsQuery',
     meta: {
-      title: '指标查询'
+      title: '指标查询',
+      noCache: true,
+
     }
   },
   {
@@ -57,7 +67,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/total'),
     name: 'patientAnalysisTotal',
     meta: {
-      title: '患者分析'
+      title: '患者分析',
+      noCache: true,
+
     }
   },
   {
@@ -67,7 +79,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/weight'),
     name: 'patientAnalysisWeight',
     meta: {
-      title: '体重分析'
+      title: '体重分析',
+      noCache: true,
+
     }
   },
   {
@@ -77,7 +91,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'),
     name: 'patientAnalysisBloodPressure',
     meta: {
-      title: '血压分析'
+      title: '血压分析',
+      noCache: true,
+
     }
   },
   {
@@ -87,7 +103,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'),
     name: 'patientAnalysisDialysisAge',
     meta: {
-      title: '透析龄分析'
+      title: '透析龄分析',
+      noCache: true,
+
     }
   },
   {
@@ -97,7 +115,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'),
     name: 'patientAnalysisLapseto',
     meta: {
-      title: '转归分析'
+      title: '转归分析',
+      noCache: true,
+
     }
   },
   {
@@ -107,7 +127,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/complication'),
     name: 'patientAnalysisComplication',
     meta: {
-      title: '并发症分析'
+      title: '并发症分析',
+      noCache: true,
+
     }
   },
   {
@@ -117,7 +139,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'),
     name: 'patientAnalysisInfectiousDiseases',
     meta: {
-      title: '传染病分析'
+      title: '传染病分析',
+      noCache: true,
+
     }
   },
   {
@@ -127,7 +151,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'),
     name: 'paPersonLapseto',
     meta: {
-      title: '转归'
+      title: '转归',
+      noCache: true,
+
     }
   },
   {
@@ -137,7 +163,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'),
     name: 'paPersonWeight',
     meta: {
-      title: '体重'
+      title: '体重',
+      noCache: true,
+
     }
   },
   {
@@ -147,7 +175,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'),
     name: 'paPersonBloodPressure',
     meta: {
-      title: '血压'
+      title: '血压',
+      noCache: true,
+
     }
   },
   {
@@ -157,7 +187,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'),
     name: 'paPersonIndicators',
     meta: {
-      title: '指标控制'
+      title: '指标控制',
+      noCache: true,
+
     }
   },
   {
@@ -167,7 +199,9 @@ export default {
     component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'),
     name: 'paPersonOralMedicine',
     meta: {
-      title: '口服药'
+      title: '口服药',
+      noCache: true,
+
     }
   }
   ]

src/router/modules/service.js

@@ -50,7 +50,9 @@ export default {
     hidden: true,
     name: 'servicePay',
     meta: {
-      title: 'servicePay'
+      title: 'servicePay',
+      noCache: true,
+
     }
   },
   {
@@ -59,7 +61,9 @@ export default {
     hidden: true,
     name: 'payType',
     meta: {
-      title: 'payType'
+      title: 'payType',
+      noCache: true,
+
     }
   },
   {

src/router/modules/stock.js

@@ -20,7 +20,9 @@ export default {
       parentNum: 1,
       meta: {
         isChild: true,
-        title: "warehouseReceipt"
+        title: "warehouseReceipt",
+        noCache: true,
+
       }
     },
     {
@@ -31,7 +33,9 @@ export default {
       parentNum: 2,
       meta: {
         isChild: true,
-        title: "warehouseReceiptOther"
+        title: "warehouseReceiptOther",
+        noCache: true,
+
       }
     },
     {

src/router/modules/systems.js

@@ -15,7 +15,9 @@ export default {
     component: () => import('@/xt_pages/role/admin'),
     name: 'adminManage',
     meta: {
-      title: 'adminManage'
+      title: 'adminManage',
+      noCache: true,
+
     }
   },
   {
@@ -23,7 +25,9 @@ export default {
     component: () => import('@/xt_pages/role/role'),
     name: 'roleManage',
     meta: {
-      title: 'roleManage'
+      title: 'roleManage',
+      noCache: true,
+
     }
   },
   {
@@ -72,7 +76,9 @@ export default {
     component: () => import('@/xt_pages/data/index'),
     name: 'dictionary',
     meta: {
-      title: 'data_dictionary'
+      title: 'data_dictionary',
+      noCache: true,
+
     }
   },
   {
@@ -80,7 +86,9 @@ export default {
     component: () => import('@/xt_pages/data/template'),
     name: 'template',
     meta: {
-      title: 'template'
+      title: 'template',
+      noCache: true,
+
     }
   },{
       path: '/data/prescription',

src/views/layout/components/Navbar.vue

@@ -207,9 +207,9 @@ export default {
               this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
               //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
               // this.$router.replace({ path: '/' })
-              // window.location.reload()
+              window.location.reload()
               // this.$router.go(0)
-              this.reload()
+              // this.reload()
             })
           })
 
@@ -272,8 +272,6 @@ export default {
     }
   },
   created() {
-    this.org_id = 12
-
     getOrgs().then(response => {
       if (response.data.state === 1) {
           this.orgs = response.data.data.orgs;
@@ -285,8 +283,6 @@ export default {
       }
     });
 
-
-
   }
 };
 </script>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -114,7 +114,7 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 4">{{anticoagulant_shouji != '0'?"mg":""}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_shouji != '0'?"mg":""}}</span>
         </li>
-       
+
 
         <li v-if="isShow('钙')">
           <label>钙: </label>
@@ -127,8 +127,8 @@
           <span class="content">{{body_fluid}}</span>
           <span class="unit"></span>
         </li>
-        
-    
+
+
         <li v-if="isShow('透析前使用其他特殊药物')">
           <label>透析前使用其他特殊药物: </label>
           <span class="content">{{special_medicine_other}}</span>
@@ -147,9 +147,9 @@
           <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
       </ul>
-      
+
       <ul>
-        
+
          <li v-if="isShow('钠')">
           <label>钠 : </label>
           <span class="content">{{sodium != '0'?sodium:""}}</span>
@@ -186,21 +186,13 @@
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
         </li>
 
-       
+
        <li v-if="isShow('钙剂量')&&getValueStr('anticoagulant','anticoagulant') == 5">
           <label>钙剂量: </label>
           <span class="content">{{getValueStr('anticoagulant_gaijiliang','anticoagulant_gaijiliang')}}</span>
           <span class="unit" v-if="getValueStr('anticoagulant','anticoagulant') == 5">{{'ml'}}</span>
         </li>
 
-     
-
-
-
-
-
-
-
 
         <li v-if="isShow('实际超滤量')">
           <label>实际超滤量: </label>

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

@@ -239,34 +239,34 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('血管通路部位')">
-            <el-form-item label="血管通路部位: ">
-              <el-select v-model="form.blood_access_part_id">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--          <el-col :span="8" v-if="isShow('血管通路部位')">-->
+<!--            <el-form-item label="血管通路部位: ">-->
+<!--              <el-select v-model="form.blood_access_part_id">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="item in vascularAccessOptions"
-                  :label="item.name"
-                  :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="血管通路: ">
-              <el-select v-model="form.blood_access_part_opera_id">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--                <el-option-->
+<!--                  v-for="item in vascularAccessOptions"-->
+<!--                  :label="item.name"-->
+<!--                  :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="血管通路: ">-->
+<!--              <el-select v-model="form.blood_access_part_opera_id">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="item in vascularAccessDescOptions"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--                <el-option-->
+<!--                  v-for="item in vascularAccessDescOptions"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.id"-->
+<!--                  :key="item.id"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <!-- </el-row>
 
         <el-row :gutter="20"> -->
@@ -349,43 +349,43 @@
 
 
                   <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">
-            <el-form-item label="内瘘震颤和血管杂音: ">
-              <el-select v-model="form.tremor_noise">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
+<!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
+<!--              <el-select v-model="form.tremor_noise">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="item in this.$store.getters.tremor_noise"
-                  :label="item.name"
-                  :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="失衡综合症: ">
-              <el-select v-model="form.disequilibrium_syndrome">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--                <el-option-->
+<!--                  v-for="item in this.$store.getters.tremor_noise"-->
+<!--                  :label="item.name"-->
+<!--                  :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="失衡综合症: ">-->
+<!--              <el-select v-model="form.disequilibrium_syndrome">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="item in this.$store.getters.disequilibrium_syndrome"
-                  :label="item.name"
-                  :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="失衡综合症症状: ">
-              <el-input
-                v-model="form.disequilibrium_syndrome_option"
-                readonly
-                @focus="showDialog('8')"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+<!--                <el-option-->
+<!--                  v-for="item in this.$store.getters.disequilibrium_syndrome"-->
+<!--                  :label="item.name"-->
+<!--                  :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="失衡综合症症状: ">-->
+<!--              <el-input-->
+<!--                v-model="form.disequilibrium_syndrome_option"-->
+<!--                readonly-->
+<!--                @focus="showDialog('8')"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <!-- </el-row>
 

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

@@ -12,10 +12,6 @@
                    >
           新增医嘱
         </el-button>
-        <el-button round @click="openGroupFrom" :loading="deleLoading"
-                   disabled>新增医嘱
-        </el-button>
-
 
         <el-button v-if="currentRow != null" round
                    @click="execAdvice" :loading="deleLoading">执行医嘱
@@ -1028,6 +1024,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          console.log(this.currentRow)
           let mode ="4"
           if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id){
             mode = "5"
@@ -1065,7 +1062,13 @@
           type: 'warning'
         }).then(() => {
           this.deleLoading = true
-          let mode = "4"
+
+
+          let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id) {
+            mode = "5"
+          }
+
           DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {
@@ -1100,6 +1103,9 @@
         }).then(() => {
           this.deleLoading = true
           let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id) {
+            mode = "5"
+          }
           DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -651,31 +651,32 @@ export default {
                   }
                 }
               }
-            }
-          })
-
-          if (isChild) {
-            for (const index in this.groupForm.adviceNames) {
-              if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.parent_row) {
-                for (const j in this.groupForm.adviceNames[index].children) {
-                  if (this.groupForm.adviceNames[index].children[j].row_key == this.groupSelectRow.row_key) {
-                    this.groupForm.adviceNames[index].children.splice(j, 1)
-                    this.$set(this.groupForm.adviceNames, index, this.groupForm.adviceNames[index])
+              if (isChild) {
+                for (const index in this.groupForm.adviceNames) {
+                  if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.parent_row) {
+                    for (const j in this.groupForm.adviceNames[index].children) {
+                      if (this.groupForm.adviceNames[index].children[j].row_key == this.groupSelectRow.row_key) {
+                        this.groupForm.adviceNames[index].children.splice(j, 1)
+                        this.$set(this.groupForm.adviceNames, index, this.groupForm.adviceNames[index])
+                        this.toggleRowExpansion()
+                        break
+                      }
+                    }
+                  }
+                }
+              } else {
+                for (const index in this.groupForm.adviceNames) {
+                  if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.row_key) {
+                    this.groupForm.adviceNames.splice(index, 1)
                     this.toggleRowExpansion()
                     break
                   }
                 }
               }
             }
-          } else {
-            for (const index in this.groupForm.adviceNames) {
-              if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.row_key) {
-                this.groupForm.adviceNames.splice(index, 1)
-                this.toggleRowExpansion()
-                break
-              }
-            }
-          }
+          })
+
+
         }).catch(() => {
         })
       },
@@ -1706,6 +1707,7 @@ export default {
           return false
         }
 
+        console.log(groups[0].advice_doctor)
         this.adminusername = this.getXuserName(groups[0].advice_doctor)
         this.groupForm = {
           advice_type: groups[0].advice_type,

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

@@ -180,7 +180,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="前次透析后：" v-if="isShow('前次透析后')">
+            <el-form-item label="前次透析后症状：" v-if="isShow('前次透析后症状')">
               <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
             </el-form-item>
           </el-col>

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

@@ -43,7 +43,7 @@
           <el-button v-if="dialysis_order.id == 0" @click="submit" type="primary" :loading="loading">执行上机</el-button>
           <el-button v-else type="info" :disabled="true">已上机</el-button>
           <el-button
-            v-if="dialysis_order.id > 0 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)"
+            v-if="dialysis_order.id > 0"
             type="primary" @click="editOrder">修改上机
           </el-button>
 
@@ -252,13 +252,6 @@
           this.schedual_type = this.dialysis_order.schedual_type
         }
 
-        if (this.dialysis_order.id > 0) {
-          for (let i = 0; i < this.special_premission.length; i++) {
-            if (this.$store.getters.xt_user.user.id == this.special_premission[i].admin_user_id) {
-              this.isPremission = true
-            }
-          }
-        }
 
         if (this.dialysis_order.id > 0) {
           if (this.dialysis_order.creator == 0) {

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

@@ -273,11 +273,11 @@
 
           <!-- </el-row>
           <el-row :gutter="20" > -->
-          <el-col :span="8" v-if="isShows('实际超滤量')">
-            <el-form-item label="实际超滤量(L)">
-              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8" v-if="isShows('实际超滤量')">-->
+<!--            <el-form-item label="实际超滤量(L)">-->
+<!--              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
 
           <!--透析耗材-->
@@ -1016,8 +1016,11 @@
                   type: 'success',
                   duration: 2000
                 })
+                var date = new Date()
+
+                var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+                var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
 
-                console.log(hour + ':' + minute)
                 const params = {
                   advices: results,
                   advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
@@ -1055,6 +1058,7 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = 1
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1067,6 +1071,10 @@
                   duration: 2000
                 })
                 console.log(hour + ':' + minute)
+                var date = new Date()
+
+                var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+                var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
 
                 const params = {
                   advices: results,
@@ -1153,6 +1161,8 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = 1
+
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1323,25 +1333,13 @@
               })
             }
           } else if (this.is_open == 2) {
+            var date = new Date()
+
+            var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
             if (this.waitUploadAdvices.length > 0) {
-              const params = {
-                advices: this.waitUploadAdvices,
-                advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                advice_doctor: this.waitUploadAdvices[0].advice_doctor,
-                advice_type: this.waitUploadAdvices[0].advice_type,
-                parent_id: this.patient_id,
-                start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                remark: ''
-              }
-              CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-                var resp = rs.data
-                if (resp.state == 1) {
-                  // this.doctorAdvices = resp.data.advices
-                  this.$emit('advice')
-                } else {
 
-                }
-              })
 
               if (this.patient.id <= 0) {
                 this.$message.error('没有选择患者')
@@ -1366,6 +1364,27 @@
                     duration: 2000
                   })
 
+                  const params = {
+                    advices: this.waitUploadAdvices,
+                    advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+                    advice_type: this.waitUploadAdvices[0].advice_type,
+                    parent_id: this.patient_id,
+                    // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                    remark: ''
+                  }
+                  CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
+                    var resp = rs.data
+                    if (resp.state == 1) {
+                      // this.doctorAdvices = resp.data.advices
+                      this.$emit('advice')
+                    } else {
+
+                    }
+                  })
+
                   const prescription_resp = response.data.data.prescription
                   var prescription = this.prescription
                   for (var index in prescription_resp) {
@@ -1491,25 +1510,12 @@
                 })
               }
             } else if (this.is_open == 2) {
-              if (this.waitUploadAdvices.length > 0) {
-                const params = {
-                  advices: this.waitUploadAdvices,
-                  advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                  advice_doctor: this.waitUploadAdvices[0].advice_doctor,
-                  advice_type: this.waitUploadAdvices[0].advice_type,
-                  parent_id: this.patient_id,
-                  start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                  remark: ''
-                }
-                CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-                  var resp = rs.data
-                  if (resp.state == 1) {
-                    // this.doctorAdvices = resp.data.advices
-                    this.$emit('advice')
-                  } else {
+              var date = new Date()
 
-                  }
-                })
+              var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+              var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
+              if (this.waitUploadAdvices.length > 0) {
 
                 if (this.patient.id <= 0) {
                   this.$message.error('没有选择患者')
@@ -1534,6 +1540,28 @@
                       duration: 2000
                     })
 
+                    const params = {
+                      advices: this.waitUploadAdvices,
+                      advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                      advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+                      advice_type: this.waitUploadAdvices[0].advice_type,
+                      parent_id: this.patient_id,
+                      // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                      start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                      remark: ''
+                    }
+                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
+                      var resp = rs.data
+                      if (resp.state == 1) {
+                        // this.doctorAdvices = resp.data.advices
+                        this.$emit('advice')
+                      } else {
+
+                      }
+                    })
+
+
                     const prescription_resp = response.data.data.prescription
                     var prescription = this.prescription
                     for (var index in prescription_resp) {
@@ -1720,25 +1748,13 @@
               })
             }
           } else if (this.is_open == 2) {
+            var date = new Date()
+
+            var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
             if (this.waitUploadAdvices.length > 0) {
-              const params = {
-                advices: this.waitUploadAdvices,
-                advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                advice_doctor: this.waitUploadAdvices[0].advice_doctor,
-                advice_type: this.waitUploadAdvices[0].advice_type,
-                parent_id: this.patient_id,
-                start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                remark: ''
-              }
-              CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-                var resp = rs.data
-                if (resp.state == 1) {
-                  // this.doctorAdvices = resp.data.advices
-                  this.$emit('advice')
-                } else {
 
-                }
-              })
 
               if (this.patient.id <= 0) {
                 this.$message.error('没有选择患者')
@@ -1765,6 +1781,26 @@
                     type: 'success',
                     duration: 2000
                   })
+                  const params = {
+                    advices: this.waitUploadAdvices,
+                    advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+                    advice_type: this.waitUploadAdvices[0].advice_type,
+                    parent_id: this.patient_id,
+                    // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                    start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                    remark: ''
+                  }
+                  CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
+                    var resp = rs.data
+                    if (resp.state == 1) {
+                      // this.doctorAdvices = resp.data.advices
+                      this.$emit('advice')
+                    } else {
+
+                    }
+                  })
 
                   const prescription_resp = response.data.data.prescription
                   var prescription = this.prescription
@@ -1900,25 +1936,13 @@
                 })
               }
             } else if (this.is_open == 2) {
+              var date = new Date()
+
+              var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+              var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
               if (this.waitUploadAdvices.length > 0) {
-                const params = {
-                  advices: this.waitUploadAdvices,
-                  advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
-                  advice_doctor: this.waitUploadAdvices[0].advice_doctor,
-                  advice_type: this.waitUploadAdvices[0].advice_type,
-                  parent_id: this.patient_id,
-                  start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
-                  remark: ''
-                }
-                CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-                  var resp = rs.data
-                  if (resp.state == 1) {
-                    // this.doctorAdvices = resp.data.advices
-                    this.$emit('advice')
-                  } else {
 
-                  }
-                })
 
                 if (this.patient.id <= 0) {
                   this.$message.error('没有选择患者')
@@ -1941,6 +1965,26 @@
                       type: 'success',
                       duration: 2000
                     })
+                    const params = {
+                      advices: this.waitUploadAdvices,
+                      advice_date: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                      advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+                      advice_type: this.waitUploadAdvices[0].advice_type,
+                      parent_id: this.patient_id,
+                      // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
+                      start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + hour + ':' + minute,
+
+                      remark: ''
+                    }
+                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
+                      var resp = rs.data
+                      if (resp.state == 1) {
+                        // this.doctorAdvices = resp.data.advices
+                        this.$emit('advice')
+                      } else {
+
+                      }
+                    })
                     const prescription_resp = response.data.data.prescription
                     const solution_resp = response.data.data.solution
                     var prescription = this.prescription

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

@@ -30,7 +30,7 @@
           <!--</el-button>-->
           <!--<el-button v-else :disabled="true" type="info">未上机</el-button>-->
           <el-button
-            v-if="dialysis_order.stage == 2 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)"
+            v-if="dialysis_order.stage == 2 "
             type="primary" @click="modifyFinish">修改下机
           </el-button>
 

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

@@ -965,7 +965,7 @@ export default {
       let mode = "1"
        if(this.form.id > 0){
          mode = "2"
-         if(this.form.creator > 0 && this.form.creator != this.$store.getters.xt_user.user.id){
+         if(this.form.monitoring_nurse > 0 && this.form.monitoring_nurse != this.$store.getters.xt_user.user.id){
           mode = "3"
          }
       }
@@ -1053,8 +1053,9 @@ export default {
       })
         .then(() => {
           let mode = "4"
-          // if(this.table_current_row)
-
+          if(this.table_current_row.creator > 0 && this.table_current_row.creator != this.$store.getters.xt_user.user.id){
+            mode = "5"
+          }
 
           const params = {
             patient_id: this.patient_id,

src/xt_pages/user/dryWeight.vue

@@ -3,8 +3,7 @@
     <patient-sidebar :id="patientID" defaultActive="1-6" v-on:tran-patient="onTranPatient"></patient-sidebar>
     <div class="patient-app-container advice-container app-container">
       <div class="cell clearfix">
-      当前时间: <el-input  style="width:130px;" v-model="nowtime" :disabled="true"></el-input> 
-         </el-time-select>&nbsp;&nbsp;
+      当前时间: <el-input  style="width:130px;" v-model="nowtime" :disabled="true"></el-input>
         干体重:<el-input style="width:100px" v-model="dryweight" :disabled="true"></el-input>&nbsp;
          <el-button size="medium" type="primary" @click="dialogVisible =true" v-show="addShow">新增</el-button>
          <el-button size="medium" type="primary" @click="dialogVisible =true" v-show="adjustShow">调整</el-button>
@@ -20,17 +19,17 @@
               {{scope.row.adjusted_value}}
         </template>
      </el-table-column>
-      <el-table-column     prop="date"    label="干体重"    align="center"> 
+      <el-table-column     prop="date"    label="干体重"    align="center">
          <template slot-scope="scope">
               {{scope.row.dry_weight}}
          </template>
       </el-table-column>
-      <el-table-column     prop="date"    label="医生"      align="center"> 
+      <el-table-column     prop="date"    label="医生"      align="center">
           <template slot-scope="scope">
                 {{scope.row.user_name}}
           </template>
       </el-table-column>
-      <el-table-column     prop="date"    label="备注"      align="center"> 
+      <el-table-column     prop="date"    label="备注"      align="center">
           <template slot-scope="scope">
               {{scope.row.remakes}}
           </template>
@@ -46,7 +45,7 @@
         align="right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"></el-pagination>
-     
+
      <el-dialog
          title="调整干体重"
          :visible.sync="dialogVisible"
@@ -75,7 +74,7 @@
            </el-input>
         </el-form-item>
       </el-form>
-     
+
      <span slot="footer" class="dialog-footer">
      <el-button @click="dialogVisible = false">取 消</el-button>
      <el-button type="primary" @click="UpdateDryWeightData('dryWeightForm')">确 定</el-button>
@@ -160,9 +159,10 @@
           doctors: this.dryWeightForm.doctors,
           remarks: this.dryWeightForm.remarks,
           patient_id: this.patientID,
-          dryweight: this.dryweight
+          dryweight: this.dryweight,
+          mode : "1"
         }
-  
+
         this.$refs[formName].validate((valid) => {
           if (valid) {
             UpdateDryWeightData(params).then(response => {
@@ -173,6 +173,9 @@
                 const id = this.$route.params && this.$route.params.id
                 this.getAllData(id)
                 this.getDryWeightData(id)
+              }else{
+                this.$message.error(response.data.msg)
+                return false
               }
             })
           }