11月14日 库存扣减更新

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -320,6 +320,10 @@
           <label>透后尿素(mmol/L): </label>
           <span class="content" >{{ this.record.after_urea}}</span>
         </li>
+       <li v-if="isShow('管路凝血')">
+          <label>管路凝血: </label>
+          <span class="content" >{{ this.record.pip_coagulation}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -376,6 +376,12 @@
           <span class="content">{{this.record.urea_befor}}</span>
           <span class="unit"></span>
         </li>
+
+       <li v-if="isShow('抽吸')">
+          <label>抽吸: </label>
+          <span class="content">{{this.record.suction}}</span>
+          <span class="unit"></span>
+        </li>
        
       </ul>
     </div>

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

@@ -1012,6 +1012,7 @@ export default {
       data["fallrisk"] = this.form.fallrisk
       data["machine_run"] = this.form.machine_run
       data["after_urea"] = this.form.after_urea
+      data["pip_coagulation"] = this.form.pip_coagulation
       console.log("Paramsquery",data)
 
       postAssessmentAfterDislysis(ParamsQuery, data)

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

@@ -546,6 +546,13 @@
               <el-input v-model="assessmentBeforeDislysis.urea_befor"></el-input>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="8">
+            <el-form-item label="抽吸:" v-if="isShow('抽吸')">
+              <el-input v-model="assessmentBeforeDislysis.suction" @focus="showInnerDialog('20')"></el-input>
+            </el-form-item>
+          </el-col>
          
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -654,6 +661,7 @@
         internal_fistula: [],
         internal_fistula_skin: [],
         puncture_method: [],
+        suctionList:[],
         isVisibiltyForCruorDialog: false,
         assessmentBeforeDislysis: {
           puncture_needle: '',
@@ -716,6 +724,7 @@
           estimated_food_intake:"",
           blood_pressure_during_dialysis:"",
           urea_befor:"",
+          suction:"",
         },
 
         InnerDialogProps: {
@@ -1071,6 +1080,12 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+            case '20': // 抽吸
+            this.InnerDialogProps.values = this.suctionList
+            this.InnerDialogProps.titles = '抽吸'
+            this.InnerDialogProps.type = 'suction'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.suction
+            this.InnerDialogProps.isShowTextArea = false
          
         }
       },
@@ -1138,6 +1153,9 @@
           case 'humor_excessive_symptom':
            this.assessmentBeforeDislysis.humor_excessive_symptom = val.value.join(',')
            break  
+          case 'suction':
+           this.assessmentBeforeDislysis.suction = val.value.join(',')
+           break
         }
       },
       innerDialogCancle: function() {
@@ -1299,7 +1317,8 @@
 
       this.catheter_suture = getDataConfig('hemodialysis', 'catheter_suture')
       this.edema = getDataConfig('hemodialysis', 'edema')
-
+      this.suctionList = getDataConfig('hemodialysis', 'suction')
+      
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
       this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')

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

@@ -523,9 +523,31 @@
               {{scope.row.blood_monitor}}
            </template>
           </el-table-column>
-
-
-
+          
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="肝素量(mg)"
+            width="140"
+            v-if="isShow('肝素量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.heparin_amount}}
+           </template>
+          </el-table-column>
+          
+         <el-table-column
+            prop="heparin"
+            align="center"
+            label="脱水(L)"
+            width="140"
+            v-if="isShow('脱水')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.dehydration}}
+           </template>
+          </el-table-column>
+ 
            <el-table-column
             prop="heparin"
             align="center"
@@ -840,6 +862,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('脱水')">
+            <el-form-item label="脱水(L):">
+              <el-input v-model="form.dehydration"></el-input>
+            </el-form-item>
+          </el-col>
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -1038,6 +1066,7 @@ export default {
         blood_thickness:"",
         blood_monitor:"",
         heparin_amount:"",//肝素量
+        dehydration:"",
       },
 
       table_current_row: null,
@@ -1261,6 +1290,8 @@ export default {
         this.form.urea_monitoring = resp.monitor.urea_monitoring?resp.monitor.urea_monitoring:""
         this.form.blood_thickness = resp.monitor.blood_thickness?resp.monitor.blood_thickness:""
         this.form.blood_monitor = resp.monitor.blood_monitor?resp.monitor.blood_monitor:""
+        this.form.dehydration = resp.monitor.dehydration?resp.monitor.dehydration:""
+        this.form.heparin_amount = resp.monitor.heparin_amount?resp.monitor.heparin_amount:""
       })
     },
 
@@ -1330,6 +1361,8 @@ export default {
         this.form.urea_monitoring = ""
         this.form.blood_thickness = ""
         this.form.blood_monitor = ""
+        this.form.dehydration = ""
+        this.form.heparin_amount = ""
       } else {
         (this.form.id = monitor.id),
         // this.form.operate_date = monitor.operate_date
@@ -1372,6 +1405,8 @@ export default {
         this.form.urea_monitoring = monitor.urea_monitoring?monitor.urea_monitoring:""
         this.form.blood_thickness = monitor.blood_thickness?monitor.blood_thickness:""
         this.form.blood_monitor = monitor.blood_monitor?monitor.blood_monitor:""
+        this.form.dehydration = monitor.dehydration?monitor.dehydration:""
+        this.form.heparin_amount = monitor.heparin_amount?monitor.heparin_amount:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -1420,6 +1455,7 @@ export default {
       this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
       this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
       this.form.heparin_amount = parseFloat(this.form.heparin_amount) == NaN ? 0 : parseFloat(this.form.heparin_amount);
+      this.form.dehydration = parseFloat(this.form.dehydration) == NaN ? 0 : parseFloat(this.form.dehydration);
       let mode = '1';
       if (this.form.id > 0) {
         mode = '2';
@@ -1485,6 +1521,8 @@ export default {
             this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
             this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
             this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
+            this.form.dehydration = parseFloat(this.form.dehydration) == NaN ? 0 : parseFloat(this.form.dehydration);
+            this.form.heparin_amount = parseFloat(this.form.heparin_amount) == NaN ? 0 : parseFloat(this.form.heparin_amount);
             this.$message.error(resp.msg)
           }
         }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -37,8 +37,8 @@
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>
           <th v-if="isShow('血压监测')" width="92px">血压监测</th>
-          <!-- <th v-if="isShow('血压监测部位')" width="92px">血压监测部位</th>
-          <th v-if="isShow('并发症')" width="92px">并发症</th> -->
+          <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
+          <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
@@ -79,13 +79,13 @@
             <span v-if="monitor.monitor_anticoagulant == 12">无抗凝剂</span>
             <span v-if="monitor.monitor_anticoagulant_value!=''">（{{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }}）</span>
           </td>
-          <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>
-          <th v-if="isShow('并发症')">{{getComplication(monitor.complication)}}</th> -->
           <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
           <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
           <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>
           <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
+          <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
+          <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -715,14 +715,21 @@
                         <div>
                           <label-box
                             :isChecked="
-                              predialysis.is_hemorrhage == 2 ? true : false
+                              predialysis.suction.indexOf(
+                                '通畅'
+                              ) > -1
+                                ? true
+                                : false
                             "
                             showValue="通畅"
                           ></label-box>
-                          &nbsp;
                           <label-box
                             :isChecked="
-                              predialysis.is_hemorrhage == 1 ? true : false
+                              predialysis.suction.indexOf(
+                                '不通畅'
+                              ) > -1
+                                ? true
+                                : false
                             "
                             showValue="不通畅"
                           ></label-box>
@@ -1359,7 +1366,13 @@
                     : ""
                 }}
               </td>
-              <td></td>
+              <td>
+                 &nbsp;{{
+                  monitor.dehydration
+                    ? monitor.dehydration
+                    : ""
+                }}
+              </td>
 
               <td>
                 &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
@@ -1528,69 +1541,46 @@
                       <td width="80">凝血情况:</td>
                       <td width="120">透析器凝血情况：</td>
                       <td width="220">
-                        <label-box
-                          :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
-                              ? true
-                              : false
-                          "
-                          showValue="0级"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
-                              ? true
-                              : false
-                          "
-                          showValue="Ⅰ级"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
-                              ? true
-                              : false
-                          "
-                          showValue="Ⅱ级"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
-                              ? true
-                              : false
-                          "
-                          showValue="Ⅲ级"
-                        ></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf(' 0级') > -1 ? true : false) :false" showValue="0级"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('Ⅰ级') > -1 ? true : false) :false" showValue="Ⅰ级"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('Ⅱ级') > -1 ? true : false) :false" showValue="Ⅱ级"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('Ⅲ级') > -1 ? true : false) :false" showValue="Ⅲ级"></label-box>
                       </td>
                       <td></td>
                       <td width="120">管路凝血情况：</td>
                       <td width="220">
-                        <label-box
+                         <label-box
                           :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
+                            afterdialysis.pip_coagulation &&
+                            afterdialysis.pip_coagulation.indexOf('0级') > -1
                               ? true
                               : false
                           "
                           showValue="0级"
                         ></label-box>
-                        <label-box
+                       
+                         <label-box
                           :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
+                            afterdialysis.pip_coagulation &&
+                            afterdialysis.pip_coagulation.indexOf('Ⅰ级') > -1
                               ? true
                               : false
                           "
                           showValue="Ⅰ级"
                         ></label-box>
-                        <label-box
+                         <label-box
                           :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
+                            afterdialysis.pip_coagulation &&
+                            afterdialysis.pip_coagulation.indexOf('Ⅱ级') > -1
                               ? true
                               : false
                           "
                           showValue="Ⅱ级"
                         ></label-box>
-                        <label-box
+                         <label-box
                           :isChecked="
-                            afterdialysis.puncture_point_oozing_blood == 1
+                            afterdialysis.pip_coagulation &&
+                            afterdialysis.pip_coagulation.indexOf('Ⅲ级') > -1
                               ? true
                               : false
                           "

src/xt_pages/stock/stockInOrderAdd.vue

@@ -785,7 +785,7 @@
               this.recordInfo.recordData[i].good_name = val.good_name
               this.recordInfo.recordData[i].good_type_id = val.good_type_id
               this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-              this.recordInfo.recordData[i].number =  val.number
+             // this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
            

src/xt_pages/stock/stockInOrderEdit.vue

@@ -802,7 +802,7 @@ export default {
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-            this.recordInfo.recordData[i].number =  val.number
+            // this.recordInfo.recordData[i].number =  val.number
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             if(val.buy_price == 0){

src/xt_pages/supply/components/addGoodOrder.vue

@@ -745,6 +745,8 @@ export default {
           this.recordInfo.tableList[i].is_total = val.is_total;
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
           this.recordInfo.tableList[i].unitList = val.unitList;
+          this.recordInfo.tableList[i].warehouse_info_id= 0
+          this.recordInfo.tableList[i].warehousing_id= 0
         }
       }
     },
@@ -780,7 +782,10 @@ export default {
       if (this.recordInfo.tableList.length <= 1) {
         this.$message.error("只有一条记录的时候无法删除");
         return;
-      }else {
+      }else{
+        this.recordInfo.tableList.splice(index, 1);
+      }
+     if(row.id > 0){
         const params = {
           id: row.id,
         };
@@ -1059,7 +1064,7 @@ export default {
               var warehouseOut = response.data.data.warehouseOut;
               this.is_check = 2
               this.warese_out_id = warehouseOut.id;
-              console.log("采购单id2322332",this.warese_out_id)
+              console.log("采购单id2322332",orderInfo)
               this.good_number = warehouseOut.good_number;
               this.rate_of_concession = warehouseOut.rate_of_concession;
               this.discount_amount = warehouseOut.discount_amount;
@@ -1081,6 +1086,7 @@ export default {
                 orderInfo[i].order_number = orderInfo[i].order_number;
                 orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
                 orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
+
                 orderInfo[i].supply_total_price = (
                   orderInfo[i].count * orderInfo[i].price
                 ).toFixed(2);
@@ -1099,6 +1105,7 @@ export default {
                         orderInfo[i].unitList[1].name = this.drugList[j].min_unit;
                       }
                       if (this.drugList[j].max_unit == this.drugList[j].min_unit) {
+                        orderInfo[i].unitList = [{ id: 1, name: "" }];
                         orderInfo[i].unitList[0].name = this.drugList[j].max_unit;
                       }
                     }
@@ -1114,6 +1121,7 @@ export default {
                 }
               }
               this.recordInfo.tableList = [];
+              console.log("orderINO22332323232233223",orderInfo)
               this.recordInfo.tableList = orderInfo;
             }
           });
@@ -1158,7 +1166,7 @@ export default {
       this.$refs["tableForm"].validate((valid) => {
         if (valid) {
           this.loading = true;
-          var warehose_out_id = this.$route.query.id;
+          var warehose_out_id = this.id;
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remake,
@@ -1177,6 +1185,20 @@ export default {
             this.good_number
           ).then((response) => {
             if (response.data.state == 1) {
+              var orderInfo =  response.data.data.list
+              // for (let i = 0; i < orderInfo.length; i++) {
+              //   orderInfo[i].id = orderInfo[i].id
+              //   orderInfo[i].supply_count = orderInfo[i].count;
+              //   orderInfo[i].supply_price = orderInfo[i].price;
+              //   orderInfo[i].supply_remake = orderInfo[i].remark;
+              //   orderInfo[i].type = orderInfo[i].is_source;
+              //   orderInfo[i].project_id = orderInfo[i].project_id;
+              //   orderInfo[i].supply_unit = orderInfo[i].supply_unit;
+              //   orderInfo[i].order_number = orderInfo[i].order_number;
+              //   orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
+              //   orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
+              // }
+              this.recordInfo.tableList = orderInfo
               this.loading = false;
               this.$message.success("保存成功!");
               

src/xt_pages/supply/components/addGoodReturn.vue

@@ -413,7 +413,8 @@ import {
   saveGoodReturnOrder,
   checkReturnOrder,
   updateGoodReturn,
-  modefyReturnOrder
+  modefyReturnOrder,
+  deleteReturnOrderById
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -719,9 +720,32 @@ export default {
       if (this.recordInfo.tableList.length <= 1) {
         this.$message.error("只有一条记录的时候无法删除");
         return;
-      } else {
+      }else{
         this.recordInfo.tableList.splice(index, 1);
       }
+      if (row.id > 0) {
+        const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除吗?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteReturnOrderById(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                 var msg = response.data.data.msg;
+                 this.recordInfo.tableList.splice(index, 1);
+                this.$message.success('删除成功')
+              }
+            })
+          }).catch(() => {
+        })
+   
+      }
     },
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
@@ -822,10 +846,7 @@ export default {
       if(this.payment > 0) this.count_payment()
     },
     count_discount() {
-      this.rate_of_concession = (
-        this.discount_amount /
-        (this.total_price * 0.01)
-      ).toFixed(2);
+      this.rate_of_concession = ( this.discount_amount / (this.total_price * 0.01)).toFixed(2);
       if(this.payment > 0) this.count_payment()
     },
     count_payment() {
@@ -1069,6 +1090,7 @@ export default {
                 var orderInfo = response.data.data.list
 
                 for(let i=0;i< orderInfo.length;i++){
+                  orderInfo[i].id = orderInfo[i].id
                   orderInfo[i].name = orderInfo[i].name
                   orderInfo[i].id = orderInfo[i].id
                   orderInfo[i].supply_count =  orderInfo[i].supply_count

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -374,7 +374,8 @@ import {
   updatePurchaseOrder,
   checkPurchaseOrder,
   getReturnOrder,
-  getAllOrderCountList
+  getAllOrderCountList,
+  deletePurchOder
 } from "@/api/supply";
 import { getDataConfig } from "@/utils/data";
 export default {
@@ -649,6 +650,7 @@ export default {
       tempObj["is_total"] = 1;
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
+      tempObj["manufacturer_id"] = "";
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -658,6 +660,27 @@ export default {
       } else {
         this.recordInfo.tableList.splice(index, 1);
       }
+      if(row.id > 0){
+         const params = {
+          id: row.id,
+        };
+        this.$confirm("确认删除吗?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+            deletePurchOder(params).then((response) => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$message.success("删除成功");
+
+                this.recordInfo.tableList.splice(index, 1);
+              }
+            });
+          }).catch(() => {});
+      }
     },
 
     savePurchaseOrder() {
@@ -850,12 +873,11 @@ export default {
             this.recordInfo.tableList[i].supply_price =
               this.recordInfo.tableList[i].supply_price.toString();
             for (let j = 0; j < this.manufactuerList.length; j++) {
-              if (
-                this.recordInfo.tableList[i].supply_manufacturer ==
-                this.manufactuerList[j].id
-              ) {
-                this.recordInfo.tableList[i].supply_manufacturer =
-                  this.manufactuerList[j].manufacturer_name;
+              if (this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id ) {
+                this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name;
+              }
+              if (this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name) {
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id;
               }
             }
           }
@@ -865,7 +887,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-
+          console.log("23223322323",params)
           updatePurchaseOrder(
             params,
             this.supplier_name,
@@ -879,6 +901,21 @@ export default {
             if (response.data.state == 1) {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
+              var orderInfo =  response.data.data.orderInfo
+              // for (let i = 0; i < orderInfo.length; i++) {
+              //   orderInfo[i].id = orderInfo[i].id
+              //   orderInfo[i].name = orderInfo[i].name
+              //   orderInfo[i].supply_count = orderInfo[i].count;
+              //   orderInfo[i].supply_price = orderInfo[i].price;
+              //   orderInfo[i].supply_remake = orderInfo[i].remark;
+              //   orderInfo[i].type = orderInfo[i].is_source;
+              //   orderInfo[i].project_id = orderInfo[i].project_id;
+              //   orderInfo[i].supply_unit = orderInfo[i].supply_unit;
+              //   orderInfo[i].supply_specification_name = orderInfo[i].supply_specification_name
+              //   orderInfo[i].supply_total = orderInfo[i].supply_total
+              // }
+              this.recordInfo.tableList = orderInfo;
+            
               this.$message.success("保存成功!");
             }
           });
@@ -1104,6 +1141,7 @@ export default {
     tempObj["is_total"] = 1;
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
+    tempObj["manufacturer_id"] = "";
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
   },

src/xt_pages/supply/components/editGoodReturn.vue

@@ -981,10 +981,8 @@ export default {
 
 
     count_discount() {
-      this.rate_of_concession = (
-        this.discount_amount /
-        (this.total_price * 0.01)
-      ).toFixed(2);
+      this.rate_of_concession = (this.discount_amount /(this.total_price * 0.01)).toFixed(2);
+      
       if(this.payment > 0) this.count_payment()
     },