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

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/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/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>
@@ -162,7 +161,7 @@
           patient_id: this.patientID,
           dryweight: this.dryweight
         }
-  
+
         this.$refs[formName].validate((valid) => {
           if (valid) {
             UpdateDryWeightData(params).then(response => {