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

@@ -266,13 +266,21 @@ export function savesupply(data) {
   })
 }
 
-export function updatesupply(data) {
+export function updatesupply(data,params) {
   return request({
-    url: '/api/supply/updatesupply',
+    url: '/api/supply/updatesupply?suppliercode=' + params.supplierCode + '&suppliername=' + params.supplierName,
     method: 'post',
     data: data
   })
 }
 
+// export function updatesupply(data) {
+//   return request({
+//     url: '/api/supply/updatesupply' ,
+//     method: 'post',
+//     data: data
+//   })
+// }
+
 
 

src/xt_pages/supply/components/addGoodReturn.vue

@@ -290,6 +290,7 @@
         >
         </el-input>
       </div>
+      <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
           >优惠率:<el-input
@@ -701,6 +702,7 @@ export default {
           this.recordInfo.tableList[i].supply_price *
           this.recordInfo.tableList[i].supply_count;
       }
+      this.total_price = total_price;
       return total_price.toFixed(2);
     },
     checkPurchaseOrder(id, index) {

src/xt_pages/supply/components/addSupply.vue

@@ -384,10 +384,11 @@ export default {
               if (valid) {
                 let params = {
                   ...this.supplier,
-                  ...this.recordInfo,
+                  // ...this.recordInfo
                 };
+                let data = { ...this.recordInfo };
                 console.log(params, "dhas");
-                updatesupply(params).then((res) => {
+                updatesupply(data,params).then((res) => {
                   console.log(res, "oo");
                 });
               } else {
@@ -401,7 +402,6 @@ export default {
           }
         });
       }
-
       this.contactsinfo();
     },