更新

2019-12-12 12:49:13 +08:00
parent 17d72c3eae
commit 49f4eccd99
11 changed files with 152 additions and 82 deletions
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -165,9 +165,9 @@
            {{ scope.row.材料 }}
          </template>
        </el-table-column>
-        <el-table-column label="数量" align="center" width="50">
+        <el-table-column label="数量" align="center" width="115">
          <template slot-scope="scope">
-            {{ scope.row.总数量 }}
+            <el-input-number :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.采购数量" :min="0" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
          </template>
        </el-table-column>
        <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="120px">
@@ -284,7 +284,7 @@
            <td colspan="2" style="text-align: center;width: 20%">成品尺寸（长、宽、高）</td>
            <td style="text-align: center;width: 17%">备注</td>
          </tr>
-          <tr v-for="(list, index) in tableData3" :key="index" style="height: 35px">
+          <tr v-for="(list, index) in tableData4" :key="index" style="height: 35px">
            <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
            <td colspan="2" style="text-align: center;width: 20%">{{ list.物料零件编码 }}</td>
            <td colspan="2" style="text-align: center;width: 10%">{{ list.零件名称 }}</td>
@@ -302,7 +302,7 @@
 </template>

 <script>
-import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurchaseOrder, searchSupplier, editPurchaseOrder, deletePurchaseOrder, searchMateriel,
+import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurchaseOrder, searchSupplier, editPurchaseOrder, deletePurchaseOrder, searchMateriel, searchMateriel1,
  addMateriel, deleteMateriel, saveMateriel, saveMateriel1, searchRawMaterial, addMateriel2, saveWeight, edit2 } from '@/api/WorkshopProcurement/CreatingPurchasingMaterials'
 import QRCode from 'qrcode'
 import $ from 'jquery'
@@ -386,6 +386,7 @@ export default {
      },
      tableData3: [],
      materielGroup: [], // 工艺计划流水号组
+      partNum: [], // 默认采购数量
      partGroup: [], // 采购计划明细流水号组
      unit: [], // 单位组
      Remarks: [], // 备注组
@@ -439,6 +440,9 @@ export default {
            this.searchTable1()
            this.searchRawMaterial()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('选入失败') }
@@ -452,10 +456,10 @@ export default {
      }
    },
    saveWeight(index, row) {
-      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
    },
    saveMoney(index, row) {
-      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
      // var reg = /^[0-9]*$/
      // if (!reg.test(row.单价)) {
      //   this.$message.error('请输入正确的单价')
@@ -464,7 +468,7 @@ export default {
      // }
    },
    saveRemarks(index, row) {
-      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
    },
    // ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
    useqrcode(contractNum) {
@@ -512,8 +516,10 @@ export default {
    },
    handleSelectionChange(val) {
      this.materielGroup = []
+      this.partNum = []
      for (let i = 0; i < val.length; i++) {
        this.materielGroup.push(val[i].工艺计划流水号)
+        this.partNum.push(val[i].批次数量)
      }
    },
    searchTable2() { // 查询采购单列表
@@ -594,6 +600,9 @@ export default {
            this.$message.success('删除成功')
            this.searchTable2()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('数据占用，删除失败') }
@@ -614,7 +623,11 @@ export default {
      this.计划完成日期 = row.计划完成日期.split(' ')[0]
      this.下单日期 = row.下单日期.split(' ')[0]
      searchMateriel(this.purchasingOrderNumber).then(response => {
+        this.tableData4 = response.data
+      })
+      searchMateriel1(this.purchasingOrderNumber).then(response => {
        this.tableData3 = response.data
+        console.log(response.data)
      })
    },
    addMateriel() { // 将材料选入请购单
@@ -623,11 +636,14 @@ export default {
      } else if (this.materielGroup.length === 0) {
        this.$message.warning('请勾选物料')
      } else {
-        addMateriel(this.purchasingOrderNumber, this.materielGroup).then(response => {
+        addMateriel(this.purchasingOrderNumber, this.materielGroup, this.partNum).then(response => {
          if (response.data[0].result === '1') {
            this.$message.success('选入成功')
            this.searchTable1()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('选入失败') }
@@ -665,6 +681,9 @@ export default {
            this.$message.success('保存成功')
            this.searchTable2()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('保存失败') }
@@ -682,6 +701,9 @@ export default {
            this.$message.success('移除成功')
            this.searchTable1()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('移除失败') }
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -333,7 +333,7 @@
              </el-table-column>
              <el-table-column label="备料件数" align="center" width="70px">
                <template slot-scope="scope">
-                  {{ scope.row.批次数量 }}
+                  {{ scope.row.采购数量 }}
                </template>
              </el-table-column>
              <el-table-column label="已到件数" align="center" width="70px">
@@ -343,7 +343,7 @@
              </el-table-column>
              <el-table-column label="到货件数" align="center" width="110px">
                <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                  <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
                </template>
              </el-table-column>
              <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
@@ -460,7 +460,7 @@
        </el-table-column>
        <el-table-column label="备料件数" align="center" width="70px">
          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.采购数量 }}
          </template>
        </el-table-column>
        <el-table-column label="已到件数" align="center" width="70px">
@@ -470,7 +470,7 @@
        </el-table-column>
        <el-table-column label="到货件数" align="center" width="110px">
          <template slot-scope="scope">
-            <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+            <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
          </template>
        </el-table-column>
        <el-table-column label="到货重量" align="center" width="110px">
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -74,7 +74,7 @@
        </el-table-column>
        <el-table-column label="备料件数" align="center" width="70">
          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.采购数量 }}
          </template>
        </el-table-column>
        <el-table-column label="备料时间" align="center" width="100">
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -92,7 +92,7 @@
        <el-table-column label="操作" align="center" min-width="100px">
          <template slot-scope="scope">
            <el-button type="warning" plain size="mini" @click="exportTable()">打印</el-button>
-            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">禁用</el-button>
+            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">打回</el-button>
          </template>
        </el-table-column>
      </el-table>