From 68edca7409736705db50504b003cba66bb4ccd6e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 08 八月 2023 11:08:50 +0800
Subject: [PATCH] 1.新增用户组管理
---
src/views/produceManager/produceOrder.vue | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/views/produceManager/produceOrder.vue b/src/views/produceManager/produceOrder.vue
index fd06019..e81b81f 100644
--- a/src/views/produceManager/produceOrder.vue
+++ b/src/views/produceManager/produceOrder.vue
@@ -45,18 +45,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 +202,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="浜у搧缂栫爜"
@@ -482,6 +500,7 @@
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
+ saleordercode: '', // 閿�鍞鍗�
// paystartdate: '', // 浜や粯鏃堕棿
paystartdate: '', // 棰勮寮�宸ユ椂闂�
payenddate: '', // 棰勮瀹屽伐鏃堕棿
@@ -520,6 +539,8 @@
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+ saleordercode: '', // 閿�鍞鍗�
saleOrderDeliveryDateIsDisabled: false// 棰勮浜や粯鏃ユ湡瀛楁鏄惁鍙慨鏀�
},
@@ -585,6 +606,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) : '', // 鍒涘缓鏃堕棿
@@ -653,6 +675,7 @@
this.form.paystartdate = ''
this.form.payenddate = ''
this.form.creatuser = ''
+ this.form.erpordercode = ''
this.form.createdate = ''
this.getErpOrderSearch()
},
@@ -717,6 +740,8 @@
this.dialogForm.warehousecode = row.stck_code
this.dialogForm.warehousename = row.stck_name
+ this.dialogForm.saleordercode = row.saleOrderCode
+
this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
this.dialogForm.saleOrderDeliveryDateIsDisabled = this.dialogForm.saleOrderDeliveryDate !== null
@@ -740,6 +765,8 @@
this.dialogForm.warehousename = ''
this.dialogForm.saleOrderDeliveryDate = ''
+
+ this.dialogForm.saleordercode = ''
this.dialogForm.erpqty = ''
this.dialogForm.markqty = ''
@@ -782,6 +809,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