From 56a9035af0b19f88d28cd64e9fb8e813f3ea2d1d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 22 九月 2023 16:27:27 +0800
Subject: [PATCH] 1.打印工单时 放出销售订单号
---
src/views/produceManager/workOrder.vue | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 14dd13a..3e881ca 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -360,7 +360,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click="handlePrint(row.wo_code)"
+ @click="handlePrint(row.wo_code,row.saleOrderCode)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
@@ -726,6 +726,9 @@
<!-- </el-form-item>-->
</el-form>
+ <div style="display: flex;justify-content: flex-end">
+ {{ routeStepArr }}
+ </div>
<!-- 宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
<el-dialog
@@ -1274,11 +1277,14 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
- {{ formApprove.mesordercode }}
+ <el-form-item label="閿�鍞崟鍙�:" class="formContent">
+ {{ formApprove.saleOrderCode }}
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿:" class="formContent">
{{ formApprove.m_po }}
+ </el-form-item>
+ <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
+ {{ formApprove.mesordercode }}
</el-form-item>
<el-form-item label="浜у搧缂栫爜:" class="formContent">
{{ formApprove.partcode }}
@@ -2248,7 +2254,9 @@
lastPrintArr: [], // 鏈亾鎵撳嵃鐨勬暟缁�(鎵�鏈�)
lastPrintArrSelected: [], // 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
- switchButton: false
+ switchButton: false,
+
+ routeStepArr: ''
}
},
created() {
@@ -2408,7 +2416,13 @@
wkshopcode: this.dialogForm.wkshopcode
}
await SelectRouteOrWkshop(data).then((res) => {
- // console.log(res, 1)
+ console.log(res, 1)
+
+ SelectRouteStep({ routecode: this.dialogForm.routecode }).then(res2 => {
+ console.log(res2)
+ this.routeStepArr = res2.data.map(i => i.stepname).join('锛�')
+ })
+
this.submitButtonIsDisabled = false
}).catch(err => {
// console.log(err, 2)
@@ -2582,6 +2596,7 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
+ this.routeStepArr = ''
this.dialogForm.partname = '' // 浜у搧鍚嶇О
this.dialogForm.partspec = '' // 浜у搧瑙勬牸
this.dialogForm.wkshopname = '' // 鐢熶骇杞﹂棿鍚嶇О
@@ -2705,11 +2720,12 @@
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 = saleOrderCode
const data2 = {
username: getCookie('admin'),
mesordercode: wo_code || this.dialogForm.mesordercode
@@ -2797,6 +2813,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
+ this.formApprove.saleOrderCode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
this.formApprove.partcode = ''
--
Gitblit v1.9.3