From e06313b6dba4774aef0924f342f13e8433f8d6f6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/masterproductionschedule/index.vue | 75 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index b88c6f4..97410ce 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -46,7 +46,7 @@
</el-dropdown-menu>
</el-dropdown>
- <el-dropdown
+ <!-- <el-dropdown
v-if="permissions.masterproductionschedule_doc_relate"
@command="documentHandle"
style="margin-left: 10px"
@@ -63,7 +63,7 @@
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
- </el-dropdown>
+ </el-dropdown> -->
<!--瀹℃牳鐘舵�佹敼鍙�-->
<el-dropdown
v-if="permissions.masterproductionschedule_audit_change"
@@ -82,15 +82,15 @@
>
</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> -->
+ <!-- <el-button
v-if="permissions.masterproductionschedule_sync_scm"
@click="syncScm()"
type="primary"
@@ -103,7 +103,7 @@
type="primary"
style="margin-left:10px;"
>SCM鐘舵�佸彉鏇�
- </el-button>
+ </el-button> -->
</template>
</ttable>
@@ -592,18 +592,18 @@
],
toolbar: [],
operator: [
- {
- text: '璁㈠崟棰勭暀',
- type: 'text',
- size: 'small',
- fun: this.customReserved
- },
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.stockHandle
- },
+ // {
+ // text: '璁㈠崟棰勭暀',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.customReserved
+ // },
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.stockHandle
+ // },
{
text: '鏉ユ簮',
type: 'text',
@@ -611,16 +611,22 @@
fun: this.searchMasterPlanSourceHandle
},
{
- text: '璁㈠崟',
+ text: '浣滃簾',
type: 'text',
size: 'small',
- fun: this.searchOrderHandle
- }
+ fun: this.deleteMainPlan
+ },
+ // {
+ // text: '璁㈠崟',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchOrderHandle
+ // }
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 240,
+ width: 140,
minWidth: 100
}
},
@@ -684,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({
@@ -708,6 +714,7 @@
this.getSysParam(sysParam.IS_REPORT_OPERATION)
},
methods: {
+ deleteMainPlan(row){},
getSysParam(paramKey) {
getSysParam(paramKey).then((response) => {
var paramVal = response.data.data
@@ -764,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