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

src/api/supply.js

@@ -267,6 +267,7 @@ export function savesupply(data) {
 }
 
 export function updatesupply(data) {
+  console.log(data,'oopo')
   return request({
     url: '/api/supply/updatesupply',
     method: 'post',
@@ -274,5 +275,13 @@ export function updatesupply(data) {
   })
 }
 
+// export function updatesupply(data) {
+//   return request({
+//     url: '/api/supply/updatesupply' ,
+//     method: 'post',
+//     data: data
+//   })
+// }
+
 
 

src/components/Popup/index.js

@@ -1,22 +1,28 @@
 import Vue from 'vue'
 import Popup from './index.vue'
 
+
 const PopupBox = Vue.extend(Popup)
 
-Popup.install = function (data) {
+Popup.install = function (data,methods) {
   let instance = new PopupBox({
-    data
+    data,
+    methods
   }).$mount()
 
   document.body.appendChild(instance.$el)
-
+  instance.toClick_1()
   Vue.nextTick(() => {
     instance.show = true
+    // this.$router.push({path:"/good/order/edit?id=" + instance.id});
     // show 和弹窗组件里的show对应，用于控制显隐
     setTimeout(() => {
       instance.show = false
     }, 3000);
   })
+
+
+
 }
 
 export default Popup

src/components/Popup/index.vue

@@ -29,8 +29,8 @@
           </p>
           <div v-for="(item, index) in orderList" :key="index">
             <li>
-              购货单 {{ item.good_number
-              }}<a @click="toClick(item.id)">点击查看</a>
+              购货单 {{ item.good_number }}
+              <router-link tag="span" to=""> </router-link>
             </li>
           </div>
         </div>
@@ -44,6 +44,9 @@
 </template>
 
 <script>
+import Vue from "vue";
+import router from "vue-router";
+Vue.use(router);
 export default {
   name: "Popup",
   data() {
@@ -54,16 +57,19 @@ export default {
       content: "",
       btnText: "关闭",
       orderList: [],
+      id: 0,
     };
   },
   created() {},
   methods: {
     btnClick() {
-      this.click();
+      this.click1();
       this.show = false;
     },
-    toClick(id) {
-      this.$router.push("/good/order/edit?id=" + id);
+    toClick_1(id) {
+      // this.toClick(id);
+      // return id;
+      console.log(this.router)
     },
   },
 };

src/main.js

@@ -33,8 +33,9 @@ import * as voicePromptFun from './utils/voicePrompt'
 import 'default-passive-events'
 Vue.prototype.voicePrompt = voicePromptFun.voicePrompt  //语音提醒
 
-import Popup from "./components/Popup/index"  //全局删除弹框控件
-Vue.prototype.$popup = Popup.install
+// import Popup from "./components/Popup/index"  //全局删除弹框控件
+// Vue.prototype.$popup = Popup.install
+// Vue.component(Popup)
 
 import Computed from "../src/xt_pages/components/Computed/index"  //自动计算金额控件
 Vue.component("Computed",Computed)

src/router/modules/supply.js

@@ -27,6 +27,15 @@ export default {
       meta: { title: 'addSupply', noCache: true },
       isChild: true
     },
+    {
+      path: '/supply/Popup',
+      component: () => import('@/xt_pages/supply/components/Popup'),
+      name: 'Popup',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'Popup', noCache: true },
+      isChild: true
+    },
     {
       path: '/supply/edit',
       component: () => import('@/xt_pages/supply/components/editSupply'),

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
          <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
+        </div>
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/data/components/drugs.vue

@@ -630,12 +630,12 @@
 
               }
 
-              // if(this.formValue.is_user <= 0){
+              if(this.formValue.is_user <= 0){
 
-              //   this.formValue.is_user = ''
-              // } else{
-              //   this.formValue.is_user = this.formValue.is_user.toString()
-              // }
+                this.formValue.is_user = ''
+              } else{
+                this.formValue.is_user = this.formValue.is_user.toString()
+              }
 
 
               if(this.formValue.is_charge_predict <= 0){

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -183,6 +183,7 @@
     },
     methods: {
       show: function (total,order) {
+
         this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -560,7 +560,7 @@
         this.form.age = jsGetAge(births, '-')
 
 
-
+        this.InsuplcAdmdvs = []
         var that = this
         let params={
           id_card_no: this.form.id_card,
@@ -590,7 +590,7 @@
                   }).catch(() => {
                   })
                 } else {
-                  that.InsuplcAdmdvs = []
+
                   for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
                     that.InsuplcAdmdvs.push({
                       value:response.data.data.info.output.insuinfo[i].insuplc_admdvs,

src/xt_pages/stock/stockInOrderEdit.vue

@@ -795,6 +795,11 @@ export default {
             }else{
                this.recordInfo.recordData[i].price = val.buy_price
             }
+            if(val.packing_price == 0){
+              this.recordInfo.recordData[i].packing_price = ""
+            }else{
+              this.recordInfo.recordData[i].packing_price = val.packing_price
+            }
           
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id

src/xt_pages/supply/components/Popup.vue

@@ -0,0 +1,144 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="27%">
+    <div class="pop">
+      <div class="content">
+        <div class="content_1">
+          <img
+            src="../../../assets/Popup/alert.png"
+            alt="正在加载.."
+            class="alertImg"
+          />
+        </div>
+        <div class="content_2">
+          <p>
+            {{content}}<span style="color: #46a3ff">{{ number }}</span
+            >{{content_1}}
+          </p>
+          <div v-for="(item, index) in orderList" :key="index">
+            <li>
+              {{content_2}} {{ item.good_number }}
+              <a style="color: blue" @click="toClick_1(item.id)">点击查看</a>
+            </li>
+          </div>
+        </div>
+      </div>
+      <div class="btn">
+        <el-button @click="btnClick">{{ btnText }}</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: ["content_2", "content_1","content","number", "orderList"], //props接收
+  name: "Popup",
+  data() {
+    return {
+      dialogVisible: false,
+      show: false,
+      title: "系统提示",
+      content: "",
+      btnText: "关闭",
+      id: 0,
+    };
+  },
+  created() {},
+  methods: {
+    btnClick() {
+      this.show = false;
+    },
+    toClick_1(id) {
+      this.$router.push("/good/order/edit?id=" + id);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+// 渐变过渡
+.fade-enter,
+.fade-leave-active {
+  opacity: 0;
+}
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.35s;
+}
+// 全局弹窗
+.mask {
+  background: rgba(0, 0, 0, 0.5);
+  position: fixed;
+  top: 0;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
+}
+
+.pop {
+  height: 205px;
+  width: 435px;
+  background: #fff;
+  border-radius: 8px;
+  position: relative;
+  left: 45%;
+  transform: translateX(-50%);
+  z-index: 20;
+  text-align: center;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    span {
+      float: left;
+      margin-left: 15px;
+    }
+  }
+  .content {
+    height: 125px;
+    display: flex;
+    .content_1 {
+      width: 20%;
+      .alertImg {
+        width: 45px;
+        height: 45px;
+      }
+    }
+
+    .content_2 {
+      p {
+        line-height: 43px !important;
+        text-align: left !important;
+      }
+
+      li {
+        list-style: disc;
+        text-align: left;
+        a {
+          float: right;
+          margin-right: 60px;
+        }
+      }
+    }
+  }
+
+  .btn {
+    height: 40px;
+    line-height: 40px;
+    transform: translateY(30px);
+    button {
+      float: right;
+      margin-right: 15px;
+    }
+  }
+
+  .close {
+    top: 0;
+    right: 10px;
+    position: absolute;
+    display: block;
+    width: 40px;
+    height: 40px;
+  }
+}
+</style>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -59,8 +59,20 @@
           <span>单据编码:{{ number }}</span>
         </div>
         <div>
-          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showOne">保存</el-button>
-          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showTwo">保存</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            @click="saveGoodReturn"
+            v-show="showOne"
+            >保存</el-button
+          >
+          <el-button
+            size="small"
+            type="primary"
+            @click="saveGoodReturn"
+            v-show="showTwo"
+            >保存</el-button
+          >
           <el-button size="small" type="primary" @click="updatePurchaseOrder"
             >审核</el-button
           >
@@ -74,8 +86,8 @@
         <el-table
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
           }"
           :data="recordInfo.tableList"
           :class="signAndWeighBoxPatients"
@@ -131,26 +143,35 @@
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
-                 placeholder="规格&单位"
+                placeholder="规格&单位"
               ></el-input>
             </template>
           </el-table-column>
 
-        <el-table-column label="单位" align="center" width="120px">
+          <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
-                <span>单位<span style="color: red">*</span></span>
+              <span>单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
-                <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
-                        <!-- <el-option
+              <el-form-item
+                :prop="'tableList.' + scope.$index + '.supply_unit'"
+                :rules="tableRules.supply_unit"
+              >
+                <el-select
+                  v-model="scope.row.supply_unit"
+                  style="width: 100px"
+                  filterable
+                  placeholder="请选择"
+                  :disabled="disabled"
+                >
+                  <!-- <el-option
                             v-for="(item,index) in scope.row.unitList"
                             :key="index"
                             :label="item.name"
                             :value="item.name">
                         </el-option> -->
                 </el-select>
-              </el-form-item>  
+              </el-form-item>
             </template>
           </el-table-column>
           <el-table-column label="可用库存" align="center" width="130px">
@@ -196,7 +217,7 @@
                 v-model="scope.row.supply_price"
                 style="width: 140px"
                 :disabled="disabled"
-                 placeholder="请输入采购单价"
+                placeholder="请输入采购单价"
               ></el-input>
             </template>
           </el-table-column>
@@ -259,26 +280,43 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" width="150px" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="150px"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="新增" placement="top" >
-                  <el-button
-                      size="mini"
-                      type="primary"
-                      icon="el-icon-circle-plus-outline"
-                      @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-            </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                  <el-button
-                      size="mini"
-                      type="danger"
-                      icon="el-icon-delete"
-                      @click="handleDelete(scope.$index, scope.row)">
-                  </el-button>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
               </el-tooltip>
             </template>
-         </el-table-column>
+          </el-table-column>
         </el-table>
       </el-form>
       <div style="margin-top: 10px">
@@ -290,11 +328,14 @@
         >
         </el-input>
       </div>
+      <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
           >优惠率:<el-input
             style="width: 100px"
             v-model="rate_of_concession"
+            @input="addressChange"
+            placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
@@ -303,6 +344,8 @@
           >优惠金额:<el-input
             style="width: 100px"
             v-model="discount_amount"
+            @input="count_discount"
+            placeholder="请输入优惠金额"
           ></el-input
         ></span>
 
@@ -310,6 +353,8 @@
           >本次付款:<el-input
             style="width: 100px"
             v-model="payment"
+            @input="count_payment"
+            placeholder="请输入本次付款"
           ></el-input
         ></span>
 
@@ -317,11 +362,12 @@
           >本次欠款:<el-input
             style="width: 100px"
             v-model="arrearage"
+            @input="count_arrearage"
+            placeholder="请输入本次欠款"
           ></el-input
         ></span>
       </div>
     </div>
-
   </div>
 </template>
 
@@ -331,7 +377,7 @@ import { uParseTime } from "@/utils/tools";
 import {
   getInitOrder,
   getGoodOrderDetail,
-  saveGoodReturnOrder
+  saveGoodReturnOrder,
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -340,7 +386,7 @@ export default {
   },
   data() {
     return {
-      tipsInfo:"",
+      tipsInfo: "",
       crumbs: [
         { path: false, name: "购货单" },
         { path: "/good/return/add", name: "新增退货单" },
@@ -374,8 +420,8 @@ export default {
       supplier_name: "",
       supplyList: [],
       rate_of_concession: "",
-      arrearage:"",
-      payment:"",
+      arrearage: "",
+      payment: "",
       discount_amount: "",
       tableRules: {
         name: [{ required: true, message: "商品不能为空", trigger: "blur" }],
@@ -392,7 +438,7 @@ export default {
       disabled: false,
       is_check: 0,
       dialogVisible: false,
-      return_remark:"",
+      return_remark: "",
     };
   },
   methods: {
@@ -701,8 +747,34 @@ export default {
           this.recordInfo.tableList[i].supply_price *
           this.recordInfo.tableList[i].supply_count;
       }
+      this.total_price = total_price;
       return total_price.toFixed(2);
     },
+
+    addressChange() {
+      var discount_amount = 0;
+      if (this.rate_of_concession > 0) {
+        discount_amount = (
+          (this.rate_of_concession / 100) *
+          this.total_price
+        ).toFixed(2);
+      }
+      this.discount_amount = discount_amount;
+    },
+    count_discount() {
+      this.rate_of_concession = (
+        this.discount_amount /
+        (this.total_price * 0.01)
+      ).toFixed(2);
+    },
+    count_payment() {
+      this.arrearage = this.total_price - this.payment;
+    },
+
+    count_arrearage() {
+      this.payment = this.total_price - this.arrearage;
+    },
+
     checkPurchaseOrder(id, index) {
       this.$confirm("是否审核?", {
         confirmButtonText: "确 定",
@@ -721,159 +793,200 @@ export default {
         })
         .catch(() => {});
     },
-    getGoodOrderDetail(){
-      
-        var id = this.$route.query.id
-      getGoodOrderDetail(id).then(response=>{
-        if(response.data.state == 1){
-          var out = response.data.data.out
-          this.is_check = out.is_check
-          this.id = out.id
-          this.supplier_name = out.supplier_id
-          this.rate_of_concession = out.rate_of_concession
-          this.discount_amount = out.discount_amount
-          this.payment = out.payment
-          this.arrearage = out.arrearage
-          this.start_time = this.getTimes(out.document_date)
-          var orderInfo = response.data.data.list
-          console.log("orderINFO233232232332",orderInfo)
-          var drugList = response.data.data.drugList
-          var goodList = response.data.data.goodList
-          for(let i=0;i< orderInfo.length;i++){
-              
-              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].good_number = orderInfo[i].good_number
-              orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
-              orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
-              orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
-            if(orderInfo[i].is_source == 1){
-              for(let j=0;j<drugList.length;j++){
-                  if( orderInfo[i].project_id == drugList[j].id){
-                    if(drugList[j].max_unit!=drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                      orderInfo[i].unitList[1].name = drugList[j].min_unit
-                    }
-                    if(drugList[j].max_unit ==drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                    }
-                  
+    getGoodOrderDetail() {
+      var id = this.$route.query.id;
+      getGoodOrderDetail(id).then((response) => {
+        if (response.data.state == 1) {
+          var out = response.data.data.out;
+          this.is_check = out.is_check;
+          this.id = out.id;
+          this.supplier_name = out.supplier_id;
+          this.rate_of_concession = out.rate_of_concession;
+          this.discount_amount = out.discount_amount;
+          this.payment = out.payment;
+          this.arrearage = out.arrearage;
+          this.start_time = this.getTimes(out.document_date);
+          var orderInfo = response.data.data.list;
+          console.log("orderINFO233232232332", orderInfo);
+          var drugList = response.data.data.drugList;
+          var goodList = response.data.data.goodList;
+          for (let i = 0; i < orderInfo.length; i++) {
+            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].good_number = orderInfo[i].good_number;
+            orderInfo[i].supply_total_price = (
+              orderInfo[i].count * orderInfo[i].price
+            ).toFixed(2);
+            orderInfo[i].supply_expiry_date = this.getTimes(
+              orderInfo[i].supply_expiry_date
+            );
+            orderInfo[i].supply_product_date = this.getTimes(
+              orderInfo[i].supply_product_date
+            );
+            if (orderInfo[i].is_source == 1) {
+              for (let j = 0; j < drugList.length; j++) {
+                if (orderInfo[i].project_id == drugList[j].id) {
+                  if (drugList[j].max_unit != drugList[j].min_unit) {
+                    orderInfo[i].unitList = [
+                      { id: 1, name: "" },
+                      { id: 2, name: "" },
+                    ];
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit;
+                    orderInfo[i].unitList[1].name = drugList[j].min_unit;
                   }
-              }  
-              } 
-            if(orderInfo[i].is_source == 2){
-              for(let j=0;j<goodList.length;j++){
-                  if(orderInfo[i].project_id == goodList[j].id){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = goodList[j].packing_unit
+                  if (drugList[j].max_unit == drugList[j].min_unit) {
+                    orderInfo[i].unitList = [{ id: 1, name: "" }];
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit;
                   }
-              }  
-            } 
+                }
+              }
+            }
+            if (orderInfo[i].is_source == 2) {
+              for (let j = 0; j < goodList.length; j++) {
+                if (orderInfo[i].project_id == goodList[j].id) {
+                  orderInfo[i].unitList = [{ id: 1, name: "" }];
+                  orderInfo[i].unitList[0].name = goodList[j].packing_unit;
+                }
+              }
+            }
           }
-        
-          this.recordInfo.tableList= []
-          this.recordInfo.tableList = orderInfo
-        
+
+          this.recordInfo.tableList = [];
+          this.recordInfo.tableList = orderInfo;
         }
-      })  
+      });
     },
     toPrint() {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    saveGoodReturn(){
+    saveGoodReturn() {
       var warehouse_out_id = this.$route.query.id;
-      this.$refs["tableForm"].validate((valid)=>{
-        if(valid){
-          this.loading = true
-          for(let i=0;i<this.recordInfo.tableList.length;i++){
-            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
-            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
-            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
-       
-            for(let j=0;j<this.manufactuerList.length;j++){
-                if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
-                  this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
-                }
-                if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
-                  this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
-                }
+      this.$refs["tableForm"].validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          for (let i = 0; i < this.recordInfo.tableList.length; i++) {
+            this.recordInfo.tableList[i].supply_count = parseInt(
+              this.recordInfo.tableList[i].supply_count
+            );
+            this.recordInfo.tableList[i].supply_price =
+              this.recordInfo.tableList[i].supply_price.toString();
+            this.recordInfo.tableList[i].supply_total =
+              this.recordInfo.tableList[i].supply_total.toString();
 
+            for (let j = 0; j < this.manufactuerList.length; j++) {
+              if (
+                this.recordInfo.tableList[i].supply_manufacturer ==
+                this.manufactuerList[j].manufacturer_name
+              ) {
+                this.recordInfo.tableList[i].manufacturer_id =
+                  this.manufactuerList[j].id;
+              }
+              if (
+                this.recordInfo.tableList[i].supply_manufacturer ==
+                this.manufactuerList[j].id
+              ) {
+                this.recordInfo.tableList[i].supply_manufacturer =
+                  this.manufactuerList[j].manufacturer_name;
+              }
             }
           }
           var params = {
-            "stockIn":this.recordInfo.tableList,
-            "return_marke":this.return_remark,
-          }
-          console.log("start_time232233232",this.start_time)
-          
-          saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
-            if(response.data.state == 1){
-               this.loading = false
-               this.showOne = false
-               this.showTwo = true
-               this.$message.success("保存成功!")
-               var warehouseCancel = response.data.data.warehouseCancel
-               var out = response.data.data.cancelOrder
-               this.id = out.id
-               this.supplier_name = out.supplier_id
-               this.rate_of_concession = out.rate_of_concession
-               this.discount_amount = out.discount_amount
-               this.payment = out.payment
-               this.arrearage = out.arrearage
-               this.start_time = this.getTimes(out.document_date)
-               var orderInfo = response.data.data.list
-               for(let i=0;i< orderInfo.length;i++){
-                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].good_number = orderInfo[i].good_number
-                orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
-                orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
-                orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
-                if(orderInfo[i].is_source == 1){
-                  for(let j=0;j<this.drugList.length;j++){
-                      if( orderInfo[i].project_id == this.drugList[j].id){
-                        if(this.drugList[j].max_unit!=this.drugList[j].min_unit){
-                          orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
-                          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
-                        }
-                      
+            stockIn: this.recordInfo.tableList,
+            return_marke: this.return_remark,
+          };
+          console.log("start_time232233232", this.start_time);
+
+          saveGoodReturnOrder(
+            params,
+            warehouse_out_id,
+            this.start_time,
+            this.rate_of_concession,
+            this.discount_amount,
+            this.arrearage,
+            this.payment,
+            this.supplier_name
+          ).then((response) => {
+            if (response.data.state == 1) {
+              this.loading = false;
+              this.showOne = false;
+              this.showTwo = true;
+              this.$message.success("保存成功!");
+              var warehouseCancel = response.data.data.warehouseCancel;
+              var out = response.data.data.cancelOrder;
+              this.id = out.id;
+              this.supplier_name = out.supplier_id;
+              this.rate_of_concession = out.rate_of_concession;
+              this.discount_amount = out.discount_amount;
+              this.payment = out.payment;
+              this.arrearage = out.arrearage;
+              this.start_time = this.getTimes(out.document_date);
+              var orderInfo = response.data.data.list;
+              for (let i = 0; i < orderInfo.length; i++) {
+                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].good_number = orderInfo[i].good_number;
+                orderInfo[i].supply_total_price = (
+                  orderInfo[i].count * orderInfo[i].price
+                ).toFixed(2);
+                orderInfo[i].supply_expiry_date = this.getTimes(
+                  orderInfo[i].supply_expiry_date
+                );
+                orderInfo[i].supply_product_date = this.getTimes(
+                  orderInfo[i].supply_product_date
+                );
+                if (orderInfo[i].is_source == 1) {
+                  for (let j = 0; j < this.drugList.length; j++) {
+                    if (orderInfo[i].project_id == this.drugList[j].id) {
+                      if (
+                        this.drugList[j].max_unit != this.drugList[j].min_unit
+                      ) {
+                        orderInfo[i].unitList = [
+                          { id: 1, name: "" },
+                          { id: 2, name: "" },
+                        ];
+                        orderInfo[i].unitList[0].name =
+                          this.drugList[j].max_unit;
+                        orderInfo[i].unitList[1].name =
+                          this.drugList[j].min_unit;
                       }
-                  }  
-                  } 
-                if(orderInfo[i].is_source == 2){
-                  for(let j=0;j<this.goodList.length;j++){
-                      if(orderInfo[i].project_id == this.goodList[j].id){
-                          orderInfo[i].unitList = [{id:1,name:""}]
-                          orderInfo[i].unitList[0].name = this.goodList[j].packing_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;
                       }
-                  }  
-                } 
+                    }
+                  }
+                }
+                if (orderInfo[i].is_source == 2) {
+                  for (let j = 0; j < this.goodList.length; j++) {
+                    if (orderInfo[i].project_id == this.goodList[j].id) {
+                      orderInfo[i].unitList = [{ id: 1, name: "" }];
+                      orderInfo[i].unitList[0].name =
+                        this.goodList[j].packing_unit;
+                    }
+                  }
+                }
               }
-              this.recordInfo.tableList= []
-              this.recordInfo.tableList = orderInfo
+              this.recordInfo.tableList = [];
+              this.recordInfo.tableList = orderInfo;
             }
-          })
+          });
         }
-      })
-    }
+      });
+    },
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/addSupply.vue

@@ -383,9 +383,11 @@ export default {
             this.$refs[formName].validate((valid) => {
               if (valid) {
                 let params = {
-                  ...this.supplier,
-                  ...this.recordInfo,
+                  // ...this.supplier,
+                  suppliername:this.supplier.supplierName,
+                  // ...this.recordInfo
                 };
+                let data = { ...this.recordInfo };
                 console.log(params, "dhas");
                 updatesupply(params).then((res) => {
                   console.log(res, "oo");
@@ -401,7 +403,6 @@ export default {
           }
         });
       }
-
       this.contactsinfo();
     },