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

src/api/advice.js

@@ -296,7 +296,22 @@ export function postDoctorAdviceConfig(params) {
 
 
 
+export function getDoctorInitConfig() {
+  return request({
+    url: '/api/advicetemplate/init/get',
+    method: 'get',
+  })
+}
+
 
+export function PostInitAdviceTemplate(params) {
+  return request({
+    url: '/api/advicetemplate/init/commit',
+    method: 'post',
+    params:params
+
+  })
+}
 
 
 

src/api/article.js

@@ -12,7 +12,9 @@ export function fetchArticle(id) {
   return request({
     url: '/article/detail',
     method: 'get',
-    params: { id }
+    params: {
+      id
+    }
   })
 }
 
@@ -20,7 +22,9 @@ export function fetchPv(pv) {
   return request({
     url: '/article/pv',
     method: 'get',
-    params: { pv }
+    params: {
+      pv
+    }
   })
 }
 
@@ -39,3 +43,19 @@ export function updateArticle(data) {
     data
   })
 }
+
+export function handleUpdateTwo(id, params) {
+  return request({
+    url: '/article/hanleupdatetwo?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateDataTwo(id, data) {
+  return request({
+    url: '/article/updatedatatwo?id=' + id,
+    method: 'post',
+    data: data
+  })
+}

src/api/config.js

@@ -48,3 +48,47 @@ export function getIsDocking(params) {
   })
 }
 
+
+
+
+
+export function getAllSystemPrescription() {
+  return request({
+    url: '/api/systemprescription/all',
+    method: 'get',
+  })
+}
+
+
+export function getSystemPrescription(params) {
+  return request({
+    url: '/api/systemprescription/get',
+    method: 'get',
+    params:params
+
+  })
+}
+
+
+export function postSystemPrescription(params) {
+  return request({
+    url: '/api/systemprescription/commit',
+    method: 'post',
+    data: params
+
+  })
+}
+
+
+export function updateSystemPrescription(id,params) {
+  return request({
+    url: '/api/systemprescription/update?id='+id,
+    method: 'post',
+    data: params
+
+  })
+}
+
+
+
+

src/api/data.js

@@ -65,3 +65,4 @@ export function getPrintTemplate() {
     method: 'get',
   })
 }
+

src/api/dialysis.js

@@ -1,273 +1,236 @@
 import request from '@/utils/request'
 
-
-export function fetchList(params){
+export function fetchList(params) {
   return request({
-    url:'/api/patients',
-    method:'get',
-    params:params
+    url: '/api/patients',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-export function getSchedualPatient(params){
+export function getSchedualPatient(params) {
   return request({
-    url:'/api/dialysis/patients',
-    method:'get',
-    params:params
+    url: '/api/dialysis/patients',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function PatientInfo(params){
+export function PatientInfo(params) {
   return request({
-    url:'/api/dialysis/info',
-    method:'get',
-    params:params
+    url: '/api/dialysis/info',
+    method: 'get',
+    params: params
   })
 }
 
-export function doctorAndNurseList(params){
+export function doctorAndNurseList(params) {
   return request({
-    url:'/api/alldoctors',
-    method:'get',
-    params:params
+    url: '/api/alldoctors',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function commitDailysisRecord(params){
+export function commitDailysisRecord(params) {
   return request({
-    url:'/api/dialysis/record',
-    method:'post',
-    params:params
+    url: '/api/dialysis/record',
+    method: 'post',
+    params: params
   })
 }
 
-export function getGobelInfo(params){
+export function getGobelInfo(params) {
   return request({
-    url:'/api/dialysis/golbal',
-    method:'post',
-    params:params
+    url: '/api/dialysis/golbal',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function CreateDoctorAdvice(id,dialysisId,record_date,params){
+export function CreateDoctorAdvice(id, dialysisId, record_date, params) {
   return request({
-    url:'/api/dialysis/advice/create?id='+id+"&dialysis_id="+dialysisId+"&record_date="+record_date,
-    method:'post',
-    data:params
+    url: '/api/dialysis/advice/create?id=' + id + '&dialysis_id=' + dialysisId + '&record_date=' + record_date,
+    method: 'post',
+    data: params
   })
 }
 
-export function getDoctorAdviceById(params){
+export function getDoctorAdviceById(params) {
   return request({
-    url:'/api/dialysis/advice/get',
-    method:'get',
-    params:params
+    url: '/api/dialysis/advice/get',
+    method: 'get',
+    params: params
   })
 }
 
-export function editDoctorAdviceById(params){
+export function editDoctorAdviceById(params) {
   return request({
-    url:'/api/dialysis/advice/edit',
-    method:'put',
-    params:params
+    url: '/api/dialysis/advice/edit',
+    method: 'put',
+    params: params
   })
 }
 
-
-export function CreateMonitor(params){
+export function CreateMonitor(params) {
   return request({
-    url:'/api/dialysis/monitor/create',
-    method:'post',
-    params:params
+    url: '/api/dialysis/monitor/create',
+    method: 'post',
+    params: params
   })
 }
 
-export function DelMonitor(params){
+export function DelMonitor(params) {
   return request({
-    url:'/api/dialysis/monitor/del',
-    method:'post',
-    params:params
+    url: '/api/dialysis/monitor/del',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function GetAllZone(params){
+export function GetAllZone(params) {
   return request({
-    url:'/api/dialysis/zone',
-    method:'get',
-    params:params
+    url: '/api/dialysis/zone',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function PostStartRecordInfo(params){
+export function PostStartRecordInfo(params) {
   return request({
-    url:'/api/dialysis/start',
-    method:'post',
-    params:params
+    url: '/api/dialysis/start',
+    method: 'post',
+    params: params
   })
 }
 
-export function GetGlobalInfo(params){
+export function GetGlobalInfo(params) {
   return request({
-    url:'/api/dialysis/device',
-    method:'get',
-    params:params
+    url: '/api/dialysis/device',
+    method: 'get',
+    params: params
   })
 }
 
-export function GetDeviceInfo(params){
+export function GetDeviceInfo(params) {
   return request({
-    url:'/api/dialysis/device',
-    method:'get',
-    params:params
+    url: '/api/dialysis/device',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function commitDailysisSolution(params){
+export function commitDailysisSolution(params) {
   return request({
-    url:'/api/dialysis/global',
-    method:'get',
-    params:params
+    url: '/api/dialysis/global',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function delMonitor(params){
+export function delMonitor(params) {
   return request({
-    url:'/api/dialysis/monitor/del',
-    method:'post',
-    params:params
+    url: '/api/dialysis/monitor/del',
+    method: 'post',
+    params: params
   })
 }
 
-
 export function getDialysisRecord(params) {
+  console.log('params容声哦', params)
   return request({
-    url:'/api/dialysis/dialysisorder',
-    method:'Get',
-    params:params
+    url: '/api/dialysis/dialysisorder',
+    method: 'Get',
+    params: params
   })
 }
 
-
-
-
-
 export function postPrescription(params) {
   return request({
-    url:'/api/dialysis/prescription',
-    method:'Post',
-    params:params
+    url: '/api/dialysis/prescription',
+    method: 'Post',
+    params: params
   })
 }
 
-
-
 export function postSoulution(params) {
   return request({
-    url:'/api/dialysis/soulution',
-    method:'Post',
-    params:params
+    url: '/api/dialysis/soulution',
+    method: 'Post',
+    params: params
   })
 }
 
-
 export function postDoubleCheck(params) {
   return request({
-    url:'/api/dialysis/dobule',
-    method:'Post',
-    params:params
+    url: '/api/dialysis/dobule',
+    method: 'Post',
+    params: params
   })
 }
 
-
 export function postAccepts(params) {
   return request({
-    url:'/api/dialysis/accepts',
-    method:'Post',
-    params:params
+    url: '/api/dialysis/accepts',
+    method: 'Post',
+    params: params
   })
 }
 
-
 export function postAssessmentBeforeDislysis(params) {
   return request({
-    url:'/api/dialysis/assessmentbeforedislysis',
-    method:'Post',
-    params:params
+    url: '/api/dialysis/assessmentbeforedislysis',
+    method: 'Post',
+    params: params
   })
 }
 
 export function postTreatmentsummary(params) {
   return request({
     url: '/api/dialysis/treatmentsummary',
-    method:'Post',
-    params:params
+    method: 'Post',
+    params: params
   })
 }
 
-
-
-
 export function postAssessmentAfterDislysis(params, data) {
   return request({
-    url:'/api/dialysis/assessmentafterdislysis',
-    method:'Post',
-    params:params,
-    data:data
+    url: '/api/dialysis/assessmentafterdislysis',
+    method: 'Post',
+    params: params,
+    data: data
   })
 }
 
-
 export function postDelMonitorInfo(params) {
   return request({
-    url:'/api/dialysis/monitor/del',
-    method:'Post',
-    params:params,
-    data:data
+    url: '/api/dialysis/monitor/del',
+    method: 'Post',
+    params: params,
+    data: data
   })
 }
 
-
-
-
-
-export function CreateGroupAdvice(id, groupno, advices){
+export function CreateGroupAdvice(id, groupno, advices) {
   return request({
-    url:'/api/advice_remind/create?id='+id + '&groupno=' + groupno,
-    method:'post',
-    data:advices,
+    url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
+    method: 'post',
+    data: advices
   })
-
 }
 
-
-
-
-
-export function GetSolution(params){
+export function GetSolution(params) {
   return request({
-    url:"/api/solution/get",
-    method:'get',
-    params:params,
+    url: '/api/solution/get',
+    method: 'get',
+    params: params
   })
-
 }
 
-
-
-export function CreateDryWeight(params){
+export function CreateDryWeight(params) {
   return request({
-    url:"/api/dryweight/commit",
-    method:'post',
-    params:params,
+    url: '/api/dryweight/commit',
+    method: 'post',
+    params: params
   })
-
 }

src/api/inspection.js

@@ -38,3 +38,24 @@ export function fetchPatientInspections(params){
         params:params,
     })
 }
+
+
+export function GetUploadInspections(params){
+  return request({
+    url:'/api/patient/inspection/get',
+    method:'get',
+    params:params,
+  })
+}
+
+export function GetInitInspections(params){
+  return request({
+    url:'/api/patient/inspectioninit/get',
+    method:'get',
+    params:params,
+  })
+}
+
+
+
+

src/api/manage.js

@@ -39,10 +39,9 @@ export function getAllMachineInfo(
   });
 }
 
-export function getAllMachine(zoneid, classid, deviceid) {
+export function getAllMachine(zoneid, deviceid) {
   const params = {
     zoneid: zoneid,
-    classid: classid,
     deviceid: deviceid
   };
   return request({
@@ -61,6 +60,7 @@ export function getMachineDetailById(id, params) {
 }
 
 export function UpdateMachineInfo(data) {
+  console.log("data", data);
   return request({
     url: "/api/management/updatemachineinfo",
     method: "Post",
@@ -93,7 +93,10 @@ export function savePlan(data, id) {
   });
 }
 
-export function getAllPlan(params) {
+export function getAllPlan(bedid) {
+  const params = {
+    bedid: bedid
+  };
   return request({
     url: "/api/management/getallplan",
     method: "Get",
@@ -101,10 +104,11 @@ export function getAllPlan(params) {
   });
 }
 
-export function getAllPlanDetail(unitype) {
+export function getAllPlanDetail(unitype, bedid) {
   // eslint-disable-next-line no-redeclare
   const params = {
-    unitype: unitype
+    unitype: unitype,
+    bedid: bedid
   };
   return request({
     url: "/api/management/getallplandetail",
@@ -617,3 +621,43 @@ export function DeleteRepairs(id, params) {
     params: params
   });
 }
+
+export function SaveMode(data) {
+  return request({
+    url: "/api/manage/savemode",
+    method: "post",
+    data: data
+  });
+}
+
+export function getAllMode(params) {
+  return request({
+    url: "/api/manage/getallmode",
+    method: "get",
+    params: params
+  });
+}
+
+export function EditMode(id, params) {
+  return request({
+    url: "/api/manage/editmode?id=" + id,
+    method: "get",
+    params: params
+  });
+}
+
+export function UpdateMode(id, data) {
+  return request({
+    url: "/api/manage/updatemode?id=" + id,
+    method: "post",
+    data: data
+  });
+}
+
+export function DeleteMode(id, params) {
+  return request({
+    url: "/api/manage/deletemode?id=" + id,
+    method: "delete",
+    params: params
+  });
+}

src/lang/zh.js

@@ -94,6 +94,7 @@ export default {
     dryWeight: '干体重',
     device: '设备',
     deviceManage: '设备管理',
+    modemanagement:'型号管理',
     dialysisMachineManage: '设备管理',
     workforce: '排班管理',
     appointment: '排班管理',
@@ -164,7 +165,8 @@ export default {
     export: '一键导出',
     upload_config: '质控上报配置',
     quality_control: '质控上报',
-    remind_print: '排版提醒打印'
+    remind_print: '排版提醒打印',
+    system_prescription:"透析方案",
 
   },
   navbar: {

src/router/modules/device.js

@@ -1,59 +1,69 @@
-import Layout from "@/views/layout/Layout";
-import { S_IFMT } from "constants";
+import Layout from '@/views/layout/Layout'
+import {
+  S_IFMT
+} from 'constants'
 
 export default {
-  path: "/device",
+  path: '/device',
   component: Layout,
-  redirect: "/device/main",
-  name: "device",
+  redirect: '/device/main',
+  name: 'device',
   alwaysShow: true,
   meta: {
-    title: "deviceManage",
-    icon: "shebei"
+    title: 'deviceManage',
+    icon: 'shebei'
   },
-  children: [
+  children: [{
+      path: '/device/zones',
+      component: () => import('@/xt_pages/device/zone_main'),
+      name: 'deviceZoneManage',
+      meta: {
+        title: 'deviceZoneManage'
+      }
+    },
     {
-      path: "/device/zones",
-      component: () => import("@/xt_pages/device/zone_main"),
-      name: "deviceZoneManage",
+      path: '/device/groups',
+      component: () => import('@/xt_pages/device/group_main'),
+      name: 'deviceGroupManage',
       meta: {
-        title: "deviceZoneManage"
+        title: 'deviceGroupManage'
       }
     },
     {
-      path: "/device/groups",
-      component: () => import("@/xt_pages/device/group_main"),
-      name: "deviceGroupManage",
+      path: '/device/numbers',
+      component: () => import('@/xt_pages/device/number_main'),
+      name: 'deviceNumberManage',
       meta: {
-        title: "deviceGroupManage"
+        title: 'deviceNumberManage'
       }
     },
     {
-      path: "/device/numbers",
-      component: () => import("@/xt_pages/device/number_main"),
-      name: "deviceNumberManage",
+      path: '/device/mode',
+      component: () => import('@/xt_pages/mode/index'),
+      name: 'modemanagement',
       meta: {
-        title: "deviceNumberManage"
+        title: 'modemanagement'
       }
     },
     {
-      path: "/device/main",
-      component: () => import("@/xt_pages/management/index"),
+      path: '/device/main',
+      component: () => import('@/xt_pages/management/index'),
       // component: () => import("@/xt_pages/device/main"),
-      name: "dialysisMachineManage",
+      name: 'dialysisMachineManage',
       meta: {
-        title: "dialysisMachineManage"
+        title: 'dialysisMachineManage'
       }
     },
     {
-      path: "/device/home",
-      component: () => import("@/xt_pages/management/home"),
-      name: "managementHome",
+      path: '/device/home',
+      component: () => import('@/xt_pages/management/home'),
+      name: 'managementHome',
       is_menu: false,
       hidden: true,
       meta: {
-        title: "设备管理详情页"
+        title: '设备管理详情页'
       }
     }
+
   ]
-};
+}

src/router/modules/systems.js

@@ -82,8 +82,14 @@ export default {
     meta: {
       title: 'template'
     }
-  },
-  {
+  },{
+      path: '/data/prescription',
+      component: () => import('@/xt_pages/data/prescription'),
+      name: 'prescription',
+      meta: {
+        title: 'system_prescription'
+      }
+    }, {
     path: '/data/druguse',
     component: () => import('@/xt_pages/data/druguseTemplate'),
     name: 'druguse',
@@ -97,7 +103,7 @@ export default {
     meta: {
       title: 'showconfig'
     }
-  }, {
+  },{
     path: '/data/print',
     component: () => import('@/xt_pages/data/printTemplate'),
     name: 'printTemplate',
@@ -111,6 +117,6 @@ export default {
     meta: {
       title: 'hisconfig'
     }
-  }
+  },
   ]
 }

src/xt_pages/data/components/table.vue

@@ -263,83 +263,86 @@ export default {
             }
             const result = response.data.data.dataconfig;
             // 更新store
-            store.dispatch('updateConfigList',result).then(() => {
+            store.dispatch("updateConfigList", result).then(() => {});
 
-            })
+            this.dialogFormVisible = false;
 
-            this.dialogFormVisible = false
-
-            this.$message.success("创建成功")
-
-          })
+            this.$message.success("创建成功");
+          });
         }
-      })
+      });
     },
     handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
+      this.temp = Object.assign({}, row); // copy obj
+      this.temp.timestamp = new Date(this.temp.timestamp);
+      this.dialogStatus = "update";
+      this.dialogFormVisible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
+        this.$refs["dataForm"].clearValidate();
+      });
     },
     updateData() {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs["dataForm"].validate(valid => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+          const tempData = Object.assign({}, this.temp);
+          tempData.timestamp = +new Date(tempData.timestamp); // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
           updateArticle(tempData).then(() => {
             for (const v of this.list) {
               if (v.id === this.temp.id) {
-                const index = this.list.indexOf(v)
-                this.list.splice(index, 1, this.temp)
-                break
+                const index = this.list.indexOf(v);
+                this.list.splice(index, 1, this.temp);
+                break;
               }
             }
-            this.dialogFormVisible = false
-
-            this.$message.success("更新成功")
+            this.dialogFormVisible = false;
 
-          })
+            this.$message.success("更新成功");
+          });
         }
-      })
+      });
     },
     handleDelete(row) {
+      this.$message.success("删除成功");
 
-      this.$message.success("删除成功")
-
-      const index = this.list.indexOf(row)
-      this.list.splice(index, 1)
+      const index = this.list.indexOf(row);
+      this.list.splice(index, 1);
     },
     handleFetchPv(pv) {
       fetchPv(pv).then(response => {
-        this.pvData = response.data.pvData
-        this.dialogPvVisible = true
-      })
+        this.pvData = response.data.pvData;
+        this.dialogPvVisible = true;
+      });
     },
     handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
+      this.downloadLoading = true;
+      import("@/vendor/Export2Excel").then(excel => {
+        const tHeader = ["timestamp", "title", "type", "importance", "status"];
+        const filterVal = [
+          "timestamp",
+          "title",
+          "type",
+          "importance",
+          "status"
+        ];
+        const data = this.formatJson(filterVal, this.list);
         excel.export_json_to_excel({
           header: tHeader,
           data,
-          filename: 'table-list'
-        })
-        this.downloadLoading = false
-      })
+          filename: "table-list"
+        });
+        this.downloadLoading = false;
+      });
     },
     formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          if (j === "timestamp") {
+            return parseTime(v[j]);
+          } else {
+            return v[j];
+          }
+        })
+      );
     }
   }
 };

src/xt_pages/data/components/tableson.vue

@@ -78,7 +78,7 @@
             <el-form-item label="排序" prop="order">
               <el-input
                 type="age"
-                v-model.number="temp.order"
+                v-model="temp.order"
                 placeholder="请输入排序值，数值越大，排序越靠前"
               ></el-input>
             </el-form-item>
@@ -385,6 +385,7 @@ export default {
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           const tempData = Object.assign({}, this.temp);
+          console.log("tempData", tempData);
           updateChildConfig(tempData).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/data/druguseTemplate.vue

@@ -22,7 +22,15 @@
           <div>
             <div class="filter-container">
               <el-button size="small"
+                         :loading="loading"
                          style="float: right;"
+                         :disabled="is_init?true:false"
+                         @click="initAdvice()"
+                         type="primary">医嘱初始化
+              </el-button>
+
+              <el-button size="small"
+                         style="float: right;margin-left: 10px;margin-right: 10px"
                          @click="dialogConfigVisible = true"
                          type="primary">长期医嘱提醒配置
               </el-button>
@@ -172,9 +180,9 @@
 
               <el-table-column prop="blood_flow_volume" align="center" label="提醒频率">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.frequency_type == 1">每次必推</span>
-                  <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
-                  <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+                  <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 1">每次必推</span>
+                  <span v-if="scope.row.advice_type == 1&&scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                  <span v-if="scope.row.advice_type == 1&&scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
                 </template>
               </el-table-column>
 
@@ -276,9 +284,9 @@
 
                   <el-table-column prop="blood_flow_volume" align="center" label="提醒频率" v-if="form.advice_type == 1">
                     <template slot-scope="scope">
-                      <span v-if="scope.row.frequency_type == 1">每次必推</span>
-                      <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
-                      <span v-if="scope.row.frequency_type == 3">每周{{scope.row.weekdays}}</span>
+                      <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 1">每次必推</span>
+                      <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                      <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 3">每周{{scope.row.weekdays}}</span>
                     </template>
                   </el-table-column>
 
@@ -1187,7 +1195,9 @@
     UpdateExecutionFrequency,
     updateTemplateName,
     getDoctorAdviceConfig,
-    postDoctorAdviceConfig
+    postDoctorAdviceConfig,
+    PostInitAdviceTemplate,
+    getDoctorInitConfig,
   } from '@/api/advice'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
@@ -1219,6 +1229,7 @@
         isEdit: false,
         dialogTitle: '',
         is_open_remind:0,
+        is_init:0,
         isAddChild: false,
         parent_id: 0,
         editDialogTitle: '编辑医嘱',
@@ -1242,7 +1253,7 @@
           name: ''
 
         },
-
+        loading:false,
         drugways: [],
         executionFrequencyOptions: [],
         drugdicRules: {
@@ -1350,8 +1361,34 @@
       this.getAdviceConfig()
       this.unitsOption = getDataConfig('hemodialysis', 'units')
       this.getDoctorAdviceConfig()
+      this.getDoctorInitConfig()
     },
     methods: {
+      initAdvice(){
+        this.$confirm('是否进行医嘱初始化操作?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            is_init:1
+          }
+          this.loading = true
+          PostInitAdviceTemplate(params).then(response => {
+            if (response.data.state == 1) {
+                this.is_init = response.data.data.init_config.is_init
+              this.getAdviceConfig()
+              this.loading = false
+
+            } else {
+              this.loading = false
+              this.$message.error(response.data.msg)
+            }
+          })
+        }).catch(() => {
+          this.loading = false
+        });
+      },
       getDoctorAdviceConfig(){
         getDoctorAdviceConfig().then(response => {
           if (response.data.state == 1) {
@@ -1361,6 +1398,20 @@
           }
         })
       },
+      getDoctorInitConfig(){
+        getDoctorInitConfig().then(response => {
+          if (response.data.state == 1) {
+            if(response.data.data.advice_init == null){
+              this.is_init = 0
+            }else{
+              this.is_init = response.data.data.advice_init.is_init
+            }
+
+          } else {
+            this.$message.error(response.data.msg)
+          }
+        })
+      },
       adviceNameShow({ row, column, rowIndex, columnIndex }) {
         if (columnIndex == 1) {
           return 'templateadvicenamedisplay'
@@ -1489,8 +1540,8 @@
             this.$message.success('添加模版成功')
 
             var template = response.data.data.template
-            if (template.DoctorAdviceTemplate.length > 0) {
-              for (let i = 0; i < template.DoctorAdviceTemplate.length; i++) {
+            if (template.advice_templates.length > 0) {
+              for (let i = 0; i < template.advice_templates.length; i++) {
                 const object = {}
                 const DoctorAdviceTemplate = template.DoctorAdviceTemplate[i]
                 for (const key in DoctorAdviceTemplate) {

src/xt_pages/data/prescription.vue

@@ -0,0 +1,901 @@
+<template>
+  <div class="app-container ">
+
+    <div class="dataTitle">透析方案</div>
+
+    <div class="app-container" style="margin-left: -20px;margin-top: -20px" v-loading="pageLoading"
+         element-loading-text="拼命加载中">
+      <el-row :gutter="20">
+        <el-col :span="7">
+          <el-table
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            height="450"
+            :row-style="{ color: '#303133' }"
+            :data="treatment_mode"
+            border
+            style="width: 100%"
+            highlight-current-row
+            :row-class-name="tableRows"
+            @row-click="onRowClicks"
+            ref="singleTable"
+          >
+            <el-table-column
+              label="透析模式"
+              align="center">
+              <template slot-scope="scope">
+                {{ scope.row.name }}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column
+              label="状态"
+              width="80"
+              align="center">
+              <template slot-scope="scope">
+                {{getModeStatus(scope.row.id)}}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="17" v-loading="itemLoading">
+          <div class="filter-container">
+
+            <el-row :gutter="20">
+              <el-col :span="16">
+                <div>{{mode_name}}</div>
+              </el-col>
+              <el-col :span="8">
+                <el-button style="float: right;visibility: hidden" size="small" class="filter-item" type="primary"
+                           icon="el-icon-edit-outline"
+                           @click="openEdit()">修改
+                </el-button>
+              </el-col>
+            </el-row>
+
+
+          </div>
+          <div class="filter-container" style="float:right">
+            <el-form ref="addPlan" :model="addPlan" label-width="160px" style="border: black">
+
+              <el-row :gutter="20">
+                <el-col :span="8">
+                  <el-form-item label="透析时长（h）:" prop="dialysis_duration">
+                    <el-time-picker
+                      v-model="dialysisTimeShow"
+                      :picker-options="{
+                  selectableRange: '00:01:00 - 23:59:00'
+                }"
+                      placeholder="透析时长"
+                      style="width:100%;"
+                      value-format="H:m"
+                      format="H:m"
+                      @change="selectnDialysisTime"
+                    >
+                    </el-time-picker>
+
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="血流量(ml/min):" prop="blood_flow_volume">
+                    <el-input v-model="addPlan.blood_flow_volume" ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id == 6">
+                  <el-form-item label="目标超滤量(ml) : ">
+                    <el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id != 6">
+                  <el-form-item label="目标超滤量(L) : ">
+                    <el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="透析液配方:">
+                    <el-select v-model="addPlan.dialysate_formulation" >
+                      <el-option v-for="(item,index)  in dialysate_formulation" :label="item.name" :key="index"
+                                 :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="抗凝剂:" prop="anticoagulant">
+                    <el-select v-model="addPlan.anticoagulant" @change="changeThisAnticoagulant" >
+                      <el-option v-for="(item,index)  in anticoagulantsConfit" :label="item.name" :key="index"
+                                 :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="anticoagulant.shouji != -1">
+                  <el-form-item :label="'首剂（'+anticoagulant.shouji_unit+'）: '" prop="anticoagulant_shouji">
+                    <el-input v-model="addPlan.anticoagulant_shouji"
+                              :disabled="anticoagulant.shouji==1?false:true" type="number"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="anticoagulant.weichi != -1">
+                  <el-form-item :label="'维持（'+anticoagulant.weichi_unit+'）: '" prop="anticoagulant_weichi">
+                    <el-input v-model="addPlan.anticoagulant_weichi"
+                              :disabled="anticoagulant.weichi==1?false:true" type="number"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="anticoagulant.zongliang != -1">
+                  <el-form-item :label="'总量（'+anticoagulant.zongliang_unit+'）: '" prop="anticoagulant_zongliang">
+                    <el-input v-model="addPlan.anticoagulant_zongliang"
+                              :disabled="anticoagulant.zongliang==1?false:true" type="number"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="anticoagulant.gaimingcheng != -1">
+                  <el-form-item :label="'钙（'+anticoagulant.gaimingcheng_unit+'）: '" prop="anticoagulant_gaimingcheng">
+                    <el-input v-model="addPlan.anticoagulant_gaimingcheng"
+                              :disabled="anticoagulant.gaimingcheng==1?false:true"
+                              placeholder="钙名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="anticoagulant.gaijiliang != -1">
+                  <el-form-item prop="anticoagulant_gaijiliang">
+                    <el-input v-model="addPlan.anticoagulant_gaijiliang"
+                              :disabled="anticoagulant.gaijiliang==1?false:true"
+                              placeholder="钙剂量"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="置换量(L) : " prop="replacement_total">
+                    <el-input v-model="addPlan.replacement_total" type="number"></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="钾（mmol/L）: " prop="kalium">
+                    <el-input v-model="addPlan.kalium" ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="钠（mmol/L）: " prop="sodium">
+                    <el-input v-model="addPlan.sodium" ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="钙（mmol/L）: " prop="calcium">
+                    <el-input v-model="addPlan.calcium" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="透析器/灌流器：">
+                    <el-input v-model="addPlan.dialyzer_perfusion_apparatus" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
+                    <el-input v-model="addPlan.bicarbonate" ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="葡萄糖（mmol/L）: " prop="glucose">
+                    <el-input v-model="addPlan.glucose" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="透析液流量（ml/min）: " prop="dialysate_flow">
+                    <el-input v-model="addPlan.dialysate_flow" ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="透析液温度（℃）: " prop="dialysate_temperature">
+                    <el-input v-model="addPlan.dialysate_temperature" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="电导度（mS/cm）: " prop="conductivity">
+                    <el-input v-model="addPlan.conductivity" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="体液过多症状:">
+                    <el-select v-model="addPlan.body_fluid" >
+                      <el-option v-for="(item,index)  in body_fluid_option" :label="item.name" :key="index"
+                                 :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="体液过多其他症状">
+                    <el-input v-model="addPlan.body_fluid_other" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="透析前使用特殊药物">
+                    <el-select v-model="addPlan.special_medicine" placeholder="请选择" style="width:100%;"
+                               >
+                      <el-option :key="0" label="请选择" :value="0"></el-option>
+                      <el-option v-for="(item,index) in special_medicine_option" :label="item.name" :key="index"
+                                 :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="使用其他特殊药物">
+                    <el-input v-model="addPlan.special_medicine_other" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="置换液："
+                                v-if="current_select == 2 &&this.$store.getters.xt_user.template_info.template_id != 6">
+                    <el-select v-model="addPlan.displace_liqui_part" placeholder="请选择">
+                      <el-option :key="0" label="请选择" :value="0"></el-option>
+                      <el-option v-for="(option, index) in displace_liqui_part_option" :key="index"
+                                 :label="option.name" :value="option.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+
+
+                  <el-form-item label="置换方式："
+                                v-if="current_select == 2 &&this.$store.getters.xt_user.template_info.template_id == 6">
+                    <el-select v-model="addPlan.displace_liqui_part" placeholder="请选择" >
+                      <el-option :key="0" label="请选择" :value="0"></el-option>
+                      <el-option v-for="(option, index) in displace_liqui_part_option" :key="index"
+                                 :label="option.name" :value="option.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+
+                </el-col>
+
+                <el-col :span="8" v-if="current_select == 2">
+                  <el-form-item label="置换液总量(L)">
+                    <el-input v-model="addPlan.displace_liqui_value" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="血管通路：">
+                    <el-select v-model="addPlan.blood_access" placeholder="请选择">
+                      <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                      <el-option v-for="(option, index) in blood_access_option" :key="index"
+                                 :label="option.name" :value="option.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <!-- </el-row>
+                <el-row :gutter="20" > -->
+                <el-col :span="8">
+                  <el-form-item label="实际超滤量(L)">
+                    <el-input v-model="addPlan.ultrafiltration" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+                <el-col :span="8">
+                  <el-form-item label="目标KT/V">
+                    <el-input v-model="addPlan.target_ktv" ></el-input>
+                  </el-form-item>
+                </el-col>
+
+
+              </el-row>
+            </el-form>
+            <el-button style="float: right" size="small" class="filter-item" type="primary"
+                       icon="el-icon-edit-outline"
+                       @click="savePrescription()">保存
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
+  import {
+    getAllSystemPrescription,
+    getSystemPrescription,
+    postSystemPrescription,
+    updateSystemPrescription
+  } from '@/api/config'
+
+  export default {
+    name: 'prescription',
+    components: {},
+
+    data() {
+      return {
+        dialysisTimeShow: new Date(2018, 1, 1, 3, 0),
+        modeOptions: null,
+        current_select: 0,
+        mode_name: 'HD',
+        pageLoading: false,
+        itemLoading: false,
+        treatment_mode: [// 治疗模式
+          {
+            id: 1,
+            name: 'HD',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 2,
+            name: 'HDF',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 3,
+            name: 'HD+HP',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 1,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 4,
+            name: 'HP',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 2,
+            blood_filter: 2,
+            perfusion_apparatus: 1,
+            blood_flow_volume: 1,
+            dialysate_flow: 2,
+            kalium: 2,
+            sodium: 2,
+            calcium: 2,
+            bicarbonate: 2
+          },
+          {
+            id: 5,
+            name: 'HF',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 2,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 6,
+            name: 'SCUF',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 2,
+            kalium: 2,
+            sodium: 2,
+            calcium: 2,
+            bicarbonate: 2
+          },
+          {
+            id: 7,
+            name: 'IUF',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 2,
+            dialysate_flow: 2,
+            kalium: 2,
+            sodium: 2,
+            calcium: 2,
+            bicarbonate: 2
+          },
+          {
+            id: 8,
+            name: 'HFHD',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 9,
+            name: 'HFHD+HP',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 1,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 10,
+            name: 'PHF',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 11,
+            name: 'HFR',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 1,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 12,
+            name: 'HDF+HP',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 1,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 13,
+            name: 'CRRT',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 2,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 14,
+            name: '腹水回输',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 2,
+            dialysate_flow: 2,
+            kalium: 2,
+            sodium: 2,
+            calcium: 2,
+            bicarbonate: 2
+          },
+          {
+            id: 15,
+            name: 'HD前置换',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 16,
+            name: 'HD后置换',
+            dialysis_duration: 1,
+            replacement_way: 2,
+            hemodialysis_machine: 1,
+            blood_filter: 2,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 17,
+            name: 'HDF前置换',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          },
+          {
+            id: 18,
+            name: 'HDF后置换',
+            dialysis_duration: 1,
+            replacement_way: 1,
+            hemodialysis_machine: 2,
+            blood_filter: 1,
+            perfusion_apparatus: 2,
+            blood_flow_volume: 1,
+            dialysate_flow: 1,
+            kalium: 1,
+            sodium: 1,
+            calcium: 1,
+            bicarbonate: 1
+          }
+
+        ],
+        addPlan: {
+          id: 0,
+          mode:'',
+          dialyzer: '',
+          dialysis_duration: '',
+          dialysis_duration_hour: '',
+          dialysis_duration_minute: '',
+          hemodialysis_machine: '',
+          perfusion_apparatus: '',
+          dialysate_formulation:'',
+          blood_flow_volume: '',
+          dewater: '',
+          displace_liqui: 0,
+          replacement_way: '',
+          anticoagulant: '',
+          anticoagulant_shouji: '',
+          anticoagulant_weichi: '',
+          anticoagulant_zongliang: '',
+          anticoagulant_gaimingcheng: '',
+          anticoagulant_gaijiliang: '',
+          kalium: '',
+          replacement_total: '',
+          sodium: '',
+          calcium: '',
+          bicarbonate: '',
+          glucose: '',
+          dry_weight: '',
+          dialysate_flow: '',
+          dialysate_temperature: '',
+          conductivity: '',
+          doctor: '',
+          remark: '',
+          target_ktv: '',
+          target_ultrafiltration: '',
+          dialyzer_perfusion_apparatus: '',
+          body_fluid: '',
+          body_fluid_other: '',
+          special_medicine: '',
+          special_medicine_other: '',
+          displace_liqui_part: '',
+          displace_liqui_value: '',
+          ultrafiltration: '',
+          blood_access: ''
+        },
+        system_prescription: [],
+        isEdit: false,
+        anticoagulant: {
+          id: 0,
+          name: '',
+          type: 1,
+          shouji: 1,
+          weichi: 1,
+          zongliang: 1,
+          gaimingcheng: -1,
+          gaijiliang: -1,
+          shouji_unit: 'mg',
+          weichi_unit: 'mg/h',
+          zongliang_unit: 'mg',
+          gaimingcheng_unit: '',
+          gaijiliang_unit: ''
+        },
+        anticoagulantsSet: {
+          type: 1
+        },
+        replacementWays: null,
+        anticoagulantsConfit: null,
+        dialysate_formulation: [],
+        body_fluid_option: [],
+        special_medicine_option: [],
+        displace_liqui_part_option: [],
+        blood_access_option: []
+
+      }
+    },
+    computed: {},
+    methods: {
+      openEdit() {
+
+      },
+      tableRows({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClicks(row, event, column) {
+        this.current_select = row.id
+        this.mode_name = row.name
+        this.isEdit = false
+        this.addPlan.mode = row.id
+        this.getSystemPrescription(row.id)
+
+      },getSystemPrescription(id){
+
+
+       var tempAddPlan = {
+          id: 0,
+            mode:'',
+            dialyzer: '',
+            dialysis_duration: '',
+            dialysis_duration_hour: '',
+            dialysis_duration_minute: '',
+            hemodialysis_machine: '',
+            dialysate_formulation:'',
+            perfusion_apparatus: '',
+            blood_flow_volume: '',
+            dewater: '',
+            displace_liqui: 0,
+            replacement_way: '',
+            anticoagulant: '',
+            anticoagulant_shouji: '',
+            anticoagulant_weichi: '',
+            anticoagulant_zongliang: '',
+            anticoagulant_gaimingcheng: '',
+            anticoagulant_gaijiliang: '',
+            kalium: '',
+            replacement_total: '',
+            sodium: '',
+            calcium: '',
+            bicarbonate: '',
+            glucose: '',
+            dry_weight: '',
+            dialysate_flow: '',
+            dialysate_temperature: '',
+            conductivity: '',
+            doctor: '',
+            remark: '',
+            target_ktv: '',
+            target_ultrafiltration: '',
+            dialyzer_perfusion_apparatus: '',
+            body_fluid: '',
+            body_fluid_other: '',
+            special_medicine: '',
+            special_medicine_other: '',
+            displace_liqui_part: '',
+            displace_liqui_value: '',
+            ultrafiltration: '',
+            blood_access: ''
+        }
+
+        for (const key in  tempAddPlan) {
+          this.addPlan[key] = tempAddPlan[key]
+        }
+        this.isEdit = false
+        let params ={
+          id:id
+        }
+
+        this.dialysisTimeShow = new Date(2018, 1, 1, this.addPlan.dialysis_duration_hour, this.addPlan.dialysis_duration_minute)
+
+
+        getSystemPrescription(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            if(response.data.data.prescription.id > 0) {
+              for (const key in  response.data.data.prescription) {
+                this.addPlan[key] = response.data.data.prescription[key]
+              }
+
+              this.dialysisTimeShow = new Date(2018, 1, 1, this.addPlan.dialysis_duration_hour, this.addPlan.dialysis_duration_minute)
+              if (this.addPlan.id > 0) {
+                this.isEdit = true
+              }
+            }
+            this.addPlan.mode = id
+          }
+        })
+      },
+      getModeStatus: function(id) {
+        for (let i = 0; i < this.system_prescription.length; i++) {
+          if (this.system_prescription[i].mode_id == id) {
+            return '已保存'
+          }
+        }
+        return '未保存'
+      }, getAllSystemPrescription() {
+        getAllSystemPrescription().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.system_prescription = response.data.data.prescriptions
+            for (let i = 0; i < this.system_prescription.length; i++) {
+              if (this.system_prescription[i].mode == 1) {
+                this.isEdit = true
+              }
+            }
+
+          }
+        })
+
+      }, selectnDialysisTime(val) {
+        var valTime = val.split(':')
+        this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
+        this.addPlan.dialysis_duration_hour = valTime[0]
+        this.addPlan.dialysis_duration_minute = valTime[1]
+      }, changeThisAnticoagulant() {
+        var thismode = parseInt(this.addPlan.anticoagulant)
+        if (isNaN(thismode) || thismode <= 0) {
+          return false
+        }
+        if (typeof (this.anticoagulantsConfit[thismode]) == 'undefined' || this.anticoagulantsConfit[thismode] == null) {
+          return false
+        }
+        this.anticoagulant = this.anticoagulantsConfit[thismode]
+      }, savePrescription:function() {
+        this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString()
+        if (!this.isEdit){
+          postSystemPrescription(this.addPlan).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '创建成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.isEdit = true
+              this.system_prescription = []
+              this.system_prescription = response.data.data.prescriptions
+              this.addPlan.id  =  response.data.data.prescription.id
+              return false
+            }
+          })
+        }else{
+          updateSystemPrescription(this.addPlan.id, this.addPlan).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.isEdit = true
+              this.addPlan.id  =  response.data.data.prescription.id
+              this.$notify({
+                title: '成功',
+                message: '编辑成功',
+                type: 'success',
+                duration: 2000
+              })
+              return false
+            }
+          })
+        }
+      }
+
+    }, mounted() {
+      this.$refs.singleTable.setCurrentRow(this.treatment_mode[0])
+      this.mode_name = this.treatment_mode[0].name
+      this.current_select = this.treatment_mode[0].id
+    },
+    created() {
+      this.anticoagulantsSet = this.$store.getters.anticoagulants_set
+      this.replacementWays = this.$store.getters.replacement_ways
+      this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+      this.blood_filters = this.$store.getters.blood_filters
+      this.dialysate_formulation = this.$store.getters.dialysate_formulation
+      this.body_fluid_option = this.$store.getters.body_fluid
+      this.special_medicine_option = this.$store.getters.special_medicine
+      this.displace_liqui_part_option = this.$store.getters.displace_liqui
+      this.blood_access_option = this.$store.getters.blood_access
+      this.addPlan.mode = 1
+      this.getAllSystemPrescription()
+      this.getSystemPrescription(this.addPlan.mode)
+
+    }, watch: {
+      'addPlan.dialysis_duration': function() {
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        )
+      },
+      'addPlan.anticoagulant_shouji': function() {
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        )
+      },
+      'addPlan.anticoagulant_weichi': function() {
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        )
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

src/xt_pages/dialysis/bloodPresssWatch.1.vue

@@ -1,8 +1,15 @@
 <template>
- <div class="main-contain">
+  <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button size="small" icon="el-icon-printer" :disabled="selecting_schs.length == 0" @click="batchPrintAction" type="primary">打印</el-button>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        icon="el-icon-printer"
+        :disabled="selecting_schs.length == 0"
+        @click="batchPrintAction"
+        type="primary"
+        >打印</el-button
+      >
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -11,7 +18,10 @@
       </div>-->
       <div class="cell clearfix">
         <label class="title">
-          <span class="name">{{ search_mode == 1 ? "日期查询" : "病人查询" }}</span> :
+          <span class="name">{{
+            search_mode == 1 ? "日期查询" : "病人查询"
+          }}</span>
+          :
         </label>
         <el-date-picker
           v-show="search_mode == 1"
@@ -40,73 +50,109 @@
             @click="searchPatientAction"
           ></el-button>
         </el-input>
-        <el-button
-          type="primary"
-          @click="changeSearchMode"
-        >{{ search_mode == 1 ? "改为病人查询" : "改为日期查询" }}</el-button>
+        <el-button type="primary" @click="changeSearchMode">{{
+          search_mode == 1 ? "改为病人查询" : "改为日期查询"
+        }}</el-button>
         <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
       </div>
       <div class="cell clearfix">
-        <label class="title">
-          <span class="name">排班班次</span> :
-        </label>
+        <label class="title"> <span class="name">排班班次</span> : </label>
         <div class="time">
           <ul class>
             <li
-              :class="item.value==schedulType?'active':''"
+              :class="item.value == schedulType ? 'active' : ''"
               @click="selectSchedulType(item.value)"
               v-for="item in schedulArr"
               :key="item.value"
-            >{{item.label}}</li>
+            >
+              {{ item.label }}
+            </li>
           </ul>
         </div>
       </div>
       <div class="cell clearfix">
-        <label class="title">
-          <span class="name">分区</span> :
-        </label>
+        <label class="title"> <span class="name">分区</span> : </label>
         <div class="time">
           <ul class>
             <li
-              :class="item.id==partitionType?'active':''"
+              :class="item.id == partitionType ? 'active' : ''"
               @click="selectPartitionType(item.id)"
               v-for="item in partitionArr"
               :key="item.id"
-            >{{item.name}}</li>
+            >
+              {{ item.name }}
+            </li>
           </ul>
         </div>
       </div>
 
-    <el-table
-      :data="SchedualPatientsTableData"
-      style="width: 100%"
-      v-loading="loading"
-      @current-change="handleSelectionChange"
-      :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      <el-table
+        :data="SchedualPatientsTableData"
+        style="width: 100%"
+        v-loading="loading"
+        @current-change="handleSelectionChange"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
       >
-        <el-table-column type="selection" width="45" align="center"></el-table-column>
-        <el-table-column prop="number" label="机号" align="center"></el-table-column>
-        <el-table-column label="排班日期" prop="sch_time" align="center" width="120"></el-table-column>
-        <el-table-column prop="dialysis_no" label="透析号" align="center"></el-table-column>
-        <el-table-column prop="name" label="姓名" align="center"></el-table-column>
+        <el-table-column
+          type="selection"
+          width="45"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="number"
+          label="机号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          label="排班日期"
+          prop="sch_time"
+          align="center"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          prop="dialysis_no"
+          label="透析号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="姓名"
+          align="center"
+        ></el-table-column>
 
-        <el-table-column prop="mode_name" label="透析模式" align="center"></el-table-column>
+        <el-table-column
+          prop="mode_name"
+          label="透析模式"
+          align="center"
+        ></el-table-column>
 
-        <el-table-column prop="dialysis_before_weight" label="透前体重 (kg)" align="center"></el-table-column>
-        <el-table-column prop="dialysis_after_weight" label="透后体重 (kg)" align="center"></el-table-column>
+        <el-table-column
+          prop="dialysis_before_weight"
+          label="透前体重 (kg)"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="dialysis_after_weight"
+          label="透后体重 (kg)"
+          align="center"
+        ></el-table-column>
         <el-table-column label="透中血压">
-          <el-table-column v-for="(item, index) in labelArr" :key="index" :label="item">
+          <el-table-column
+            v-for="(item, index) in labelArr"
+            :key="index"
+            :label="item"
+          >
             <!-- 数据的遍历  scope.row就代表数据的每一个对象-->
             <template slot-scope="scope">
               <!--<span>{{scope.row.bp[index].value}}</span>-->
-              <span>{{getValue(scope.row.bp[index])}}</span>
+              <span>{{ getValue(scope.row.bp[index]) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
       </el-table>
 
       <el-pagination
-      align="right"
+        align="right"
         @current-change="handleCurrentChange"
         :page-sizes="[10]"
         :page-size="10"
@@ -119,7 +165,6 @@
   </div>
 </template>
 
-
 <script>
 import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { parseTime } from "@/utils";
@@ -129,9 +174,9 @@ export default {
   name: "Patient",
   data() {
     return {
-      crumbs:[
-        {path:false, name:'透析管理'},
-        {path:false, name:'透析监测'},
+      crumbs: [
+        { path: false, name: "透析管理" },
+        { path: false, name: "透析监测" }
       ],
       loading: false,
       time: "",
@@ -226,9 +271,8 @@ export default {
       });
     },
     handleSelectionChange(val) {
-      console.log(val);
       this.selecting_schs = val;
-      console.log(this.selecting_schs,this.selecting_schs.length);
+      console.log(this.selecting_schs, this.selecting_schs.length);
     },
 
     selectSchedulType(scheduleType) {
@@ -278,11 +322,12 @@ export default {
           // console.log(response.data.data)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
             if (response.data.data.schedule[i].patient.id > 0) {
-              let SchedualPatientsTable = {
+              const SchedualPatientsTable = {
                 bp: []
               };
 
-              SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id
+              SchedualPatientsTable["sch_id"] =
+                response.data.data.schedule[i].id;
               SchedualPatientsTable["sch_time_int"] =
                 response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(
@@ -326,7 +371,7 @@ export default {
                 a < response.data.data.schedule[i].monitoring_record.length;
                 a++
               ) {
-                let bp = {};
+                const bp = {};
                 bp["value"] =
                   response.data.data.schedule[i].monitoring_record[
                     a
@@ -372,44 +417,45 @@ export default {
       this.getSchedualPatientList();
     },
     batchPrintAction: function() {
-      var sch_ids = []
+      var sch_ids = [];
       for (let index = 0; index < this.selecting_schs.length; index++) {
-        sch_ids.push(this.selecting_schs[index].sch_id)
+        sch_ids.push(this.selecting_schs[index].sch_id);
       }
-      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
+      console.log("sch_ids", sch_ids);
+      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
       this.$router.push({ path: "/dialysis/print/batch" });
     }
   },
   components: {
-      BreadCrumb
+    BreadCrumb
   }
 };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
-//   margin: 20px;
+  //   margin: 20px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
   }
-  .cqd-dataTitle{
+  .cqd-dataTitle {
     color: #303133;
     font-size: 14px;
-    border-bottom: 2px #E4E7ED solid;
+    border-bottom: 2px #e4e7ed solid;
     height: 36px;
     line-height: 36px;
     margin: 0 0 25px 0;
     position: relative;
   }
   .cqd-dataTitle::before {
-      position: absolute;
-      left: 0;
-      bottom: -2px;
-      content: "";
-      width: 42px;
-      height: 2px;
-      background: #409eff;
+    position: absolute;
+    left: 0;
+    bottom: -2px;
+    content: "";
+    width: 42px;
+    height: 2px;
+    background: #409eff;
   }
   .search-component {
     width: 500px;
@@ -456,4 +502,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -157,68 +157,68 @@
 
 
 <script>
-import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
-import { parseTime } from "@/utils";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getSchedualPatient, GetAllZone } from '@/api/dialysis'
+import { parseTime } from '@/utils'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getPrintTemplate } from '@/api/data'
 
 export default {
-  name: "Patient",
+  name: 'Patient',
   data() {
     return {
-      crumbs:[
-        {path:false, name:'透析管理'},
-        {path:false, name:'透析监测'},
+      crumbs: [
+        { path: false, name: '透析管理' },
+        { path: false, name: '透析监测' }
       ],
       loading: false,
-      time: "",
+      time: '',
 
       search_mode: 1, // 搜索模式 1.日期搜索 2.病人搜索
-      patient_search_keyword: "",
+      patient_search_keyword: '',
 
       SchedualPatientsTableData: [],
       active: true,
       schedulType: 0,
       schedulArr: [
-        { value: 0, label: "全部" },
-        { value: 1, label: "上午" },
-        { value: 2, label: "下午" },
-        { value: 3, label: "晚上" }
+        { value: 0, label: '全部' },
+        { value: 1, label: '上午' },
+        { value: 2, label: '下午' },
+        { value: 3, label: '晚上' }
       ],
-      template_id : 0,
+      template_id: 0,
 
       partitionType: 0,
 
-      labelArr: ['第1次', "第2次", "第3次", "第4次", "第5次", "第6次", "第7次"],
+      labelArr: ['第1次', '第2次', '第3次', '第4次', '第5次', '第6次', '第7次'],
 
       pickerOptions1: {
         shortcuts: [
           {
-            text: "今天",
+            text: '今天',
             onClick(picker) {
-              picker.$emit("pick", new Date());
+              picker.$emit('pick', new Date())
             }
           },
           {
-            text: "昨天",
+            text: '昨天',
             onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
             }
           },
           {
-            text: "一周前",
+            text: '一周前',
             onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
             }
           },
           {
-            text: "清空",
+            text: '清空',
             onClick(picker) {
-              picker.$emit("pick");
+              picker.$emit('pick')
             }
           }
         ]
@@ -230,35 +230,35 @@ export default {
         limit: 10,
         schedul_type: 0,
         partition_type: 0,
-        schedul_time: "",
-        keywords: ""
+        schedul_time: '',
+        keywords: ''
       },
       selecting_schs: [],
       partitionArr: []
-    };
+    }
   },
   created() {
-    var date = new Date();
-    this.time = date;
-    var year = date.getFullYear();
-    var month = date.getMonth() + 1;
-    var day = date.getDate();
+    var date = new Date()
+    this.time = date
+    var year = date.getFullYear()
+    var month = date.getMonth() + 1
+    var day = date.getDate()
     if (month < 10) {
-      month = "0" + month;
+      month = '0' + month
     }
     if (day < 10) {
-      day = "0" + day;
+      day = '0' + day
     }
-    var nowDate = year + "-" + month + "-" + day;
-    var date = new Date(nowDate + " 00:00:00");
-    this.listQuery.schedul_time = date.getTime();
-    this.getAllZone();
-    this.getSchedualPatientList();
-    this.getTemplateInfo();
+    var nowDate = year + '-' + month + '-' + day
+    var date = new Date(nowDate + ' 00:00:00')
+    this.listQuery.schedul_time = date.getTime()
+    this.getAllZone()
+    this.getSchedualPatientList()
+    this.getTemplateInfo()
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
-    getTemplateInfo(){
+    getTemplateInfo() {
       getPrintTemplate().then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
@@ -270,181 +270,182 @@ export default {
       })
     },
     clickCurrent(val) {
-      console.log(val);
+      console.log(val)
       this.$router.push({
-        path: "/dialysis/details",
+        path: '/dialysis/details',
         query: { patient_id: val.patient_id, date: val.sch_time_int }
-      });
+      })
     },
     handleSelectionChange(val) {
-      this.selecting_schs = val;
+      this.selecting_schs = val
     },
 
     selectSchedulType(scheduleType) {
       // alert(scheduleType);/
-      this.schedulType = scheduleType;
-      this.listQuery.schedul_type = scheduleType;
-      this.getSchedualPatientList();
+      this.schedulType = scheduleType
+      this.listQuery.schedul_type = scheduleType
+      this.getSchedualPatientList()
     },
     selectPartitionType(partitionType) {
-      this.partitionType = partitionType;
-      this.listQuery.partition_type = partitionType;
-      this.getSchedualPatientList();
+      this.partitionType = partitionType
+      this.listQuery.partition_type = partitionType
+      this.getSchedualPatientList()
     },
 
     changeTime() {
-      this.listQuery.schedul_time = this.time;
-      this.getSchedualPatientList();
+      this.listQuery.schedul_time = this.time
+      this.getSchedualPatientList()
     },
     getAllZone: function() {
       GetAllZone().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.partitionArr = response.data.data.zone;
-          this.partitionArr.unshift({ id: 0, name: "全部" });
+          this.partitionArr = response.data.data.zone
+          this.partitionArr.unshift({ id: 0, name: '全部' })
         }
-      });
+      })
     },
     getSchedualPatientList: function() {
-      this.loading = true;
+      this.loading = true
       if (this.search_mode == 1) {
-        this.listQuery.keywords = "";
+        this.listQuery.keywords = ''
       } else {
-        this.listQuery.schedul_time = "";
+        this.listQuery.schedul_time = ''
       }
-      this.SchedualPatientsTableData = [];
+      this.SchedualPatientsTableData = []
       getSchedualPatient(this.listQuery).then(response => {
         if (response.data.state == 0) {
-          this.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
+          this.loading = false
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.loading = false;
-          this.total = response.data.data.total;
+          this.loading = false
+          this.total = response.data.data.total
           // console.log(response.data.data)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
             if (response.data.data.schedule[i].patient.id > 0) {
-              let SchedualPatientsTable = {
+              const SchedualPatientsTable = {
                 bp: []
-              };
+              }
 
-              SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id
-              SchedualPatientsTable["sch_time_int"] =
-                response.data.data.schedule[i].schedule_date;
-              SchedualPatientsTable["sch_time"] = parseTime(
+              SchedualPatientsTable['sch_id'] = response.data.data.schedule[i].id
+              SchedualPatientsTable['sch_time_int'] =
+                response.data.data.schedule[i].schedule_date
+              SchedualPatientsTable['sch_time'] = parseTime(
                 response.data.data.schedule[i].schedule_date,
-                "{y}-{m}-{d}"
-              );
-              SchedualPatientsTable["dialysis_no"] =
-                response.data.data.schedule[i].patient.dialysis_no;
-              SchedualPatientsTable["name"] =
-                response.data.data.schedule[i].patient.name;
-              SchedualPatientsTable["number"] =
-                response.data.data.schedule[i].device_number.number;
-              SchedualPatientsTable["gender"] =
-                response.data.data.schedule[i].patient.gender;
-              SchedualPatientsTable["source"] =
-                response.data.data.schedule[i].patient.source;
-              SchedualPatientsTable["patient_id"] =
-                response.data.data.schedule[i].patient_id;
-              SchedualPatientsTable["mode_name"] =
-                response.data.data.schedule[i].treatment_mode.name;
+                '{y}-{m}-{d}'
+              )
+              SchedualPatientsTable['dialysis_no'] =
+                response.data.data.schedule[i].patient.dialysis_no
+              SchedualPatientsTable['name'] =
+                response.data.data.schedule[i].patient.name
+              SchedualPatientsTable['number'] =
+                response.data.data.schedule[i].device_number.number
+              SchedualPatientsTable['gender'] =
+                response.data.data.schedule[i].patient.gender
+              SchedualPatientsTable['source'] =
+                response.data.data.schedule[i].patient.source
+              SchedualPatientsTable['patient_id'] =
+                response.data.data.schedule[i].patient_id
+              SchedualPatientsTable['mode_name'] =
+                response.data.data.schedule[i].treatment_mode.name
               if (
                 response.data.data.schedule[i].assessment_before_dislysis.id > 0
               ) {
-                SchedualPatientsTable["dialysis_before_weight"] =
+                SchedualPatientsTable['dialysis_before_weight'] =
                   response.data.data.schedule[
                     i
-                  ].assessment_before_dislysis.weight_before;
+                  ].assessment_before_dislysis.weight_before
               }
               if (
                 response.data.data.schedule[i].assessment_after_dislysis.id > 0
               ) {
-                SchedualPatientsTable["dialysis_after_weight"] =
+                SchedualPatientsTable['dialysis_after_weight'] =
                   response.data.data.schedule[
                     i
-                  ].assessment_after_dislysis.weight_after;
+                  ].assessment_after_dislysis.weight_after
               }
 
-              SchedualPatientsTable.bp = [];
+              SchedualPatientsTable.bp = []
               for (
                 let a = 0;
                 a < response.data.data.schedule[i].monitoring_record.length;
                 a++
               ) {
-                let bp = {};
-                bp["value"] =
+                const bp = {}
+                bp['value'] =
                   response.data.data.schedule[i].monitoring_record[
                     a
                   ].systolic_blood_pressure.toString() +
-                  "/" +
+                  '/' +
                   response.data.data.schedule[i].monitoring_record[
                     a
-                  ].diastolic_blood_pressure.toString();
+                  ].diastolic_blood_pressure.toString()
 
-                SchedualPatientsTable.bp.unshift(bp);
+                SchedualPatientsTable.bp.unshift(bp)
               }
 
-              this.SchedualPatientsTableData.push(SchedualPatientsTable);
+              this.SchedualPatientsTableData.push(SchedualPatientsTable)
             }
           }
         }
-      });
+      })
     },
     getValue: function(val) {
       if (val != undefined) {
-        return val.value;
+        return val.value
       } else {
-        return "";
+        return ''
       }
     },
 
     handleCurrentChange(val) {
-      this.listQuery.page = val;
-      this.getSchedualPatientList();
+      this.listQuery.page = val
+      this.getSchedualPatientList()
     },
     changeSearchMode: function() {
       if (this.search_mode == 1) {
-        this.search_mode = 2;
+        this.search_mode = 2
       } else {
-        this.search_mode = 1;
+        this.search_mode = 1
       }
     },
     searchPatientAction: function() {
-      this.listQuery.keywords = this.patient_search_keyword;
-      console.log(this.patient_search_keyword);
+      this.listQuery.keywords = this.patient_search_keyword
+      console.log(this.patient_search_keyword)
       if (this.patient_search_keyword.length == 0) {
-        return;
+        return
       }
-      this.getSchedualPatientList();
+      this.getSchedualPatientList()
     },
     handleSizeChange(val) {
       this.listQuery.limit = val
-      this.getSchedualPatientList();
-
+      this.getSchedualPatientList()
     },
     batchPrintAction: function() {
+    // 模板ID为6
       var sch_ids = []
+
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id)
       }
-      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
-      if (this.template_id == 2 ||this.template_id == 0 ){
-        this.$router.push({ path: "/dialysis/print/batch/other" });
-      }else if(this.template_id == 1) {
-        this.$router.push({ path: "/dialysis/print/batch" });
-      }
-      else if(this.template_id == 3) {
-        this.$router.push({ path: "/dialysis/print/batch/three" });
-      }
-      else if(this.template_id == 4) {
-        this.$router.push({ path: "/dialysis/print/batch/four" });
-      } else if (this.template_id == 5  ){
-        this.$router.push({ path: "/dialysis/print/batch/five" });
-      } else if (this.template_id == 6  ){
-        this.$router.push({ path: "/dialysis/print/batch/six" });
+      console.log('第一个', sch_ids)
+      console.log('模板id', this.template_id)
+      this.$store.dispatch('SetBatchPrintDialysisRecordIDs', sch_ids)
+      if (this.template_id == 2 || this.template_id == 0) {
+        this.$router.push({ path: '/dialysis/print/batch/other' })
+      } else if (this.template_id == 1) {
+        this.$router.push({ path: '/dialysis/print/batch' })
+      } else if (this.template_id == 3) {
+        this.$router.push({ path: '/dialysis/print/batch/three' })
+      } else if (this.template_id == 4) {
+        this.$router.push({ path: '/dialysis/print/batch/four' })
+      } else if (this.template_id == 5) {
+        this.$router.push({ path: '/dialysis/print/batch/five' })
+      } else if (this.template_id == 6) {
+        this.$router.push({ path: '/dialysis/print/batch/six' })
       }
     },
     batchPrintActionOne: function() {
@@ -452,13 +453,14 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id)
       }
-      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
-      if (this.template_id == 2 ||this.template_id == 0){
-        this.$router.push({ path: "/dialysis/print/batch/otherone" });
-      }else if(this.template_id == 1) {
-        this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.template_id == 5){
-        this.$router.push({ path: "/dialysis/print/batch/fiveone" });
+      console.log('第二个', sch_ids)
+      this.$store.dispatch('SetBatchPrintDialysisRecordIDs', sch_ids)
+      if (this.template_id == 2 || this.template_id == 0) {
+        this.$router.push({ path: '/dialysis/print/batch/otherone' })
+      } else if (this.template_id == 1) {
+        this.$router.push({ path: '/dialysis/print/batch' })
+      } else if (this.template_id == 5) {
+        this.$router.push({ path: '/dialysis/print/batch/fiveone' })
       }
     },
     batchPrintActionTwo: function() {
@@ -466,20 +468,20 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id)
       }
-      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
-      if (this.template_id == 2 ||this.template_id == 0 ){
-        this.$router.push({ path: "/dialysis/print/batch/othertwo" });
-      }else if(this.template_id == 1){
-        this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.template_id == 5  ){
-        this.$router.push({ path: "/dialysis/print/batch/fivetwo" });
+      this.$store.dispatch('SetBatchPrintDialysisRecordIDs', sch_ids)
+      if (this.template_id == 2 || this.template_id == 0) {
+        this.$router.push({ path: '/dialysis/print/batch/othertwo' })
+      } else if (this.template_id == 1) {
+        this.$router.push({ path: '/dialysis/print/batch' })
+      } else if (this.template_id == 5) {
+        this.$router.push({ path: '/dialysis/print/batch/fivetwo' })
       }
     }
   },
   components: {
-      BreadCrumb
+    BreadCrumb
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -253,7 +253,14 @@ export default {
       default: () => {
         return { id: 0 };
       }
+    },  system_prescribe: {
+      // 系统透析方案
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     },
+
     receiver_treatment_access: {
       // 接诊评估
       type: Object,
@@ -528,14 +535,9 @@ export default {
       lastAssessmentAfterDislysis,
       lastDialysisPrescribe,
       lastDryWeightDislysis,
-      schedual
+      schedual,
+      system_prescribe
     ) {
-      console.log(lastPredialysisEvaluation);
-      console.log(lastMonitorRecord);
-      console.log(lastAssessmentAfterDislysis);
-      console.log(lastDialysisPrescribe);
-      console.log(lastDryWeightDislysis);
-      console.log(schedual);
 
       this.$refs.assessmentBefore.setLastRecord(
         lastPredialysisEvaluation,
@@ -546,7 +548,8 @@ export default {
         lastAssessmentAfterDislysis,
         lastPredialysisEvaluation,
         lastDialysisPrescribe,
-        lastDryWeightDislysis
+        lastDryWeightDislysis,
+        system_prescribe
       );
 
       // this.temp_schedual = schedual

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

@@ -909,7 +909,7 @@
           return true
         }
       },
-      setLastRecord: function(schedual, lastAssessmentAfterDislysis, lastPredialysisEvaluation, lastDialysisPrescribe, lastDryWeightDislysis) {
+      setLastRecord: function(schedual, lastAssessmentAfterDislysis, lastPredialysisEvaluation, lastDialysisPrescribe, lastDryWeightDislysis,system_prescribe) {
         this.treatment_mode = this.$store.getters.treatment_mode
         this.perfusion_apparatus = getDataConfig('hemodialysis', 'perfusion_apparatus')
         this.replacement_ways = getDataConfig('hemodialysis', 'replacement_ways')
@@ -931,17 +931,27 @@
           }
         } else if (this.solution != null && typeof this.solution.id !== 'undefined' && this.solution.id > 0) {
           for (const key in this.solution) {
-            this.dialysisPrescription[key] = this.solution[key]
+            if (key != 'target_ultrafiltration') {
+              this.dialysisPrescription[key] = this.solution[key]
+            }
           }
         } else if (lastDialysisPrescribe != null && typeof lastDialysisPrescribe.id !== 'undefined' && lastDialysisPrescribe.id > 0) {
           for (const key in lastDialysisPrescribe) {
-            this.dialysisPrescription[key] = lastDialysisPrescribe[key]
+            if (key != 'target_ultrafiltration') {
+
+              this.dialysisPrescription[key] = lastDialysisPrescribe[key]
+            }
+          }
+        } else if (system_prescribe != null && typeof system_prescribe.id !== 'undefined' && system_prescribe.id > 0) {
+          for (const key in system_prescribe) {
+            if (key != 'target_ultrafiltration') {
+              this.dialysisPrescription[key] = system_prescribe[key]
+            }
           }
         } else {
           this.dialysisPrescription.mode_id = schedual.mode_id
         }
 
-        console.log(this.dialysisPrescription.anticoagulant)
 
         var thismode = parseInt(this.dialysisPrescription.anticoagulant)
         if (isNaN(thismode) || thismode <= 0) {
@@ -2055,6 +2065,12 @@
                     this.dialysisPrescription[key] = response.data.data.prescription[key]
                   }
                 }
+              } else if (response.data.data.system_prescription != null) { // 临时处方不为空
+                for (const key in response.data.data.system_prescription) {
+                  if (key != 'target_ultrafiltration') {
+                    this.dialysisPrescription[key] = response.data.data.system_prescription[key]
+                  }
+                }
               } else {
                 for (const key in this.dialysisPrescription) { // 临时处方为空
                   if (key != 'target_ultrafiltration') {

src/xt_pages/dialysis/details/index.vue

@@ -59,7 +59,7 @@
         :last_dryWeight_dislysis = "lastDryWeightDislysis"
         :special_premission = "headNurses"
         @assessmentAfterDislysis="assessmentAfterDislysisFunc"
-
+        :system_prescribe = "system_prescribe"
 
 
       >
@@ -314,6 +314,7 @@
         schedual: { id: 0 }, // 患者排班信息
         prescription: { id: 0 }, // 透析处方
         solution: { id: 0 }, // 透析方案
+        system_prescribe:{id:0},
         receiver_treatment_access: { id: 0 }, // 接诊评估
         predialysis_evaluation: { id: 0 }, // 透前评估
         doctor_advices: [], // 临时医嘱
@@ -505,7 +506,10 @@
             var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
 
 
-            this.$refs.nav.setLastRecord(lastPredialysisEvaluation,lastMonitorRecord,lastAssessmentAfterDislysis,lastDialysisPrescribe,lastDryWeightDislysis,schedual)
+            var system_prescribe = resp.data.system_prescribe
+
+
+            this.$refs.nav.setLastRecord(lastPredialysisEvaluation,lastMonitorRecord,lastAssessmentAfterDislysis,lastDialysisPrescribe,lastDryWeightDislysis,schedual,system_prescribe)
 
 
 
@@ -520,7 +524,7 @@
             this.lastDialysisPrescribe = lastDialysisPrescribe
             this.lastDryWeightDislysis = lastDryWeightDislysis
             this.headNurses = headNurses
-
+            this.system_prescribe =  system_prescribe
 
 
 

src/xt_pages/management/components/ManageForm.vue

@@ -38,7 +38,7 @@
             <el-form-item
               label="机位号:"
               v-show="bedShow"
-              required 
+              required
               prop="bed_number"
             >
               <el-select style="width:135px" v-model="form.bed_number">
@@ -52,10 +52,7 @@
             </el-form-item>
 
             <el-form-item label="机位号:" v-show="bedShowTwo">
-              <el-input
-                v-model="forms.beds"
-                style="width:135px"
-              ></el-input>
+              <el-input v-model="forms.beds" style="width:135px"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -88,7 +85,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="设备型号:" required prop="unit_type">
-              <el-input style="width:135px" v-model="form.unit_type"></el-input>
+              <el-select style="width:135px" v-model="form.unit_type">
+                <el-option
+                  v-for="item in this.deviceMode"
+                  :key="item.id"
+                  :label="item.device_mode"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -308,20 +312,33 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="SaveManageInfo('form')" v-show="buttonShow"
+        <el-button
+          type="primary"
+          @click="SaveManageInfo('form')"
+          v-show="buttonShow"
+          >保存</el-button
+        >
+        <el-button
+          type="primary"
+          @click="SaveManageInfoTwo('form')"
+          v-show="buttonShowTwo"
           >保存</el-button
         >
-         <el-button type="primary" @click="SaveManageInfoTwo('form')" v-show="buttonShowTwo"
+        <el-button @click="SaveManageInfoThree('form')" v-show="buttonShowThree"
           >保存</el-button
         >
-        <el-button @click="SaveManageInfoThree('form')" v-show="buttonShowThree">保存</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { getAllSubregion, SaveManageInfo, SaveManageInfoTwo } from '@/api/manage'
+import {
+  getAllSubregion,
+  SaveManageInfo,
+  SaveManageInfoTwo,
+  getAllMode
+} from '@/api/manage'
 const treatmentmodes = [
   'HD',
   'HDF',
@@ -432,7 +449,8 @@ export default {
       disa: true,
       buttonShow: true,
       buttonShowTwo: false,
-      buttonShowThree: false
+      buttonShowThree: false,
+      deviceMode: []
     }
   },
   methods: {
@@ -799,17 +817,24 @@ export default {
           })
         }
       })
+    },
+    getAllMode() {
+      getAllMode().then(response => {
+        var mode = response.data.data.mode
+        this.deviceMode = mode
+        console.log('mode', mode)
+      })
     }
   },
   created() {
     this.getAllSubregion()
+    this.getAllMode()
   }
 }
 </script>
 
 <style lang="scss">
 .el-form-item__label {
-  width: 100px;
   font-size: 14px;
 }
 // .el-form-item {

src/xt_pages/management/components/PlanForm.vue

@@ -14,7 +14,7 @@
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
-                  :label="item.equitment_name"
+                  :label="item.device_mode"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -137,9 +137,9 @@
 </template>
 
 <script>
-import { getAllEquimentName, savePlan, getAllEquitType } from '@/api/manage'
+import { getAllEquimentName, savePlan, getAllEquitType } from "@/api/manage";
 export default {
-  name: 'PlanForm',
+  name: "PlanForm",
   props: {
     equimentid: Number
   },
@@ -147,8 +147,8 @@ export default {
     return {
       dialogVisible: false,
       form: {
-        device_type: '',
-        disinfec_time: '',
+        device_type: "",
+        disinfec_time: "",
         time: [],
         class_time: [],
         way: 0,
@@ -158,130 +158,127 @@ export default {
       },
       value: [],
       timeType: [
-        { id: 1, name: '周一' },
-        { id: 2, name: '周二' },
-        { id: 3, name: '周三' },
-        { id: 4, name: '周四' },
-        { id: 5, name: '周五' },
-        { id: 6, name: '周六' },
-        { id: 7, name: '周日' }
+        { id: 1, name: "周一" },
+        { id: 2, name: "周二" },
+        { id: 3, name: "周三" },
+        { id: 4, name: "周四" },
+        { id: 5, name: "周五" },
+        { id: 6, name: "周六" },
+        { id: 7, name: "周日" }
       ],
       classType: [
-        { id: 1, name: '上午' },
-        { id: 2, name: '下午' },
-        { id: 3, name: '晚上' }
+        { id: 1, name: "上午" },
+        { id: 2, name: "下午" },
+        { id: 3, name: "晚上" }
       ],
       // 机表消毒方式
       disinfectType: [
-        { id: 0, name: '/' },
-        { id: 1, name: '擦拭' },
-        { id: 2, name: '化学消毒' }
+        { id: 0, name: "/" },
+        { id: 1, name: "擦拭" },
+        { id: 2, name: "化学消毒" }
       ],
       // 基表消毒液
       disinfectantType: [
-        { id: 0, name: '/' },
-        { id: 1, name: '0.22%季铵盐' },
-        { id: 2, name: '500mg/l含氯消毒剂' },
-        { id: 3, name: '1000mg/l含氯消毒剂' },
-        { id: 4, name: '1500mg/l含氯消毒剂' }
+        { id: 0, name: "/" },
+        { id: 1, name: "0.22%季铵盐" },
+        { id: 2, name: "500mg/l含氯消毒剂" },
+        { id: 3, name: "1000mg/l含氯消毒剂" },
+        { id: 4, name: "1500mg/l含氯消毒剂" }
       ],
       // 夜路消毒方式
       sterilizeType: [
-        { id: 0, name: '/' },
-        { id: 1, name: '热化学消毒' },
-        { id: 2, name: '化学消毒 + 除钙' },
-        { id: 3, name: '热化学消毒 + 除钙' },
-        { id: 4, name: '热消毒' },
-        { id: 5, name: '化学消毒' },
-        { id: 6, name: '除钙' },
-        { id: 7, name: '清洗' }
+        { id: 0, name: "/" },
+        { id: 1, name: "热化学消毒" },
+        { id: 2, name: "化学消毒 + 除钙" },
+        { id: 3, name: "热化学消毒 + 除钙" },
+        { id: 4, name: "热消毒" },
+        { id: 5, name: "化学消毒" },
+        { id: 6, name: "除钙" },
+        { id: 7, name: "清洗" }
       ],
       // 夜路消毒液
       fluidPathType: [
-        { id: 0, name: '/' },
-        { id: 1, name: '20%柠檬酸' },
-        { id: 2, name: '25%柠檬酸' },
-        { id: 3, name: '50%柠檬酸' },
-        { id: 4, name: '50%柠檬酸 + 5%次氯酸钠' },
-        { id: 5, name: '20%柠檬酸 + 10%冰醋酸' },
-        { id: 6, name: '0.2%过氧化乙酸' },
-        { id: 7, name: '10%冰醋酸' },
-        { id: 8, name: '50%冰醋酸' },
-        { id: 9, name: '5%次氯酸钠' }
+        { id: 0, name: "/" },
+        { id: 1, name: "20%柠檬酸" },
+        { id: 2, name: "25%柠檬酸" },
+        { id: 3, name: "50%柠檬酸" },
+        { id: 4, name: "50%柠檬酸 + 5%次氯酸钠" },
+        { id: 5, name: "20%柠檬酸 + 10%冰醋酸" },
+        { id: 6, name: "0.2%过氧化乙酸" },
+        { id: 7, name: "10%冰醋酸" },
+        { id: 8, name: "50%冰醋酸" },
+        { id: 9, name: "5%次氯酸钠" }
       ],
       DeviceType: [],
       planid: 0,
       plandata: 0
-    }
+    };
   },
   methods: {
     open: function() {
-      this.dialogVisible = true
+      this.dialogVisible = true;
     },
     getAllEquimentName() {
       getAllEquimentName().then(response => {
         if (response.data.state === 1) {
-          var equit = response.data.data.equit
+          var equit = response.data.data.equit;
           // console.log('equit', equit);
           // this.DeviceType = equit;
         }
-      })
+      });
     },
     savePlan(formName) {
-      var equimentid = this.equimentid
+      var equimentid = this.equimentid;
       // console.log('equimentid', equimentid);
-      var devicetype = this.form.device_type
-      var devicetypes = parseInt(devicetype)
-      this.form.device_type = devicetypes
+      var devicetype = this.form.device_type;
+      var devicetypes = parseInt(devicetype);
+      this.form.device_type = devicetypes;
 
-      var ways = this.form.way
-      var way = parseInt(ways)
-      this.form.way = way
+      var ways = this.form.way;
+      var way = parseInt(ways);
+      this.form.way = way;
 
-      var machinedisinfectant = this.form.machine_disinfectant
-      var machinedisinfectants = parseInt(machinedisinfectant)
-      this.form.machine_disinfectant = machinedisinfectants
+      var machinedisinfectant = this.form.machine_disinfectant;
+      var machinedisinfectants = parseInt(machinedisinfectant);
+      this.form.machine_disinfectant = machinedisinfectants;
 
-      var disinfectantways = this.form.disinfectant_way
-      var disinfectantway = parseInt(disinfectantways)
-      this.form.disinfectant_way = disinfectantway
+      var disinfectantways = this.form.disinfectant_way;
+      var disinfectantway = parseInt(disinfectantways);
+      this.form.disinfectant_way = disinfectantway;
 
-      var disinfectants = this.form.disinfectant
-      var disinfectant = parseInt(disinfectants)
-      this.form.disinfectant = disinfectant
+      var disinfectants = this.form.disinfectant;
+      var disinfectant = parseInt(disinfectants);
+      this.form.disinfectant = disinfectant;
       savePlan(this.form, this.equimentid).then(response => {
         if (response.data.state === 1) {
-          var msg = response.data.data.msg
+          var msg = response.data.data.msg;
           // console.log('msg', msg);
-          this.$message.success('保存成功')
-          this.dialogVisible = false
-          this.$emit('getAllPlan')
-          this.$emit('getAllPlanDetail')
+          this.$message.success("保存成功");
+          this.dialogVisible = false;
+          this.$emit("getAllPlan");
+          this.$emit("getAllPlanDetail");
           // 如果保存成功通过状态值改变父组键表格的值
-          this.plandata = 1
-          this.$emit('func', this.plandata)
+          this.plandata = 1;
+          this.$emit("func", this.plandata);
         } else {
-          this.$message.error('该消毒计划已存在')
+          this.$message.error("该消毒计划已存在");
         }
-      })
+      });
     },
     getAllEquitType() {
       getAllEquitType().then(response => {
         if (response.data.state === 1) {
-          var equitname = response.data.data.equitname
-          var name = response.data.data.name
-          console.log('name', name)
-          // console.log('equitname', equitname)
-          this.DeviceType = equitname
+          var equitname = response.data.data.mode;
+          this.DeviceType = equitname;
         }
-      })
+      });
     }
   },
   created() {
-    this.getAllEquimentName()
-    this.getAllEquitType()
+    this.getAllEquimentName();
+    this.getAllEquitType();
   }
-}
+};
 </script>
 
 <style scoped></style>

src/xt_pages/management/components/RemanderForm.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <el-dialog
-      title="使用登记系统自动录取数据开启提醒"
+      title="设备使用记录自动生成配置"
       :visible.sync="dialogVisible"
       width="30%"
       center
     >
       <el-form :model="randerform" ref="randerform">
         <el-row>
-          <el-form-item label="开启提醒:">
+          <el-form-item label="是否开启:">
             <el-radio-group v-model="randerform.run" @change="changeRun">
               <el-radio
                 :label="gender.id"
@@ -27,15 +27,15 @@
 
 <script>
 // eslint-disable-next-line no-unused-vars
-import { changeRun, getRemanderData } from '@/api/manage'
+import { changeRun, getRemanderData } from "@/api/manage";
 export default {
-  name: 'RemanderForm',
+  name: "RemanderForm",
   data() {
     return {
       dialogVisible: false,
       Option: [
-        { id: 1, name: '是' },
-        { id: 2, name: '否' }
+        { id: 1, name: "是" },
+        { id: 2, name: "否" }
       ],
       randerform: {
         run: 2
@@ -44,39 +44,39 @@ export default {
   },
   methods: {
     open: function() {
-      this.dialogVisible = true
+      this.dialogVisible = true;
     },
     changeRun(id) {
       // eslint-disable-next-line no-undef
       changeRun(id).then(response => {
         if (response.data.state === 1) {
-          var id = response.data.data.id
+          var id = response.data.data.id;
           // eslint-disable-next-line eqeqeq
           if (id == 1) {
-            this.$message.success('开启成功')
+            this.$message.success("开启成功");
           }
           // eslint-disable-next-line eqeqeq
           if (id == 2) {
-            this.$message.success('关闭成功')
+            this.$message.success("关闭成功");
           }
         }
-      })
+      });
     },
     getRemanderData() {
       getRemanderData().then(response => {
         // eslint-disable-next-line eqeqeq
         if (response.data.state == 1) {
-          var remander = response.data.data.remander
-          //console.log('remander=================小夏', remander)
-          this.randerform.run = remander.is_run
+          var remander = response.data.data.remander;
+          // console.log('remander=================小夏', remander)
+          this.randerform.run = remander.is_run;
         }
       });
     }
   },
   created() {
-    this.getRemanderData()
+    this.getRemanderData();
   }
-}
+};
 </script>
 
 <style scoped></style>

src/xt_pages/management/components/RepairForm.vue

@@ -1,15 +1,7 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="2">
-        <el-checkbox v-model="checkAllStatus" @change="changeCheck"
-          >全选</el-checkbox
-        >
-      </el-col>
-      <el-col :span="2" class="a">
-        <el-button size="small" @click="BatchDelete">批量删除</el-button>
-      </el-col>
-      <el-col :span="4" class="a">
+    <el-row class="row">
+      <el-col :span="4">
         <span class="machineClass">机号:</span>
         <el-select style="width:100px" v-model="forms.bed">
           <el-option
@@ -20,7 +12,7 @@
           ></el-option>
         </el-select>
       </el-col>
-      <el-col :span="10" class="a">
+      <el-col :span="11">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
           v-model="forms.start_time"
@@ -46,6 +38,16 @@
         <el-button @click="queryRepair()">查询</el-button>
       </el-col>
     </el-row>
+    <el-row>
+        <el-col :span="2">
+        <el-checkbox v-model="checkAllStatus" @change="changeCheck"
+          >全选</el-checkbox
+        >
+      </el-col>
+      <el-col :span="2" class="a">
+        <el-button size="small" @click="BatchDelete">批量删除</el-button>
+      </el-col>
+    </el-row>
     <el-row>
       <el-table
         ref="multipleTable"
@@ -63,7 +65,7 @@
           width="55"
         ></el-table-column>
         <el-table-column prop="date" label="机号" width="80" align="center">
-          <template slot-scope="scope">{{ scope.row.bed_number}}</template>
+          <template slot-scope="scope">{{ scope.row.bed_number }}</template>
         </el-table-column>
         <el-table-column
           prop="name"
@@ -357,15 +359,17 @@
                 action="https://upload.qiniup.com"
                 :on-success="handleSuccess"
                 :before-upload="beforeUploadFile"
-                multiple
-                :on-preview="handlePreview"
                 :limit="1"
-                :on-exceed="handleExceed"
+                ref="upload"
               >
                 <el-button size="small" type="primary">上传图片</el-button>
-              </el-upload>            
+              </el-upload>
             </el-form-item>
-            <a>{{this.guaForm.images}}</a>
+            <a class="el-upload-list__item-name">
+              <i
+                ><a @click="toLink()">{{ filename }}</a></i
+              >
+            </a>
           </el-col>
         </el-row>
         <el-row>
@@ -445,7 +449,8 @@ export default {
         images: '',
         exclude: '',
         reason: '',
-        code_information: ''
+        code_information: '',
+        image_name: ''
       },
       isIndeterminate: false,
       checkAllStatus: false,
@@ -472,7 +477,8 @@ export default {
       filename: '',
       limit: 10,
       page: 1,
-      total: 0
+      total: 0,
+      filename: ''
     }
   },
   methods: {
@@ -561,6 +567,7 @@ export default {
       EditRepair(id).then(response => {
         if (response.data.state === 1) {
           var repair = response.data.data.repair
+          console.log('repair', repair)
           this.guaForm.guarantee_date = uParseTime(
             repair.guarantee_date,
             '{y}-{m}-{d}'
@@ -587,14 +594,20 @@ export default {
           this.guaForm.reason = repair.reason
           this.guaForm.code_information = repair.code_information
           this.guaForm.id = repair.id
+          this.filename = repair.image_name
         }
       })
     },
     handleSuccess(res, file, fileList) {
       this.guaForm.images = this.qiniuDomain + res.url
       console.log('图片上传', this.guaForm.images)
+      this.$refs.upload.clearFiles()
+      this.filename = file.name
+      this.guaForm.image_name = file.name
     },
     beforeUploadFile(file) {
+      this.filename = file.name
+      this.guaForm.image_name = file.name
       const isLt2M = file.size / 1024 / 1024 <= 2048
       console.log('filename', file)
       // console.log('视频大小', file.size / 1024 / 1024)
@@ -634,11 +647,23 @@ export default {
           })
       })
     },
+    toLink() {
+      window.location.href = this.guaForm.images
+    },
     UpdateRepair(formName) {
       this.$refs[formName].validate(valid => {
-        this.guaForm.start_time = uParseTime(this.guaForm.start_time, '{y}-{m}-{d} {h}:{i}')
-        this.guaForm.arrive_time = uParseTime(this.guaForm.arrive_time, '{y}-{m}-{d} {h}:{i}')
-        this.guaForm.finish_time = uParseTime(this.guaForm.finish_time, '{y}-{m}-{d} {h}:{i}')
+        this.guaForm.start_time = uParseTime(
+          this.guaForm.start_time,
+          '{y}-{m}-{d} {h}:{i}'
+        )
+        this.guaForm.arrive_time = uParseTime(
+          this.guaForm.arrive_time,
+          '{y}-{m}-{d} {h}:{i}'
+        )
+        this.guaForm.finish_time = uParseTime(
+          this.guaForm.finish_time,
+          '{y}-{m}-{d} {h}:{i}'
+        )
 
         if (this.guaForm.failure_stage === '') {
           this.guaForm.failure_stage = 0
@@ -747,4 +772,8 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+  .row{
+    margin-bottom:10px;
+  }
+</style>

src/xt_pages/management/home.vue

@@ -9,7 +9,7 @@
                  <el-row>
                    <el-col :span="24">
                      <span class="zone">分&nbsp;&nbsp;&nbsp;&nbsp;区:</span>
-                      <el-select v-model="forms.zone_id" placeholder="请选择" class="a" @change="changeBedNumber" style="width:125px">
+                      <el-select v-model="forms.zone_id" placeholder="请选择" class="a" @change="changeBedNumber" style="width:125px" :disabled="zoneDisabled">
                         <el-option
                          v-for="item in bedZone"
                          :key="item.id"
@@ -20,19 +20,19 @@
                       </el-select>
                      </el-col>
                   </el-row>
-                  <el-row>
-                   <el-col>
-                    <span class="zone">班&nbsp;&nbsp;&nbsp;&nbsp;次:</span>
-                      <el-select v-model="forms.class_id" placeholder="请选择" class="a" @change="changeClassId" style="width:125px">
-                        <el-option
-                         v-for="item in Classes"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-                        </el-option>
-                      </el-select>
-                     </el-col>
-                  </el-row>
+<!--                  <el-row>-->
+<!--                   <el-col>-->
+<!--                    <span class="zone">班&nbsp;&nbsp;&nbsp;&nbsp;次:</span>-->
+<!--                      <el-select v-model="forms.class_id" placeholder="请选择" class="a" @change="changeClassId" style="width:125px">-->
+<!--                        <el-option-->
+<!--                         v-for="item in Classes"-->
+<!--                         :key="item.id"-->
+<!--                         :label="item.name"-->
+<!--                         :value="item.id">-->
+<!--                        </el-option>-->
+<!--                      </el-select>-->
+<!--                     </el-col>-->
+<!--                  </el-row>-->
                   <el-row>
                      <el-col>
                      <span>设备类型:</span>
@@ -53,7 +53,7 @@
                           highlight-current-row
                            border
                           @current-change="handleCurrentChange"
-                           height="1050"
+                           height="440"
                         >
                      <el-table-column
                        prop="date"
@@ -62,7 +62,7 @@
                       align="center"
                       >
                       <template slot-scope="scope">
-                         <div @click="handleIndex(scope.$index)">{{scope.row.device_name}}</div> 
+                         <div @click="handleIndex(scope.$index)">{{scope.row.device_name}}</div>
                       </template>
                     </el-table-column>
                      <el-table-column
@@ -71,7 +71,7 @@
                       width="90"
                       align="center">
                       <template slot-scope="scope">
-                        <div @click="handleIndex(scope.$index)">{{scope.row.unit_type}}</div> 
+                        <div @click="handleIndex(scope.$index)">{{scope.row.device_mode}}</div>
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -152,7 +152,14 @@
                              <el-row>
                                <el-col :span="7">
                                    <el-form-item label="设备型号:" required prop="unit_type">
-                                       <el-input style="width:150px" v-model="form.unit_type" :disabled="disableThree"></el-input>
+                                        <el-select style="width:135px" v-model="form.unit_type" :disabled="disableThree">
+                                           <el-option
+                                             v-for="item in this.deviceMode"
+                                             :key="item.id"
+                                             :label="item.device_mode"
+                                             :value="item.id"
+                                           ></el-option>
+                                          </el-select>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="7">
@@ -353,7 +360,14 @@
                              <el-row>
                                <el-col :span="7">
                                    <el-form-item label="设备型号:" required prop="unit_type">
-                                       <el-input style="width:150px" v-model="form.unit_type" :disabled="disableFour"></el-input>
+                                       <el-select style="width:135px" v-model="form.unit_type" :disabled="disableFour">
+                                        <el-option
+                                            v-for="item in this.deviceMode"
+                                            :key="item.id"
+                                            :label="item.device_mode"
+                                            :value="item.id"
+                                             ></el-option>
+                                           </el-select>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="7">
@@ -563,9 +577,16 @@
                               <el-row>
                                <el-col :span="7">
                                    <el-form-item label="设备型号:" required prop="unit_type">
-                                       <el-input style="width:150px" v-model="form.unit_type" :disabled="disableFive"></el-input>
-                                   </el-form-item>
-                               </el-col>
+                                       <el-select style="width:135px" v-model="form.unit_type" :disabled="disableFive">
+                                        <el-option
+                                            v-for="item in this.deviceMode"
+                                            :key="item.id"
+                                            :label="item.device_mode"
+                                            :value="item.id"
+                                             ></el-option>
+                                           </el-select>
+                                       </el-form-item>
+                                    </el-col>
                                <el-col :span="7">
                                   <el-form-item label="使用科室:">
                                        <el-input style="width:150px" v-model="form.use_section" :disabled="disableFive"></el-input>
@@ -779,7 +800,7 @@
                                                     {{scope.row.disinfec_time}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="操作" align="center" min-width="120px">
+                                         <el-table-column label="操作" align="center" min-width="130px">
                                              <template slot-scope="scope">
                                                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                                                   <el-button
@@ -827,7 +848,7 @@
                                         <el-table-column align="center" type="selection" width="55"></el-table-column>
                                         <el-table-column label="型号" align="center" min-width="70px">
                                                 <template slot-scope="scope">
-                                                    {{scope.row.equitment_name}}
+                                                    {{scope.row.device_mode}}
                                                  </template>
                                         </el-table-column>
                                          <el-table-column label="时间" align="center" min-width="70px" >
@@ -865,7 +886,7 @@
                                                     {{scope.row.disinfec_time}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="操作" align="center" min-width="130px">
+                                         <el-table-column label="操作" align="center" width="130px">
                                              <template slot-scope="scope">
                                                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                                                   <el-button
@@ -901,7 +922,7 @@
 
                    <el-tab-pane label="使用登记" name="third">
                        <div class="userbutton">
-                          <el-button @click="ToReminders">使用登记提醒配置</el-button>
+                          <el-button @click="ToReminders">自动生成使用登记</el-button>
                        </div>
                      <div v-show="UserShow">
                         <el-tabs v-model="activeNameThree" @tab-click="handleClick">
@@ -910,7 +931,7 @@
                              <el-form :model="userform" ref="userform" :rules="userRules">
                                 <el-row>
                                   <el-col :span="8">
-                                     <el-form-item label="日期:" required prop="date">
+                                     <el-form-item label="日期:" required prop="date" class="st">
                                          <el-date-picker
                                            v-model="userform.date"
                                            prefix-icon="none"
@@ -923,7 +944,7 @@
                                      </el-form-item>
                                   </el-col>
                                   <el-col :span="8">
-                                     <el-form-item label="班次:" required prop="classtype">
+                                     <el-form-item label="班次:" required prop="classtype" class="st">
                                        <el-select v-model="userform.classtype" placeholder="请选择" class="a" @change="ChangeClass">
                                            <el-option
                                             v-for="item in classType"
@@ -1251,7 +1272,7 @@
                                          <el-radio-group v-model="userform.dialysis_concentration">
                                                 <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in potency" :key="index">{{gender.name}}</el-radio>
                                          </el-radio-group>
-                                      
+
                                       </el-form-item>
                                    </el-col>
                                 </el-row>
@@ -1315,7 +1336,7 @@
                                   </div>
                                 </el-row>
                              </el-form>
-                             
+
                           </el-tab-pane>
                            <el-tab-pane label="使用登记列表" name="second">
                              <user-form ref="userForm" :userdata="userdata"></user-form>
@@ -1818,11 +1839,13 @@
                                       action="https://upload.qiniup.com"
                                       :on-success="handleSuccess"
                                       :before-upload="beforeUploadFile"
-                                       :limit="1">
+                                      :limit="1"
+                                      ref='upload'
+                                      >
                                         <el-button size="small" type="primary">上传图片</el-button>
                                       </el-upload>
                                      <a class="el-upload-list__item-name">
-                                        <i><a href="guaForm.images">{{filename}}</a></i>
+                                        <i><a @click="toLink()">{{filename}}</a></i>
                                      </a>
                                   </el-form-item>
                                </el-col>
@@ -1909,7 +1932,7 @@
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
-                  :label="item.equitment_name"
+                  :label="item.device_mode"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -2028,7 +2051,7 @@
   import { getAllSubregion, getAllMachine, getMachineDetailById,
     UpdateMachineInfo, getAllPlan, getAllPlanDetail, DeletePlans,
     getAllEquimentName, EditPlanDetail, UpdatePlanInfo, SaveInformation, getPatientInfo,
-    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -2155,9 +2178,9 @@ export default {
         bedZone: [],
         bedZoneTwo: [],
         forms: {
-          zone_id: '', // 分区号
+          zone_id: 0, // 分区号
           class_id: '', // 班次
-          device_type: '', // 设备类型
+          device_type: 0, // 设备类型
           date: ''
         },
         currentRow: null,
@@ -2469,8 +2492,10 @@ export default {
           images: '',
           exclude: '',
           reason: '',
-          code_information: ''
+          code_information: '',
+          imageName: ''
         },
+
         filename: '',
         qiniuDomain: 'https://images.shengws.com/',
         uploadFileData: { token: '', key: '' },
@@ -2502,7 +2527,11 @@ export default {
           { id: 1, name: '单级反渗' },
           { id: 2, name: '双级反渗' }
         ],
-        tabIndex: ''
+        tabIndex: '',
+        deviceMode: [],
+        zoneDisabled: false,
+        bedid: '',
+        unitType: ''
       }
     },
     methods: {
@@ -2578,7 +2607,7 @@ export default {
           this.bedZoneTwo = zones
           this.bedZoneThree = zoness
           this.bedNumber = numbers
-  
+
           // this.Number = devicenumber
         })
       },
@@ -2592,13 +2621,19 @@ export default {
         this.getAllMachine()
       },
       changeDeviceId(val) {
+        if (val === 1) {
+          this.zoneDisabled = false
+        } else {
+          this.zoneDisabled = true
+        }
         this.forms.device_type = val
         this.getAllMachine()
       },
       getAllMachine() {
-        getAllMachine(this.forms.zone_id, this.forms.class_id, this.forms.device_type).then(response => {
+        getAllMachine(this.forms.zone_id, this.forms.device_type).then(response => {
           if (response.data.state === 1) {
             var addmahcer = response.data.data.addmahcer
+            console.log('addmacher是', addmahcer)
             this.tableDatatwo = addmahcer
             this.tabIndex = this.$route.query.index
             this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
@@ -2609,13 +2644,14 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
+        this.unitType = val.unit_type
         // console.log('val是什么', val)
         this.currentRow = val
         this.$forceUpdate()
         this.getMachineDetailById(val.id)
         this.equimentid = val.id
         this.userdata = val.id
-        this.getAllPlanDetail(val.unit_type)
+        this.getAllPlanDetail(val.unit_type, val.bed_id)
         this.getPatientInfo(val.id)
         // 获取基本信息
         this.getUserRegister(val.id)
@@ -2635,20 +2671,20 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
-            console.log('addmacher', addmacher)
+            console.log('设备详情', addmacher)
             var warning = response.data.data.warning
-            console.log('warning', warning)
+            // console.log('warning', warning)
             var time = this.getTimestamp(this.userform.date) - warning.stime
-            console.log('时间', time)
+            // console.log('时间', time)
             if (time < 2678400 && warning.dialysis_checked === 1) {
               this.warnShow = false
             } else {
               this.warnShow = true
             }
             var germ = response.data.data.germ
-            console.log('germ', germ)
+            // console.log('germ', germ)
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
-            console.log('时间', timetwo)
+            // console.log('时间', timetwo)
             if (timetwo < 2678400 && germ.germ_checked === 1) {
               this.warnShowTwo = false
             } else {
@@ -2656,7 +2692,7 @@ export default {
             }
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
-            console.log('时间', timethree)
+            // console.log('时间', timethree)
             if (timethree < 2678400 && clean.clean === 1) {
               this.warnShowThree = false
             } else {
@@ -2771,7 +2807,10 @@ export default {
             this.form.device_name = addmacher.device_name
             this.form.manufacture_factory = addmacher.manufacture_factory
             this.form.service_manufacturer = addmacher.service_manufacturer
-            this.form.unit_type = addmacher.unit_type
+
+            // this.form.unit_type = addmacher.unit_type
+  
+            this.form.unit_type = parseInt(addmacher.device_mode)
             this.form.use_section = addmacher.use_section
             this.form.section_number = addmacher.section_number
             if (addmacher.buy_date !== 0) {
@@ -2798,7 +2837,7 @@ export default {
             this.form.rubbish_reason = addmacher.rubbish_reason
             this.form.user_year = addmacher.user_year
             this.form.work_time = addmacher.work_time
-  
+
             // eslint-disable-next-line eqeqeq
             if (addmacher.disinfection_mode == 0) {
               this.form.Disinfection_mode = 0
@@ -2898,7 +2937,7 @@ export default {
         this.form.bed_number = bed_numberss
         this.$refs[formName].validate(valid => {
           UpdateMachineInfo(this.form).then(response => {
-            console.log('form', this.form)
+            // console.log('form', this.form)
             if (response.data.state === 1) {
               var addmacher = response.data.data.addmacher
               this.$message.success('修改成功')
@@ -2929,7 +2968,7 @@ export default {
         var machine_status = this.form.machine_status
         var machine_statuss = parseInt(machine_status)
         this.form.machine_status = machine_statuss
-  
+
         var revers_mode = this.form.revers_mode
         var revers_modes = parseInt(revers_mode)
         this.form.revers_mode = revers_modes
@@ -2937,7 +2976,7 @@ export default {
         var disinfecction_modes = this.form.Disinfection_mode
         var disinfecction_modess = parseInt(disinfecction_modes)
         this.form.Disinfection_mode = disinfecction_modess
-  
+
         this.$refs[formName].validate(valid => {
           if (valid) {
             UpdateMachineInfoTwo(this.form).then(response => {
@@ -2968,7 +3007,7 @@ export default {
         var machine_status = this.form.machine_status
         var machine_statuss = parseInt(machine_status)
         this.form.machine_status = machine_statuss
-  
+
         this.$refs[formName].validate(valid => {
           UpdateMacheineTwo(this.form).then(response => {
             if (response.data.state === 1) {
@@ -3031,11 +3070,11 @@ export default {
           this.form.rubbish_reason = ''
         }
       },
-      getAllPlan() {
-        getAllPlan().then(response => {
+      getAllPlan(bedid) {
+        getAllPlan(bedid).then(response => {
           if (response.data.state === 1) {
             var plan = response.data.data.plan
-  
+
             for (let index = 0; index < plan.length; index++) {
               if (plan[index].time === 1) {
                 plan[index].time = '周一'
@@ -3165,11 +3204,11 @@ export default {
           }
         })
       },
-      getAllPlanDetail(unit_type) {
-        getAllPlanDetail(unit_type).then(response => {
+      getAllPlanDetail(unit_type, bedid) {
+        getAllPlanDetail(unit_type, bedid).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
-            // console.log('plandetail=====================', plandetail)
+            console.log('plandetail', plandetail)
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -3313,6 +3352,7 @@ export default {
             this.machineform.machine_disinfectant = plan.machine_disinfectant
             this.machineform.disinfectant_way = plan.disinfectan_way
             this.machineform.disinfectant = plan.disinfectant
+            this.getPatientDetail(this.unitType, this.$route.query.bedid)
           }
         })
       },
@@ -3349,12 +3389,12 @@ export default {
         var disinfectant = parseInt(disinfectants)
         this.machineform.disinfectant = disinfectant
         UpdatePlanInfo(this.machineform).then(response => {
-          if (response.data.state == 1) {
+          if (response.data.state === 1) {
             var plan = response.data.data.plan
             this.dialogVisible = false
             this.$message.success('修改成功')
-            this.getAllPlanDetail(this.equimentid)
-            this.getAllPlan()
+            this.getAllPlanDetail(this.unitType, this.$route.query.bedid)
+            this.getAllPlan(this.$route.query.bedid)
           }
         })
       },
@@ -3509,7 +3549,7 @@ export default {
         ChangeClass(this.equimentid, id).then(response => {
           if (response.data.state === 1) {
             var patients = response.data.data.patients
-  
+
             if (patients.is_infectious === 0) {
               this.userform.contagion = ''
             }
@@ -3656,14 +3696,14 @@ export default {
         var hyperfiltratio = this.userform.hyperfiltratio
         var hyperfiltratios = parseInt(hyperfiltratio)
         this.userform.hyperfiltratio = hyperfiltratios
-  
+
         if (this.userform.weight_loss === '') {
           this.userform.weight_loss = 0
         }
         var weightloss = this.userform.weight_loss
         var weidht = parseInt(weightloss)
         this.userform.weight_loss = weidht
-  
+
         if (this.userform.user_total === '0') {
           this.userform.user_total = 0
         }
@@ -3687,6 +3727,9 @@ export default {
           }
         })
       },
+      toLink() {
+        window.location.href = this.guaForm.images
+      },
       // changStartTime(val) {
       //   this.userform.starttime = val
       // },
@@ -3727,9 +3770,9 @@ export default {
             // console.log('role', role)
             // eslint-disable-next-line eqeqeq
             var dislysis = response.data.data.dislysis
-  
+
             this.userform.id = information.id
-            if (information.date == 0) {
+            if (information.date === 0) {
               this.userform.date = moment(new Date()).format('YYYY-MM-DD')
             } else {
               this.userform.date = uParseTime(information.date, '{y}-{m}-{d}')
@@ -3790,7 +3833,7 @@ export default {
             this.userform.dialysis_name = information.dialysis_name
             this.userform.norms = information.norms
             this.userform.dialysis_concentration = information.dialysis_concentration
-  
+
             if (information.germ_checked === 0) {
               this.userform.germ_checked = false
             }
@@ -3802,7 +3845,7 @@ export default {
             if (information.germ_checked === 1) {
               this.userform.germ_checked = true
             }
-  
+
             this.userform.germ_name = information.germ_name
             this.userform.germ_number = information.germ_number
             if (information.clean === 1) {
@@ -3994,6 +4037,7 @@ export default {
       },
       beforeUploadFile(file) {
         this.filename = file.name
+        this.guaForm.imageName = file.name
         const isLt2M = file.size / 1024 / 1024 <= 2048
         var date = new Date()
         var ext = getFileExtension(file.name)
@@ -4014,7 +4058,10 @@ export default {
       },
       handleSuccess(res, file, fileList) {
         this.guaForm.images = this.qiniuDomain + res.url
+        console.log('图片路径', this.guaForm.images)
+        this.$refs.upload.clearFiles()
         this.filename = file.name
+        this.guaForm.imageName = file.name
       },
       // eslint-disable-next-line no-dupe-keys
       getTime(value, temp) {
@@ -4126,7 +4173,7 @@ export default {
       getAllEquitType() {
         getAllEquitType().then(response => {
           if (response.data.state === 1) {
-            var equitname = response.data.data.equitname
+            var equitname = response.data.data.mode
             this.DeviceType = equitname
           }
         })
@@ -4148,7 +4195,7 @@ export default {
         getAllpatient().then(response => {
           if (response.data.state === 1) {
             var allpatient = response.data.data.allpatient
-  
+
             this.patientName = allpatient
           }
         })
@@ -4157,9 +4204,9 @@ export default {
         getTimeWarning(id).then(response => {
           if (response.data.state === 1) {
             var information = response.data.data.informations
-            console.log('码字', information)
-            console.log('当前时间', this.getTimestamp(this.userform.date))
-            console.log('存入时间', information.stime)
+            // console.log('码字', information)
+            // console.log('当前时间', this.getTimestamp(this.userform.date))
+            // console.log('存入时间', information.stime)
             var time = this.getTimestamp(this.userform.date) - information.stime
             console.log('时间', time)
             // if (time < 2678400) {
@@ -4171,7 +4218,7 @@ export default {
             // if (timetwo < 2678400) {
             //  this.warnShowTwo = false
             // }
-  
+
             var clean = response.data.data.clean
             // var timethree = this.getTimestamp(this.userform.date) - clean.stime
             // if (timethree < 2678400) {
@@ -4188,23 +4235,32 @@ export default {
       // 通过自组建传值改变表格数据
       getPlanData(data) {
         if (data === 1) {
-          this.getAllPlanDetail(this.equimentid)
+          this.getAllPlanDetail(this.unitType, this.$route.query.bedid)
         }
+      },
+      getAllMode() {
+        getAllMode().then(response => {
+          var mode = response.data.data.mode
+          this.deviceMode = mode
+        })
       }
     },
     created() {
       this.getAllSubregion()
       this.getAllMachine()
       var index = this.$route.query.index
+      var bedid = this.$route.query.bedid
       // var id = this.$route.query.id
       // this.equimentid = id
-      this.getAllPlan()
+      this.bedid = bedid
+      this.getAllPlan(bedid)
       this.getAllEquimentName()
       this.getAllOrganization()
       this.getOrgName()
       this.getAllEquitType()
       this.getAllpatient()
-    }
+      this.getAllMode()
+  }
   }
 </script>
 <style lang="scss" scoped>
@@ -4240,7 +4296,7 @@ export default {
       width: 460px;
       height: 50px;
       // border:solid 1px red;
-      margin-left:780px;
+      margin-left:650px;
     }
 
   .zClass{
@@ -4256,7 +4312,7 @@ export default {
   }
 
   .userbutton{
-    margin-left:985px;
+   margin-left:700px;
   }
 
 </style>
@@ -4270,7 +4326,7 @@ export default {
 
    .b{
     .el-button{
-      margin-left: 850px;
+      margin-left: 820px;
       margin-bottom: 10px;
     }
    }
@@ -4280,6 +4336,11 @@ export default {
        width:190px;
      }
    }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
    .main{
      position: relative;
      .newButtonOne{
@@ -4293,7 +4354,7 @@ export default {
       // border: solid 1px red;
       height: 50px;
       width: 400px;
-      margin-left: 750px;
+      margin-left: 650px;
     }
   // .el-form-item__label {
   //   width: 130px;

src/xt_pages/management/index.vue

@@ -101,7 +101,7 @@
           <template slot-scope="scope">{{ scope.row.device_name }}</template>
         </el-table-column>
         <el-table-column label="设备型号" align="center">
-          <template slot-scope="scope">{{ scope.row.unit_type }}</template>
+          <template slot-scope="scope">{{ scope.row.device_mode }}</template>
         </el-table-column>
 
         <el-table-column label="分区" align="center">
@@ -123,7 +123,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button
-              @click="handleClick(scope.row.id, scope.$index)"
+              @click="handleClick(scope.row.id, scope.$index, scope.row.bed_id)"
               type="text"
               size="small"
               >查看
@@ -152,12 +152,12 @@
 </template>
 
 <script>
-import BreadCrumb from "../components/bread-crumb";
-import { getAllMachineInfo, getAllSubregion } from "@/api/manage";
-import ManageForm from "./components/ManageForm";
+import BreadCrumb from '../components/bread-crumb'
+import { getAllMachineInfo, getAllSubregion } from '@/api/manage'
+import ManageForm from './components/ManageForm'
 
 export default {
-  name: "index.vue",
+  name: 'index.vue',
   components: {
     BreadCrumb,
     ManageForm
@@ -165,75 +165,75 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "设备管理" },
-        { path: false, name: "设备管理" }
+        { path: false, name: '设备管理' },
+        { path: false, name: '设备管理' }
       ],
-      searchKey: "",
-      zones: [{ id: 0, name: "全部" }],
+      searchKey: '',
+      zones: [{ id: 0, name: '全部' }],
       schedulType: 0,
       schedulTypeone: 0,
       schedulTypetwo: 0,
       DeviceType: [
-        { id: 0, name: "全部" },
-        { id: 1, name: "透析机" },
-        { id: 2, name: "水处理机" },
-        { id: 3, name: "其他" }
+        { id: 0, name: '全部' },
+        { id: 1, name: '透析机' },
+        { id: 2, name: '水处理机' },
+        { id: 3, name: '其他' }
       ],
 
       AllStatus: [
-        { id: 0, name: "全部" },
-        { id: 1, name: "使用机" },
-        { id: 2, name: "备用机" },
-        { id: 3, name: "急诊机" },
-        { id: 4, name: "报废机" }
+        { id: 0, name: '全部' },
+        { id: 1, name: '使用机' },
+        { id: 2, name: '备用机' },
+        { id: 3, name: '急诊机' },
+        { id: 4, name: '报废机' }
       ],
       tableData: [],
       listQuery: {
         page: 1,
         limit: 10,
-        searchKey: "",
-        zoneid: "",
-        equipmentid: "",
-        statusid: ""
+        searchKey: '',
+        zoneid: '',
+        equipmentid: '',
+        statusid: ''
       },
       total: 0
-    };
+    }
   },
   methods: {
     getAllSubregion() {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
-          var zone = response.data.data.zones;
-          var zones = [{ id: 0, name: "全部" }];
+          var zone = response.data.data.zones
+          var zones = [{ id: 0, name: '全部' }]
           for (let i = 0; i < zone.length; i++) {
-            const item = zone[i];
-            zones.push({ id: item.id, name: item.name });
+            const item = zone[i]
+            zones.push({ id: item.id, name: item.name })
           }
           // console.log('zones', zones)
-          this.zones = zones;
+          this.zones = zones
         }
-      });
+      })
     },
     selectSchedulType(scheduleType) {
-      this.schedulType = scheduleType;
-      this.listQuery.zoneid = scheduleType;
-      this.getAllMachineInfo();
+      this.schedulType = scheduleType
+      this.listQuery.zoneid = scheduleType
+      this.getAllMachineInfo()
     },
     selectSchedulTypeOne(scheduleType) {
-      this.schedulTypeone = scheduleType;
-      this.listQuery.equipmentid = scheduleType;
-      this.getAllMachineInfo();
+      this.schedulTypeone = scheduleType
+      this.listQuery.equipmentid = scheduleType
+      this.getAllMachineInfo()
     },
     selectSchedulTypeTwo(scheduleType) {
-      this.schedulTypetwo = scheduleType;
-      this.listQuery.statusid = scheduleType;
-      this.getAllMachineInfo();
+      this.schedulTypetwo = scheduleType
+      this.listQuery.statusid = scheduleType
+      this.getAllMachineInfo()
     },
     seahcerMacherInfo() {
-      this.getAllMachineInfo();
+      this.getAllMachineInfo()
     },
     AddManage() {
-      this.$refs.manageForm.open();
+      this.$refs.manageForm.open()
     },
     getAllMachineInfo() {
       getAllMachineInfo(
@@ -245,59 +245,61 @@ export default {
         this.listQuery.statusid
       ).then(response => {
         if (response.data.state === 1) {
-          var addmahcer = response.data.data.addmahcer;
+          var addmahcer = response.data.data.addmahcer
           for (let index = 0; index < addmahcer.length; index++) {
             if (addmahcer[index].device_type === 1) {
-              addmahcer[index].device_type = "透析机";
+              addmahcer[index].device_type = '透析机'
             }
             if (addmahcer[index].device_type === 2) {
-              addmahcer[index].device_type = "水处理机";
+              addmahcer[index].device_type = '水处理机'
             }
 
             if (addmahcer[index].device_type === 3) {
-              addmahcer[index].device_type = "其他";
+              addmahcer[index].device_type = '其他'
             }
 
             if (addmahcer[index].machine_status === 1) {
-              addmahcer[index].machine_status = "使用机";
+              addmahcer[index].machine_status = '使用机'
             }
             if (addmahcer[index].machine_status === 2) {
-              addmahcer[index].machine_status = "备用机";
+              addmahcer[index].machine_status = '备用机'
             }
             if (addmahcer[index].machine_status === 3) {
-              addmahcer[index].machine_status = "急诊机";
+              addmahcer[index].machine_status = '急诊机'
             }
             if (addmahcer[index].machine_status === 4) {
-              addmahcer[index].machine_status = "报废机";
+              addmahcer[index].machine_status = '报废机'
             }
           }
-          this.tableData = addmahcer;
+          this.tableData = addmahcer
           // console.log('addmacher', addmahcer)
-          var total = response.data.data.total;
+          var total = response.data.data.total
           // console.log('total', total)
-          this.total = total;
+          this.total = total
         }
-      });
+      })
     },
     handleSizeChange(limit) {
-      this.listQuery.limit = limit;
-      this.getAllMachineInfo();
+      this.listQuery.limit = limit
+      this.getAllMachineInfo()
     },
     handleCurrentChange(page) {
-      this.listQuery.page = page;
-      this.getAllMachineInfo();
+      this.listQuery.page = page
+      this.getAllMachineInfo()
     },
-    handleClick(id, index) {
-      this.$router.push({ path: '/device/home?index=' + index })
+    handleClick(id, index, bedid) {
+      this.$router.push({
+        path: '/device/home?index=' + index + '&' + 'bedid=' + bedid + '&' + 'id=' + id
+      })
       // this.$router.push({ path: '/device/home?index=' + index + '&' + 'id=' + id })
     }
   },
   created() {
     // 获取所有的分区
-    this.getAllSubregion();
-    this.getAllMachineInfo();
+    this.getAllSubregion()
+    this.getAllMachineInfo()
   }
-};
+}
 </script>
 
 <style scoped></style>

src/xt_pages/mode/index.vue

@@ -0,0 +1,211 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+
+      <el-button
+        size="small"
+        icon="el-icon-circle-plus-outline"
+        type="primary"
+        @click="addMode"
+        >新增</el-button
+      >
+    </div>
+    <div class="app-container">
+      <el-row>
+        <el-col :span="24">
+          <el-table
+            :data="tableData"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            border
+          >
+            <el-table-column label="型号名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.device_mode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="编辑"
+                  placement="top"
+                >
+                  <el-button
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    size="small"
+                    @click="EditMode(scope.row.id)"
+                  ></el-button>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <el-button
+                    type="danger"
+                    icon="el-icon-delete"
+                    size="small"
+                    @click="DeleteMode(scope.row.id, scope.$index)"
+                  ></el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+
+      <el-dialog
+        title="添加设备型号"
+        :visible.sync="dialogVisible"
+        width="30%"
+        center
+      >
+        <el-form :model="form" ref="form" :rules="ModeRules">
+          <el-form-item label="设备型号:" required prop="device_mode">
+            <el-input style="width:200px" v-model="form.device_mode"></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="SaveMode('form')">保存</el-button>
+        </span>
+      </el-dialog>
+
+      <el-dialog
+        title="编辑设备型号"
+        :visible.sync="editDialogVisible"
+        width="30%"
+        center
+      >
+        <el-form :model="form" ref="form" :rules="ModeRules">
+          <el-form-item label="设备型号:">
+            <el-input style="width:200px" v-model="form.device_mode"></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="editDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="UpdateMode('form')">保存</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+// eslint-disable-next-line no-unused-vars
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  SaveMode,
+  getAllMode,
+  EditMode,
+  UpdateMode,
+  DeleteMode
+} from "@/api/manage";
+export default {
+  name: "index.vue",
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "设备管理" },
+        { path: "/device/mode", name: "型号管理" }
+      ],
+      dialogVisible: false,
+      editDialogVisible: false,
+      tableData: [],
+      form: {
+        id: "",
+        device_mode: ""
+      },
+      ModeRules: {
+        device_mode: [{ required: true, message: "请填写设备型号" }]
+      }
+    };
+  },
+  methods: {
+    addMode() {
+      this.dialogVisible = true;
+    },
+    SaveMode(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          // eslint-disable-next-line no-undef
+          SaveMode(this.form).then(response => {
+            // eslint-disable-next-line no-empty
+            if (response.data.state === 1) {
+              var mode = response.data.data.mode;
+              this.form.device_mode = "";
+              this.dialogVisible = false;
+              this.getAllMode();
+            }
+          });
+        }
+      });
+    },
+    getAllMode() {
+      getAllMode().then(response => {
+        if (response.data.state === 1) {
+          var mode = response.data.data.mode;
+          this.tableData = mode;
+          console.log(mode);
+        }
+      });
+    },
+    EditMode(id) {
+      this.editDialogVisible = true;
+      EditMode(id).then(response => {
+        if (response.data.state === 1) {
+          var mode = response.data.data.mode;
+          this.form.id = mode.id;
+          this.form.device_mode = mode.device_mode;
+        }
+      });
+    },
+    UpdateMode(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          UpdateMode(this.form.id, this.form).then(response => {
+            if (response.data.state === 1) {
+              var mode = response.data.data.mode;
+              this.editDialogVisible = false;
+              this.getAllMode();
+            }
+          });
+        }
+      });
+    },
+    DeleteMode(id, index) {
+      this.$confirm(
+        "确认要删除所选信息吗? <br>删除后,信息将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        DeleteMode(id, index).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            this.tableData.splice(index, 1);
+          }
+        });
+      });
+    }
+  },
+
+  created() {
+    this.getAllMode();
+  }
+};
+</script>
+
+<style scoped></style>

src/xt_pages/qcd/dialysisTotal.vue

@@ -22,7 +22,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -301,6 +301,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     selectStatisticalMethod(type) {
       this.statisticalMethod = type;
       this.listQuery.statistical_method = type;

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -31,7 +31,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -376,6 +376,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     selectLapseTo(lapseto) {
       this.lapsetoType = lapseto;
       this.listQuery.lapseto = lapseto;

src/xt_pages/qcd/patientAnalysis/total.vue

@@ -38,7 +38,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -283,6 +283,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     onSearch() {
       this.getList();
     },

src/xt_pages/qcd/processIndicators.vue

@@ -22,7 +22,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -321,6 +321,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     selectLapseTo(lapseto) {
       this.lapsetoType = lapseto;
       this.listQuery.lapseto = lapseto;

src/xt_pages/stock/cancelStockOrder.vue

@@ -339,7 +339,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -381,7 +381,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -380,7 +380,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/stockInDetail.vue

@@ -422,7 +422,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -404,7 +404,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -337,7 +337,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -174,51 +174,51 @@
 </template>
 
 <script>
-import { uParseTime } from '@/utils/tools'
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
   deleteSalesReturn,
   GetAllConfig,
   getSalesReturnList,
   getWarehouseInfoList,
   getWarehouseList
-} from '@/api/stock'
-import BreadCrumb from '../components/bread-crumb'
+} from "@/api/stock";
+import BreadCrumb from "../components/bread-crumb";
 
 export default {
-  name: 'salesReturnOrder',
+  name: "salesReturnOrder",
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date()
-    var nowYear = nowDate.getFullYear()
-    var nowMonth = nowDate.getMonth() + 1
-    var nowDay = nowDate.getDate()
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
     this.end_time =
       nowYear +
-      '-' +
-      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-      '-' +
-      (nowDay < 10 ? '0' + nowDay : nowDay)
-    nowDate.setMonth(nowDate.getMonth() - 1)
-    nowYear = nowDate.getFullYear()
-    nowMonth = nowDate.getMonth() + 1
-    nowDay = nowDate.getDate()
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
     this.start_time =
       nowYear +
-      '-' +
-      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-      '-' +
-      (nowDay < 10 ? '0' + nowDay : nowDay)
-    this.GetSalesReturn()
-    this.GetConfigInfo()
-    this.fetchAllAdminUsers()
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.GetSalesReturn();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
   },
   data() {
     return {
-      searchKey: '',
+      searchKey: "",
       crumbs: [
-        { path: false, name: '库存管理' },
-        { path: false, name: '其他退货单' }
+        { path: false, name: "库存管理" },
+        { path: false, name: "其他退货单" }
       ],
       type: 2,
       page: 1,
@@ -229,17 +229,17 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-      start_time: '',
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
       saleReturnDate: [],
-      end_time: '',
+      end_time: "",
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      startTime: ''
-    }
+      startTime: ""
+    };
   },
   methods: {
     search: function() {
@@ -250,25 +250,25 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey
-      }
-      this.saleReturnDate = []
+      };
+      this.saleReturnDate = [];
       getSalesReturnList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.total = response.data.data.total
+          this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.saleReturnDate.push(response.data.data.list[i])
+            this.saleReturnDate.push(response.data.data.list[i]);
           }
         }
-      })
+      });
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: 'salesReturnOrderAdd',
+        name: "salesReturnOrderAdd",
         query: { type: this.type }
-      })
+      });
     },
     GetSalesReturn: function() {
       const Params = {
@@ -277,214 +277,212 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      }
-      this.saleReturnDate = []
+      };
+      this.saleReturnDate = [];
       getSalesReturnList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.total = response.data.data.total
+          this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.saleReturnDate.push(response.data.data.list[i])
+            this.saleReturnDate.push(response.data.data.list[i]);
           }
         }
-      })
+      });
     },
     getXuserName(id) {
       if (id <= 0) {
-        return ''
+        return "";
       }
-      var name = ''
+      var name = "";
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === 'undefined'
+        typeof this.adminUserOptions.length === "undefined"
       ) {
-        return name
+        return name;
       }
-      var leng = this.adminUserOptions.length
+      var leng = this.adminUserOptions.length;
       if (leng == 0) {
-        return name
+        return name;
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name
-          break
+          name = this.adminUserOptions[index].name;
+          break;
         }
       }
-      return name
+      return name;
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response)
+        console.log(response);
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users
-          var alen = this.adminUserOptions.length
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      })
+      });
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val
+      this.multipleSelection = val;
     },
     handleSizeChange(val) {
-      this.limit = val
-      this.GetSalesReturn()
+      this.limit = val;
+      this.GetSalesReturn();
     },
     handleCurrentChange(val) {
-      this.page = val
-      this.GetSalesReturn()
+      this.page = val;
+      this.GetSalesReturn();
     },
     startTimeChange(val) {
-      this.startTime = this.getTimestamp(val)
-      this.GetSalesReturn()
+      this.startTime = this.getTimestamp(val);
+      this.GetSalesReturn();
     },
     endTimeChange(val) {
-      var time = this.getTimestamp(val) - this.startTime
-      console.log('开始时间', this.startTime)
-      console.log('结束', this.getTimestamp(val))
-      console.log('时间差', time)
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
       if (time < 0) {
-        this.$message.error('结束时间不能小于开始时间')
-        this.end_time = ''
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
       } else {
-        this.GetSalesReturn()
+        this.GetSalesReturn();
       }
     },
-    getTimestamp(time) { // 把时间日期转成时间戳
-      return (new Date(time)).getTime() / 1000
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100
+      return Math.round(parseFloat(val) * 100) / 100;
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.manufacturer = response.data.data.manufacturer
-          this.dealer = response.data.data.dealer
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
         }
-      })
+      });
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name
+          return this.manufacturer[i].manufacturer_name;
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name
+          return this.dealer[i].dealer_name;
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: 'salesReturnDetail',
+        name: "salesReturnDetail",
         query: { id: row.id, type: this.type }
-      })
+      });
     },
     handleDelete: function(index, row) {
-      const ids = []
-      ids.push(row.id)
-      const idStr = ids.join(',')
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
 
       const params = {
         ids: idStr
-      }
+      };
 
-      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
         .then(() => {
           deleteSalesReturn(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.saleReturnDate.length; y++) {
                   if (ids[i] == this.saleReturnDate[y].id) {
-                    this.saleReturnDate.splice(y, 1)
+                    this.saleReturnDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
+          });
         })
-        .catch(() => {})
+        .catch(() => {});
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection()
+        this.$refs.multipleTable.toggleAllSelection();
       } else {
-        this.$refs.multipleTable.clearSelection()
+        this.$refs.multipleTable.clearSelection();
       }
     },
     select(selection) {
-      this.selectedTableData = selection
+      this.selectedTableData = selection;
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error('请选择要删除的记录')
-        return
+        this.$message.error("请选择要删除的记录");
+        return;
       }
-      const ids = []
+      const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id)
+        ids.push(this.selectedTableData[i].id);
       }
-      const idStr = ids.join(',')
+      const idStr = ids.join(",");
       const params = {
         ids: idStr
-      }
-      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      };
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
         .then(() => {
           deleteSalesReturn(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.saleReturnDate.length; y++) {
                   if (ids[i] == this.saleReturnDate[y].id) {
-                    this.saleReturnDate.splice(y, 1)
+                    this.saleReturnDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
+          });
         })
-        .catch(() => {})
+        .catch(() => {});
     }
   }
-}
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>

src/xt_pages/stock/otherStockInOrder.vue

@@ -453,7 +453,17 @@ export default {
       this.GetWarehouse();
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/otherStockOutOrder.vue

@@ -336,7 +336,17 @@ export default {
       this.GetWarehouseOut();
     },
     endTimeChange(val) {
-      this.GetWarehouseOut();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouseOut();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/salesReturnOrder.vue

@@ -338,8 +338,19 @@ export default {
       this.GetSalesReturn();
     },
     endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
       this.GetSalesReturn();
     },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },

src/xt_pages/stock/stockInOrder.vue

@@ -483,9 +483,7 @@ export default {
       this.startTime = this.getTimestamp(val);
     },
     endTimeChange(val) {
-      console.log("开始时间", this.start_time);
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
-      console.log("time", time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";

src/xt_pages/stock/stockOutOrder.vue

@@ -168,50 +168,50 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { uParseTime } from '@/utils/tools'
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 
 import {
   deleteWarehouseOut,
   GetAllConfig,
   getWarehouseOutList
-} from "@/api/stock";
-import BreadCrumb from "../components/bread-crumb";
+} from '@/api/stock'
+import BreadCrumb from '../components/bread-crumb'
 
 export default {
-  name: "salesReturnOrder",
+  name: 'salesReturnOrder',
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
     this.end_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    nowDate.setMonth(nowDate.getMonth() - 1)
+    nowYear = nowDate.getFullYear()
+    nowMonth = nowDate.getMonth() + 1
+    nowDay = nowDate.getDate()
     this.start_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    this.GetWarehouseOut();
-    this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    this.GetWarehouseOut()
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
   },
   data() {
     return {
-      searchKey: "",
+      searchKey: '',
       crumbs: [
-        { path: false, name: "库存管理" },
-        { path: false, name: "出库单" }
+        { path: false, name: '库存管理' },
+        { path: false, name: '出库单' }
       ],
       page: 1,
       limit: 10,
@@ -221,17 +221,17 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      start_time: '',
       warehouseOutDate: [],
-      end_time: "",
+      end_time: '',
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
       type: 1
-    };
+    }
   },
   methods: {
     search: function() {
@@ -242,25 +242,25 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey
-      };
-      this.warehouseOutDate = [];
+      }
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "stockOutOrderAdd",
+        name: 'stockOutOrderAdd',
         query: { type: this.type }
-      });
+      })
     },
     GetWarehouseOut: function() {
       const Params = {
@@ -269,201 +269,211 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      };
-      this.warehouseOutDate = [];
+      }
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     getXuserName(id) {
       if (id <= 0) {
-        return "";
+        return ''
       }
-      var name = "";
+      var name = ''
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === "undefined"
+        typeof this.adminUserOptions.length === 'undefined'
       ) {
-        return name;
+        return name
       }
-      var leng = this.adminUserOptions.length;
+      var leng = this.adminUserOptions.length
       if (leng == 0) {
-        return name;
+        return name
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name;
-          break;
+          name = this.adminUserOptions[index].name
+          break
         }
       }
-      return name;
+      return name
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+        console.log(response)
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users;
-          var alen = this.adminUserOptions.length;
+          this.adminUserOptions = response.data.data.users
+          var alen = this.adminUserOptions.length
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      });
+      })
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     handleSizeChange(val) {
-      this.limit = val;
-      this.GetWarehouseOut();
+      this.limit = val
+      this.GetWarehouseOut()
     },
     handleCurrentChange(val) {
-      this.page = val;
-      this.GetWarehouseOut();
+      this.page = val
+      this.GetWarehouseOut()
     },
     startTimeChange(val) {
-      this.GetWarehouseOut();
+      this.GetWarehouseOut()
     },
     endTimeChange(val) {
-      this.GetWarehouseOut();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time)
+      if (time < 0) {
+        this.$message.error('结束时间不能小于开始时间')
+        this.end_time = ''
+      } else {
+        this.GetWarehouseOut()
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100;
+      return Math.round(parseFloat(val) * 100) / 100
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.manufacturer = response.data.data.manufacturer;
-          this.dealer = response.data.data.dealer;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
         }
-      });
+      })
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name;
+          return this.manufacturer[i].manufacturer_name
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name;
+          return this.dealer[i].dealer_name
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "stockOutDetail",
+        name: 'stockOutDetail',
         query: { id: row.id, type: this.type }
-      });
+      })
     },
     handleDelete: function(index, row) {
-      const ids = [];
-      ids.push(row.id);
-      const idStr = ids.join(",");
+      const ids = []
+      ids.push(row.id)
+      const idStr = ids.join(',')
 
       const params = {
         ids: idStr
-      };
+      }
 
-      this.$confirm("确认删除出库单记录?", "删除出库单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除出库单记录?', '删除出库单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     select(selection) {
-      this.selectedTableData = selection;
+      this.selectedTableData = selection
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error("请选择要删除的记录");
-        return;
+        this.$message.error('请选择要删除的记录')
+        return
       }
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        ids.push(this.selectedTableData[i].id)
       }
-      const idStr = ids.join(",");
+      const idStr = ids.join(',')
       const params = {
         ids: idStr
-      };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      }
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">

src/xt_pages/upload/fast/FastCountry.vue

@@ -6,17 +6,11 @@
       v-on:inspection="inspectionClick()"
     ></fast-patients-sidebar>
     <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
-    <one v-if="isShow == 1" :id="patientID" :is-edit='true' :class='panelClass'></one>
-    <two v-if="isShow == 2"
+    <one ref="one" v-if="isShow == 1" :patientID="patientID" :is-edit='true' :class='panelClass' @></one>
+    <two ref="two" v-if="isShow == 2"
          :id="patientID"
          :is-edit="true"
          :class="panelClass"></two>
-    <!--<fast-upload-inspectiton-detail-->
-    <!--v-if="isShow == 2"-->
-    <!--:id="patientID"-->
-    <!--:is-edit="true"-->
-    <!--:class="panelClass"-->
-    <!--&gt;</fast-upload-inspectiton-detail>-->
   </div>
 </template>
 
@@ -39,7 +33,7 @@
     },
     data() {
       return {
-        patientID: 1,
+        patientID: 0,
         panelClass: 'patient-app-container',
         patientInfo: {
           id: 0
@@ -64,18 +58,95 @@
             this.patientsList = response.data.data.patients
             if (type == 1) {
               this.patientID = this.patientsList[0].id
+
             } else {
               this.patientID = this.$route.query.id
             }
+            this.$nextTick(() => {
+              this.$refs.one.fetchPatient(this.patientID)
+
+            })
           }
         })
       },
       patientInfoClick: function() {
         this.isShow = 1
+        this.$nextTick(() => {
+          this.$refs.one.fetchPatient(this.patientID)
+
+        })
+
       },
       inspectionClick: function() {
         this.isShow = 2
+        this.$nextTick(() => {
+          var start_time = new Date(this.getQuarterStartDate().replace(/-/g, '/')).getTime() / 1000
+          var end_time = new Date(this.getQuarterEndDate().replace(/-/g, '/')).getTime() / 1000
+          this.$refs.two.GetInitInspections()
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,1,"1")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,2,"2-4-20")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,3,"21")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,4,"2-4-15-24-25")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,5,"15-23")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,6,"14")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,7,"22")
+        })
+
+      }, getQuarterStartDate: function() {
+        var now = new Date() //当前日期
+        var nowYear = now.getFullYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+
+        var quarterStartDate = new Date(nowYear, this.getQuarterStartMonth(), 1)
+        return this.formatDate(quarterStartDate)
+      }, getQuarterEndDate: function() {
+        var now = new Date() //当前日期
+        var nowYear = now.getFullYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+        var quarterEndMonth = this.getQuarterStartMonth() + 2
+        var quarterStartDate = new Date(nowYear, quarterEndMonth, this.getMonthDays(quarterEndMonth))
+        return this.formatDate(quarterStartDate)
+      }, formatDate: function(date) {
+        var myyear = date.getFullYear()
+        var mymonth = date.getMonth() + 1
+        var myweekday = date.getDate()
+
+        if (mymonth < 10) {
+          mymonth = '0' + mymonth
+        }
+        if (myweekday < 10) {
+          myweekday = '0' + myweekday
+        }
+        return (myyear + '-' + mymonth + '-' + myweekday)
+      }, getQuarterStartMonth: function() {
+        var now = new Date() //当前日期
+        var nowMonth = now.getMonth() //当前月
+
+        var quarterStartMonth = 0
+        if (nowMonth < 3) {
+          quarterStartMonth = 0
+        }
+        if (2 < nowMonth && nowMonth < 6) {
+          quarterStartMonth = 3
+        }
+        if (5 < nowMonth && nowMonth < 9) {
+          quarterStartMonth = 6
+        }
+        if (nowMonth > 8) {
+          quarterStartMonth = 9
+        }
+        return quarterStartMonth
+      },  //获得某月的天数
+      getMonthDays(myMonth) {
+        var now = new Date() //当前日期
+        var nowYear = now.getYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+        var monthStartDate = new Date(nowYear, myMonth, 1)
+        var monthEndDate = new Date(nowYear, myMonth + 1, 1)
+        var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
+        return days
       }
+
     }
   }
 </script>

src/xt_pages/upload/fast/FastPatientsSidebar.vue

@@ -87,9 +87,9 @@ export default {
     handleNodeClick(data) {
       var name = data.name;
       if (name == "1-1") {
-        this.$emit("patient");
+        this.$emit("patient",this.selectID);
       } else if (name == "1-2") {
-        this.$emit("inspection");
+        this.$emit("inspection",this.selectID);
       }
     },
 
@@ -102,10 +102,10 @@ export default {
             for (let index = 0; index < len; index++) {
               if (this.patientsList[index].id == this.id) {
                 this.currentPatient = this.patientsList[index];
-
                 this.selectID = this.patientsList[index].id;
                 this.$emit("tran-patient", this.currentPatient);
                 break;
+
               }
             }
           }

src/xt_pages/upload/fast/FastProvince.vue

@@ -29,7 +29,7 @@
               :value="item.id">
             </el-option>
           </el-select>
-          <el-select v-model="form.city" disabled filterable placeholder="请选择" @change="changeCity">
+          <el-select v-model="form.city" disabled filterable placeholder="请选择" >
             <el-option
               v-for="item in citys"
               :key="item.id"
@@ -57,6 +57,7 @@
         dialogVisible: false,
         end_time: '',
         provinces: [],
+        citys:[],
         form: {
           province: '',
           city: ''

src/xt_pages/upload/fast/FastUploadDetail.vue

@@ -384,7 +384,6 @@
       fetchPatient(id) {
         fetchPatient(id)
           .then(response => {
-            console.log(response.data.data)
             if (response.data.state === 1) {
               this.$emit('tran-patient-info', response.data.data.patient)
               var patietInfo = response.data.data.patient

src/xt_pages/upload/fast/One.vue

@@ -7,126 +7,144 @@
       <div class="row">
         <div class="rowOne">
           <p class="rowName">首次诊治时间:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.first_treatment_date" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.first_treatment_date"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName1">
             首次肾脏替代治疗时间 :
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.firstDialysisDate" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.firstDialysisDate"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">创建者:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.registrars" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.registrars"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">创建日期:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.create_time" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.create_time"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">姓名:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.name" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.name"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">性别:</p>
           <div class="radioOne">
             <template>
-              <el-radio v-model="radio" label="1">男</el-radio>
-              <el-radio v-model="radio" label="2">女</el-radio>
+              <el-radio v-model="form.gender" label="1">男</el-radio>
+              <el-radio v-model="form.gender" label="2">女</el-radio>
             </template>
           </div>
         </div>
         <div class="rowOne">
           <p class="rowName">证件类型:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" :disabled="true" v-model="form.id_type">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.id_type"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">身份证号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" style="width: 200px;" v-model="form.idCardNo" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.idCardNo"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
-          <p class="rowName">名族:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <p class="rowName">民族:</p>
+          <el-input placeholder="请输入内容" v-model="form.nation" :disabled="true">
           </el-input>
         </div>
         <div class="rowOne">
           <p class="rowName">
             婚姻状况:
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容"  :disabled="true" v-model="form.maritalStatus">
           </el-input>
+
         </div>
         <div class="rowOne">
           <p class="rowName">年龄:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.age" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.age"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">出生日期:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.birth" :disabled="true">
           </el-input>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">教育程度:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" style="width: 270px;" v-model="form.education" :disabled="true">
           </el-input>
         </div>
         <div class="rowOne">
           <p class="rowName">
             职业:
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容"  style="width: 270px;" v-model="form.profession" :disabled="true">
           </el-input>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">门诊号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-if="form.source == 1" v-model="form.admissionNumber" :disabled="true">
+          </el-input>
+          <el-input placeholder="请输入内容" v-if="form.source == 2"  :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn"  v-clipboard:copy="form.admissionNumber"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">
             住院号:
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-if="form.source == 2" v-model="form.admissionNumber" :disabled="true">
+          </el-input>
+          <el-input placeholder="请输入内容" v-if="form.source == 1"  :disabled="true">
           </el-input>
+          <div class="btn"  v-clipboard:copy="form.admissionNumber"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">透析病案号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.dialysisNo" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.dialysisNo"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">透析龄(月):</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.dialysis_age" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.dialysis_age"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row1">
@@ -134,13 +152,13 @@
           <p class="rowName">费别:</p>
           <div class="radioOne">
             <template>
-              <el-radio v-model="radio" label="1">基本医保</el-radio>
-              <el-radio v-model="radio" label="2">新农合</el-radio>
-              <el-radio v-model="radio" label="2">自费医疗</el-radio>
-              <el-radio v-model="radio" label="2">公费医疗</el-radio>
-              <el-radio v-model="radio" label="2">商业保险</el-radio>
-              <el-radio v-model="radio" label="2">军队医疗</el-radio>
-              <el-radio v-model="radio" label="2">其他</el-radio>
+              <el-radio v-model="form.expense_kind"  label="1">基本医保</el-radio>
+              <el-radio  v-model="form.expense_kind" label="2">新农合</el-radio>
+              <el-radio  v-model="form.expense_kind" label="3">自费医疗</el-radio>
+              <el-radio  v-model="form.expense_kind" label="4">公费医疗</el-radio>
+              <el-radio v-model="form.expense_kind" label="5">商业保险</el-radio>
+              <el-radio  v-model="form.expense_kind" label="6">军队医疗</el-radio>
+              <el-radio  v-model="form.expense_kind" label="7">其他</el-radio>
             </template>
           </div>
         </div>
@@ -148,45 +166,46 @@
       <div class="row1">
         <div class="line">
           <p class="rowName">通信地址:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容"  :disabled="true">
           </el-input
-          ><el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          ><el-input placeholder="请输入内容" :disabled="true">
           </el-input
-          ><el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          ><el-input placeholder="请输入内容"  :disabled="true">
           </el-input>
         </div>
         <div class="rowOne">
-          <p class="rowName">门诊号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <p class="rowName">具体地址:</p>
+          <el-input placeholder="请输入内容" v-model="form.homeAddress" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.homeAddress"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">联系人姓名:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.contact_name" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.contact_name"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowTwo">
           <p class="rowName1">
             固定电话 &ensp;&ensp;&ensp;&ensp;(电话):
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
-          </el-input>
-          <div class="btn">复制</div>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.tell_phone" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.tell_phone"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName1">
             联系电话 &ensp;&ensp;&ensp;&ensp;(电话):
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.homeTelephone" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.homeTelephone"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
     </div>
@@ -194,6 +213,306 @@
   </div>
 
 </template>
+<script>
+  import { getDataConfig } from '@/utils/data'
+  import {
+    uParseTime
+  } from '@/utils/tools'
+  import {
+    fetchPatient
+  } from '@/api/patient'
+  import { fetchAllAdminUsers } from '@/api/doctor'
+  const defaultForm = {
+    avatar: '',
+    patientType: '',
+    dialysisNo: '',
+    admissionNumber: '',
+    source: '',
+    lapseto: '',
+    partition: '',
+    bed: '',
+    name: '',
+    gender: '',
+    nation: '',
+    native_place: '',
+    maritalStatus: '',
+    idCardNo: '',
+    birth: '',
+    age: '',
+    reimbursementWayID: '',
+    healthCareNo: '',
+    healthCareDueDate: '',
+    height: '',
+    blood: '',
+    rh: '',
+    healthCareDueAlertDate: '',
+    education: '',
+    profession: '',
+    phone: '',
+    homeTelephone: '',
+    homeAddress: '',
+    work: '',
+    receivingDate: '',
+    firstDialysisDate: '',
+    dialysisAge: '',
+    induction: '',
+    initial: '',
+    dialysisTotal: '',
+    contagions: [],
+    doctor: '',
+    nurse: '',
+    assessment: '',
+    diseases: [],
+    diagnose: '',
+    registrars: '',
+    patient_complains: '',
+    present_history: '',
+    past_history: '',
+    temperature: '',
+    pulse: '',
+    respiratory: '',
+    sbp: '',
+    dbp: '',
+    record_date: '',
+    response_result: '',
+    is_infectious: '',
+    formItem: [],
+    tell_phone:'',
+    first_treatment_date:'',
+    dialysis_age:'',
+    expense_kind:'',
+    contact_name:'',
+    create_time:'',
+    id_type:"身份证"
+  }
+
+  export default {
+    name: 'One',
+    components: { },
+
+    data() {
+      return {
+        expenseOptions:[
+          {id:1,name:"基本医保"},
+          {id:2,name:"新农合"},
+          {id:3,name:"自费医疗"},
+          {id:4,name:"公费医疗"},
+          {id:5,name:"商业保险"},
+          {id:6,name:"军队医疗"},
+          {id:7,name:"其他"},
+        ],
+        form: Object.assign({}, defaultForm),
+        adminUserOptions:[],
+        maritalOptions:[],
+        educationOptions: [],
+        professionOptions:[],
+
+      }
+    },
+    created() {
+      this.maritalOptions = getDataConfig('patient', 'marital_options')
+      this.educationOptions = getDataConfig('patient', 'education_types')
+      this.professionOptions = getDataConfig('patient', 'profession_options')
+      this.fetchAllAdminUsers()
+    },
+    methods: {
+      getTime(val){
+        return uParseTime(val, '{y}年{m}月{d}日')
+      },
+
+      getZones() {
+        getZones().then(response => {
+          if (response.data.state === 1) {
+            this.partitionOptions = response.data.data.zones
+          }
+        })
+      },
+      fetchPatient(id) {
+        fetchPatient(id)
+          .then(response => {
+            if (response.data.state === 1) {
+              var patietInfo = response.data.data.patient
+              this.form.avatar = patietInfo.avatar
+              this.form.name = patietInfo.name
+              this.form.alias = patietInfo.alias
+              this.form.lapseto = patietInfo.lapseto
+              this.form.idCardNo = patietInfo.id_card_no
+              this.form.dialysisNo = patietInfo.dialysis_no
+              this.form.gender = patietInfo.gender
+              this.form.is_infectious = patietInfo.is_infectious
+              // this.form.record_date = patietInfo.is_infectious
+              this.form.response_result = patietInfo.response_result
+              this.form.remind_cycle = patietInfo.remind_cycle
+              this.infections = response.data.data.infections
+              this.form.formItem = this.infections
+              if (patietInfo.gender === 1 || patietInfo.gender === 2) {
+                this.form.gender = patietInfo.gender.toString()
+              }
+              this.form.nation = patietInfo.nation
+              this.form.native_place = patietInfo.native_place
+              this.form.birth = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
+              this.form.create_time = uParseTime(patietInfo.created_time, '{y}-{m}-{d}')
+
+              this.form.firstDialysisDate = uParseTime(patietInfo.first_dialysis_date, '{y}-{m}-{d}')
+              this.form.height = patietInfo.height + ''
+              if (patietInfo.marital_status > 0) {
+                this.form.maritalStatus = patietInfo.marital_status
+              }
+              this.form.children = patietInfo.children
+              this.form.admissionNumber = patietInfo.admission_number
+              if (patietInfo.reimbursement_way_id > 0) {
+                this.form.reimbursementWayID = patietInfo.reimbursement_way_id
+              }
+              this.form.healthCareNo = patietInfo.health_care_no
+              this.form.phone = patietInfo.phone
+              this.form.homeTelephone = patietInfo.home_telephone
+              this.form.relative_phone = patietInfo.relative_phone
+              this.form.relative_relations = patietInfo.relative_relations
+              this.form.homeAddress = patietInfo.home_address
+              this.form.work = patietInfo.work_unit
+              this.form.unit_address = patietInfo.unit_address
+
+              if (patietInfo.age == 0) {
+                this.form.age = jsGetAge(this.form.birth, '-')
+              } else {
+                this.form.age = patietInfo.age
+              }
+
+              if (patietInfo.profession > 0) {
+                this.form.profession = patietInfo.profession
+              }
+              if (patietInfo.education_level > 0) {
+                this.form.education = patietInfo.education_level
+              }
+              if (patietInfo.source === 1 || patietInfo.source === 2) {
+                this.form.source = patietInfo.source
+              }
+              console.log("source:"+this.form.source)
+              if (patietInfo.lapseto === 1 || patietInfo.lapseto === 2) {
+                this.form.lapseto = patietInfo.lapseto
+              }
+              if (patietInfo.is_hospital_first_dialysis === 1 || patietInfo.is_hospital_first_dialysis === 2) {
+                this.form.is_hospital_first_dialysis = patietInfo.is_hospital_first_dialysis
+              }
+              if (patietInfo.first_dialysis_date !== 0) {
+                this.form.firstDialysisDate = uParseTime(
+                  patietInfo.first_dialysis_date,
+                  '{y}-{m}-{d}'
+                )
+              }
+              this.form.first_dialysis_hospital = patietInfo.first_dialysis_hospital
+              if (patietInfo.predialysis_condition.length > 0) {
+                this.form.predialysis_condition = patietInfo.predialysis_condition.split(',')
+              }
+              this.form.pre_hospital_dialysis_frequency = patietInfo.pre_hospital_dialysis_frequency
+              this.form.pre_hospital_dialysis_times = patietInfo.pre_hospital_dialysis_times
+              if (patietInfo.hospital_first_dialysis_date !== 0) {
+                this.form.hospital_first_dialysis_date = uParseTime(
+                  patietInfo.hospital_first_dialysis_date,
+                  '{y}-{m}-{d}'
+                )
+              }
+              this.form.contagions = response.data.data.contagions
+              this.form.diseases = response.data.data.diseases
+              this.form.remark = patietInfo.remark
+              this.form.diagnose = patietInfo.diagnose
+
+              this.form.patient_complains = patietInfo.patient_complains
+              this.form.present_history = patietInfo.present_history
+              this.form.past_history = patietInfo.past_history
+              this.form.temperature = patietInfo.temperature
+              this.form.pulse = patietInfo.pulse
+              this.form.respiratory = patietInfo.respiratory
+              this.form.sbp = patietInfo.sbp
+              this.form.dbp = patietInfo.dbp
+
+              this.form.contact_name = patietInfo.contact_name
+              this.form.tell_phone = patietInfo.tell_phone
+              this.form.dialysis_age = patietInfo.dialysis_age
+              if( patietInfo.expense_kind == 0){
+                this.form.expense_kind = ""
+              }else{
+                this.form.expense_kind = patietInfo.expense_kind.toString()
+              }
+
+
+
+              this.form.first_treatment_date =  uParseTime(
+                patietInfo.first_treatment_date,
+                '{y}-{m}-{d}'
+              )
+
+              if (patietInfo.registrars_id > 0) {
+                var eLen = this.adminUserOptions.length
+                for (let index = 0; index < eLen; index++) {
+                  if (this.adminUserOptions[index].id === patietInfo.registrars_id) {
+                    this.form.registrars = this.adminUserOptions[index].name
+                    break
+                  }
+                }
+              } else {
+                this.form.registrars = ''
+              }
+
+
+              this.form.maritalStatus = this.getMaritalType(patietInfo.marital_status)
+              this.form.education = this.getEducationType(patietInfo.education_level)
+              this.form.profession = this.getProfessionType(patietInfo.profession)
+
+
+
+
+
+
+            } else {
+              console.log('patient get err state')
+              this.$notify.error({
+                title: '错误',
+                message: '网络异常'
+              })
+            }
+          }).catch(err => {
+          this.$notify.error({
+            title: '错误',
+            message: '网络异常'
+          })
+        })
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state === 1) {
+            this.adminUserOptions = response.data.data.users
+          }
+        })
+      },getMaritalType(id){
+        for(let i = 0; i < this.maritalOptions.length; i++){
+          if(this.maritalOptions[i].id == id){
+            return this.maritalOptions[i].name
+          }
+        }
+      },getEducationType(id){
+        for(let i = 0; i < this.educationOptions.length; i++){
+          if(this.educationOptions[i].id == id){
+            return this.educationOptions[i].name
+          }
+        }
+      },getProfessionType(id){
+        for(let i = 0; i < this.professionOptions.length; i++){
+          if(this.professionOptions[i].id == id){
+            return this.professionOptions[i].name
+          }
+        }
+      },onCopy(){
+        this.$message.success('复制成功')
+
+      },onError(){
+        this.$message.success('复制失败,请重试')
+      },
+
+    }
+  }
+</script>
+
 
 <style lang="scss">
 .basicInfo {
@@ -216,7 +535,7 @@
     .rowOne {
       float: left;
       height: 36px;
-      width: 262px;
+      width: 350px;
       // line-height: 36px;
       margin-right: 12px;
       margin-bottom: 20px;

src/xt_pages/user/components/PatientDetail.vue

@@ -82,11 +82,26 @@
                   <el-date-picker v-model="form.birth" type="date" disabled placeholder="选择日期" :suffix-icon="'el-icon-menu'" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
+
+
+            <el-col :span="8">
+              <el-form-item label="首次肾脏治疗时间 : " label-width="150px"  class="is-required" prop="birth" >
+                <el-date-picker v-model="form.firstDialysisDate" type="date" disabled placeholder="选择日期" :suffix-icon="'el-icon-menu'" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
+              </el-form-item>
+            </el-col>
+
+
+
             <el-col :span="8">
               <el-form-item label="本人电话: " class="is-required" prop="phone">
                 <el-input v-model="form.phone" maxlength="20" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="家属姓名: " >
+                <el-input v-model="form.contact_name" maxlength="20" disabled></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="家属电话: " prop="homeTelephone">
                 <el-input v-model="form.homeTelephone" maxlength="20" disabled></el-input>
@@ -239,6 +254,29 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+
+              <el-col :span="8">
+                <el-form-item label="固定电话 : ">
+                  <el-input v-model="form.tell_phone" maxlength="20" disabled></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="费别 : ">
+                  <el-select v-model="form.expense_kind" disabled>
+                    <el-option v-for="item in expenseOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" >
+                <el-form-item label="透析龄(月): ">
+                  <el-input v-model="form.dialysis_age"  disabled></el-input>
+                </el-form-item>
+              </el-col>
+
+
             <el-col :span="8" >
               <el-form-item label="亲友电话: " prop="relative_phone">
                 <el-input v-model="form.relative_phone" maxlength="20" disabled></el-input>
@@ -354,8 +392,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <el-form-item label="首次透析日期 : "  prop="firstDialysisDate">
-            <el-date-picker v-model="form.firstDialysisDate" type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-form-item label="首次诊治日期 : "  >
+            <el-date-picker v-model="form.first_treatment_date" type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span="6" >
@@ -596,7 +634,12 @@ const defaultForm = {
   record_date: '',
   response_result: '',
   is_infectious: '',
-  formItem: []
+  formItem: [],
+  tell_phone:'',
+  first_treatment_date:'',
+  dialysis_age:'',
+  expense_kind:'',
+  contact_name:'',
 }
 
 export default {
@@ -605,6 +648,16 @@ export default {
 
   data() {
     return {
+      expenseOptions:[
+        {id:1,name:"基本医保"},
+        {id:2,name:"新农合"},
+        {id:3,name:"自费医疗"},
+        {id:4,name:"公费医疗"},
+        {id:5,name:"商业保险"},
+        {id:6,name:"军队医疗"},
+        {id:7,name:"其他"},
+      ],
+
       generic_info_fold: true,
       treat_info_fold: true,
       dialogFormVisible: false,
@@ -642,6 +695,8 @@ export default {
       patientPrint: {},
       print_time: '',
 
+
+
       rules: {
         contagions: [
           { type: 'array', required: false, trigger: 'change' }
@@ -776,6 +831,7 @@ export default {
             this.form.nation = patietInfo.nation
             this.form.native_place = patietInfo.native_place
             this.form.birth = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
+            this.form.firstDialysisDate = uParseTime(patietInfo.first_dialysis_date, '{y}-{m}-{d}')
             this.form.height = patietInfo.height + ''
             // this.form.age = jsGetAge(this.form.birth, "-");
             if (patietInfo.marital_status > 0) {
@@ -848,6 +904,20 @@ export default {
             this.form.sbp = patietInfo.sbp
             this.form.dbp = patietInfo.dbp
 
+            this.form.contact_name = patietInfo.contact_name
+            this.form.tell_phone = patietInfo.tell_phone
+            this.form.dialysis_age = patietInfo.dialysis_age
+            if( patietInfo.expense_kind == 0){
+              this.form.expense_kind = ""
+            }else{
+              this.form.expense_kind = patietInfo.expense_kind
+            }
+
+            this.form.first_treatment_date =  uParseTime(
+              patietInfo.first_treatment_date,
+              '{y}-{m}-{d}'
+            )
+
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;

src/xt_pages/user/components/PatientForm.vue

@@ -137,16 +137,31 @@
                                   value-format="yyyy-MM-dd"></el-date-picker>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="6" :style="isEdit?'width:380px':''">
+                <el-form-item label="首次肾脏治疗时间:" prop="firstDialysisDate" label-width="150px">
+                  <el-date-picker v-model="form.firstDialysisDate" type="date" format="yyyy-MM-dd"
+                                  value-format="yyyy-MM-dd"></el-date-picker>
+                </el-form-item>
+              </el-col>
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="本人电话 : " class="is-required" prop="phone">
                   <el-input v-model="form.phone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-form-item label="家属姓名 : ">
+                  <el-input v-model="form.contact_name" maxlength="20"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="家属电话 : " prop="homeTelephone">
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
+
+
+
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="患者来源 : " class="is-required" prop="source">
                   <el-radio-group v-model="form.source">
@@ -287,6 +302,27 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+
+                <el-col :span="8" :style="isEdit?'width:360px':''">
+                  <el-form-item label="固定电话 : ">
+                    <el-input v-model="form.tell_phone" maxlength="20"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8" :style="isEdit?'width:360px':''">
+                  <el-form-item label="费别 : ">
+                    <el-select v-model="form.expense_kind">
+                      <el-option v-for="item in expenseOptions" :key="item.id" :label="item.name" :value="item.id"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+                  <el-form-item label="透析龄(月): ">
+                    <el-input v-model="form.dialysis_age" ></el-input>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="亲友电话 : " prop="relative_phone">
                     <el-input v-model="form.relative_phone" maxlength="20"></el-input>
@@ -447,10 +483,11 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
             <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="首次透析日期 : " prop="firstDialysisDate">
-                <el-date-picker v-model="form.firstDialysisDate" type="date" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd" @change="selectFirstDialysisDate"></el-date-picker>
+              <el-form-item label="首次诊治时间 : " >
+                <el-date-picker v-model="form.first_treatment_date" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6" :style="isEdit?'width:360px':''">
@@ -566,9 +603,19 @@
     diagnose: '',
     is_infectious:1,
     age: '',
+
     response_result:'',
     remind_cycle:0,
     record_date:'',
+
+    tell_phone:'',
+    first_treatment_date:'',
+    dialysis_age:'',
+    expense_kind:'',
+    contact_name:'',
+
+
+
     formItem:[
       { id: 0,
         item: "",
@@ -743,6 +790,7 @@
       }
 
       return {
+
         crumbs: [
           { path: false, name: '病人管理' },
           { path: false, name: '新增病人' }
@@ -787,6 +835,15 @@
         submitMsg: '',
         patientID: 0,
         formLoading:false,
+        expenseOptions:[
+          {id:1,name:"基本医保"},
+          {id:2,name:"新农合"},
+          {id:3,name:"自费医疗"},
+          {id:4,name:"公费医疗"},
+          {id:5,name:"商业保险"},
+          {id:6,name:"军队医疗"},
+          {id:7,name:"其他"},
+        ],
 
 
         subscibe: {},
@@ -804,6 +861,7 @@
           idCardNo: [{ required: true, message: '请填写身份证号', trigger: 'blur' }],
           birth: [{ required: true, message: '请填写生日', trigger: 'blur' }],
           age: [{ required: true, message: '请填写年龄', trigger: 'blur' }],
+          firstDialysisDate:[{ required: true, message: '请选择日期', trigger: 'blur' }],
 
 
           // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
@@ -1207,6 +1265,19 @@
               this.form.remind_cycle = patietInfo.remind_cycle
               this.form.is_infectious = patietInfo.is_infectious
 
+              this.form.tell_phone = patietInfo.tell_phone
+              this.form.dialysis_age = patietInfo.dialysis_age
+              this.form.contact_name = patietInfo.contact_name
+              if( patietInfo.expense_kind == 0){
+                this.form.expense_kind = ""
+              }else{
+                this.form.expense_kind = patietInfo.expense_kind
+              }
+
+              this.form.first_treatment_date =  uParseTime(
+                patietInfo.first_treatment_date,
+                '{y}-{m}-{d}'
+              )
 
 
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -27,9 +27,9 @@
       <el-tree
         :data="treeData"
         accordion
-        node-key="name" 
-        :key="treeKey" 
-        :current-node-key="treeKey" 
+        node-key="name"
+        :key="treeKey"
+        :current-node-key="treeKey"
         :default-expanded-keys="[defaultActive]"
         @node-click="handleNodeClick"
         >

src/xt_pages/user/dialysisSolution.vue

@@ -453,6 +453,14 @@
     editPatientDialysisSolution,
     fetchPatientDialysisSolutions
   } from '@/api/patient'
+
+  import {
+    getSystemPrescription,
+  } from '@/api/config'
+
+
+
+
   import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
   import store from '@/store'
 
@@ -1198,6 +1206,85 @@
         }
         // this.current_model = this.modeOptions[thismode];
         this.addPlan.mode_name = this.modeOptions[thismode].name
+        let params = {
+          id: thismode
+        }
+
+
+
+        getSystemPrescription(params).then(response => {
+          if (response.data.state == 1) {
+            if(response.data.data.prescription.id > 0) {
+              for (const key in  response.data.data.prescription) {
+                //因为el-input特性整数类型或者浮点数类型需要转换成字符串，所以加上toString()
+                this.$set(this.addPlan, key, response.data.data.prescription[key].toString())
+              }
+
+              //因为el-select特性,整数类型不能转字符串，所以额外处理这些数据
+              this.$set(this.addPlan, "dialysate_formulation", response.data.data.prescription['dialysate_formulation'])
+              this.$set(this.addPlan, "anticoagulant", response.data.data.prescription['anticoagulant'])
+              this.$set(this.addPlan, "body_fluid", response.data.data.prescription['body_fluid'])
+              this.$set(this.addPlan, "special_medicine", response.data.data.prescription['special_medicine'])
+              this.$set(this.addPlan, "displace_liqui_part", response.data.data.prescription['displace_liqui_part'])
+              this.$set(this.addPlan, "blood_access", response.data.data.prescription['blood_access'])
+
+
+
+              this.dialysisTimeShow = new Date(2018, 1, 1, this.addPlan.dialysis_duration_hour, this.addPlan.dialysis_duration_minute)
+
+            }else{
+              var tempAddPlan = {
+                id: 0,
+                dialyzer: '',
+                dialysis_duration: '',
+                dialysis_duration_hour: '',
+                dialysis_duration_minute: '',
+                hemodialysis_machine: '',
+                dialysate_formulation:'',
+                perfusion_apparatus: '',
+                blood_flow_volume: '',
+                dewater: '',
+                displace_liqui: 0,
+                replacement_way: '',
+                anticoagulant: '',
+                anticoagulant_shouji: '',
+                anticoagulant_weichi: '',
+                anticoagulant_zongliang: '',
+                anticoagulant_gaimingcheng: '',
+                anticoagulant_gaijiliang: '',
+                kalium: '',
+                replacement_total: '',
+                sodium: '',
+                calcium: '',
+                bicarbonate: '',
+                glucose: '',
+                dry_weight: '',
+                dialysate_flow: '',
+                dialysate_temperature: '',
+                conductivity: '',
+                doctor: '',
+                remark: '',
+                target_ktv: '',
+                target_ultrafiltration: '',
+                dialyzer_perfusion_apparatus: '',
+                body_fluid: '',
+                body_fluid_other: '',
+                special_medicine: '',
+                special_medicine_other: '',
+                displace_liqui_part: '',
+                displace_liqui_value: '',
+                ultrafiltration: '',
+                blood_access: ''
+              }
+
+              for (const key in  tempAddPlan) {
+                this.addPlan[key] = tempAddPlan[key]
+              }
+
+
+            }
+          }
+        })
       },
       setCurrentMode(id) {
         if (typeof (this.modeOptions[id]) == 'undefined' || this.modeOptions[id] == null) {

src/xt_pages/user/inspection.vue

@@ -106,8 +106,8 @@
 
       <el-form :model="form"  ref="form" label-position="top">
 
-        <el-row v-if="form.formItem[0].project_id == 14">
-          <el-col :span="24">
+        <el-row >
+          <el-col :span="24" v-if="form.formItem[0].project_id == 14">
             <el-form-item label="传染病周期提醒: " >
               <el-radio-group v-model="form.remind_cycle">
                 <el-radio :label="1">一月一次</el-radio>