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

src/api/batch/batch.js

@@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+export function prescriptiontemplate(params,data) {
+  return request({
+    url: '/api/his/addstemplate',
+    method: 'post',
+    data:data,
+    params:params,
+  })
+}
+export function replacesavedrug(params,data) {
+  return request({
+    url: '/api/his/replacesavedrug',
+    method: 'post',
+    data:data,
+    params:params,
+  })
+}
+export function replacesaveproject(params,data) {
+  return request({
+    url: '/api/his/replacesaveproject',
+    method: 'post',
+    data:data,
+    params:params,
+  })
+}
+
+export function getdialysismodename(query) {
+  return request({
+    url: '/api/his/getdialysismodename',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getdrugsname(query) {
+  return request({
+    url: '/api/his/getdrugsname',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getmodeconfigs(query) {
+  return request({
+    url: '/api/his/getmodeconfigs',
+    method: 'get',
+    params: query
+  })
+}
+
+//根据id获取药品耗材项目基本信息
+export function getdrugsinformation(query) {
+  return request({
+    url: '/api/his/getdrugsinformation',
+    method: 'get',
+    params: query
+  })
+}
+//替换——获取患者名字
+export function replacepeoplename(query) {
+  return request({
+    url: '/api/his/replacepeoplename',
+    method: 'get',
+    params: query
+  })
+}
+//替换——配置
+export function replaceconfig(query) {
+  return request({
+    url: '/api/his/replaceconfig',
+    method: 'get',
+    params: query
+  })
+}
+//批量删除——药品
+export function deletedrugsbatch(query) {
+  return request({
+    url: '/api/his/deletedrugsbatch',
+    method: 'get',
+    params: query
+  })
+}
+//批量删除——项目
+export function batchdeleteitems(query) {
+  return request({
+    url: '/api/his/batchdeleteitems',
+    method: 'get',
+    params: query
+  })
+}
+//根据患者id、透析模式获取处方模板信息
+export function ptemplateinformation(query) {
+  return request({
+    url: '/api/his/ptemplateinformation',
+    method: 'get',
+    params: query
+  })
+}
+//删除一条记录
+export function deleteone(query) {
+  return request({
+    url: '/api/his/deleteone',
+    method: 'get',
+    params: query
+  })
+}

src/api/data.js

@@ -43,9 +43,9 @@ export function updateTemplate(params) {
   })
 }
 
-export function updateFieldIsShow(id, is_show) {
+export function updateFieldIsShow(id, is_show, is_write) {
   return request({
-    url: '/api/filed/show?id=' + id + '&is_show=' + is_show,
+    url: '/api/filed/show?id=' + id + '&is_show=' + is_show + '&is_write=' + is_write,
     method: 'post'
   })
 }

src/api/pharmacy.js

@@ -104,3 +104,19 @@ export function getcurrentname(params) {
     params: params
   })
 }
+//获取分区列表
+export function getpartitionlist(params) {
+  return request({
+    url: '/api/pharmacy/getpartitionlist',
+    method: 'get',
+    params: params
+  })
+}
+//获取给药途径
+export function routeofadministration(params) {
+  return request({
+    url: '/api/pharmacy/routeofadministration',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/hisTool.js

@@ -26,6 +26,22 @@ export default {
       hidden: true,
       is_menu: false
     },
+    {
+      path: '/hisTool/batchDelete',
+      component: () => import('@/xt_pages/outpatientDoctorStation/batch_delete'),
+      name: 'batchDelete',
+      meta: { title: 'batchDelete', noCache: true },
+      hidden: true,
+      is_menu: false
+    },
+    {
+      path: '/hisTool/batchReplacement',
+      component: () => import('@/xt_pages/outpatientDoctorStation/batch_replacement'),
+      name: 'batchReplacement',
+      meta: { title: 'batchReplacement', noCache: true },
+      hidden: true,
+      is_menu: false
+    },
     {
       path: '/hisTool/modeTemplateDetail',
       component: () => import('@/xt_pages/outpatientDoctorStation/modeTemplateDetail'),

src/store/modules/xt_user.js

@@ -11,7 +11,7 @@ const xt_user = {
     zone_selected: 0,
     patient_state_selected: 0,
     treat_state_selected: 0,
-    selected_date:new Date(),
+    selected_date: new Date(),
     app_id: 0,
     user: {
       id: 0,
@@ -55,17 +55,17 @@ const xt_user = {
     urlfors: [],
     fileds: [],
 
-    //监测的搜索状态
+    // 监测的搜索状态
     search_mode: 1,
-    //监测的搜索值
-    search_value:''
+    // 监测的搜索值
+    search_value: ''
   },
 
   mutations: {
-    SET_SEARCH_VALUE:(state, search_value) => {
+    SET_SEARCH_VALUE: (state, search_value) => {
       state.search_value = search_value
     },
-    SET_SEARCH_MODE:(state, search_mode) => {
+    SET_SEARCH_MODE: (state, search_mode) => {
       state.search_mode = search_mode
     },
     SET_SCHEDULE_TYPE_SELECTED: (state, schedule_type_selected) => {
@@ -380,7 +380,8 @@ const xt_user = {
     }) {
       commit('CLEAR_USER_INFO')
       removeAdminUserInfoCache()
-    }, updateFiledConfigList({ commit }, object) {
+    },
+    updateFiledConfigList({ commit }, object) {
       var oldFiledList = getFiledConfigList()
       console.log('oldFiledList', oldFiledList)
       var infoJSON = JSON.parse(oldFiledList)
@@ -389,6 +390,7 @@ const xt_user = {
         for (let i = 0; i < infoJSON.length; i++) {
           if (infoJSON[i].id == object.id) {
             infoJSON[i].is_show = object.is_show
+            infoJSON[i].is_write = object.is_write
           }
         }
 

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -49,7 +49,7 @@
 
           <el-table
             v-if="state == 1"
-            :height="tableHeight"
+            height="60vh"
             :data="waiting_drug"
             border
             style="width: 100%"
@@ -114,19 +114,49 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
+          班次：
+          <el-select v-model="shift" placeholder="请选择" @change="getdrugsdetails02">
+            <el-option
+              v-for="item in banshift"
+              :key="item.value"
+              :label="item.text"
+              :value="item.value">
+            </el-option>
+          </el-select>
+          分区：
+          <el-select v-model="partition" placeholder="请选择" @change="getdrugsdetails">
+            <el-option
+              v-for="item in fen"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          给药途径：
+          <el-select v-model="deliveryway" placeholder="请选择" @change="getdruglist02">
+            <el-option
+              v-for="item in routeofadministration"
+              :key="item.name"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+          <el-button type="primary" @click="toExport" v-if="state == 2">导出</el-button>
           <!--          <el-button type="primary" @click="tt">调试</el-button>-->
           <el-button type="primary" @click="dispense" v-if="state == 1"
             >发药</el-button
           >
           <el-button type="primary" @click="toPrint">打印</el-button>
-          <!--          <el-button @click="tt">调试</el-button>-->
-          <!--          <el-button type="primary" @click="toSetting">设置</el-button>-->
+<!--                    <el-button @click="tt">调试</el-button>-->
+
         </div>
         <el-divider></el-divider>
         <div>
           <el-table
             :height="tableHeight"
             :data="tableData"
+            :summary-method="getSummaries"
+            show-summary
             border
             highlight-current-row
             style="width: 1328px"
@@ -317,6 +347,8 @@
             </el-table-column>
           </el-table>
         </div>
+        <div style="background-color: #f5f7fa;display:flex;padding: 10px;justify-content:space-around;position:absolute;width:75.6%;margin-top: 27.5%;
+"><div style="width: 40%;padding-left:3%">合计 </div> <div style="width: 40%;display: flex;justify-content:center;padding-left: 37%">{{total}}</div></div>
         <div style="margin-top: 25px" v-if="state == 1">
           领药人：
           <el-select v-model="admin_user_id" placeholder="请选择">
@@ -382,6 +414,8 @@ import {
   getpatientswithdrugs,
   medicinedeparture,
   getcurrentname,
+  getpartitionlist,
+  routeofadministration,
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -417,13 +451,26 @@ export default {
       issued_drug: [], //已发药列表
       currentRow: null,
       tmp: 0,
+      banshift:[
+        {value:0,text:'全部班'},
+        {value:1,text:'上午'},
+        {value:2,text: '下午'},
+        {value:3,text: '晚上'}
+      ],
+      shift:0,//班次
+      fen:[],
+      partition:0,//分区
+      routeofadministration:[],
+      deliveryway:"全部",//给药途径
+      total:"",//合计
     };
   },
 
   methods: {
     tt() {
-      console.log("this.currentRow", this.currentRow);
-      this.$router.go(0);
+      console.log("this.state", this.state);
+      console.log("this.tableData", this.tableData);
+      console.log("this.deliveryway", this.deliveryway);
     },
     async fun3() {
       console.log("fun3");
@@ -455,6 +502,34 @@ export default {
         }
       });
     },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        console.log(data, "合计data1");
+        const values = data.map((item) => Number(item[column.property]));
+
+        if (!values.every((value) => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += " 元";
+        } else {
+          sums[index] = "N/A";
+        }
+      });
+
+      return sums;
+    },
     changeTimes() {
       // alert("aa")
       // this.getdruglist();
@@ -495,6 +570,174 @@ export default {
         this.start_time
       );
     },
+    toExport() {
+      if (this.state == 1 && this.multipleSelection.length == 0) {
+        this.$message.error("未选择任何数据");
+        return;
+      }
+      if (this.state == 2 && this.tableData == null) {
+        this.$message.error("未选择任何数据");
+        return;
+      }
+      // for (let i = 0; i < this.tableData.length; i++) {
+      //   this.tableData[i].index = i + 1;
+      //   this.tableData[i].name = this.tableData[i].dose + this.tableData[i].dose_unit + "*" + this.tableData[i].min_number + this.tableData[i].min_unit +
+      //     "/" +
+      //     this.tableData[i].max_unit;
+      //
+      //   this.tableData[i].total_price = (
+      //     this.tableData[i].warehousing_count * this.exportList[i].price
+      //   ).toFixed(2);
+      //   for (let j = 0; j < this.manufacturerList.length; j++) {
+      //     if (this.exportList[i].manufacturer == this.manufacturerList[j].id) {
+      //       this.exportList[i].manufacturer =
+      //         this.manufacturerList[j].manufacturer_name;
+      //     }
+      //     if (this.exportList[i].manufacturer == 0) {
+      //       this.exportList[i].manufacturer = "";
+      //     }
+      //   }
+      //
+      //   for (let z = 0; z < this.dealerList.length; z++) {
+      //     if (this.exportList[i].dealer == this.dealerList[z].id) {
+      //       this.exportList[i].dealer = this.dealerList[z].dealer_name;
+      //     }
+      //     if (this.exportList[i].dealer == 0) {
+      //       this.exportList[i].dealer = "";
+      //     }
+      //   }
+      // }
+
+      if(this.state == 1){
+        import("@/vendor/Export2Excel").then((excel) => {
+          for (let i = 0; i < this.multipleSelection.length; i++) {
+            this.multipleSelection[i].index = i + 1;
+            this.multipleSelection[i].time = this.start_time
+            this.multipleSelection[i].yname = this.currentRow.name
+          }
+
+          const tHeader = [
+            "序号",
+            "时间",
+            "患者名称",
+            "药品名称",
+            "单次用量",
+            "用法",
+            "频率",
+            "天数",
+            "总量",
+            "数据来源",
+          ];
+          const filterVal = [
+            "index",
+            "time",
+            "name",
+            "yname",
+            "single_dosage",
+            "usage",
+            "frequency",
+            "days",
+            "total",
+            "data_sources",
+          ];
+
+          const data = this.formatJson(filterVal, this.multipleSelection);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "发药单详情",
+          });
+          this.downloadLoading = false;
+        });
+      }else if(this.state == 2){
+        import("@/vendor/Export2Excel").then((excel) => {
+          for (let i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].index = i + 1;
+            this.tableData[i].time = this.start_time
+            this.tableData[i].yname = this.currentRow.name
+          }
+
+          const tHeader = [
+            "序号",
+            "日期",
+            "患者名称",
+            "药品名称",
+            "单次用量",
+            "用法",
+            "频率",
+            "天数",
+            "总量",
+            "数据来源",
+            "领药人",
+          ];
+          const filterVal = [
+            "index",
+            "time",
+            "name",
+            "yname",
+            "single_dosage",
+            "usage",
+            "frequency",
+            "days",
+            "total",
+            "data_sources",
+            "people",
+          ];
+
+          const data = this.formatJson(filterVal, this.tableData);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "发药单详情",
+          });
+          this.downloadLoading = false;
+        });
+      }else{
+        this.$message.error("药品状态异常");
+        return;
+      }
+      // import("@/vendor/Export2Excel").then((excel) => {
+      //   // for (let i = 0; i < this.tableData.length; i++) {
+      //   //   for (let j = 0; j < this.drugTypeList.length; j++) {
+      //   //     if (this.exportList[i].drug_type == this.drugTypeList[j].id) {
+      //   //       this.exportList[i].drug_type = this.drugTypeList[j].name;
+      //   //     }
+      //   //   }
+      //   // }
+      //
+      //   const tHeader = [
+      //     "序号",
+      //     "患者名称",
+      //     "单次用量",
+      //     "用法",
+      //     "频率",
+      //     "天数",
+      //     "总量",
+      //     "数据来源",
+      //   ];
+      //   const filterVal = [
+      //     "index",
+      //     "drug_name",
+      //     "drug_type",
+      //     "unit",
+      //     "batch_number",
+      //     "warehousing_count",
+      //     "price",
+      //     "total_price",
+      //   ];
+      //
+      //   const data = this.tableData;
+      //   excel.export_json_to_excel({
+      //     header: tHeader,
+      //     data,
+      //     filename: "药品入库单详情",
+      //   });
+      //   this.downloadLoading = false;
+      // });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
     //列表选择
     handleSelectionChange(val) {
       this.multipleSelection = val;
@@ -564,10 +807,38 @@ export default {
       });
     },
     //获取药品列表
+    getdruglist02() {
+      // var tps = this.currentRow.id;
+      this.tableData = [];
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+        deliveryway: this.deliveryway,
+      };
+      waitingmedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.waiting_drug = res.data.data.list;
+        }
+      });
+      dispensemedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.issued_drug = res.data.data.list;
+        }
+      });
+      if(this.state == 2){
+        this.handleCurrentChange(this.currentRow);
+        // this.fun5(tps);
+      }else{
+        this.handleCurrentChange(this.currentRow);
+        // this.fun4(tps);
+      }
+    },
+    //获取药品列表
     getdruglist() {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        deliveryway: this.deliveryway,
       };
       waitingmedicine(params).then((res) => {
         if (res.data.state == 1) {
@@ -584,6 +855,7 @@ export default {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        deliveryway: this.deliveryway,
       };
       await waitingmedicine(params).then((res) => {
         if (res.data.state == 1) {
@@ -633,6 +905,8 @@ export default {
     },
     handleCurrentChange(val) {
       this.currentRow = val;
+      console.log("currentRow",this.currentRow)
+      this.total = ""
       if (this.state == 1) {
         this.getdrugsdetails(0);
       }
@@ -640,15 +914,47 @@ export default {
         this.getdrugsdetails(1);
       }
     },
+    getdrugsdetails02(val) {
+      if(this.state == 1){
+        val = 0
+      }else{
+        val = 1
+      }
+      var params = {
+        drug_id: this.currentRow.id,
+        is_medicine: val,
+        time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
+        deliveryway: this.deliveryway,
+      };
+      getpatientswithdrugs(params).then((res) => {
+        if (res.data.state == 1) {
+          this.tableData = res.data.data.list; //列表数据
+          this.total = res.data.data.total;//合计
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      });
+    },
     getdrugsdetails(val) {
+      if(this.state == 1){
+        val = 0
+      }else{
+        val = 1
+      }
       var params = {
         drug_id: this.currentRow.id,
         is_medicine: val,
         time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
+        deliveryway: this.deliveryway,
       };
       getpatientswithdrugs(params).then((res) => {
         if (res.data.state == 1) {
           this.tableData = res.data.data.list; //列表数据
+          this.total = res.data.data.total;//合计
         } else {
           this.$message.error(res.data.msg);
         }
@@ -676,6 +982,20 @@ export default {
         }
       });
     },
+    getrouteofadministration(){
+      var params = {}
+      routeofadministration(params).then((res) =>{
+        if(res.data.state == 1){
+          this.routeofadministration = res.data.data.list;
+        }
+      })
+    },
+    getgetpartitionlist(){
+      var params = {}
+      getpartitionlist(params).then((res) =>{
+        this.fen = res.data.data.list;
+      })
+    },
     getUserlist(drug_id) {
       var params = {
         start_time: this.start_time,
@@ -706,6 +1026,8 @@ export default {
     this.getlist();
     // this.getdruglist();
     this.fun3();
+    this.getrouteofadministration();
+    this.getgetpartitionlist();
   },
 };
 </script>
@@ -759,7 +1081,8 @@ export default {
 }
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-  overflow: auto;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -53,7 +53,7 @@
           </div>
 
           <el-table
-            :height="tableHeight"
+            height="60vh"
             ref="table01"
             :data="waitmount_data"
             highlight-current-row
@@ -112,6 +112,25 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
+          班次：
+          <el-select v-model="shift" placeholder="请选择" @change="searchAction">
+            <el-option
+              v-for="item in banshift"
+              :key="item.value"
+              :label="item.text"
+              :value="item.value">
+            </el-option>
+          </el-select>
+          分区：
+          <el-select v-model="partition" placeholder="请选择" @change="searchAction">
+            <el-option
+              v-for="item in fen"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-button type="primary" @click="toExport" v-if="state == 2">导出</el-button>
           <el-button type="primary" @click="dispense" v-if="state == 1"
             >发药</el-button
           >
@@ -119,7 +138,7 @@
             >退药</el-button
           >
           <el-button type="primary" @click="toPrint">打印</el-button>
-          <!--          <el-button @click="tiaoshi">调试</el-button>-->
+<!--                    <el-button @click="tiaoshi">调试</el-button>-->
           <el-button type="primary" v-if="state == 1" @click="toSetting"
             >设置</el-button
           >
@@ -243,6 +262,7 @@ import {
   getpharmacycontent,
   dispensingmedicine,
   drugwithdrawal,
+  getpartitionlist,
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -272,6 +292,15 @@ export default {
       currentRow: null,
       dialogVisible: false,
       is_open: "2",
+      banshift:[
+        {value:0,text:'全部班'},
+        {value:1,text:'上午'},
+        {value:2,text: '下午'},
+        {value:3,text: '晚上'}
+        ],
+      shift:0,//班次
+      fen:[],
+      partition:0,//分区
     };
   },
   watch: {},
@@ -279,12 +308,26 @@ export default {
     this.init();
     this.gettodaynumber();
     this.fun3();
+    this.getgetpartitionlist();
     // this.getwaitmount();//fun3
     // this.selectedbydefault();
   },
   methods: {
+    getgetpartitionlist(){
+      var params = {}
+      getpartitionlist(params).then((res) =>{
+        if(res.data.state == 1){
+          this.fen = res.data.data.list
+        }
+      })
+    },
     tiaoshi() {
-      console.log("this.tableData", this.tableData);
+      console.log("this.shift", this.shift);
+      console.log("this.partition", this.partition);
+      console.log("this.waitmount_data", this.waitmount_data);
+      console.log("this.alreadmount_data", this.alreadmount_data);
+      console.log("this.waitmount", this.waitmount);
+      console.log("this.alreadmount", this.alreadmount);
     },
     async fun3() {
       console.log("fun3");
@@ -344,6 +387,8 @@ export default {
       this.state = 1;
       this.tableData = null;
       this.currentRow = null;
+      this.partition = 0;
+      this.shift = 0;
     },
     testsss() {
       this.state = 1;
@@ -397,15 +442,31 @@ export default {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
       };
       waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
           this.waitmount_data = res.data.data.list;
+          if(this.shift != 0 || this.partition != 0){
+            if(this.waitmount_data == null){
+              this.waitmount = 0
+            }else{
+              this.waitmount = this.waitmount_data.length
+            }
+          }
         }
       });
       issueddrugs(params).then((res) => {
         if (res.data.state == 1) {
           this.alreadmount_data = res.data.data.list;
+          if(this.shift != 0 || this.partition != 0){
+            if (this.alreadmount_data == null){
+              this.alreadmount = 0
+            }else{
+              this.alreadmount = this.alreadmount_data.length
+            }
+          }
         }
       });
     },
@@ -415,6 +476,8 @@ export default {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
+        shift: this.shift,
+        partition: this.partition,
       };
       await waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
@@ -460,11 +523,66 @@ export default {
         this.start_time
       );
     },
+    toExport() {
+
+      import("@/vendor/Export2Excel").then((excel) => {
+          for (let i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].index = i + 1;
+            this.tableData[i].time = this.start_time
+            this.tableData[i].uname = this.currentRow.Name
+          }
+
+          const tHeader = [
+            "序号",
+            "日期",
+            "患者名称",
+            "名称",
+            "单次用量",
+            "用法",
+            "频率",
+            "天数",
+            "总量",
+            "开立医生",
+            "数据来源",
+            "备注",
+          ];
+          const filterVal = [
+            "index",
+            "time",
+            "uname",
+            "Name",
+            "SingleDosage",
+            "Usage",
+            "Frequency",
+            "Days",
+            "Total",
+            "Doctor",
+            "DataSources",
+            "Remarks",
+          ];
+
+          const data = this.formatJson(filterVal, this.tableData);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "领药单",
+          });
+          this.downloadLoading = false;
+        });
+
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
 
     // 搜索患者
     searchAction() {
       this.tableData = null;
       this.getwaitmount();
+      if(this.shift != 0 || this.partition != 0){
+      }else{
+        this.gettodaynumber();
+      }
     },
 
     // 药品发药
@@ -612,6 +730,7 @@ export default {
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
   overflow: auto;
+  overflow-x: hidden;
 }
 /deep/ .gutter {
   width: 15px !important;

src/xt_pages/data/components/dialysisAfter.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisBefore.vue

@@ -77,7 +77,7 @@
           cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               const params = {
                 id: response.data.data.id,
@@ -103,7 +103,7 @@
           cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               const params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisComputer.vue

@@ -30,6 +30,8 @@
         </template>
       </el-table-column>
 
+   
+
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-tooltip
@@ -89,7 +91,7 @@
           type: "warning"
         })
           .then(() => {
-            updateFieldIsShow(row.id, 2).then(response => {
+            updateFieldIsShow(row.id, 2,0).then(response => {
               if (response.data.state == 1) {
                 let params = {
                   id: response.data.data.id,
@@ -113,7 +115,7 @@
           type: "warning"
         })
           .then(() => {
-            updateFieldIsShow(row.id, 1).then(response => {
+            updateFieldIsShow(row.id, 1,1).then(response => {
               if (response.data.state == 1) {
                 let params = {
                   id: response.data.data.id,

src/xt_pages/data/components/dialysisMonitor.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisOff.vue

@@ -30,9 +30,49 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" label="是否必填">
+        <template slot-scope="scope">
+          <span v-if="scope.row.is_write == 1">是</span>
+          <span v-if="scope.row.is_write == 0">否</span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-tooltip
+            <el-button
+              v-if="scope.row.is_show == 1"
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHide(scope.$index, scope.row)"
+            >
+            </el-button>
+            <el-button
+              v-if="scope.row.is_write == 1"
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHideOne(scope.$index, scope.row)"
+            >
+            </el-button>
+
+             <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+            <el-button
+              v-if="scope.row.is_write == 0"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShowOne(scope.$index, scope.row)"
+            >
+            </el-button>
+          <!-- <el-tooltip
             class="item"
             effect="dark"
             content="不展示"
@@ -48,6 +88,22 @@
             </el-button>
           </el-tooltip>
 
+           <el-tooltip
+            class="item"
+            effect="dark"
+            content="不必填"
+            placement="top"
+            v-if="scope.row.is_write == 1"
+          >
+            <el-button
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHideOne(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+
           <el-tooltip
             class="item"
             effect="dark"
@@ -62,7 +118,25 @@
               @click="handleShow(scope.$index, scope.row)"
             >
             </el-button>
+           
           </el-tooltip>
+
+           <el-tooltip
+            class="item"
+            effect="dark"
+            content="必填"
+            placement="top"
+            v-if="scope.row.is_write == 2"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShowOne(scope.$index, scope.row)"
+            >
+            </el-button>
+           
+          </el-tooltip> -->
         </template>
       </el-table-column>
     </el-table>
@@ -81,6 +155,12 @@ export default {
       type: Array
     }
   },
+  data(){
+    return {
+    is_show:2,
+    is_write:0,
+   }
+  },
   methods: {
     handleHide: function(index, row) {
       this.$confirm("是否将该字段设为不可见?", "提示", {
@@ -89,11 +169,40 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,row.is_write).then(response => {
             if (response.data.state == 1) {
+              this.is_show = response.data.data.is_show
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    },
+    handleHideOne: function(index, row) {
+      this.$confirm("是否将该字段设为不必填?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      })
+        .then(() => {
+          updateFieldIsShow(row.id,row.is_show,0).then(response => {
+          
+            if (response.data.state == 1) {
+              this.is_write = response.data.data.is_write
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);
@@ -112,11 +221,39 @@ export default {
         cancelButtonText: "取 消",
         type: "warning"
       }).then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,row.is_write).then(response => {
+            if (response.data.state == 1) {
+              this.is_show = response.data.data.is_show
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    },
+    handleShowOne: function(index, row) {
+      this.$confirm("是否将该字段设为必填?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      }).then(() => {
+         
+          updateFieldIsShow(row.id,row.is_show,1).then(response => {
             if (response.data.state == 1) {
+              this.is_write = response.data.data.is_write
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);

src/xt_pages/data/components/dialysisPrescription.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/dialysisSummary.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -113,7 +113,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/doubleCheck.vue

@@ -89,7 +89,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -112,7 +112,7 @@ export default {
         cancelButtonText: "取 消",
         type: "warning"
       }).then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/components/receiveTreatmentAsses.vue

@@ -88,7 +88,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 2).then(response => {
+          updateFieldIsShow(row.id, 2,0).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
@@ -112,7 +112,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          updateFieldIsShow(row.id, 1).then(response => {
+          updateFieldIsShow(row.id, 1,1).then(response => {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,

src/xt_pages/data/showConfig.vue

@@ -175,10 +175,11 @@ export default {
       }
     },
     changeDialysisOffData:function(object){
-
+    
      for (let i = 0; i < this.dialysis_off_data.length; i++) {
         if (this.dialysis_off_data[i].id == object.id) {
           this.dialysis_off_data[i].is_show = object.is_show;
+          this.dialysis_off_data[i].is_write = object.is_write
         }
       }
     }
@@ -186,7 +187,7 @@ export default {
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-    
+    console.log("地址32323232232332322我噢",filedList)
   
     for (let i = 0; i < filedList.length; i++) {
       switch (filedList[i].module) {

src/xt_pages/device/components/partition_dialog.vue

@@ -10,7 +10,7 @@
                         <el-table-column prop="name" label="分区名称" align="center"></el-table-column>
                         <el-table-column prop="type" label="分区类型" align="center"></el-table-column>
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
-                        <el-table-column label="操作" align="center"> 
+                        <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyZoneAt(scope.row)"></el-button>
 
@@ -22,7 +22,7 @@
                                         <el-button size="mini" @click="scope.row.willDelete = false">取消</el-button>
                                     </div>
                                 </el-popover> -->
-                            </template>  
+                            </template>
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
@@ -34,7 +34,7 @@
                         <el-table-column prop="zone_name" label="所属分区" align="center"></el-table-column>
                         <el-table-column prop="group_name" label="所属分组" align="center"></el-table-column>
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
-                        <el-table-column label="操作" align="center"> 
+                        <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyDeviceNumberAt(scope.row)"></el-button>
 
@@ -46,7 +46,7 @@
                                     </div>
                                     <el-button type="danger" slot="reference"  icon="el-icon-delete" size="mini">删除</el-button>
                                 </el-popover> -->
-                            </template>  
+                            </template>
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
@@ -68,14 +68,14 @@
                                     </div>
                                     <el-button type="danger" slot="reference" icon="el-icon-delete" size="mini">删除</el-button>
                                 </el-popover> -->
-                            </template>  
+                            </template>
                         </el-table-column>
                     </el-table>
                 </el-tab-pane>
             </el-tabs>
-            
+
             <!-- <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="visible = false">保 存</el-button>            
+                <el-button type="primary" @click="visible = false">保 存</el-button>
                 <el-button @click="visible = false">取 消</el-button>
             </span> -->
         </el-dialog>
@@ -273,7 +273,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyZone(this.zone_form.id, this.zone_form.name, this.zone_form.type).then(rs => {
                             var resp = rs.data
@@ -293,7 +293,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -314,7 +314,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyGroup(this.group_form.id, this.group_form.name).then(rs => {
                             var resp = rs.data
@@ -333,7 +333,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -354,7 +354,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyDeviceNumber(this.number_form.id, this.number_form.number, this.number_form.zone, this.number_form.group).then(rs => {
                             var resp = rs.data
@@ -375,7 +375,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -324,6 +324,10 @@
           <label>管路凝血: </label>
           <span class="content" >{{ this.record.pip_coagulation}}</span>
         </li>
+       <li v-if="isShow('累计血容量')">
+          <label>累计血容量: </label>
+          <span class="content" >{{ this.record.accumulated_blood_volume}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -5,14 +5,21 @@
     </h2>
     <div class="plate ">
       <ul>
-        <li v-if="isShow('透前称重')">
-          <label>透前称重 : </label>
+        <li v-if="isShow('透前体重')">
+          <label>透前体重 : </label>
           <span class="content" v-if="weight_before != '0'">{{
             weight_before
           }}</span>
           <span class="unit" v-if="weight_before != '0'">kg</span>
         </li>
 
+        <li v-if="isShow('透前体重备注')">
+          <label>透前体重备注 : </label>
+          <span class="content">
+            {{this.record.weight_befor_remake}}
+          </span>
+        </li>
+
         <li v-if="isShow('干体重')">
           <label>干体重 : </label>
           <span class="content" v-if="dry_weight != '0'">{{ dry_weight }}</span>

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

@@ -614,11 +614,18 @@
               <el-input v-model="form.after_urea"></el-input>
             </el-form-item>
        </el-col>
+       <el-col :span="8" v-if="isShow('累计血容量')">
+            <el-form-item label="累计血容量(L)："  label-width="150px">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
             </el-form-item>
         </el-col>
+
+      
       </el-form>
 
 
@@ -793,6 +800,7 @@ export default {
         fallrisk:"",
         machine_run:"",
         after_urea:"",
+        accumulated_blood_volume:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1013,6 +1021,7 @@ export default {
       data["machine_run"] = this.form.machine_run
       data["after_urea"] = this.form.after_urea
       data["pip_coagulation"] = this.form.pip_coagulation
+      data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
       console.log("Paramsquery",data)
 
       postAssessmentAfterDislysis(ParamsQuery, data)

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

@@ -29,6 +29,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="透前体重备注:" v-if="isShow('透前体重备注')">
+              <el-input v-model="assessmentBeforeDislysis.weight_befor_remake"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="干体重(kg)："
                           v-if="isShow('干体重')">
@@ -553,6 +559,8 @@
               <el-input v-model="assessmentBeforeDislysis.suction" @focus="showInnerDialog('20')"></el-input>
             </el-form-item>
           </el-col>
+
+ 
          
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -725,6 +733,7 @@
           blood_pressure_during_dialysis:"",
           urea_befor:"",
           suction:"",
+          weight_befor_remake:"",
         },
 
         InnerDialogProps: {

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

@@ -196,7 +196,7 @@
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
@@ -207,7 +207,7 @@
                             </el-form-item>
 
                             <el-form-item
-                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10346 && dialysisPrescription.anticoagulant == 2'
+                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 && dialysisPrescription.anticoagulant == 2'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -256,7 +256,7 @@
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 ">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -265,7 +265,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54 ||  this.$store.getters.xt_user.template_info.org_id == 10346">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54 ||  this.$store.getters.xt_user.template_info.org_id == 10346 ||  this.$store.getters.xt_user.template_info.org_id == 10387">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -308,9 +308,9 @@
 
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -318,7 +318,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387'
                                     :label="'总量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -2204,11 +2204,12 @@
                 return
               }
             }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
-                this.dialysisPrescription.displace_liqui_part = 0
-                this.dialysisPrescription.displace_liqui_value = 0
-            } 
+            
           }
+          if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+            this.dialysisPrescription.displace_liqui_part = 0
+            this.dialysisPrescription.displace_liqui_value = 0
+          } 
 
           this.is_pre = 1
 

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

@@ -4,7 +4,7 @@
       <!-- <div class="txsj">
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-      <el-form :model="form" label-width="100px">
+      <el-form :model="form" label-width="100px"  :rules="drugdicRules"  ref="form">
         <el-form-item label="下机护士">
           <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
@@ -28,12 +28,12 @@
               <el-radio :label="2">无</el-radio>
            </el-radio-group>
         </el-form-item>
-        
+
         <el-form-item label="内瘘: " v-if="isShowFiled('内瘘')">
             <el-input v-model="form.internal_fistula" readonly  @focus="showInnerDialog('7')" style="width:200px"></el-input>
         </el-form-item>
 
-    
+
         <el-form-item label="导管: " v-if="isShowFiled('导管')">
           <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
         </el-form-item>
@@ -45,18 +45,18 @@
             readonly
             @focus="showInnerDialog('1')"
           ></el-input>
-       </el-form-item> 
+       </el-form-item>
 
         <el-form-item>
-          <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit" :loading="loading"
+          <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit('form')" :loading="loading"
                      type="primary">执行下机
           </el-button>
           <el-button
             v-if="dialysis_order.stage == 2 "
-            type="primary" @click="modifyFinish">修改下机
+            type="primary" @click="modifyFinish('form')">修改下机
           </el-button>
         </el-form-item>
-        
+
 
 
       </el-form>
@@ -114,6 +114,10 @@
         },
         catheter: [],
         cruorOptions: [],
+        drugdicRules: {
+         internal_fistula: [{ required: true, message: "请选择内瘘" }]
+        },
+        required:false,
       }
     },
     props: {
@@ -165,12 +169,25 @@
     methods: {
        isShowFiled(name) {
         var filedList = store.getters.xt_user.fileds
-       
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
+          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_write == 1) {
+             this.required = true
+          }
         }
+        this.required = false
+        return false
+      },
+      isWrite(name){
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_write == 1) {
+            return true
+          }
+        }
+        
         return false
       },
       show: function(record) {
@@ -193,7 +210,7 @@
         if(this.$route.query.patient_id){
           this.patient_id = this.$route.query.patient_id
         }
-        
+
         this.schedule_date = this.$route.query.date
 
         if (this.dialysis_order.id == 0) {
@@ -250,57 +267,89 @@
       hide: function() {
         this.visible = false
       },
-      modifyFinish:function(){
-        let ParamsQuery = {};
-        ParamsQuery["id"] = this.dialysis_order.id;
-        ParamsQuery["nurse"] = this.form.nurse_id;
-        ParamsQuery["end_time"] = this.end_time;
-        ParamsQuery["mode"] = "2"
-        ParamsQuery["puncture_point_haematoma"] = paseInt(this.form.puncture_point_haematoma)
-        ParamsQuery["internal_fistula"] = this.form.internal_fistula
-        ParamsQuery["catheter"] = this.form.catheter
-        ParamsQuery["cruor"] = this.form.cruor
-        if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
-          ParamsQuery["mode"] = "3"
-        }
-        PostModifyFinishDialysis(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-
-            return false;
-          } else {
-            this.$message.success("修改成功")
-            var record = this.dialysis_order;
-            for (const key in response.data.data.dialysis_order) {
-              this.$set(record, key, response.data.data.dialysis_order[key]);
+      modifyFinish:function(formName){
+        this.$refs[formName].validate(valid=>{
+          if(valid){
+            if(this.isWrite("内瘘") == true && this.form.internal_fistula == ""){
+              this.$message.error("请选择内瘘")
+              return
+             }
+            if(this.isWrite("导管") == true && this.form.catheter == ""){
+              this.$message.error("请选择导管")
+              return
+             }
+            if(this.isWrite("透析器凝血") == true && this.form.cruor == ""){
+              this.$message.error("请选择透析器凝血")
+              return
+             }
+            let ParamsQuery = {};
+            ParamsQuery["id"] = this.dialysis_order.id;
+            ParamsQuery["nurse"] = this.form.nurse_id;
+            ParamsQuery["end_time"] = this.end_time;
+            ParamsQuery["mode"] = "2"
+            ParamsQuery["puncture_point_haematoma"] = parseInt(this.form.puncture_point_haematoma)
+            ParamsQuery["internal_fistula"] = this.form.internal_fistula
+            ParamsQuery["catheter"] = this.form.catheter
+            ParamsQuery["cruor"] = this.form.cruor
+            if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
+              ParamsQuery["mode"] = "3"
             }
-            console.log(response.data.data.after)
-            this.$emit('assessmentAfterDislysis', response.data.data.after)
-          }
-        });
-
+            PostModifyFinishDialysis(ParamsQuery).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
 
+                return false;
+              } else {
+                this.$message.success("修改成功")
+                var record = this.dialysis_order;
+                for (const key in response.data.data.dialysis_order) {
+                  this.$set(record, key, response.data.data.dialysis_order[key]);
+                }
+                console.log(response.data.data.after)
+                this.$emit('assessmentAfterDislysis', response.data.data.after)
+              }
+            });
+          }
+        })
       },
-      submit: function() {
-        this.loading = true
-        let mode = "1"
-        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
-          this.loading = false
-          var resp = rs.data
-          if (resp.state == 1) {
-            var dialysis_order = resp.data.dialysis_order
-            var this_order = this.dialysis_order
-            for (const key in dialysis_order) {
-              this.$set(this_order, key, dialysis_order[key])
-            }
-            let orgId = parseInt(sessionStorage.getItem("org_id"));
-            this.hide()
-            this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
+      submit: function(formName) {
+        
+        this.$refs[formName].validate(valid=>{
+          if(valid){
+             if(this.isWrite("内瘘") == true && this.form.internal_fistula == ""){
+              this.$message.error("请选择内瘘")
+              return
+             }
+            if(this.isWrite("导管") == true && this.form.catheter == ""){
+              this.$message.error("请选择导管")
+              return
+             }
+            if(this.isWrite("透析器凝血") == true && this.form.cruor == ""){
+              this.$message.error("请选择透析器凝血")
+              return
+             }
+             this.loading = true
+             let mode = "1"
+            finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
+              this.loading = false
+              var resp = rs.data
+              if (resp.state == 1) {
+                var dialysis_order = resp.data.dialysis_order
+                var this_order = this.dialysis_order
+                for (const key in dialysis_order) {
+                  this.$set(this_order, key, dialysis_order[key])
+                }
+                let orgId = parseInt(sessionStorage.getItem("org_id"));
+                this.hide()
+                this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 
-          } else {
-            this.$message.error(resp.msg)
+              } else {
+                this.$message.error(resp.msg)
+              }
+            })
           }
         })
+    
       }, getTime(value, temp) {
         if (value != undefined) {
           return parseTime(value, temp)
@@ -364,7 +413,7 @@
             this.InnerDialogProps.selected = this.form.cruor
             this.InnerDialogProps.isShowTextArea = false
             break
-          
+
         }
       },
       innerDialogComfirm: function(val) {
@@ -383,7 +432,7 @@
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
-      }, 
+      },
     }
   }
 </script>

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

@@ -707,7 +707,7 @@
             align="center"
             label="累计血容量(ml)"
             width="100"
-            v-if="isShow('累计血容量') && template_id != 41"
+            v-if="isShow('累计血容量') && template_id != 41 && org_id != 9538 && org_id != 9671"
           >
              <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
@@ -718,7 +718,7 @@
             align="center"
             label="累计血容量(L)"
             width="100"
-            v-if="isShow('累计血容量') && template_id == 41"
+            v-if="isShow('累计血容量') && (template_id == 41  || org_id == 9538 || org_id == 9671)"
           >
             <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
@@ -1384,13 +1384,13 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量') && template_id == 41">
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id == 41 || org_id == 9671 || org_id == 9538)">
             <el-form-item label="累计血容量(L)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>
-         
-          <el-col :span="8" v-if="isShow('累计血容量') && template_id  != 41">
+
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && template_id!=9538)">
             <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
@@ -1553,7 +1553,7 @@
 
       <div slot="footer" class="dialog-footer" v-show="edit">
         <el-button @click="cancelEditAction">取 消</el-button>
-        <el-button type="primary" @click="submitAction">保 存</el-button>
+        <el-button :loading="loading" type="primary"  @click="submitAction">保 存</el-button>
       </div>
       <!--</div>-->
     </el-dialog>
@@ -1576,6 +1576,7 @@ export default {
   name: "MonitorDialog",
   data() {
     return {
+      loading: false,
       is_has_create: true,
       is_has_modify: true,
       is_has_modify_other: true,
@@ -1685,7 +1686,7 @@ export default {
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
     this.form.operate_time = new Date().getTime();
     var symptoms = getDataConfig("hemodialysis", "symptoms");
-    
+
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     //console.log("抗凝剂",this.anticoagulantsConfit)
     this.bloodPressureMmonitoringSite = getDataConfig(
@@ -1803,6 +1804,7 @@ export default {
     },
 
     newRecordAction: function () {
+      console.log("111111111")
       this.setEditMonitor(null);
       this.$refs.table.setCurrentRow(null);
       console.log(this.dispose_options,'oop')
@@ -1953,12 +1955,14 @@ export default {
         return;
       }
       this.creator = this.table_current_row.creator;
+      console.log("22222222222")
       this.setEditMonitor(this.table_current_row);
       this.$refs.table.setCurrentRow(null);
       this.edit = true;
       this.isAdd = false;
     },
     cancelEditAction: function () {
+      console.log("3333333333")
       this.setEditMonitor(null);
       this.$refs.table.setCurrentRow(null);
       this.edit = false;
@@ -2127,6 +2131,8 @@ export default {
 
     submitAction: function () {
       // TODO loading
+      this.loading = true
+      console.log("aaaa")
       var is_new = this.form.id;
       this.form.operate_time = parseInt(this.form.operate_time / 1000);
       this.form.systolic_bp =
@@ -2419,6 +2425,7 @@ export default {
           }
         }
       );
+      this.loading = false
     },
 
     symptomTextareaBlur: function () {

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -33,8 +33,8 @@
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量')" width="92px">累计血容量 
-            <span v-if="template_id !=41">(ml)</span>
-            <span v-if="template_id == 41">(L)</span>
+            <span v-if="template_id !=41 && org_id!=9671 && org_id!=9538">(ml)</span>
+            <span v-if="template_id == 41 || org_id == 9671 || org_id == 9538">(L)</span>
           </th>
           <th v-if="isShow('血容量')" width="92px">血容量(L)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1797,6 +1797,7 @@ export default {
           style: style12,
           scanStyles: false,
         });
+        
       }else if (
         this.org_template_info.template_id == 54
       ) {

src/xt_pages/dialysis/schedualPatient.vue

@@ -87,7 +87,7 @@
           <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;line-height:30px;">{{zone_schedule.zone_name}}</div>
           <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' :selected_date="selected_date" style="flex:1"></patient-box>
         </div>
-        
+
         <div class="NoData" v-show="filtedSchedules.length == 0">
           <img src="@/assets/img/data.jpg" alt="">
         </div>
@@ -392,7 +392,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.websocket.onmessage = e => {
           let res = JSON.parse(e.data);
           // let res = re.data;
-          console.log('res3333333333',res)
+          console.log('res333adasda3333333',res)
           if(res.channel == 'queue/join'){
             let timeType = null
             if(this.schedule_type_selected == 1){
@@ -423,7 +423,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
                 }
             }
             this.fisrtQueueInfo = fisrtQueueInfo
-            
+
             // this.fisrtQueueInfo = res.data.fisrtQueueInfo
             let arr = res.data.patientQueueList.data
             let waitingCalledArr = []

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -226,7 +226,7 @@
               ></label-box>
             </td>
           </tr>
-          <tr class="list_table_1" style="line-height:40px;">
+          <tr class="list_table_1" style="line-height: 40px">
             <td
               width="250"
               style="border-right: none; padding-left: 10px"
@@ -821,9 +821,11 @@
             <td v-if="advice_index === 1">体重增加量:</td>
             <td v-if="advice_index === 1">
               {{
-                (
-                  predialysis.weight_before - assessmentafter.weight_after
-                ).toFixed(2)
+                (assessmentafter.weight_after == 0
+                  ? 0
+                  : (
+                      predialysis.weight_before - assessmentafter.weight_after
+                    ).toFixed(2))
               }}kg
             </td>
             <td v-if="advice_index === 2">干体重(DW):</td>
@@ -831,9 +833,11 @@
             <td v-if="advice_index === 3">较干体重增加量:</td>
             <td v-if="advice_index === 3">
               {{
-                (afterdialysis.weight_after - predialysis.dry_weight).toFixed(
-                  2
-                )
+                afterdialysis.weight_after == 0
+                  ? 0
+                  : (
+                      afterdialysis.weight_after - predialysis.dry_weight
+                    ).toFixed(2)
               }}kg
             </td>
             <td v-if="advice_index === 4">净脱水量:</td>
@@ -847,9 +851,11 @@
             <td v-if="advice_index === 6">本次透析体重下降量:</td>
             <td v-if="advice_index === 6">
               {{
-                (
-                  predialysis.weight_before - afterdialysis.weight_after
-                ).toFixed(2)
+                afterdialysis.weight_after == 0
+                  ? 0
+                  : (
+                      predialysis.weight_before - afterdialysis.weight_after
+                    ).toFixed(2)
               }}kg
             </td>
             <td v-if="advice_index > 6"></td>
@@ -886,9 +892,11 @@
               >
                 {{
                   getAdminUser(
-                    prescription == null? 0: prescription.creater ? prescription.prescription_doctor: ""
-                     
-                     
+                    prescription == null
+                      ? 0
+                      : prescription.creater
+                      ? prescription.prescription_doctor
+                      : ""
                   )
                 }}
               </span>
@@ -901,8 +909,8 @@
                       : prescription.creater
                       ? prescription.creater
                       : ''
-                  ) "
-               
+                  )
+                "
                 alt=""
                 srcset=""
                 v-else

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -573,7 +573,7 @@
                           {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                           {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                         </td>
-                        <td>{{ monitor.monitor_temperature ? monitor.monitor_temperature : "" }}</td>
+                        <td>{{ monitor.temperature ? monitor.temperature : "" }}</td>
                         <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
                         <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "" }}</td>
                         <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -385,7 +385,8 @@
                             border-right: 1px solid;
                           "
                         >
-                          透析机：{{
+                          透析机：
+                         <span v-if="dialysisOrder!=null">{{
                             dialysisOrder &&
                             dialysisOrder.DeviceNumber &&
                             dialysisOrder.DeviceNumber.number.length > 0
@@ -393,6 +394,7 @@
                               : patientInfo.DialysisSchedule.device_number
                                   .number
                           }}
+                          </span> 
                         </div>
                         <div
                           style="
@@ -767,36 +769,36 @@
             <td>
               <table class="print-table" border="1" style="text-align: center">
                 <tr>
-                  <td style="height: 20px" width="50">
+                  <td style="height: 20px" width="60">
                     <p style="height: 20px; line-height: 20px">时间</p>
                   </td>
                   <td
                     style="height: 20px"
-                    width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    width="90"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <p style="height: 20px; line-height: 20px">开嘱医生</p>
                   </td>
-                  <td style="height: 20px" width="420">
+                  <td style="height: 20px" width="344">
                     <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
                   </td>
                   <td
                     style="height: 20px"
-                    width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    width="70"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <p style="height: 20px; line-height: 20px">执行时间</p>
                   </td>
-                  <td style="height: 20px" width="85">
+                  <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">执行</p>
                   </td>
-                  <td style="height: 20px" width="85">
+                  <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">核对</p>
                   </td>
-                  <td style="height: 20px" width="145">
+                  <td style="height: 20px" width="144">
                     <p style="height: 20px; line-height: 20px">上次透后体重</p>
                   </td>
-                  <td style="height: 20px">
+                  <td style="height: 20px" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -817,35 +819,25 @@
             <td>
               <table class="print-table" border="1">
                 <tr>
-                  <td width="50">
+                  <td width="60">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </td>
                   <td
                     style="line-height: 30px"
-                    width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    width="90"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                       {{ getAdminUser(advice.advice_doctor) }}
                     </span>
-                    <span
-                      v-else
-                      style="
-                        display: flex;
-                        align-items: center;
-                        justify-content: space-around;
-                        height: 36px;
-                      "
-                    >
-                      <img
-                        style="height: 30px"
-                        :src="setAdminUserES(advice.advice_doctor)"
-                        alt
-                        srcset
-                      />
-                    </span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.advice_doctor)"
+                      alt=""
+                      srcset=""
+                    />
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="415">
+                  <td style="text-align: left; padding-left: 5px" width="340">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -870,15 +862,15 @@
                     <span>{{ advice.remark }}</span>
                   </td>
                   <td
-                    style="line-height: 30px"
-                    width="100"
-                    v-if="org_id == 10346 || org_id == 9675"
+                    style="line-height: 10px"
+                    width="70"
+                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
                   >
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
-                  <td style="line-height: 30px" width="85">
+                  <td style="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
                     }}</span>
@@ -887,10 +879,9 @@
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
-                      v-else
                     />
                   </td>
-                  <td style="line-height: 30px" width="85">
+                  <td style="line-height: 30px" width="90">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{
                       getAdminUser(advice.checker)
                     }}</span>
@@ -904,7 +895,7 @@
                   </td>
 
                   <td v-if="advice_index === 0" width="145">透前体重:</td>
-                  <td v-if="advice_index === 0">
+                  <td v-if="advice_index === 0" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -914,20 +905,20 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 1" width="145">体重增加量:</td>
-                  <td v-if="advice_index === 1">
+                  <td v-if="advice_index === 1" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
-                      0
+                        0 && assessmentafter.weight_after != 0
                         ? (
                             predialysis.weight_before -
                             assessmentafter.weight_after
                           ).toFixed(2)
-                        : "/"
+                        : 0
                     }}kg
                   </td>
                   <td v-if="advice_index === 2" width="145">干体重(DW):</td>
-                  <td v-if="advice_index === 2">
+                  <td v-if="advice_index === 2" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -937,19 +928,19 @@
                     }}kg
                   </td>
                   <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
-                  <td v-if="advice_index === 3">
+                  <td v-if="advice_index === 3" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
-                      0
+                        0 && afterdialysis.weight_after != 0
                         ? (
                             afterdialysis.weight_after - predialysis.dry_weight
                           ).toFixed(2)
-                        : "/"
+                        : 0
                     }}kg
                   </td>
                   <td v-if="advice_index === 4" width="145">净脱水量:</td>
-                  <td v-if="advice_index === 4">
+                  <td v-if="advice_index === 4" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -959,7 +950,7 @@
                     }}ml
                   </td>
                   <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5">
+                  <td v-if="advice_index === 5" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -971,20 +962,20 @@
                   <td v-if="advice_index === 6" width="145">
                     本次透析体重下降量:
                   </td>
-                  <td v-if="advice_index === 6">
+                  <td v-if="advice_index === 6" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
-                      0
+                        0 && afterdialysis.weight_after != 0
                         ? (
                             predialysis.weight_before -
                             afterdialysis.weight_after
                           ).toFixed(2)
-                        : "/"
+                        : 0
                     }}kg
                   </td>
                   <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6"></td>
+                  <td v-if="advice_index > 6" width="60"></td>
                 </tr>
               </table>
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -425,13 +425,13 @@
                     <div class="inline_block" style="flex:1;">
                       置换方式：
                       <div class="under_line" style="width: 60px;text-align: center">
-                        {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }}
+                        <span v-if="prescription.mode_id != 2 && prescription.mode_id!=5 && prescription.mode_id!=12"> {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }} </span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       置换总量：
                       <div class="under_line" style="width: 50px;text-align: center">
-                        {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                         <span v-if="prescription.mode_id != 2 && prescription.mode_id!=5 && prescription.mode_id!=12"> {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
                       </div>
                       L
                     </div>
@@ -628,7 +628,7 @@
                   <table class="inside_table">
                     <tbody>
                       <tr>
-                        <td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
+                        <td colspan="12" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
                           监测记录
                         </td>
                       </tr>
@@ -680,7 +680,7 @@
                         </td>
                       </tr>
                       <tr>
-                        <td colspan="11" style="line-height:25px;text-align:left;">
+                        <td colspan="12" style="line-height:25px;text-align:left;">
                           医师记录：{{ summary.special_record ? summary.special_record : '' }}
                         </td>
                       </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -674,9 +674,7 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        {{
-                          getDisplaceLiquiPart(prescription.displace_liqui_part)
-                        }}
+                       <span v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12">{{getDisplaceLiquiPart(prescription.displace_liqui_part)}}</span> 
                       </div>
                     </div>
                     <div
@@ -688,11 +686,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
-                          prescription.displace_liqui_value
-                            ? prescription.displace_liqui_value
-                            : "/"
-                        }}
+                       <span v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12">{{ prescription.displace_liqui_value ? prescription.displace_liqui_value: "/"}} </span> 
                       </div>
                       L
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2083,7 +2083,7 @@
                           white-space: normal;
                         "
                       >
-                        <!-- {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }} -->
+                        {{ afterdialysis.accumulated_blood_volume ? afterdialysis.accumulated_blood_volume : "/" }}
                       </div>
                     </div>
                   </div>

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -1776,6 +1776,7 @@ export default {
   height: 36px;
   display: flex;
   align-items: center;
+  padding-top: 10px;
 }
 
 .fixedCell {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -365,7 +365,7 @@
                   <el-input style="width:50%;" @input="searchProjectAction"
                             @keyup.enter.native='searchProjectAction'
                             v-model.trim="search_project_keyword"
-                            placeholder="请输入项目名称"></el-input>
+                            placeholder="请输入项目名称"></el-input><!--住院工作站-->
 
                   <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
                              @change="changeClass">
@@ -667,16 +667,20 @@ export default {
   methods: {
 
     changeClass(id) {
+      console.log("asdaff,id",id)
+      console.log("asdaff,this.value",this.value)
+      console.log("asdaff,this.allProject",this.allProject)
       this.tabProject = []
       if (id == 0) {
         this.tabProject = this.allProject
       } else {
         for (let i = 0; i < this.allProject.length; i++) {
-          if (this.allProject[i].cost_classify == id) {
+          if (this.allProject[i].project.cost_classify == id) {
             this.tabProject.push(this.allProject[i])
           }
         }
       }
+
     },
     setMonthPrescription(month_prescriptions) {
       console.log('~~~~~~~~')

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -471,14 +471,14 @@
               this.$message.error(scope.row.drug_name + '库存不足')
             }
           }
-         
+
         } else {
           if(scope.row.drug.is_user!=1){
             if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
               this.$message.error(scope.row.drug_name + '库存不足')
             }
           }
-        
+
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
@@ -521,14 +521,14 @@
               this.$message.error(scope.row.drug_name + '库存不足')
            }
           }
-        
+
         } else {
           if(scope.row.drug.is_user!=1){
             if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
               this.$message.error(scope.row.drug_name + '库存不足')
             }
           }
-         
+
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/management/components/RepairForm.vue

@@ -35,7 +35,7 @@
         ></el-date-picker>
       </el-col>
       <el-col :span="2">
-        <el-button @click="queryRepair()">查询</el-button>
+        <el-button style="background-color:#409eff;color: #DCDFE6" @click="queryRepair()">查询</el-button>
       </el-col>
     </el-row>
     <el-row style="display: flex;align-items: center;">
@@ -406,6 +406,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
+<!--        <button @click="lili">调试</button>-->
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="UpdateRepair('guaForm')"
           >保存</el-button
@@ -482,10 +483,12 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
-      filename: ""
     };
   },
   methods: {
+    lili(){
+      console.log("this.guaForm",this.guaForm)
+    },
     changeCheck() {
       this.$refs.multipleTable.clearSelection();
       if (this.checkAllStatus) {
@@ -655,19 +658,21 @@ export default {
       window.location.href = this.guaForm.images;
     },
     UpdateRepair(formName) {
+      console.log("formName",formName)
+      console.log("this.guaForm",this.guaForm)
       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;

src/xt_pages/outpatientDoctorStation/batch_delete.vue

@@ -0,0 +1,828 @@
+<template>
+  <!--批量删除-->
+  <div class="main-contain">
+    <div class="app-container">
+    <div class="bannar_list">
+      <div class="banner_left">
+        <div>
+          透析模式:
+          <el-select
+            v-model="modeOptions_value"
+            placeholder="请选择"
+            @change="getUsername"
+          >
+            <el-option
+              v-for="item in modeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          删除类型:
+          <el-select
+            v-model="new_type"
+            placeholder="请选择"
+            @change="changetype"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="new_type == 1">
+          请输入需要删除的药品:
+          <el-select
+            filterable
+            v-model="id"
+            placeholder="请选择"
+            @change="getUsername"
+          >
+            <el-option
+              v-for="item in druglist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="new_type == 2">
+          请输入需要删除的项目:
+          <el-select
+            filterable
+            v-model="id"
+            placeholder="请选择"
+            @change="getUsername"
+          >
+            <el-option
+              v-for="item in projectlist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+
+      <!--        <button @click="lili">调试</button>-->
+      <el-button type="primary" @click="save">保存</el-button>
+    </div>
+
+    <el-container>
+      <div class="left_table" style="width: 211px;height: 70vh;border: 1px solid #DCDFE6;box-shadow: 0 2px 4px 0 rgb(0 0 0 / 12%), 0 0 6px 0 rgb(0 0 0 / 4%);">
+        <el-table
+          border
+          height="70vh"
+          ref="multipleTable"
+          :data="tableData"
+          tooltip-effect="dark"
+          style="width: 100%;"
+          @selection-change="handleSelectionChange"
+          @current-change="test"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
+          }"
+        >
+          <el-table-column type="selection" width="55" align="center"> </el-table-column>
+          <el-table-column label="患者姓名" width="155" align="center">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <el-main>
+        <el-tabs type="border-card" v-if="isshow == 1 && list.length > 0" style="min-height: 70vh;">
+        <el-tab-pane
+          v-for="(item, index) in list"
+          :key="index"
+          :label="'处方' + (index + 1)"
+          :name="index"
+        >
+          <el-table
+            v-if="item.advices.length > 0"
+            :data="item.advices"
+            style="width: 100%"
+            max-height="250"
+            border
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+          >
+            <el-table-column fixed label="药品名称" width="230" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.advice_name }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单次用量" width="200" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="用法" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.delivery_way }}
+              </template>
+            </el-table-column>
+            <el-table-column label="频率" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.execution_frequency }}
+              </template>
+            </el-table-column>
+            <el-table-column label="天数" width="110" align="center">
+              <template slot-scope="scope"> {{ scope.row.day }}天 </template>
+            </el-table-column>
+            <el-table-column label="总量" width="200" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.prescribing_number
+                }}{{ scope.row.prescribing_number_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" width="120" align="center">
+              <template slot-scope="scope"> {{ scope.row.price }}元 </template>
+            </el-table-column>
+            <el-table-column label="备注" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.remark }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="120" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  @click.native.prevent="delects(scope.$index, scope, item)"
+                  type="danger"
+                  size="small"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-table
+            v-if="item.project.length > 0"
+            :data="item.project"
+            style="width: 100%"
+            max-height="250"
+            border
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+          >
+            <el-table-column fixed label="项目名称" width="230" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.type == 2">
+                  {{ scope.row.project.project_name }}
+                </div>
+                <div v-if="scope.row.type == 3">
+                  {{ scope.row.good_info.good_name }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="组" width="120" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.type == 2">
+                  {{ scope.row.project.translate }}
+                </div>
+                <div v-if="scope.row.type == 3">
+                  {{ scope.row.good_info.translate }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="单次用量" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.single_dose }}
+                {{ scope.row.unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="用法" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.delivery_way }}
+              </template>
+            </el-table-column>
+            <el-table-column label="频率" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.execution_frequency }}
+              </template>
+            </el-table-column>
+            <el-table-column label="天数" width="110" align="center">
+              <template slot-scope="scope"> {{ scope.row.day }}天 </template>
+            </el-table-column>
+            <el-table-column label="总量" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.count }}
+                {{ scope.row.unit }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" width="120" align="center">
+              <template slot-scope="scope"> {{ scope.row.price }}元 </template>
+            </el-table-column>
+            <el-table-column label="备注" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.remark }}
+              </template>
+            </el-table-column>
+            <el-table-column label="推送频率" width="120" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.frequency_type == 1">
+                  {{ "每次必推" }}
+                </div>
+                <div v-if="scope.row.frequency_type == 2">
+                  {{ scope.row.day_count }}天/次
+                </div>
+                <div v-if="scope.row.frequency_type == 3">
+                  {{ scope.row.week_days }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="102" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  @click.native.prevent="delects(scope.$index, scope, item)"
+                  type="danger"
+                  size="small"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      </el-main>
+      
+    </el-container>
+  
+  </div>
+  </div>
+</template>
+<script>
+import { gethisusertoalive } from "@/api/deposit";
+import {
+  getdrugsinformation,
+  replacepeoplename,
+  replaceconfig,
+  deletedrugsbatch,
+  batchdeleteitems,
+  getmodeconfigs,
+  ptemplateinformation,
+  deleteone,
+} from "@/api/batch/batch";
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      tableList: [],
+      editableTabsValue: "1",
+      modeOptions: {},
+      tableDatas: [
+        {
+          id: "",
+          drug_name: "",
+          single_dose: "",
+          single_dose_unit: "",
+          delivery_way: "",
+          execution_frequency: "",
+          day: "",
+          prescribing_number: "",
+          prescribing_number_unit: "",
+          price: "",
+          remark: "",
+        },
+      ], //药品
+      project: [
+        {
+          id: "",
+          drug_name: "",
+          translate: "",
+          single_dose: "",
+          unit: "",
+          delivery_way: "",
+          execution_frequency: "",
+          day: "",
+          prescribing_number: "",
+          price: "",
+          remark: "",
+          frequency_type: 1,
+          day_count: "",
+          week_days: "",
+        },
+      ], //项目
+      tabIndex: 2,
+      modeOptions_value: 1, //透析模式
+      multipleSelection: [], //选中的患者
+      tableData: [],
+      options: [
+        { id: 1, name: "药品" },
+        { id: 2, name: "项目" },
+      ],
+      options_patient: [
+        { id: 1, name: "是" },
+        { id: 2, name: "否" },
+      ],
+      options_2: [
+        { id: 1, name: "普通门诊" },
+        { id: 2, name: "门诊特殊病" },
+      ],
+      new_type: 1, //新增类型
+      druglist: [], //药品列表
+      projectlist: [], //项目列表
+      id: "", //药品、项目、耗材
+      tmplist: [], //临时
+      unit: [
+        { id: 1, name: "g" },
+        { id: 2, name: "mg" },
+        { id: 3, name: "u" },
+        { id: 4, name: "ml" },
+        { id: 5, name: "万U" },
+        { id: 6, name: "枚" },
+        { id: 7, name: "粒" },
+        { id: 8, name: "片" },
+        { id: 9, name: "支" },
+        { id: 10, name: "μg" },
+        { id: 11, name: "iu" },
+        { id: 12, name: "包" },
+        { id: 13, name: "袋" },
+        { id: 14, name: "万" },
+        { id: 15, name: "万iu" },
+        { id: 16, name: "丸" },
+        { id: 17, name: "盒" },
+        { id: 18, name: "瓶" },
+        { id: 19, name: "瓶（袋）" },
+        { id: 20, name: "次" },
+      ],
+      usage: [], //用法
+      frequency: [], //频率
+      frequency_type: "", //周期提醒
+      day_count: "", //周期提醒天
+      week_days: [], //周期提醒星期
+      tabhang: 0, //tab的下标
+      hang: 0, //行数
+      list: [],
+      isshow: 0, //是否显示处方
+      tmpid: 0,
+    };
+  },
+  created() {
+    // console.log("this.$store.getters.treatment_mode",this.$store.getters.treatment_mode)
+    for (let key in this.$store.getters.treatment_mode) {
+      this.modeOptions[key] = this.$store.getters.treatment_mode[key];
+    }
+    // console.log("this.modeOptions",this.modeOptions)
+    this.getdrugconfigs();
+    this.isshow = 0;
+    this.tmpid = 0;
+  },
+  methods: {
+    save() {
+      var tmp = this.modeOptions[this.modeOptions_value].name;
+      var tmp2 = "";
+      if (this.druglist != null) {
+        for (let i = 0; i < this.druglist.length; i++) {
+          if (this.id == this.druglist[i].id) {
+            tmp2 = this.druglist[i].name;
+          }
+        }
+      }
+      if (this.projectlist != null) {
+        for (let j = 0; j < this.projectlist.length; j++) {
+          if (this.id == this.projectlist[j].id) {
+            tmp2 = this.projectlist[j].name;
+          }
+        }
+      }
+      this.$confirm(
+        "请确定是否删除?", //注：该操作将会把所选患者的"+tmp+"透析模式中的"+tmp2+"进行删除，
+        "",
+        {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }
+      ).then(() => {
+        if (this.multipleSelection.length == 0) {
+          this.$message.error("没有选中有效信息");
+          return;
+        }
+        let st = "";
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          st = st + this.multipleSelection[i].id + ",";
+        }
+        console.log("string", st);
+        let params = {
+          mode_id: this.modeOptions_value,
+          patient_id: st,
+          type: this.new_type,
+          replaced: this.id,
+        };
+        if (this.new_type == 1) {
+          deletedrugsbatch(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功");
+              this.getUsername();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+        } else {
+          batchdeleteitems(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功");
+              this.getUsername();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+        }
+      });
+    },
+    test(val) {
+      console.log("val?:", val);
+      this.tmpid = val.id;
+      var params = {
+        mode_id: this.modeOptions_value,
+        patient_id: val.id,
+      };
+      ptemplateinformation(params).then((res) => {
+        if (res.data.state == 1) {
+          this.list = res.data.data.list;
+          this.isshow = 1;
+        }
+      });
+    },
+    lili() {
+      console.log("this.list", this.list);
+      console.log("this.multipleSelection", this.multipleSelection);
+      // console.log("this.mode",this.modeOptions_value)
+      // console.log("this.projectlist2",this.projectlist2)
+      // console.log("patient_value",this.patient_value)
+    },
+    delects(hang, sc, item) {
+      this.$confirm("删除后不可恢复，是否确认删除?", "删除", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          var params = {
+            type: item.type, //1药品2项目
+            id: sc.row.id,
+          };
+          var params2 = {
+            mode_id: this.modeOptions_value,
+            patient_id: this.tmpid,
+          };
+          deleteone(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功");
+              ptemplateinformation(params2).then((res) => {
+                if (res.data.state == 1) {
+                  this.list = res.data.data.list;
+                  this.isshow = 1;
+                }
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: 'success',
+            message: "已取消删除",
+          });
+        });
+      // console.log("hang",hang)
+      // console.log("sc",sc)
+      // console.log("item",item)
+    },
+    changetype() {
+      console.log(">>>>>>>", this.new_type);
+      this.id = "";
+      this.tableData = [];
+    },
+    changeid(item, index) {
+      item.id = item.drug_name;
+      var params = {
+        id: item.id,
+      };
+      getdrugsinformation(params).then((res) => {
+        if (res.data.state == 1) {
+          console.log("res??", res);
+          this.tableDatas[0].single_dose = res.data.data.list[0].single_dose;
+          this.tableDatas[0].single_dose_unit =
+            res.data.data.list[0].single_dose_unit;
+          this.tableDatas[0].delivery_way = res.data.data.list[0].delivery_way;
+          this.tableDatas[0].execution_frequency =
+            res.data.data.list[0].execution_frequency;
+          this.tableDatas[0].day = res.data.data.list[0].drug_day;
+          this.tableDatas[0].prescribing_number =
+            res.data.data.list[0].prescribing_number;
+          this.tableDatas[0].prescribing_number_unit =
+            res.data.data.list[0].prescribing_number_unit;
+          this.tableDatas[0].price = res.data.data.list[0].retail_price;
+          this.tableDatas[0].remark = res.data.data.list[0].remark;
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    changeid2(item, index) {
+      item.id = item.drug_name;
+      var params = {
+        id: item.id,
+      };
+      getdrugsinformation(params).then((res) => {
+        if (res.data.state == 1) {
+          console.log("res??", res);
+          this.project[0].single_dose = res.data.data.list[0].single_dose;
+          this.project[0].translate = res.data.data.list[0].translate;
+          this.project[0].delivery_way = res.data.data.list[0].delivery_way;
+          this.project[0].execution_frequency =
+            res.data.data.list[0].execution_frequency;
+          this.project[0].day = res.data.data.list[0].day;
+          this.project[0].prescribing_number =
+            res.data.data.list[0].prescribing_number;
+          this.project[0].unit = res.data.data.list[0].unit;
+          this.project[0].price = res.data.data.list[0].retail_price;
+          this.project[0].remark = res.data.data.list[0].remark;
+        }
+      });
+    },
+    //获取配置
+    getdrugconfigs() {
+      var params = {};
+      replaceconfig(params).then((res) => {
+        if (res.data.state == 1) {
+          this.druglist = res.data.data.list;
+          this.projectlist = res.data.data.list2;
+        }
+      });
+      getmodeconfigs(params).then((res) => {
+        if (res.data.state == 1) {
+          this.frequency = res.data.data.efs;
+          this.usage = res.data.data.drugways;
+        }
+      });
+    },
+    getUsername() {
+      var params = {
+        id: this.id,
+        mode: this.modeOptions_value,
+      };
+      replacepeoplename(params).then((res) => {
+        if (res.data.state == 1) {
+          this.tableData = res.data.data.list;
+        }
+      });
+    },
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+        })
+        .catch((_) => {});
+    },
+  },
+};
+</script>
+
+
+
+<style lang="scss" scoped>
+::v-deep .el-tabs__content {
+  padding: 8px;
+}
+
+/deep/ .el-table__fixed {
+  bottom: 0px !important;
+}
+.app-container {
+  padding: 10px;
+  background: #f6f8f9;
+}
+::v-deep .el-table__body-wrapper {
+  height: 500px;
+  overflow-y: scroll;
+
+}
+.bannar_list {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  .banner_left {
+    width: 960px;
+    display: flex;
+    justify-content: space-around;
+    div {
+      white-space: nowrap;
+      font-size: 14px;
+      color: #606266;
+    }
+  }
+}
+.left_table{
+  /deep/ .el-table{
+    .el-table__body-wrapper{
+      overflow-x: hidden;
+    }
+  }
+}
+.frequence {
+  text-align: center;
+}
+/deep/ .el-button--small {
+  padding: 9px 6px;
+}
+.zone {
+  //  margin-left: 30px;
+  //  text-align: left;
+  width: 70px;
+  display: inline-block;
+  color: #606266;
+}
+.disinfect {
+  position: relative;
+  .newButton {
+    // position: absolute;
+    // right: 2%;
+    // top:4px;
+    // z-index: 9;
+    margin-bottom: 10px;
+    margin-left: 90%;
+  }
+}
+.disinfectOne {
+  position: relative;
+  .newButtonOne {
+    position: absolute;
+    right: 0;
+    top: -10;
+    z-index: 18;
+  }
+}
+.but {
+  width: 200px;
+  height: 50px;
+  // border: solid 1px red;
+  margin-left: 77%;
+}
+.clearn {
+  width: 460px;
+  height: 50px;
+  // border:solid 1px red;
+  margin-left: 650px;
+}
+
+.zClass {
+  width: 200px;
+  height: 200px;
+  // border:solid 1px red;
+  margin-left: 450px;
+  margin-top: 200px;
+}
+.warn {
+  color: red;
+  font-size: 14px;
+  width: 100%;
+  display: inline-block;
+  margin-left: 96px;
+}
+
+.userbutton {
+  margin-bottom: 10px;
+  margin-left: 82%;
+}
+</style>
+<style lang="scss" >
+.a {
+  margin-bottom: 10px;
+  margin-top: 6px;
+}
+
+.b {
+  .el-button {
+    margin-left: 90%;
+    margin-bottom: 10px;
+  }
+}
+
+.stoppage {
+  .el-form-item__label {
+    width: 190px;
+  }
+}
+.st {
+  .el-form-item__label {
+    width: -10px;
+  }
+}
+.main {
+  position: relative;
+  .newButtonOne {
+    position: absolute;
+    right: 0;
+    z-index: 2;
+  }
+}
+
+.elbutton {
+  // border: solid 1px red;
+  height: 50px;
+  width: 400px;
+  margin-left: 650px;
+}
+// .el-form-item__label {
+//   width: 130px;
+//   font-size: 14px;
+// }
+.el-form-item__error {
+  margin-left: 130px;
+}
+
+.el-upload-list__item-name {
+  color: #606266;
+  display: block;
+  margin-right: 40px;
+  overflow: hidden;
+  padding-left: 4px;
+  text-overflow: ellipsis;
+  transition: color 0.3s;
+  white-space: nowrap;
+}
+.el-main {
+  padding-top: 0px;
+  padding-left: 18px;
+  padding-right: 0px;
+  .el-tabs{
+    .el-tabs__content{
+      padding: 12px;
+      .el-table .el-table__header-wrapper table{
+        width: 100% !important;
+      }
+      .el-table .el-table__body-wrapper table{
+        width: 100% !important;
+      }
+    }
+  }
+}
+
+.newMain {
+  .el-form-item__label {
+    width: 104px;
+  }
+}
+.newDisinfectOne {
+  .el-input--prefix .el-input__inner {
+    // padding-left: 15px;
+    padding-right: 0px !important;
+  }
+}
+.stoppage {
+  .el-form-item__label {
+    width: 18%;
+  }
+}
+.newItem {
+  .el-form-item__label {
+    width: 130px;
+  }
+}
+.formItem {
+  .el-form-item__label {
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname {
+  .el-form-item__label {
+    width: 60px;
+  }
+}
+::-webkit-scrollbar {
+  height: 20px;
+}
+
+.el-table td .cell {
+  padding: 0 5px !important;
+}
+.addTab {
+  position: absolute;
+  right: 8px;
+  top: 3px;
+  z-index: 20;
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -667,12 +667,15 @@
     methods: {
 
       changeClass(id) {
+        console.log("asdaff,id",id)
+        console.log("asdaff,this.value",this.value)
+        console.log("asdaff,this.allProject",this.allProject)
         this.tabProject = []
         if (id == 0) {
           this.tabProject = this.allProject
         } else {
           for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].cost_classify == id) {
+            if (this.allProject[i].project.cost_classify == id) {
               this.tabProject.push(this.allProject[i])
             }
           }
@@ -1818,7 +1821,7 @@
       },
 
       tabclickEvent(val) {
-
+        console.log("li3333333333333li")
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
             this.prescription_id = this.prescriptions[i].id
@@ -2154,10 +2157,12 @@
       },
 
       moreState(tab, event) {
+        console.log("li222222222")
         if (tab == 'more') {
           return false
         }
-      }, open_three() {
+      },
+      open_three() {
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
@@ -2654,7 +2659,7 @@
       },
       addTab(targetName) {
 
-        console.log("this.prescriptions",this.prescriptions)
+        console.log("this.prescriptionsaaaaaa",this.prescriptions)
         for(let i = 0; i < this.prescriptions.length; i++){
           if (this.prescriptions[i].is_medicine_status) {
             this.$message.error('处方中包含已发药处方,无法新增')
@@ -2741,7 +2746,7 @@
 
       },
       removeTab(targetName) {
-
+        console.log("1111111111111111")
         if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5 || this.curPrescriptions.is_medicine_status) {
           this.$message.error('该处方已经结算或者记账或者已发药，无法删除')
           return

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -4,19 +4,19 @@
         <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border
                   style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" width="70" label="序号">
+            <el-table-column align="center" width="50" label="序号">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.groupno" placeholder=""></el-input>
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="drug_name" label="名称">
+            <el-table-column align="center" prop="drug_name" label="名称"  width="297" >
                 <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
                 </template>
             </el-table-column>
 
-          <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
+          <el-table-column align="center" prop="single_dose" width="150" label="单次用量">
             <template slot-scope="scope">
               <div style="display:flex;align-items:center;">
                 <el-input v-model="scope.row.single_dose" @input="getAllChange(scope)"
@@ -32,7 +32,7 @@
               </div>
             </template>
           </el-table-column>
-            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+            <el-table-column align="center" prop="delivery_way" width="110" label="用法">
                 <template slot-scope="scope">
                     <el-select v-model="scope.row.delivery_way" placeholder="请选择">
                         <el-option
@@ -44,7 +44,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+            <el-table-column align="center" prop="execution_frequency" width="110" label="频率">
                 <template slot-scope="scope">
                     <el-select v-model="scope.row.execution_frequency" placehold er="请选择" @change="getAllChange(scope)">
                         <el-option
@@ -58,7 +58,7 @@
             </el-table-column>
 
 
-            <el-table-column align="center" prop="day" width="70" label="天数">
+            <el-table-column align="center" prop="day" width="90" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
@@ -83,7 +83,7 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+            <el-table-column align="center" prop="retail_price" width="100" label="单价">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
@@ -92,13 +92,13 @@
 
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="50" label="备注">
+            <el-table-column align="center" prop="remark" width="100" label="备注">
                 <template slot-scope="scope">
                     <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+            <el-table-column align="center" prop="remark" width="80" label="推送频率">
                 <template slot-scope="scope">
                     <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
                     <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
@@ -108,7 +108,7 @@
             </el-table-column>
 
 
-            <el-table-column align="center" width="100" prop="name" label="操作">
+            <el-table-column align="center" width="140" prop="name" label="操作">
                 <template slot-scope="scope">
                     <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
                     <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
@@ -120,7 +120,11 @@
         <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border
                   style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" width="40" label="序号">
+              <template slot-scope="scope">
+                {{scope.$index+1}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="project_name" label="名称">
                 <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
                 </template>
@@ -136,6 +140,7 @@
                         <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)"
                                   placeholder=""></el-input>
                         <div>{{scope.row.unit}}</div>
+                      <div v-if="scope.row.unit == ''">{{scope.row.good_info.default_count_unit}}</div>
                     </div>
 
                 </template>
@@ -170,7 +175,7 @@
                     <div style="display:flex;align-items:center;">
                         <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
                         <div>{{scope.row.unit}}</div>
-
+                      <div v-if="scope.row.unit == ''">{{scope.row.good_info.default_count_unit}}</div>
                     </div>
                 </template>
             </el-table-column>
@@ -355,6 +360,10 @@
         this.templateFormVisible = true
 
 
+      },
+      lili(data){
+        console.log("data",this.prescription)
+
       },
       createFilter(queryString) {
         return (restaurant) => {
@@ -413,7 +422,7 @@
           }
         })
 
-      }, 
+      },
       deleteDrug: function(row, index) {
 
         this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {

src/xt_pages/outpatientDoctorStation/modeTemplate.vue

@@ -87,11 +87,11 @@
     },
     methods: {
       searchAction() {
-      
+
       },
       handleSizeChange(val) {
         this.limit = val
-      
+
       },
       getTime(val, temp) {
         if (val != 0) {
@@ -114,7 +114,7 @@
 
            this.templates = modeTeplate
          }
-       })   
+       })
       },
       handleCurrentChange(row){
         this.mode_id = row.id
@@ -126,7 +126,7 @@
           if(id == this.tablelist[i].id){
             mode_name = this.tablelist[i].name
           }
-        } 
+        }
         return mode_name
       },
       deleteModeTemplate(row,index) {
@@ -152,9 +152,9 @@
        jumpDetail(row) {
         this.$router.push('/hisTool/modeTemplateDetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name +"&modes="+this.mode_str)
       },
-      batchAdd(){
-        this.$router.push("/hisTool/batchTemplate")
-      }
+      // batchAdd(){
+      //   this.$router.push("/hisTool/batchTemplate")
+      // }
     },
     created() {
       this.tablelist =  Object.values(this.$store.getters.treatment_mode)

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -56,7 +56,8 @@
                             <prescription-template-mode-table ref="prescription_tables"
                                                          :prescription="curPrescriptions"
                                                          :preDrugs="preDrugs"
-                                                         :activeType="customTabIndex"></prescription-template-mode-table>
+                                                         :activeType="customTabIndex">
+                            </prescription-template-mode-table>
                         </el-tabs>
                     </div>
                 </div>
@@ -1988,7 +1989,7 @@
         display: flex;
         flex-direction: column;
         position: relative;
-
+        
     .el-form-item {
         width: 33%;
         margin-bottom: 14px;

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1288,6 +1288,7 @@
           this.showOne = true
           this.showTwo = false
           this.$nextTick(() => {
+            console.log("lilili1111111111111111111111111111111111111111111",this.prescriptions[this.prescriptions.length - 1])
             this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
           })
           this.customTabIndex = 1
@@ -1299,6 +1300,7 @@
           this.showTwo = true
           this.showOne = false
           this.$nextTick(() => {
+            console.log("lilili1111111111111111111111111111111111111111111",this.prescriptions[this.prescriptions.length - 1])
             this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
           })
           this.customTabIndex = 2
@@ -2140,7 +2142,7 @@
         display: flex;
         flex-direction: column;
         position: relative;
-
+        overflow-x: auto;
     .el-form-item {
         width: 33%;
         margin-bottom: 14px;

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -116,7 +116,7 @@ export default {
         websocketSend(data) {
             try {
                 this.websocket.send(JSON.stringify(data))
-                
+
             } catch (error) {
                 this.showError = true;
                 this.showIndex = 4;
@@ -128,8 +128,8 @@ export default {
             this.websocket.onmessage = e => {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
-                console.log('res3333333333',res)
-                
+                console.log('res3333ssss333333',res)
+
                     if(res.channel == 'queue/join'){
                         if(res.data.type == 3){
                             let fisrtQueueInfo = []
@@ -237,7 +237,7 @@ export default {
                         }
                         this.fisrtQueueInfo = fisrtQueueInfo
                     }
-                
+
             }
         },
         handleStateChange: function(index) {
@@ -249,7 +249,7 @@ export default {
             //         if(item.schedule_type == 1){
             //             newArr.push(item)
             //         }
-            //     }) 
+            //     })
             //     this.waitingCalledAm = newArr
             // }else if(index == 1){
             //     let arr = this.waitingCalledPm
@@ -258,7 +258,7 @@ export default {
             //         if(item.schedule_type == 2){
             //             newArr.push(item)
             //         }
-            //     }) 
+            //     })
             //     this.waitingCalledPm = newArr
             // }
             if(index == 2){

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -112,6 +112,7 @@
         <el-button size="small" type="primary" @click="toExport()"
           >导出</el-button
         >
+        <el-button @click="lili">调试</el-button>
         <div>
           <span>&nbsp;&nbsp;</span>
           <label class="title"><span class="name">审核状态</span> :</label>
@@ -997,6 +998,9 @@ export default {
       });
     },
 
+    lili(){
+      console.log("exportList",this.exportList)
+    },
     toExport() {
       if (this.order_id == "") {
         this.$message.error("请勾选入库单");

src/xt_pages/user/dialysisSolution.vue

@@ -286,7 +286,7 @@
               ></el-input>
             </el-form-item>
             </div>
-            
+
           </el-col>
           <el-col
             :span="8"
@@ -397,7 +397,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-         
+
 
           <el-col :span="8" v-if="isShows('钾')">
             <el-form-item label="钾（mmol/L）: " prop="kalium">
@@ -895,7 +895,7 @@ export default {
         epo:"",
         epo_count:"",
         max_ultrafiltration_rate:"",
-        
+
       },
       childPlan: {
         mode: '',
@@ -1063,7 +1063,7 @@ export default {
          this.addPlan.anticoagulant_zongliang = ""
          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
       }
-      
+
     },
     'addPlan.anticoagulant_weichi': function() {
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
@@ -1401,7 +1401,7 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              
+
               this.dialogFormVisible = false
               this.tableData[this.current_index].doctor =
                 response.data.data.solution.doctor
@@ -1486,6 +1486,10 @@ export default {
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
           this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
+          if(this.addPlan.mode_id!=2 && this.addPlan.mode_id!=5&&this.addPlan.mode_id!=12){
+            this.addPlan.displace_liqui_part = 0
+            this.addPlan.displace_liqui_value = 0
+          }
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1519,7 +1523,10 @@ export default {
       })
     },
     submitNewSolution(formName) {
-
+       if(this.addPlan.mode_id!=2 && this.addPlan.mode_id!=5&&this.addPlan.mode_id!=12){
+          this.addPlan.displace_liqui_part = 0
+          this.addPlan.displace_liqui_value = 0
+       }
       this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -1569,7 +1576,7 @@ export default {
       this.fetchPatientDialysisSolutions()
     },
     openEdit(index, row) {
-      console.log("ro2333333",row)
+      console.log("ro233344433344444444",row)
       this.current_index = index
       this.addPlan.id = row.id
       this.addPlan.mode = row.mode_id
@@ -1595,7 +1602,7 @@ export default {
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
       }
-     
+
       if (row.anticoagulant == 3) {
         this.addPlan.anticoagulant = '低分子肝素'
       }
@@ -1614,7 +1621,7 @@ export default {
       if(row.target_ultrafiltration!="" || row.target_ultrafiltration!=undefined){
         this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
       }
-   
+
 
       this.addPlan.dialysis_duration = parseFloat(row.dialysis_duration_hour) + parseFloat((row.dialysis_duration_minute / 60).toFixed(2))
       this.addPlan.dialysis_duration_hour = row.dialysis_duration_hour
@@ -1643,7 +1650,7 @@ export default {
       if(row.calcium!=""||row.calcium!=undefined){
          this.addPlan.calcium = row.calcium.toString()
       }
-     
+
      if(row.bicarbonate!=""||  row.bicarbonate!=undefined){
        this.addPlan.bicarbonate = row.bicarbonate.toString()
      }
@@ -1660,8 +1667,8 @@ export default {
     if(row.conductivity!="" ||row.conductivity!=undefined ){
        this.addPlan.conductivity = row.conductivity.toString()
     }
-     
-    
+
+
       this.addPlan.remark = row.remark
 
       this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
@@ -1669,30 +1676,30 @@ export default {
       if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
         this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
       }
-     
+
       this.addPlan.puncture_needle  = row.puncture_needle
 
       if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
         this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
       }
-     
+
       this.addPlan.epo  = row.epo
 
       if(row.epo_count!="" || row.epo_count!=undefined){
         this.addPlan.epo_count  = row.epo_count.toString()
       }
-    
+
       if(row.dialyzer_perfusion_apparatus!="" ||  row.dialyzer_perfusion_apparatus!=undefined){
          this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
       }
       if(row.plasma_separator!="" || row.plasma_separator!=undefined){
         this.addPlan.plasma_separator = row.plasma_separator.toString()
       }
-     
+
       if(row.bilirubin_adsorption_column!="" || row.bilirubin_adsorption_column!=undefined){
          this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
       }
-    
+
       this.addPlan.dialysis_irrigation = row.dialysis_irrigation
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialysis_irrigation = row.dialysis_irrigation
@@ -1717,12 +1724,12 @@ export default {
       if(row.body_fluid_other!=''|| row.body_fluid_other!=undefined){
         this.addPlan.body_fluid_other = row.body_fluid_other.toString()
       }
-     
+
       this.addPlan.special_medicine = row.special_medicine
       if(row.special_medicine_other!=""||row.special_medicine_other!=undefined){
         this.addPlan.special_medicine_other = row.special_medicine_other.toString()
       }
-   
+
       this.addPlan.displace_liqui_part = row.displace_liqui_part
       if(row.displace_liqui_value!=''||row.displace_liqui_value!=undefined){
         this.addPlan.displace_liqui_value = row.displace_liqui_value.toString()
@@ -1730,7 +1737,7 @@ export default {
       if(row.ultrafiltration!='' ||  row.ultrafiltration!=undefined){
         this.addPlan.ultrafiltration = row.ultrafiltration.toString()
       }
-     
+
       this.addPlan.blood_access = row.blood_access
 
       this.addPlan.registrars_id = row.registrars_id
@@ -1749,7 +1756,7 @@ export default {
     },
     isShows(name) {
       var filedList = store.getters.xt_user.fileds
-      
+
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 1 &&
@@ -2196,7 +2203,7 @@ export default {
     this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
     this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
     this.queryParams.id = this.patientID
-  
+
 
   }
 }