From eb5aca176bf68e13be87c98eb1ead8aa72adee28 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 09 七月 2024 15:36:54 +0800
Subject: [PATCH] 1.工单打印新增销售订单号2.综合看板修改
---
src/views/kanbanManager/zhkb.vue | 6 ++++++
src/views/workOrder/workOrderList.vue | 11 ++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index aa90341..b162f3e 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -215,6 +215,9 @@
this.LeftTopData02.push(data)
}
}
+ const t1 = this.LeftTopData02[ this.LeftTopData02.length - 1]
+ this.LeftTopData02.splice(7, 1)
+ this.LeftTopData02.splice(3, 0, t1)
loadEcharts('all01', all01(this.legendData, this.LeftTopData02))
setInterval(() => {
@@ -253,6 +256,9 @@
this.LeftTopData02.push(data)
}
}
+ const t1 = this.LeftTopData02[ this.LeftTopData02.length - 1]
+ this.LeftTopData02.splice(7, 1)
+ this.LeftTopData02.splice(3, 0, t1)
loadEcharts('all01', all01(this.legendData, this.LeftTopData02))
})
}, 1000 * 30)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 2d963b1..94ff178 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -383,7 +383,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.saleOrderCod)"
/>
</el-tooltip>
@@ -1331,6 +1331,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>
@@ -3047,11 +3050,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
}
@@ -3137,6 +3140,7 @@
},
dialogVisibleConfirmClose() {
+ this.formApprove.saleOrderCode = ''
// this.dialogForm.mesordercode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
@@ -3438,6 +3442,7 @@
},
// 琛岀偣鍑讳簨浠�
async rowClick(row, event, column) {
+ this.formApprove.saleOrderCode = row.saleOrderCode
this.routeCode = row.route_code ? row.route_code : ''
this.partCode = row.partcode ? row.partcode : ''
const data = {
--
Gitblit v1.9.3