From 86f08ecff780071e294b6c50757b70dda01fa764 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 23 九月 2023 09:36:07 +0800
Subject: [PATCH] 1.工单实现75%
---
src/views/workOrder/workOrderList.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 1f3ad55..d2a2399 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -269,6 +269,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="data_sources"
+ show-tooltip-when-overflow
+ label="鏁版嵁鏉ユ簮"
+ sortable="custom"
+ width="120"
+ />
<el-table-column
prop="lm_user"
@@ -295,12 +302,12 @@
<i
class="el-icon-edit-outline"
:style="{color:$store.state.settings.theme}"
- @click="edit('edit',row)"
+ @click.stop="edit('edit',row)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+ <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">
@@ -313,7 +320,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click="handlePrint(row.wo_code)"
+ @click.stop="handlePrint(row.wo_code)"
/>
</el-tooltip>
@@ -322,7 +329,7 @@
class="el-icon-view"
style="cursor: pointer;"
:style="{color:$store.state.settings.theme}"
- @click="edit('view',row)"
+ @click.stop="edit('view',row)"
/>
</el-tooltip>
@@ -1984,7 +1991,9 @@
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
- data_sources: '' // 鏁版嵁鏉ユ簮
+ data_sources: '', // 鏁版嵁鏉ユ簮
+
+ mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
@@ -2355,7 +2364,7 @@
},
selected(row, index) {
- // && row.isstep === 'Y'
+ // && row.isstep === 'Y' //鍚庣杩欎釜瀛楁杩樻病鏀惧嚭鏉�
if (row.status === 'NEW') {
return true
} else {
@@ -2427,6 +2436,7 @@
this.dialogForm.partspec = row.partspec
this.dialogForm.wkshopcode = row.wkshp_code
this.dialogForm.deliverydate = row.saleOrderDeliveryDate.substring(0, 11)
+ this.dialogForm.mesqty = row.plan_qty
const data = {
sourceid: this.dialogForm.sourceorderid,
@@ -2435,7 +2445,8 @@
data_sources: this.dialogForm.data_sources
}
const { data: res } = await UpdateMesOrderStepSearch(data)
- this.dialogForm.mesqty = res.canupdate_qty
+ this.dialogForm.mesmaxqty = res.canupdate_qty
+
res.stepdata.forEach(i => {
this.stepTableData.push(
{
@@ -2496,6 +2507,10 @@
return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
}
+ if (this.dialogForm.data_sources === 'ERP' && this.dialogForm.mesmaxqty < this.dialogForm.mesqty) {
+ return this.$message.info('姝ゅ伐鍗曠殑鏈�澶т慨鏀规暟鍊间负锛�' + this.dialogForm.mesmaxqty)
+ }
+
const workListSub = []
this.stepTableData.forEach((i, j) => {
workListSub.push(
--
Gitblit v1.9.3