From bb1368e4c5154b006b2e678261cbfa01e317b3b6 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 21 十一月 2024 16:38:53 +0800
Subject: [PATCH] 1.订单工单 新增重量、总料 字段
---
src/views/workOrder/workOrderClose.vue | 21 +++++
src/views/workOrder/produceOrderList.vue | 48 +++++++++++
src/views/produce/stepReport.vue | 30 +++++++
src/views/workOrder/workOrderList.vue | 57 +++++++++++++
src/views/workOrder/workOrderSend.vue | 42 +++++++---
5 files changed, 181 insertions(+), 17 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 6769a89..0b2ed03 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -275,6 +275,26 @@
</el-table-column>
<el-table-column
+ prop="weight"
+ label="閲嶉噺"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+ </el-table-column>
+
+ <el-table-column
+ prop="totalnumber"
+ label="鎬绘枡"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+ </el-table-column>
+
+ <el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
width="110"
@@ -374,7 +394,7 @@
:visible.sync="dialogVisible"
width="1160px"
:close-on-click-modal="false"
- :top="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'? '6vh':'15vh'"
+ :top="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'? '6vh':'8vh'"
@closed="handleClose"
@close="handleClose"
>
@@ -410,6 +430,12 @@
</el-form-item>
<el-form-item label="棰滆壊" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.colour? dialogForm.colour:'/' }}</div>
+ </el-form-item>
+ <el-form-item label="閲嶉噺" class="dialogFormItem">
+ <div class="dialogFormItemDiv">{{ dialogForm.weight? dialogForm.weight:'/' }}</div>
+ </el-form-item>
+ <el-form-item label="鎬绘枡" class="dialogFormItem">
+ <div class="dialogFormItemDiv">{{ dialogForm.totalnumber? dialogForm.totalnumber:'/' }}</div>
</el-form-item>
<el-form-item label="浠诲姟鏁伴噺" class="dialogFormItem">
@@ -1197,6 +1223,8 @@
this.dialogForm.customercode = row.customercode
this.dialogForm.customername = row.customername
this.dialogForm.colour = row.colour
+ this.dialogForm.weight = row.weight
+ this.dialogForm.totalnumber = row.totalnumber
if (this.activeName === '澶栧崗鏀舵枡') {
this.dialogForm.list = []
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 935c3fa..af352e4 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -296,6 +296,26 @@
>
<template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
</el-table-column>
+
+ <el-table-column
+ prop="weight"
+ label="閲嶉噺"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="totalnumber"
+ label="鎬绘枡"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+ </el-table-column>
+
<el-table-column
prop="clerkuser"
label="閿�鍞笟鍔″憳"
@@ -514,6 +534,19 @@
v-model="dialogForm.colour"
style="width: 200px"
disabled
+ />
+ </el-form-item>
+
+ <el-form-item label="閲嶉噺">
+ <el-input
+ v-model="dialogForm.weight"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="鎬绘枡">
+ <el-input
+ v-model="dialogForm.totalnumber"
+ style="width: 200px"
/>
</el-form-item>
@@ -801,7 +834,10 @@
'injectnumber': '', // 娉ㄥ鏈哄彿
'customercode': '', // 瀹㈡埛缂栧彿
'customername': '', // 瀹㈡埛鍚嶇О
- 'colour': ''// 棰滆壊
+ 'colour': '', // 棰滆壊
+
+ weight: '', // 閲嶉噺
+ totalnumber: ''// 鎬绘枡
},
operation: '',
@@ -1092,6 +1128,8 @@
'customercode': i.customercode,
'customername': i.customername,
'colour': i.colour,
+ 'weight': i.weight,
+ 'totalnumber': i.totalnumber,
// 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00'
})
@@ -1158,6 +1196,9 @@
this.dialogForm.customercode = row.customercode
this.dialogForm.customername = row.customername
this.dialogForm.colour = row.colour
+
+ this.dialogForm.weight = row.weight
+ this.dialogForm.totalnumber = row.totalnumber
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -1187,6 +1228,9 @@
customercode: '',
customername: '',
colour: '',
+
+ weight: '',
+ totalnumber: '',
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
}
@@ -1230,6 +1274,8 @@
'customercode': this.dialogForm.customercode, // 瀹㈡埛缂栧彿
'customername': this.dialogForm.customername, // 瀹㈡埛鍚嶇О
'colour': this.dialogForm.colour, // 棰滆壊
+ 'weight': this.dialogForm.weight, // 棰滆壊
+ 'totalnumber': this.dialogForm.totalnumber, // 棰滆壊
'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
diff --git a/src/views/workOrder/workOrderClose.vue b/src/views/workOrder/workOrderClose.vue
index d599b2a..716569a 100644
--- a/src/views/workOrder/workOrderClose.vue
+++ b/src/views/workOrder/workOrderClose.vue
@@ -285,6 +285,27 @@
>
<template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
</el-table-column>
+
+ <el-table-column
+ prop="weight"
+ label="閲嶉噺"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+ </el-table-column>
+
+ <el-table-column
+ prop="totalnumber"
+ label="鎬绘枡"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+ </el-table-column>
+
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index cc08537..a559944 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -223,6 +223,27 @@
>
<template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
</el-table-column>
+
+ <el-table-column
+ prop="weight"
+ label="閲嶉噺"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+ </el-table-column>
+
+ <el-table-column
+ prop="totalnumber"
+ label="鎬绘枡"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+ </el-table-column>
+
<el-table-column
prop="plan_qty"
label="宸ュ崟鏁�"
@@ -537,7 +558,7 @@
:title="operation==='add'?'鏂板':(operation==='edit'?'淇敼':'璇︽儏')"
:visible.sync="dialogVisible"
width="1200px"
- top="8vh"
+ top="3vh"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
@@ -712,6 +733,12 @@
</el-form-item>
<el-form-item label="棰滆壊">
<el-input v-model="dialogForm.colour" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="閲嶉噺">
+ <el-input v-model="dialogForm.weight" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎬绘枡">
+ <el-input v-model="dialogForm.totalnumber" style="width: 200px" />
</el-form-item>
<el-divider content-position="left">宸ュ簭淇℃伅</el-divider>
@@ -1340,6 +1367,13 @@
</el-form-item>
<el-form-item label="棰滆壊:" class="formContent">
{{ formApprove.colour }}
+ </el-form-item>
+
+ <el-form-item label="閲嶉噺:" class="formContent">
+ {{ formApprove.weight }}
+ </el-form-item>
+ <el-form-item label="鎬绘枡:" class="formContent">
+ {{ formApprove.totalnumber }}
</el-form-item>
<!-- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
<!-- {{ formApprove.routename }}-->
@@ -2128,6 +2162,9 @@
customername: '', // 瀹㈡埛鍚嶇О
colour: '', // 棰滆壊
+ weight: '', // 閲嶉噺
+ totalnumber: '', // 鎬绘枡
+
mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
customerArr: [],
@@ -2186,6 +2223,12 @@
],
colour: [
{ required: true, message: '璇疯緭鍏ラ鑹�', trigger: ['blur', 'change'] }
+ ],
+ weight: [
+ { required: true, message: '璇疯緭鍏ラ噸閲�', trigger: ['blur', 'change'] }
+ ],
+ totalnumber: [
+ { required: true, message: '璇疯緭鍏ユ�绘枡', trigger: ['blur', 'change'] }
]
},
@@ -2619,6 +2662,9 @@
this.dialogForm.customercode = row.customercode
this.dialogForm.colour = row.colour
+ this.dialogForm.weight = row.weight
+ this.dialogForm.totalnumber = row.totalnumber
+
const data = {
sourceid: this.dialogForm.sourceorderid,
sourcewo: this.dialogForm.sourceorder,
@@ -2720,7 +2766,9 @@
injectnumber: '',
customercode: '',
- colour: ''
+ colour: '',
+ weight: '',
+ totalnumber: ''
}
this.stepSelectedValue = []
this.stepTableData = []
@@ -2774,6 +2822,9 @@
customercode: this.dialogForm.customercode,
customername: this.customerArr.find(i => i.code === this.dialogForm.customercode).name,
colour: this.dialogForm.colour,
+
+ weight: this.dialogForm.weight,
+ totalnumber: this.dialogForm.totalnumber,
data_sources: this.dialogForm.data_sources, // 鏁版嵁鏉ユ簮
isstep: workListSub.length > 0 ? 'Y' : 'N', //
@@ -2867,6 +2918,8 @@
this.formApprove.injectnumber = row.injectnumber || '/'
this.formApprove.customername = row.customername || '/'
this.formApprove.colour = row.colour || '/'
+ this.formApprove.weight = row.weight || '/'
+ this.formApprove.totalnumber = row.totalnumber || '/'
this.$nextTick(() => {
res3.forEach(i => {
diff --git a/src/views/workOrder/workOrderSend.vue b/src/views/workOrder/workOrderSend.vue
index 8706181..2d8389a 100644
--- a/src/views/workOrder/workOrderSend.vue
+++ b/src/views/workOrder/workOrderSend.vue
@@ -290,6 +290,27 @@
>
<template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
</el-table-column>
+
+ <el-table-column
+ prop="weight"
+ label="閲嶉噺"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template>
+ </el-table-column>
+
+ <el-table-column
+ prop="totalnumber"
+ label="鎬绘枡"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template>
+ </el-table-column>
+
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
@@ -354,19 +375,14 @@
<i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" />
</el-tooltip>
- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">
- <!-- <i-->
- <!-- class="el-icon-tickets"-->
- <!-- style="cursor: pointer;color: #42b983;margin-right: 15px"-->
- <!-- @click="check(row)"-->
- <!-- />-->
- <i
- :style="{color:$store.state.settings.theme}"
- class="el-icon-printer"
- style="cursor: pointer;margin-right: 15px"
- @click.stop="handlePrint(row.wo_code)"
- />
- </el-tooltip>
+ <!-- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">-->
+ <!-- <i-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- class="el-icon-printer"-->
+ <!-- style="cursor: pointer;margin-right: 15px"-->
+ <!-- @click.stop="handlePrint(row.wo_code)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
<el-tooltip class="item" effect="dark" content="璇︽儏" placement="top">
<i
--
Gitblit v1.9.3