From 14e30d9f5686895a48952e2912dc5ba4efa2ef95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 10 Jan 2025 17:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/edit/components/orderProdList.vue   | 22 +++++++++++++++++--
 src/views/bst/orderProd/index.vue             |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/bst/order/edit/components/orderProdList.vue b/src/views/bst/order/edit/components/orderProdList.vue
index 5f607a5..0e19168 100644
--- a/src/views/bst/order/edit/components/orderProdList.vue
+++ b/src/views/bst/order/edit/components/orderProdList.vue
@@ -36,8 +36,19 @@
         <template v-slot:content-tip="d">{{d.row.name}}</template>
         <el-input slot-scope="d" v-model="d.row.name" placeholder="请输入名称"/>
       </table-form-col>
-      <table-form-col label="数量" prop-prefix="prodList" prop="num" required :rules="rules.num">
-        <el-input-number slot-scope="d" v-model="d.row.num" placeholder="请输入数量" :min="0" controls-position="right" style="width: 100%"/>
+      <table-form-col label="装量" prop-prefix="prodList" prop="contentNum" required :rules="rules.contentNum">
+        <el-input-number 
+          slot-scope="d"
+          v-model="d.row.contentNum"
+          placeholder="请输入装量" 
+          :min="1"
+          controls-position="right"
+          style="width: 100%"
+          @change="(nv, ov) => handleContentNumChange(d.row, nv, ov)"
+        />
+      </table-form-col>
+      <table-form-col label="生产数量" prop-prefix="prodList" prop="num" required :rules="rules.num">
+        <el-input-number slot-scope="d" v-model="d.row.num" placeholder="请输入数量" :min="0" :precision="0" controls-position="right" style="width: 100%"/>
       </table-form-col>
       <table-form-col label="加工商" prop-prefix="prodList" prop="workType" :rules="rules.workType" required>
         <el-select slot-scope="d" v-model="d.row.workType" placeholder="请选择加工商">
@@ -146,6 +157,12 @@ export default {
   },
   methods: {
     isEmpty,
+    // 装量改变时，生产数量改变
+    handleContentNumChange(row, nv, ov) {
+      if (nv != null && nv != ov && ov != 0) {
+        row.num = row.num / ov * nv;
+      }
+    },
     handleExpand(row) {
       // 展开行
       this.$refs.table.toggleRowExpansion(row, true)
@@ -174,6 +191,7 @@ export default {
         materialNo:null,
         picture:null,
         spec:null,
+        contentNum: 1,
         num: this.form.num,
         remark:null,
         isEnd: false,
diff --git a/src/views/bst/orderProd/index.vue b/src/views/bst/orderProd/index.vue
index 05b49e4..d79c0d1 100644
--- a/src/views/bst/orderProd/index.vue
+++ b/src/views/bst/orderProd/index.vue
@@ -237,6 +237,7 @@ export default {
         {key: 'effect', visible: true, label: '效果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'color', visible: true, label: '颜色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'coverColor', visible: true, label: '盖子颜色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'contentNum', visible: true, label: '装量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'num', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'reportNum', visible: true, label: '已上报', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
         {key: 'storeNum', visible: true, label: '已清点', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},