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/kanbanManager/zhkb.vue | 4 ++--
src/views/produceManager/workOrder.vue | 13 +++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index 0c712da..a004284 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -753,7 +753,7 @@
.content01 {
height: 30px;
width: 100%;
- border-bottom: 1px solid $main_color;
+ //border-bottom: 1px solid $main_color;
display: flex;
align-items: center;
justify-content: center;
@@ -761,7 +761,7 @@
.content02Parent {
display: flex;
-
+border-top: 1px solid $main_color;
.content02 {
width: 60px;
border-right: 1px solid $main_color;
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 19b910f..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">
@@ -1277,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 }}
@@ -2717,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
@@ -2809,6 +2813,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
+ this.formApprove.saleOrderCode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
this.formApprove.partcode = ''
--
Gitblit v1.9.3