From ac49f7ab115f1a8cf91ab1f5bbaddfbcecebcd14 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 24 四月 2024 12:08:55 +0800
Subject: [PATCH] 1.工单页面新增修改显示销售订单号

---
 src/views/workOrder/workOrderList.vue |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index dec0654..327fc49 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -163,7 +163,7 @@
           />
           <el-table-column
             prop="rowNum"
-            width="50"
+            width="80"
             label="搴忓彿"
             fixed
           />
@@ -336,7 +336,7 @@
                     :style="{color:$store.state.settings.theme}"
                     class="el-icon-printer"
                     style="cursor: pointer;margin-right: 15px"
-                    @click.stop="handlePrint(row.wo_code)"
+                    @click.stop="handlePrint(row.wo_code,row.saleOrderCode)"
                   />
                 </el-tooltip>
 
@@ -574,6 +574,7 @@
         <!--            />-->
         <!--          </div>-->
         <!--        </div>-->
+
         <el-form-item label="宸ュ崟鏁伴噺" prop="mesqty">
           <el-input
             v-model="dialogForm.mesqty"
@@ -629,6 +630,13 @@
               :value="item.torg_code"
             />
           </el-select>
+        </el-form-item>
+        <el-form-item label="閿�鍞鍗�" prop="">
+          <el-input
+            v-model="dialogForm.saleordercode"
+            style="width: 200px"
+            :disabled="!(dialogForm.mesorderstus==='NEW'&&dialogForm.data_sources==='MES')"
+          />
         </el-form-item>
         <el-form-item label="棰勮浜や粯鏃ユ湡" prop="deliverydate">
           <el-date-picker
@@ -1244,6 +1252,9 @@
               style="display: flex;justify-content: space-between"
             >
               <div class="elForm">
+                <el-form-item label="閿�鍞崟鍙�:" class="formContent">
+                  {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
+                </el-form-item>
                 <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
                   {{ formApprove.mesordercode }}
                 </el-form-item>
@@ -2032,6 +2043,8 @@
         sourceorderid: '', // 婧愬崟id
         sourceorder: '', // 婧愬崟鍗曞彿
 
+        saleordercode: '', // 閿�鍞鍗曞彿
+
         partcode: '', // 浜у搧缂栫爜
         partname: '', // 浜у搧鍚嶇О
         partspec: '', // 浜у搧瑙勬牸
@@ -2125,6 +2138,7 @@
       formApprove: {
         m_po: '', // 婧愬崟鍗曞彿
         mesordercode: '',
+        saleOrderCode: '', // 閿�鍞崟鍙�
         partcode: '',
         partname: '',
         partspec: '',
@@ -2485,6 +2499,7 @@
       this.dialogForm.ordertype = row.wotype
       this.dialogForm.sourceorderid = row.sourceid
       this.dialogForm.sourceorder = row.m_po
+      this.dialogForm.saleordercode = row.saleOrderCode
       this.dialogForm.partcode = row.partcode
       this.dialogForm.partname = row.partname
       this.dialogForm.partspec = row.partspec
@@ -2548,7 +2563,7 @@
         this.getMesOrderNewStepContent()
       }
     },
-    async  getMesOrderNewStepContent() {
+    async getMesOrderNewStepContent() {
       const data = {
         wkshopcode: this.dialogForm.wkshopcode,
         partcode: this.dialogForm.partcode
@@ -2579,7 +2594,7 @@
         ordertype: 'PO', // 宸ュ崟绫诲瀷
         sourceorderid: '', // 婧愬崟id
         sourceorder: '', // 婧愬崟鍗曞彿
-
+        saleordercode: '', // 閿�鍞鍗曞彿
         partcode: '', // 浜у搧缂栫爜
         partname: '', // 浜у搧鍚嶇О
         partspec: '', // 浜у搧瑙勬牸
@@ -2634,6 +2649,7 @@
             wotype: this.dialogForm.ordertype, // 宸ュ崟绫诲瀷
             sourceid: this.dialogForm.sourceorderid, // 婧愬崟id
             sourcewo: this.dialogForm.sourceorder, // 婧愬崟鍗曞彿
+            saleordercode: this.dialogForm.saleordercode, // 婧愬崟鍗曞彿
             partcode: this.dialogForm.partcode, // 浜у搧缂栧彿
             wkshopcode: this.dialogForm.wkshopcode,
             woqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
@@ -2648,11 +2664,11 @@
             if (res.code === '200') {
               this.dialogVisible = false
               // this.handlePrint()
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇濆瓨鎴愬姛锛�')
               this.getMesOrderSearch()
               this.$store.state.app.buttonIsDisabled = false
             } else {
-              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '娲惧彂澶辫触锛�')
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇濆瓨澶辫触锛�')
             }
           })
         }
@@ -2705,10 +2721,11 @@
       this.dialogVisibleSearch = false
     },
     // 澶勭悊鎵撳嵃
-    handlePrint(wo_code) {
+    handlePrint(wo_code, saleOrderCode) {
       // const number = Math.random() * Math.random()
       // this.number = number === 0 ? (10 + Math.random()) : number
       // console.log(number)
+      this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
 
       const data2 = {
         mesordercode: wo_code || this.dialogForm.mesordercode
@@ -2796,6 +2813,7 @@
 
     dialogVisibleConfirmClose() {
       // this.dialogForm.mesordercode = ''
+      this.formApprove.saleOrderCode = ''
       this.formApprove.mesordercode = ''
       this.formApprove.m_po = ''
       this.formApprove.partcode = ''

--
Gitblit v1.9.3