From bb1368e4c5154b006b2e678261cbfa01e317b3b6 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 21 十一月 2024 16:38:53 +0800
Subject: [PATCH] 1.订单工单 新增重量、总料  字段

---
 src/views/workOrder/workOrderList.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index cc08537..a559944 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -223,6 +223,27 @@
           >
             <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
           </el-table-column>
+
+          <el-table-column
+            prop="weight"
+            label="閲嶉噺"
+            show-tooltip-when-overflow
+            width="110"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+          </el-table-column>
+
+          <el-table-column
+            prop="totalnumber"
+            label="鎬绘枡"
+            show-tooltip-when-overflow
+            width="110"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+          </el-table-column>
+
           <el-table-column
             prop="plan_qty"
             label="宸ュ崟鏁�"
@@ -537,7 +558,7 @@
       :title="operation==='add'?'鏂板':(operation==='edit'?'淇敼':'璇︽儏')"
       :visible.sync="dialogVisible"
       width="1200px"
-      top="8vh"
+      top="3vh"
       :close-on-click-modal="false"
       @closed="handleClose"
       @close="handleClose"
@@ -712,6 +733,12 @@
         </el-form-item>
         <el-form-item label="棰滆壊">
           <el-input v-model="dialogForm.colour" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閲嶉噺">
+          <el-input v-model="dialogForm.weight" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鎬绘枡">
+          <el-input v-model="dialogForm.totalnumber" style="width: 200px" />
         </el-form-item>
 
         <el-divider content-position="left">宸ュ簭淇℃伅</el-divider>
@@ -1340,6 +1367,13 @@
                 </el-form-item>
                 <el-form-item label="棰滆壊:" class="formContent">
                   {{ formApprove.colour }}
+                </el-form-item>
+
+                <el-form-item label="閲嶉噺:" class="formContent">
+                  {{ formApprove.weight }}
+                </el-form-item>
+                <el-form-item label="鎬绘枡:" class="formContent">
+                  {{ formApprove.totalnumber }}
                 </el-form-item>
                 <!--                <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
                 <!--                  {{ formApprove.routename }}-->
@@ -2128,6 +2162,9 @@
         customername: '', // 瀹㈡埛鍚嶇О
         colour: '', // 棰滆壊
 
+        weight: '', // 閲嶉噺
+        totalnumber: '', // 鎬绘枡
+
         mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
       },
       customerArr: [],
@@ -2186,6 +2223,12 @@
         ],
         colour: [
           { required: true, message: '璇疯緭鍏ラ鑹�', trigger: ['blur', 'change'] }
+        ],
+        weight: [
+          { required: true, message: '璇疯緭鍏ラ噸閲�', trigger: ['blur', 'change'] }
+        ],
+        totalnumber: [
+          { required: true, message: '璇疯緭鍏ユ�绘枡', trigger: ['blur', 'change'] }
         ]
 
       },
@@ -2619,6 +2662,9 @@
       this.dialogForm.customercode = row.customercode
       this.dialogForm.colour = row.colour
 
+      this.dialogForm.weight = row.weight
+      this.dialogForm.totalnumber = row.totalnumber
+
       const data = {
         sourceid: this.dialogForm.sourceorderid,
         sourcewo: this.dialogForm.sourceorder,
@@ -2720,7 +2766,9 @@
 
         injectnumber: '',
         customercode: '',
-        colour: ''
+        colour: '',
+        weight: '',
+        totalnumber: ''
       }
       this.stepSelectedValue = []
       this.stepTableData = []
@@ -2774,6 +2822,9 @@
             customercode: this.dialogForm.customercode,
             customername: this.customerArr.find(i => i.code === this.dialogForm.customercode).name,
             colour: this.dialogForm.colour,
+
+            weight: this.dialogForm.weight,
+            totalnumber: this.dialogForm.totalnumber,
 
             data_sources: this.dialogForm.data_sources, // 鏁版嵁鏉ユ簮
             isstep: workListSub.length > 0 ? 'Y' : 'N', //
@@ -2867,6 +2918,8 @@
           this.formApprove.injectnumber = row.injectnumber || '/'
           this.formApprove.customername = row.customername || '/'
           this.formApprove.colour = row.colour || '/'
+          this.formApprove.weight = row.weight || '/'
+          this.formApprove.totalnumber = row.totalnumber || '/'
 
           this.$nextTick(() => {
             res3.forEach(i => {

--
Gitblit v1.9.3