From ec5790cd8e6bd32a3dd599ace9b27f298789bc2d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 15:42:23 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/index.vue | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index df9636f..41d2c4f 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -67,20 +67,20 @@
>
</el-dropdown-menu>
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.customerorder_ifs_line"
style="margin-left:10px;"
type="primary"
@click="pullIfsLineNo"
>鑾峰彇OTC琛屽彿</el-button
- >
- <el-button
+ > -->
+ <!-- <el-button
v-if="permissions.customerorder_push_otc"
style="margin-left:10px;"
type="primary"
@click="pushOtc"
>鎺ㄩ�丱TC</el-button
- >
+ > -->
<!-- <el-button
style="margin-left:10px;"
type="primary"
@@ -93,13 +93,13 @@
@click="exportStandBook"
>瀵煎嚭鍙拌处</el-button
> -->
- <el-button
+ <!-- <el-button
v-if="permissions.plan_customerorder_return"
style="margin-left:10px;"
type="primary"
@click="returnOrder"
>璁㈠崟閫�鍥�</el-button
- >
+ > -->
</template>
</ttable>
@@ -345,11 +345,9 @@
sourceIdList: [{
label: '澶栭儴',
value: '0',
- type: 'success',
},{
label: '鍐呴儴',
value: '1',
- type: ''
}],
stateTagArr: [
{
@@ -447,7 +445,7 @@
{
minWidth: '100',
width: '100px',
- prop: 'contractNo',
+ prop: 'customerOrderNo',
label: '鍚堝悓缂栧彿',
sort: true,
isTrue: true,
@@ -817,7 +815,7 @@
}
},
immediate: true
- }
+ },
},
mounted() {
this.initQueryParams()
@@ -886,7 +884,6 @@
prop: 'coState',
searchInfoType: 'select',
// propVal: '01partUnCheck'
- propVal: ''
})
)
this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -930,6 +927,7 @@
}
}
this.scheduleVisible = true
+ console.log(this.multipleSelection);
this.$nextTick(() => {
this.$refs.schedule.init(this.multipleSelection)
})
--
Gitblit v1.9.3