From ab6aa515b84c02ae785e4c348d797e20429af5b1 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 24 Oct 2019 09:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=96=E8=B4=AD=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatingPurchasingMaterials.js            |  8 ++---
 .../CreatingPurchasingMaterials/index.vue     | 29 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
index 7dd0c706..c710844c 100644
--- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
+++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
@@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) {
   })
 }
 // 保存重量和备注
-export function saveWeight(num1, num2, num3, num4) {
+export function saveWeight(num1, num2, num3, num4, num5, num6, num7) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_采购计划明细_保存重量和备注',
-      param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单价=${num4}`
+      param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}`
     }
   })
 }
@@ -160,14 +160,14 @@ export function saveMateriel1(num1) {
   })
 }
 // 删除采购计划明细
-export function deleteMateriel(num, num1) {
+export function deleteMateriel(num, num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_外购备料_移出数据',
-      param: `采购计划明细流水号=${num}&工艺计划流水号=${num1}`
+      param: `采购计划流水号=${num}&零件图号=${num1}&材料=${num2}&零件名称=${num3}`
     }
   })
 }
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 59380005..726855d8 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -177,11 +177,6 @@
             {{ scope.row.物料零件编码 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="原材料名称" align="center" min-width="150">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.原材料名称 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column label="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
@@ -194,7 +189,7 @@
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.总数量 }}
           </template>
         </el-table-column>
         <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="250px">
@@ -317,7 +312,7 @@
             <td colspan="2" style="text-align: center;width: 10%">{{ list.零件名称 }}</td>
             <td colspan="2" style="text-align: center;width: 10%">{{ list.材料 }}</td>
             <td colspan="2" style="text-align: center;width: 8%">{{ list.单位 }}</td>
-            <td colspan="2" style="text-align: center;width: 8%">{{ list.批次数量 }}</td>
+            <td colspan="2" style="text-align: center;width: 8%">{{ list.总数量 }}</td>
             <td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
             <td style="text-align: center;width: 17%">{{ list.备注1 }}</td>
           </tr>
@@ -479,19 +474,19 @@ export default {
       }
     },
     saveWeight(index, row) {
-      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
+      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
     },
     saveMoney(index, row) {
-      var reg = /^[0-9]*$/
-      if (!reg.test(row.单价)) {
-        this.$message.error('请输入正确的单价')
-        row.单价 = ''
-      } else {
-        saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
-      }
+      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      // var reg = /^[0-9]*$/
+      // if (!reg.test(row.单价)) {
+      //   this.$message.error('请输入正确的单价')
+      //   row.单价 = ''
+      // } else {
+      // }
     },
     saveRemarks(index, row) {
-      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
+      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
     },
     // ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
     useqrcode(contractNum) {
@@ -705,7 +700,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteMateriel(row.采购计划明细流水号, row.工艺计划流水号).then(response => {
+        deleteMateriel(row.采购计划流水号, row.零件图号, row.材料, row.零件名称).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('移除成功')
             this.searchTable1()