From d8ac6057eaad648687699e25a575f3b7b8c1b102 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 18:52:19 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/schedule-table.vue
---
src/views/plan/customerorder/index.vue | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 9cfba54..09782db 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -658,7 +658,18 @@
minWidth: '140',
width: '120',
prop: 'deliveryDate',
- label: '浜よ揣鏃堕棿',
+ label: '璁″垝浜よ揣鏃堕棿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'datetimerange',
+ formatter: this.formatDutyDate
+ },
+ {
+ minWidth: '140',
+ width: '120',
+ prop: 'wantedDeliveryDate',
+ label: '瀹㈡埛鏈熸湜浜よ揣鏃堕棿',
sort: true,
isTrue: true,
isSearch: true,
@@ -841,7 +852,7 @@
}
if (this.permissions.customerorder_submit_oa) {
this.table.toolbar.push({
- text: '鎻愪氦瀹℃牳',
+ text: '鎻愪氦OA瀹℃牳',
type: 'primary',
fun: this.auditCustomerOrder,
disabled: false,
@@ -1113,13 +1124,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+ this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
type: 'warning'
}).then(() => {
- dropByContractNo(row.customerOrderNo).then((res) => {
+ dropByContractNo({id:row.id}).then((res) => {
if (res.data.code === 0) {
this.$message.success('浣滃簾鎴愬姛')
this.getData()
@@ -1127,22 +1138,7 @@
this.$message.error('浣滃簾澶辫触')
}
})
- })
- // .then(() => {
- // markPlanned([row.id], '05cancel').then((response) => {
- // var data = response.data
- // if (data.code === 0) {
- // this.$message.success('浣滃簾鎴愬姛')
- // this.getData()
- // } else {
- // this.$message.error('浣滃簾澶辫触')
- // }
- // })
- // })
- // .then((data) => {
- // this.$message.success('浣滃簾鎴愬姛')
- // this.getData()
- // })
+ }).catch(()=>{ })
},
// 鍒犻櫎
deleteHandle(row) {
--
Gitblit v1.9.3