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

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/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,42 @@ 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) {
       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 +977,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 +1021,8 @@ export default {
     this.getlist();
     // this.getdruglist();
     this.fun3();
+    this.getrouteofadministration();
+    this.getgetpartitionlist();
   },
 };
 </script>
@@ -759,7 +1076,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,21 @@ 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.partition", this.partition);
     },
     async fun3() {
       console.log("fun3");
@@ -344,6 +382,8 @@ export default {
       this.state = 1;
       this.tableData = null;
       this.currentRow = null;
+      this.partition = 0;
+      this.shift = 0;
     },
     testsss() {
       this.state = 1;
@@ -397,6 +437,8 @@ 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) {
@@ -415,6 +457,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,6 +504,57 @@ 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() {
@@ -612,6 +707,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/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/DialysisPrintOrderFiftyThree.vue

@@ -769,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 >
@@ -819,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"
@@ -872,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>
@@ -889,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>
@@ -906,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 >
@@ -916,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 >
@@ -939,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 >
@@ -961,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 >
@@ -973,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

@@ -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/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/outpatientDoctorStation/batch_replacement.vue

@@ -3,10 +3,16 @@
   <div class="main-contain new-main-contain">
     <div class="bannar_list">
       <div class="banner_left">
-        <div style="width:1000px;display: flex">
+        <div
+          style="width: 1000px; display: flex; justify-content: space-evenly;"
+        >
           <div>
             透析模式:
-            <el-select v-model="modeOptions_value" placeholder="请选择" @change="getUsername">
+            <el-select
+              v-model="modeOptions_value"
+              placeholder="请选择"
+              @change="getUsername"
+            >
               <el-option
                 v-for="item in modeOptions"
                 :key="item.id"
@@ -75,12 +81,13 @@
 
     <div
       class="app-container"
-      style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+      style="display: flex; flex: 1; padding: 10px 10px 0px 10px"
     >
       <div class="mainLeft">
         <div>
           <el-table
             border
+            height="70vh"
             ref="multipleTable"
             :data="tableData"
             tooltip-effect="dark"
@@ -92,20 +99,18 @@
               color: '#606266',
             }"
           >
-            <el-table-column type="selection" width="55"> </el-table-column>
-            <el-table-column label="患者姓名" width="184">
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
+            <el-table-column label="患者姓名" width="184" align="center">
               <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
           </el-table>
         </div>
       </div>
-      <div class="mainRight">
+      <div class="mainRight" v-if="new_type == 1">
         <el-table
-          v-if="new_type == 1"
           :data="tableDatas"
           style="width: 100%"
-          :height="tableHeight"
-          max-height="70vh"
           border
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -122,7 +127,6 @@
           >
             <template slot-scope="scope">
               <el-select
-                filterable
                 v-model="scope.row.drug_name"
                 placeholder="请选择"
                 @change="changeid(scope.row, scope.$index)"
@@ -233,130 +237,134 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-table
-        v-if="new_type == 2"
-        :data="project"
-        style="width: 100%"
-        max-height="250"
-        border
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
+      <div class="mainRight" v-if="new_type == 2">
+        <el-table
+          :data="project"
+          style="width: 100%"
+          border
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266',
           }"
-      >
-        <el-table-column fixed label="替换项目名称" width="230">
-          <template slot-scope="scope">
-            <el-select
-              filterable
-              v-model="scope.row.drug_name"
-              placeholder="请选择"
-              @change="changeid2(scope.row,scope.$index)"
-            >
-              <el-option
-                v-for="item in projectlist"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="组" width="120">
-          <template slot-scope="scope">
-            {{scope.row.translate}}
-          </template>
-        </el-table-column>
-        <el-table-column label="单次用量" width="200">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.single_dose"
-              placeholder="请输入内容"
-            ></el-input>
-            {{ scope.row.unit }}
-          </template>
-        </el-table-column>
-        <el-table-column label="用法" width="120">
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.delivery_way"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in usage"
-                :key="item.name"
-                :label="item.name"
-                :value="item.name"
+          highlight-current-row
+        >
+          <el-table-column
+            fixed
+            label="替换项目名称"
+            width="280"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-select
+                filterable
+                v-model="scope.row.drug_name"
+                placeholder="请选择"
+                @change="changeid2(scope.row, scope.$index)"
               >
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="频率" width="120">
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.execution_frequency"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in frequency"
-                :key="item.name"
-                :label="item.name"
-                :value="item.name"
+                <el-option
+                  v-for="item in projectlist"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="组" width="120" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.translate }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单次用量" width="200" align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.single_dose"
+                placeholder="请输入内容"
+              ></el-input>
+              {{ scope.row.unit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="用法" width="120" align="center">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+                <el-option
+                  v-for="item in usage"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="频率" width="120" align="center">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.execution_frequency"
+                placeholder="请选择"
               >
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="天数" width="110">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.day"
-              placeholder="请输入"
-              style="width: 75px"
-            ></el-input>天
-          </template>
-        </el-table-column>
-        <el-table-column label="总量" width="200">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.prescribing_number"
-              placeholder="请输入"
-              style="width: 75px"
-            ></el-input>
-            {{ scope.row.unit }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单价" width="120">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.price" style="width: 80px"></el-input
-            >元
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" width="120">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" placeholder=""></el-input>
-          </template>
-        </el-table-column>
-        <!--          <el-table-column label="推送频率" width="120">-->
-        <!--            <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">-->
-        <!--            <template slot-scope="scope">-->
-        <!--              <el-button-->
-        <!--                @click.native.prevent="addopen(scope.$index)"-->
-        <!--                type="text"-->
-        <!--                size="small">-->
-        <!--                推送-->
-        <!--              </el-button>-->
-        <!--            </template>-->
-        <!--          </el-table-column>-->
-      </el-table>
+                <el-option
+                  v-for="item in frequency"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="天数" width="110" align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.day"
+                placeholder="请输入"
+                style="width: 75px"
+              ></el-input
+              >天
+            </template>
+          </el-table-column>
+          <el-table-column label="总量" width="200" align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.prescribing_number"
+                placeholder="请输入"
+                style="width: 75px"
+              ></el-input>
+              {{ scope.row.unit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" width="120" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.price" style="width: 80px"></el-input
+              >元
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" width="120" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" placeholder=""></el-input>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column label="推送频率" width="120">-->
+          <!--            <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">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button-->
+          <!--                @click.native.prevent="addopen(scope.$index)"-->
+          <!--                type="text"-->
+          <!--                size="small">-->
+          <!--                推送-->
+          <!--              </el-button>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+        </el-table>
+      </div>
     </div>
 
     <el-dialog
@@ -388,9 +396,9 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="">确 定</el-button>
-  </span>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="">确 定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -414,66 +422,97 @@ export default {
       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: "",
-        list_1:[],
-        list_2:[],
-      },],
-      project:[ {
-        id: "",
-        drug_name: "",
-        translate:"",
-        single_dose: "",
-        unit: "",
-        delivery_way: "",
-        execution_frequency: "",
-        day: "",
-        prescribing_number: "",
-        price: "",
-        remark: "",
-        frequency_type:1,
-        day_count:"",
-        week_days:"",
-      },],//项目
+      tableDatas: [
+        {
+          id: "",
+          drug_name: "",
+          single_dose: "",
+          single_dose_unit: "",
+          delivery_way: "",
+          execution_frequency: "",
+          day: "",
+          prescribing_number: "",
+          prescribing_number_unit: "",
+          price: "",
+          remark: "",
+          list_1: [],
+          list_2: [],
+        },
+      ],
+      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,//行数
-
-    }
+      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, //行数
+    };
   },
   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]
+      this.modeOptions[key] = this.$store.getters.treatment_mode[key];
     }
     // console.log("this.modeOptions",this.modeOptions)
     this.getdrugconfigs();
@@ -534,27 +573,27 @@ export default {
           }
         }
       }
-      if (this.new_type == 1){
-        if(this.druglist != null){
-          for(let d1 = 0;d1 < this.druglist.length;d1++){
-            if(this.id == this.druglist[d1].id){
-              tmp2 = this.druglist[d1].name
+      if (this.new_type == 1) {
+        if (this.druglist != null) {
+          for (let d1 = 0; d1 < this.druglist.length; d1++) {
+            if (this.id == this.druglist[d1].id) {
+              tmp2 = this.druglist[d1].name;
             }
-            if(this.tableDatas != null){
-              if(this.tableDatas[0].id == this.druglist[d1].id){
-                tmp3 = this.druglist[d1].name
+            if (this.tableDatas != null) {
+              if (this.tableDatas[0].id == this.druglist[d1].id) {
+                tmp3 = this.druglist[d1].name;
               }
             }
           }
         }
-        if(this.druglist2 != null){
-          for(let d2 = 0;d2 < this.druglist2.length;d2++){
-            if(this.id == this.druglist2[d2].id){
-              tmp2 = tmp2 + this.druglist2[d2].name
+        if (this.druglist2 != null) {
+          for (let d2 = 0; d2 < this.druglist2.length; d2++) {
+            if (this.id == this.druglist2[d2].id) {
+              tmp2 = tmp2 + this.druglist2[d2].name;
             }
-            if(this.tableDatas != null){
-              if(this.tableDatas[0].id == this.druglist2[d2].id){
-                tmp3 = this.druglist2[d2].name
+            if (this.tableDatas != null) {
+              if (this.tableDatas[0].id == this.druglist2[d2].id) {
+                tmp3 = this.druglist2[d2].name;
               }
             }
           }
@@ -562,7 +601,7 @@ export default {
       }
 
       this.$confirm(
-        "请确定是否保存?",//注：该操作将会把所选患者的"+tmp+"透析模式中的"+tmp2+"替换为"+tmp3+"，
+        "请确定是否保存?", //注：该操作将会把所选患者的"+tmp+"透析模式中的"+tmp2+"替换为"+tmp3+"，
         "",
         {
           confirmButtonText: "确 定",
@@ -574,99 +613,107 @@ export default {
           this.$message.error("没有选中有效信息");
           return;
         }
-        let st = ""
-        for (let i = 0;i < this.multipleSelection.length;i++){
-          st = st + this.multipleSelection[i].id + ","
+        let st = "";
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          st = st + this.multipleSelection[i].id + ",";
         }
-        console.log("string",st)
+        console.log("string", st);
         let params = {
-          mode_id:this.modeOptions_value,
+          mode_id: this.modeOptions_value,
           patient_id: st,
-          type:this.new_type,
+          type: this.new_type,
           replaced: this.id,
-        }
+        };
         let data1 = {
-          "prescriptions": this.tableDatas
-        }
+          prescriptions: this.tableDatas,
+        };
         let data2 = {
-          "prescriptions": this.project
-        }
-        if (this.new_type == 1){
-          replacesavedrug(params,data1).then((res) =>{
-            if (res.data.state == 1){
-              this.$message.success('替换成功')
-              this.multipleSelection = []
-              this.tableData=[]
-              this.tableDatas=[{
-                id: "",
-                drug_name: "",
-                single_dose: "",
-                single_dose_unit: "",
-                delivery_way: "",
-                execution_frequency: "",
-                day: "",
-                prescribing_number: "",
-                prescribing_number_unit: "",
-                price: "",
-                remark: "",
-              },];
-              this.project=[ {
-                id: "",
-                drug_name: "",
-                translate:"",
-                single_dose: "",
-                unit: "",
-                delivery_way: "",
-                execution_frequency: "",
-                day: "",
-                prescribing_number: "",
-                price: "",
-                remark: "",
-                frequency_type:1,
-                day_count:"",
-                week_days:"",
-              },];
-            }else{
-              this.$message.error(res.data.msg)
+          prescriptions: this.project,
+        };
+        if (this.new_type == 1) {
+          replacesavedrug(params, data1).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("替换成功");
+              this.multipleSelection = [];
+              this.tableData = [];
+              this.tableDatas = [
+                {
+                  id: "",
+                  drug_name: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  day: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  price: "",
+                  remark: "",
+                },
+              ];
+              this.project = [
+                {
+                  id: "",
+                  drug_name: "",
+                  translate: "",
+                  single_dose: "",
+                  unit: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  day: "",
+                  prescribing_number: "",
+                  price: "",
+                  remark: "",
+                  frequency_type: 1,
+                  day_count: "",
+                  week_days: "",
+                },
+              ];
+            } else {
+              this.$message.error(res.data.msg);
             }
-          })
-        }else{
-          replacesaveproject(params,data2).then((res) =>{
-            if (res.data.state == 1){
-              this.$message.success('替换成功')
-              this.multipleSelection = []
-              this.tableData=[]
-              this.tableDatas=[{
-                id: "",
-                drug_name: "",
-                single_dose: "",
-                single_dose_unit: "",
-                delivery_way: "",
-                execution_frequency: "",
-                day: "",
-                prescribing_number: "",
-                prescribing_number_unit: "",
-                price: "",
-                remark: "",
-              },];
-              this.project=[ {
-                id: "",
-                drug_name: "",
-                translate:"",
-                single_dose: "",
-                unit: "",
-                delivery_way: "",
-                execution_frequency: "",
-                day: "",
-                prescribing_number: "",
-                price: "",
-                remark: "",
-                frequency_type:1,
-                day_count:"",
-                week_days:"",
-              },];
-            }else{
-              this.$message.error(res.data.msg)
+          });
+        } else {
+          replacesaveproject(params, data2).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("替换成功");
+              this.multipleSelection = [];
+              this.tableData = [];
+              this.tableDatas = [
+                {
+                  id: "",
+                  drug_name: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  day: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  price: "",
+                  remark: "",
+                },
+              ];
+              this.project = [
+                {
+                  id: "",
+                  drug_name: "",
+                  translate: "",
+                  single_dose: "",
+                  unit: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  day: "",
+                  prescribing_number: "",
+                  price: "",
+                  remark: "",
+                  frequency_type: 1,
+                  day_count: "",
+                  week_days: "",
+                },
+              ];
+            } else {
+              this.$message.error(res.data.msg);
             }
           });
         }
@@ -675,116 +722,126 @@ export default {
 
     lili() {
       // console.log("this.multipleSelection",this.multipleSelection);
-      console.log("this.modeOptions_value",this.modeOptions_value)
+      console.log("this.modeOptions_value", this.modeOptions_value);
       // console.log("this.mode",this.modeOptions_value)
       // console.log("this.projectlist2",this.projectlist2)
       // console.log("patient_value",this.patient_value)
     },
-    addopen(hang){
-      this.hang = hang
+    addopen(hang) {
+      this.hang = hang;
       //清空
       this.week_days = [];
       this.day_count = "";
       this.frequency_type = 1;
       this.dialogVisible = true;
     },
-    changetype(){
-      console.log(">>>>>>>",this.new_type)
-      this.id = ""
-      this.tableData = []
+    changetype() {
+      console.log(">>>>>>>", this.new_type);
+      this.id = "";
+      this.tableData = [];
     },
     changeid(item, index) {
       console.log("");
       item.id = item.drug_name;
       var params = {
-        id:item.id
-      }
-      getdrugsinformation(params).then((res) =>{
-        if (res.data.state == 1){
-          console.log("res??",res)
+        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].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].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;
-          if (res.data.data.list[0].prescribing_number_unit == res.data.data.list[0].min_unit || res.data.data.list[0].prescribing_number_unit == "" || res.data.data.list[0].prescribing_number_unit == null){
+          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;
+          if (
+            res.data.data.list[0].prescribing_number_unit ==
+              res.data.data.list[0].min_unit ||
+            res.data.data.list[0].prescribing_number_unit == "" ||
+            res.data.data.list[0].prescribing_number_unit == null
+          ) {
             this.tableDatas[0].price = res.data.data.list[0].min_price;
-          }else{
+          } else {
             this.tableDatas[0].price = res.data.data.list[0].retail_price;
           }
           this.tableDatas[0].remark = res.data.data.list[0].remark;
           this.tableDatas[0].list_1 = res.data.data.list[0].list_1;
           this.tableDatas[0].list_2 = res.data.data.list[0].list_2;
         }
-      })
+      });
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    changeid2(item,index){
-      item.id = item.drug_name
+    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)
+        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].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].prescribing_number =
+            res.data.data.list[0].prescribing_number;
           this.project[0].unit = res.data.data.list[0].unit;
-          if (res.data.data.list[0].retail_price != null){
+          if (res.data.data.list[0].retail_price != null) {
             this.project[0].price = res.data.data.list[0].retail_price;
-          }else{
+          } else {
             this.project[0].price = res.data.data.list[0].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
+    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
+      });
+      getmodeconfigs(params).then((res) => {
+        if (res.data.state == 1) {
+          this.frequency = res.data.data.efs;
+          this.usage = res.data.data.drugways;
         }
-      })
+      });
     },
-    getUsername(){
+    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
+        mode: this.modeOptions_value,
+      };
+      replacepeoplename(params).then((res) => {
+        if (res.data.state == 1) {
+          this.tableData = res.data.data.list;
         }
-      })
+      });
     },
     handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
+      this.$confirm("确认关闭？")
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
-    }
-  }
-
-}
+        .catch((_) => {});
+    },
+  },
+};
 </script>
 
 
@@ -810,7 +867,7 @@ export default {
 }
 ::v-deep .el-table__body-wrapper {
   // height: 500px;
-  overflow-y: scroll;
+  // overflow-y: scroll;
 }
 .right_contain {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
@@ -818,11 +875,11 @@ export default {
 }
 .bannar_list {
   width: 99%;
-  margin-bottom: 10px;
+  margin-top: 20px;
   display: flex;
   justify-content: space-between;
   .banner_left {
-    width: 96%;
+    width: 100%;
     margin: 0 auto;
     display: flex;
     justify-content: space-between;
@@ -1022,7 +1079,7 @@ export default {
 .mainRight {
   margin-left: 10px;
   flex: 1;
-  height: 100%;
+  height: 70vh;
   display: flex;
   flex-direction: column;
   overflow-y: auto;
@@ -1039,7 +1096,8 @@ export default {
     }
 
     .el-table__body-wrapper {
-      height: auto !important;
+      max-height: 70vh;
+      // overflow-y: scroll;
       .el-table__body {
         width: 100% !important;
       }
@@ -1048,7 +1106,11 @@ export default {
 }
 
 /deep/ .el-table__fixed {
+  height: 101px !important;
   bottom: 0 !important;
+  .el-table__fixed-body-wrapper {
+    top: 45px !important;
+  }
 }
 .mainCenter {
   display: flex;

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/prescriptionTemplate.vue

@@ -7,7 +7,7 @@
         <el-button type="primary" @click="batchAdds">批量新增</el-button>
         <el-button type="primary" @click="batchReplace">批量替换</el-button>
         <el-button type="danger" @click="batchDeletes">批量删除</el-button>
-        <el-button type="primary" @click="add">新增</el-button>
+        <el-button type="primary" @click="add" style="width:70px;">新增</el-button>
       </div>
     </div>
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -2142,7 +2142,7 @@
         display: flex;
         flex-direction: column;
         position: relative;
-
+        overflow-x: auto;
     .el-form-item {
         width: 33%;
         margin-bottom: 14px;

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("请勾选入库单");