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/produceManager/produceOrder.vue | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/src/views/produceManager/produceOrder.vue b/src/views/produceManager/produceOrder.vue
index fd06019..dea6122 100644
--- a/src/views/produceManager/produceOrder.vue
+++ b/src/views/produceManager/produceOrder.vue
@@ -9,12 +9,21 @@
@click="syncERP"
>鍚屾ERP
</el-button>
- <el-button
- v-waves
- icon="el-icon-switch-button"
- @click="orderClose"
- >鍏抽棴璁㈠崟
- </el-button>
+ <div style="display: flex">
+ <el-button
+ v-waves
+ icon="el-icon-switch-button"
+ @click="orderClose"
+ >鍏抽棴璁㈠崟
+ </el-button>
+ <el-button
+ v-waves
+ icon="el-icon-delete"
+ @click="orderDel"
+ >鍒犻櫎璁㈠崟
+ </el-button>
+ </div>
+
</div>
<div class="bodyTopFormGroup">
@@ -45,18 +54,24 @@
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
<el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
+
+ <el-form-item label="閿�鍞鍗�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item
v-show="isExpandForm"
label="棰勮寮�宸ユ椂闂�"
@@ -196,6 +211,18 @@
sortable="custom"
min-width="150"
/>
+ <el-table-column
+ show-tooltip-when-overflow
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
@@ -445,7 +472,7 @@
<script>
import Pagination from '@/components/Pagination'
-import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/produceManager'
+import { ClosedErpOrder, DeleteErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/produceManager'
import { handleDatetime } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
import elDragDialog from '@/directive/el-drag-dialog'
@@ -482,6 +509,7 @@
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
+ saleordercode: '', // 閿�鍞鍗�
// paystartdate: '', // 浜や粯鏃堕棿
paystartdate: '', // 棰勮寮�宸ユ椂闂�
payenddate: '', // 棰勮瀹屽伐鏃堕棿
@@ -520,6 +548,8 @@
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+ saleordercode: '', // 閿�鍞鍗�
saleOrderDeliveryDateIsDisabled: false// 棰勮浜や粯鏃ユ湡瀛楁鏄惁鍙慨鏀�
},
@@ -585,6 +615,7 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
paystartdate: tempDate2, // 浜や粯鏃堕棿
payenddate: tempDate, // 浜や粯鏃堕棿
+ saleordercode: this.form.saleordercode,
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
// createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
@@ -637,6 +668,8 @@
// this.$message.error('鍚屾澶辫触锛�')
// }, 10000)
// }
+ }).catch(e => {
+ loading.close()
})
},
// 鏌ヨ
@@ -653,6 +686,7 @@
this.form.paystartdate = ''
this.form.payenddate = ''
this.form.creatuser = ''
+ this.form.erpordercode = ''
this.form.createdate = ''
this.getErpOrderSearch()
},
@@ -662,6 +696,35 @@
},
rowClick(row) {
this.radioSelectedId = row.id
+ },
+
+ // 璁㈠崟鍒犻櫎
+ orderDel() {
+ if (this.radioSelectedId.length < 1) {
+ return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
+ }
+ this.tableData.forEach(item => {
+ if (item.id === this.radioSelectedId) {
+ if (item.status === 'CLOSED') {
+ return this.$message.info('姝よ鍗曞凡鍏抽棴锛屾棤娉曞垹闄わ紒')
+ } else {
+ this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteErpOrder({ erpordercode: item.wo, erporderid: this.radioSelectedId }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('璁㈠崟鍒犻櫎鎴愬姛!')
+ this.getErpOrderSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄わ紒')
+ })
+ }
+ }
+ })
},
// 璁㈠崟鍏抽棴
async orderClose() {
@@ -698,7 +761,7 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
- if (parseFloat(row.qty) === parseFloat(row.relse_qty)) {
+ if (parseFloat(row.qty) === parseFloat(row.relse_qty) || row.status === 'CLOSED') {
return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
}
@@ -716,6 +779,8 @@
this.dialogForm.wkshopname = row.wkshp_name
this.dialogForm.warehousecode = row.stck_code
this.dialogForm.warehousename = row.stck_name
+
+ this.dialogForm.saleordercode = row.saleOrderCode
this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
@@ -740,6 +805,8 @@
this.dialogForm.warehousename = ''
this.dialogForm.saleOrderDeliveryDate = ''
+
+ this.dialogForm.saleordercode = ''
this.dialogForm.erpqty = ''
this.dialogForm.markqty = ''
@@ -782,6 +849,7 @@
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
'relse_qty': this.dialogForm.relse_qty,
+ 'saleordercode': this.dialogForm.saleordercode,
'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
--
Gitblit v1.9.3