From a48ded866d223f581944ea9043df1b296b3425e3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:17:46 +0800
Subject: [PATCH] modified: src/views/basic/company/index.vue modified: src/views/basic/customizeparamtemplatetype/index.vue modified: src/views/basic/division/index.vue modified: src/views/basic/factory/index.vue modified: src/views/basic/location/index.vue modified: src/views/basic/param/index.vue modified: src/views/basic/part/index.vue modified: src/views/basic/post/index.vue modified: src/views/basic/shift/index.vue modified: src/views/basic/staff/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/warehouse/index.vue modified: src/views/basic/workstation/index.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/plan/masterproductionschedule/index.vue modified: src/views/plan/operationtask/index.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/technology/completeproductstructure/index.vue modified: src/views/technology/document/index.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/routing/index.vue modified: src/views/technology/structure/index.vue modified: src/views/warehouse/FinishedWarehousing/index.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/pallettransports/index.vue
---
src/views/plan/masterproductionschedule/index.vue | 106 +++++++++++++++++-----------------------------------
1 files changed, 35 insertions(+), 71 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 988e12c..5aca1b1 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,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()"
@@ -411,7 +411,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '140',
prop: 'inventoryReservedQuantity',
label: '搴撳瓨棰勭暀鏁伴噺',
@@ -419,8 +419,8 @@
isTrue: true,
isSearch: false,
searchInfoType: 'text'
- },
- {
+ }, */
+ /* {
minWidth: '140',
prop: 'outsourcingNumber',
label: '濮斿鏁伴噺',
@@ -428,7 +428,7 @@
isTrue: true,
isSearch: false,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '140',
prop: 'manufacturingQuantity',
@@ -552,7 +552,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }/* ,
{
minWidth: '140',
prop: 'outerColor',
@@ -588,39 +588,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- }
+ } */
],
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.searchMasterPlanSourceHandle
- },
- {
- text: '璁㈠崟',
- type: 'text',
- size: 'small',
- fun: this.searchOrderHandle
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 240,
+ width: 140,
minWidth: 100
}
},
@@ -662,40 +637,25 @@
},
created() {
this.getManufactureAttrs()
- /*
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addMasterProductionSchedule,
- disabled: false,
- permitArr: []
- },
- {
- text: '鍒涘缓濮斿璁㈠崟',
- fun: this.createOutsourcingOrder
- } */
- if (this.permissions.plan_masterproductionschedule_add) {
- this.table.toolbar.push({
- text: '鏂板',
- type: 'primary',
- fun: this.addMasterProductionSchedule,
- disabled: false,
- permitArr: []
- })
+ let optionList = []
+ if(this.permissions.masterproductionschedule_view_source){
+ optionList.push({
+ text: '鏉ユ簮',
+ type: 'text',
+ size: 'small',
+ fun: this.searchMasterPlanSourceHandle
+ })
}
- if (this.permissions.masterproductionschedule_create_outsourcing) {
- this.table.toolbar.push({
- text: '鍒涘缓濮斿璁㈠崟',
- fun: this.createOutsourcingOrder
- })
+ if(this.permissions.plan_masterproductionschedule_del){
+ optionList.push({
+ text: '浣滃簾',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteMainPlan
+ })
}
- if (this.permissions.masterproductionschedule_create_order_manual) {
- this.orderTypeArr.push({
- label: '鎵嬪姩鏂板',
- command: 'MANUAL',
- disabled: false,
- permitArr: ['02processed']
- })
+ if(optionList.length>0){
+ this.table.operator = optionList
}
if (this.permissions.masterproductionschedule_create_order_auto) {
this.orderTypeArr.push({
@@ -749,6 +709,10 @@
},
// 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.plan_masterproductionschedule_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�");
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row ? row.id : row, row ? row.state : row)
@@ -764,8 +728,8 @@
return ''
},
// 鍒犻櫎
- deleteHandle(row) {
- this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
+ deleteMainPlan(row) {
+ this.$confirm('鏄惁纭浣滃簾ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
--
Gitblit v1.9.3