From 791f4f0f88eb534b1fc9a875fa71d94bd62e696b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 17:16:02 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/index.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 1b11ec8..2dba483 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -345,11 +345,9 @@
sourceIdList: [{
label: '澶栭儴',
value: '0',
- type: 'success',
},{
label: '鍐呴儴',
value: '1',
- type: ''
}],
stateTagArr: [
{
@@ -692,7 +690,6 @@
'01partUnCheck',
'02technologyUnCheck',
'03plan'
- // '04planed'
],
key: 'coState'
}
@@ -818,7 +815,7 @@
}
},
immediate: true
- }
+ },
},
mounted() {
this.initQueryParams()
@@ -844,7 +841,7 @@
}
if (this.permissions.customerorder_submit_oa) {
this.table.toolbar.push({
- text: '鎻愪氦瀹℃牳',
+ text: '鎻愪氦OA瀹℃牳',
type: 'primary',
fun: this.auditCustomerOrder,
disabled: false,
@@ -887,7 +884,6 @@
prop: 'coState',
searchInfoType: 'select',
// propVal: '01partUnCheck'
- propVal: '02technologyUnCheck'
})
)
this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -931,6 +927,7 @@
}
}
this.scheduleVisible = true
+ console.log(this.multipleSelection);
this.$nextTick(() => {
this.$refs.schedule.init(this.multipleSelection)
})
@@ -1116,13 +1113,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+ this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.id + '鎻愮ず', {
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()
--
Gitblit v1.9.3