From dff1f3ff97550bd88468c365fefe1e8119467577 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 20 九月 2024 13:22:14 +0800
Subject: [PATCH] 1.工单新增三个字段
---
src/views/kanbanManager/ckgl.vue | 2
src/views/kanbanManager/cj2.vue | 2
src/views/workOrder/workOrderClose.vue | 27 ++++++
src/views/workOrder/produceOrderList.vue | 66 ++++++++++++++++
src/views/kanbanManager/cj.vue | 2
src/views/produce/reportCorrect.vue | 6
src/views/workOrder/workOrderList.vue | 47 +++++++++++
src/views/workOrder/workOrderSend.vue | 27 ++++++
src/views/produce/reportVerify.vue | 6
9 files changed, 172 insertions(+), 13 deletions(-)
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 039d9f0..262eb74 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -133,7 +133,7 @@
],
// index: true,
- columnWidth: [150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150],
+ columnWidth: [200, 140, 150, 290, 130, 130, 130, 130, 130, 130, 130, 130, 130],
align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
// carousel: 'page'
}
diff --git a/src/views/kanbanManager/cj2.vue b/src/views/kanbanManager/cj2.vue
index 0a9fe9c..9aac4ea 100644
--- a/src/views/kanbanManager/cj2.vue
+++ b/src/views/kanbanManager/cj2.vue
@@ -133,7 +133,7 @@
],
// index: true,
- columnWidth: [150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150],
+ columnWidth: [200, 140, 150, 290, 130, 130, 130, 130, 130, 130, 130, 130, 130],
align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
// carousel: 'page'
}
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 5a99feb..32fd065 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -135,7 +135,7 @@
],
index: true,
- columnWidth: [50, 150, 150, 150, 150, 150, 150, 150, 150],
+ columnWidth: [50, 130, 150, 300, 200, 120, 120, 120, 120],
align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
// carousel: 'page'
},
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 7df5531..8816c2c 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -186,13 +186,13 @@
</el-table-column>
<el-table-column
prop="wx_name"
- label="渚涘簲鍟�"
+ label="璁惧/渚涘簲鍟�"
show-overflow-tooltip
sortable="custom"
- min-width="110"
+ min-width="125"
>
<template slot-scope="{row}">
- {{ row.wx_name ? row.wx_name : '/' }}
+ {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 2ccbeb3..d42ff57 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -225,13 +225,13 @@
</el-table-column>
<el-table-column
prop="wx_name"
- label="渚涘簲鍟�"
+ label="璁惧/渚涘簲鍟�"
show-overflow-tooltip
sortable="custom"
- min-width="110"
+ min-width="125"
>
<template slot-scope="{row}">
- {{ row.wx_name ? row.wx_name : '/' }}
+ {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 65c40f0..fb614f5 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -262,6 +262,33 @@
sortable="custom"
/>
<el-table-column
+ prop="injectnumber"
+ label="娉ㄥ鏈哄彿"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="customername"
+ label="瀹㈡埛鍚嶇О"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="colour"
+ label="棰滆壊"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
+ </el-table-column>
+ <el-table-column
prop="clerkuser"
label="閿�鍞笟鍔″憳"
show-tooltip-when-overflow
@@ -451,6 +478,28 @@
/>
</el-form-item>
+ <el-form-item label="娉ㄥ鏈哄彿">
+ <el-input
+ v-model="dialogForm.injectnumber"
+ style="width: 200px"
+ disabled
+ />
+ </el-form-item>
+ <el-form-item label="瀹㈡埛鍚嶇О">
+ <el-input
+ v-model="dialogForm.customername"
+ style="width: 200px"
+ disabled
+ />
+ </el-form-item>
+ <el-form-item label="棰滆壊">
+ <el-input
+ v-model="dialogForm.colour"
+ style="width: 200px"
+ disabled
+ />
+ </el-form-item>
+
<el-form-item label="閿�鍞笟鍔″憳" prop="">
<el-input
v-model="dialogForm.clerkuser"
@@ -579,7 +628,13 @@
clerkuser: '', // 閿�鍞笟鍔″憳
- saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
+ saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+ 'injectnumber': '', // 娉ㄥ鏈哄彿
+ 'customercode': '', // 瀹㈡埛缂栧彿
+ 'customername': '', // 瀹㈡埛鍚嶇О
+ 'colour': ''// 棰滆壊
+
},
operation: '',
dialogFormRules: {
@@ -871,6 +926,11 @@
this.dialogForm.ordernum = 1
this.dialogForm.relse_qty = row.relse_qty
this.dialogForm.clerkuser = row.clerkuser
+
+ this.dialogForm.injectnumber = row.injectnumber
+ this.dialogForm.customercode = row.customercode
+ this.dialogForm.customername = row.customername
+ this.dialogForm.colour = row.colour
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -934,6 +994,10 @@
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
'relse_qty': this.dialogForm.relse_qty,
+ 'injectnumber': this.dialogForm.injectnumber, // 娉ㄥ鏈哄彿
+ 'customercode': this.dialogForm.customercode, // 瀹㈡埛缂栧彿
+ 'customername': this.dialogForm.customername, // 瀹㈡埛鍚嶇О
+ 'colour': this.dialogForm.colour, // 棰滆壊
'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
diff --git a/src/views/workOrder/workOrderClose.vue b/src/views/workOrder/workOrderClose.vue
index 4435910..5a58e06 100644
--- a/src/views/workOrder/workOrderClose.vue
+++ b/src/views/workOrder/workOrderClose.vue
@@ -259,6 +259,33 @@
width="100"
/>
<el-table-column
+ prop="injectnumber"
+ label="娉ㄥ鏈哄彿"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="customername"
+ label="瀹㈡埛鍚嶇О"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="colour"
+ label="棰滆壊"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
+ </el-table-column>
+ <el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
show-tooltip-when-overflow
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index af688a1..db62842 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -263,6 +263,33 @@
width="100"
/>
<el-table-column
+ prop="injectnumber"
+ label="娉ㄥ鏈哄彿"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="customername"
+ label="瀹㈡埛鍚嶇О"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="colour"
+ label="棰滆壊"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
+ </el-table-column>
+ <el-table-column
prop="clerkuser"
label="閿�鍞笟鍔″憳"
sortable="custom"
@@ -348,7 +375,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)"
/>
</el-tooltip>
@@ -1273,6 +1300,16 @@
</el-form-item>
<el-form-item label="宸ュ崟鏁伴噺:" class="formContent">
{{ formApprove.plan_qty }}
+ </el-form-item>
+
+ <el-form-item label="娉ㄥ鏈哄彿:" class="formContent">
+ {{ formApprove.injectnumber }}
+ </el-form-item>
+ <el-form-item label="瀹㈡埛鍚嶇О:" class="formContent">
+ {{ formApprove.customername }}
+ </el-form-item>
+ <el-form-item label="棰滆壊:" class="formContent">
+ {{ formApprove.colour }}
</el-form-item>
<!-- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
<!-- {{ formApprove.routename }}-->
@@ -2717,13 +2754,13 @@
this.dialogVisibleSearch = false
},
// 澶勭悊鎵撳嵃
- handlePrint(wo_code) {
+ handlePrint(row) {
// const number = Math.random() * Math.random()
// this.number = number === 0 ? (10 + Math.random()) : number
// console.log(number)
const data2 = {
- mesordercode: wo_code || this.dialogForm.mesordercode
+ mesordercode: row.wo_code || this.dialogForm.mesordercode
}
MesOrderPrintSearch(data2).then(res2 => {
if (res2.code === '200') {
@@ -2739,6 +2776,10 @@
this.formApprove.routename = localStorage.getItem('username') // 鎵撳嵃浜哄憳
this.formApprove.lm_date = res3[0].lm_date
+ this.formApprove.injectnumber = row.injectnumber || '/'
+ this.formApprove.customername = row.customername || '/'
+ this.formApprove.colour = row.colour || '/'
+
this.$nextTick(() => {
res3.forEach(i => {
this.bindQRCode(i.seq, i.stepqrcode, 'small')
diff --git a/src/views/workOrder/workOrderSend.vue b/src/views/workOrder/workOrderSend.vue
index c726f93..56bcd20 100644
--- a/src/views/workOrder/workOrderSend.vue
+++ b/src/views/workOrder/workOrderSend.vue
@@ -264,6 +264,33 @@
width="100"
/>
<el-table-column
+ prop="injectnumber"
+ label="娉ㄥ鏈哄彿"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="customername"
+ label="瀹㈡埛鍚嶇О"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="colour"
+ label="棰滆壊"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
+ </el-table-column>
+ <el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
show-tooltip-when-overflow
--
Gitblit v1.9.3