From f3a5877f84dd9e38a5ad58adeb4398dbcff01b91 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 18 十一月 2023 14:18:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/masterproductionschedule/index.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 6229039..927b1ff 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -82,14 +82,14 @@
>
</el-dropdown-menu>
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.masterproductionschedule_submit_oa"
@click="commitOa()"
type="primary"
style="margin-left:10px;"
:loading="loadingOa"
>鎻愪氦OA
- </el-button>
+ </el-button> -->
<!-- <el-button
v-if="permissions.masterproductionschedule_sync_scm"
@click="syncScm()"
@@ -690,18 +690,18 @@
})
}
if (this.permissions.masterproductionschedule_create_outsourcing) {
- this.table.toolbar.push({
- text: '鍒涘缓濮斿璁㈠崟',
- fun: this.createOutsourcingOrder
- })
+ // this.table.toolbar.push({
+ // text: '鍒涘缓濮斿璁㈠崟',
+ // fun: this.createOutsourcingOrder
+ // })
}
if (this.permissions.masterproductionschedule_create_order_manual) {
- this.orderTypeArr.push({
- label: '鎵嬪姩鏂板',
- command: 'MANUAL',
- disabled: false,
- permitArr: ['02processed']
- })
+ // this.orderTypeArr.push({
+ // label: '鎵嬪姩鏂板',
+ // command: 'MANUAL',
+ // disabled: false,
+ // permitArr: ['02processed']
+ // })
}
if (this.permissions.masterproductionschedule_create_order_auto) {
this.orderTypeArr.push({
@@ -771,8 +771,8 @@
return ''
},
// 鍒犻櫎
- deleteHandle(row) {
- this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
+ deleteMainPlan(row) {
+ this.$confirm('鏄惁纭浣滃簾ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
--
Gitblit v1.9.3