From 2fd9231d7768c1955579430a70d3c34f7d9bfa96 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 27 十月 2023 16:19:24 +0800
Subject: [PATCH] 1.MES工单 打印 解决销售单号未出来的问题
---
src/views/produceManager/workOrder.vue | 67 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 19b910f..fa235ca 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">
@@ -662,7 +662,14 @@
/>
</el-select>
</el-form-item>
-
+ <el-form-item label="宸ヤ环绠℃帶" required>
+ <el-switch
+ v-model="dialogForm.is_steprice"
+ active-color="#13ce66"
+ inactive-color="#eee"
+ @change="routecodeChange"
+ />
+ </el-form-item>
<!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
<!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
<!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
@@ -726,7 +733,7 @@
<!-- </el-form-item>-->
</el-form>
- <div style="display: flex;justify-content: flex-end">
+ <div style="display: flex;justify-content: flex-end;margin-top: -50px;">
{{ routeStepArr }}
</div>
@@ -1277,11 +1284,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 }}
@@ -2069,6 +2079,9 @@
mesqty: '', // 宸ュ崟鏁伴噺
routecode: '', // 宸ヨ壓璺嚎缂栫爜
+
+ is_steprice: false, // 鏄惁宸ヤ环绠＄悊
+
wkshopcode: '', // 鐢熶骇杞﹂棿缂栫爜
planstartdate: '', // 璁″垝寮�濮嬫椂闂�
planenddate: '', // 璁″垝瀹屾垚鏃堕棿
@@ -2355,6 +2368,7 @@
this.form.paydate = ''
this.form.creatuser = ''
this.form.sourceorder = ''
+ this.form.saleordercode = ''
this.form.creatuser = ''
this.form.ordertype = ''
this.getMesOrderSearch()
@@ -2407,24 +2421,27 @@
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange() {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode,
- wkshopcode: this.dialogForm.wkshopcode
- }
- await SelectRouteOrWkshop(data).then((res) => {
- console.log(res, 1)
+ if (this.dialogForm.routecode) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode,
+ wkshopcode: this.dialogForm.wkshopcode,
+ is_steprice: this.dialogForm.is_steprice ? 'Y' : 'N'
+ }
+ await SelectRouteOrWkshop(data).then((res) => {
+ console.log(res, 1)
- SelectRouteStep({ routecode: this.dialogForm.routecode }).then(res2 => {
- console.log(res2)
- this.routeStepArr = res2.data.map(i => i.stepname).join('锛�')
+ 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)
+ this.submitButtonIsDisabled = true
})
-
- this.submitButtonIsDisabled = false
- }).catch(err => {
- // console.log(err, 2)
- this.submitButtonIsDisabled = true
- })
+ }
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
async wkshopcodeChange(wkshopcode, partcode) {
@@ -2609,6 +2626,7 @@
this.dialogForm.routecode = '' // 宸ヨ壓璺嚎缂栫爜
this.dialogForm.wkshopcode = '' // 鐢熶骇杞﹂棿缂栫爜
+ this.dialogForm.is_steprice = false// 鏄惁宸ヤ环绠＄悊
this.dialogForm.planstartdate = '' // 璁″垝寮�濮嬫椂闂�
this.dialogForm.planenddate = '' // 璁″垝瀹屾垚鏃堕棿
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
@@ -2717,11 +2735,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)
-
+ console.log(this.formApprove.saleOrderCode, 321)
+ this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
const data2 = {
username: getCookie('admin'),
mesordercode: wo_code || this.dialogForm.mesordercode
@@ -2809,6 +2828,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
+ this.formApprove.saleOrderCode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
this.formApprove.partcode = ''
@@ -3106,6 +3126,7 @@
},
// 琛岀偣鍑讳簨浠�
async rowClick(row, event, column) {
+ this.formApprove.saleOrderCode = row.saleOrderCode
this.radioSelected = row.wo_code ? row.wo_code : this.radioSelected
const { data: res } = await SearchWorkStep({ wo_code: this.radioSelected, storg_code: this.$store.state.settings.orgType === 'W' ? (this.switchButton ? '' : getCookie('stu_torgcode')) : '' })
this.tableDataDetail = res
--
Gitblit v1.9.3