From b3ebb6f99f647a08cac70ebd9cf1baabdffc6852 Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期三, 20 十二月 2023 14:55:56 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/technology/completeproductstructure/index.vue | 109 ++++++++++++++++++++---------------------------------- 1 files changed, 40 insertions(+), 69 deletions(-) diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue index 7903eab..b1b962e 100644 --- a/src/views/technology/completeproductstructure/index.vue +++ b/src/views/technology/completeproductstructure/index.vue @@ -10,7 +10,21 @@ :ajaxFun="ajaxFun" ref="completeProductStructureTable" > - <template #toolbar></template> + <template #toolbar> + <el-button type="primary" @click="addByStructureHandle" + v-if="permissions.technology_completeproductstructure_bom">浜у搧缁撴瀯鐢熸垚BOM</el-button> + <el-button @click="() => {this.approveHandle('ACCEPT')}" + :disabled="uniqueStateArr.includes('01draft')" + v-if="permissions.technology_completeproductstructure_accept">鎵瑰噯</el-button> + <el-button @click="() => {this.approveHandle('REVOKE')}" + :disabled="uniqueStateArr.includes('02accepted')" + v-if="permissions.technology_completeproductstructure_revoke">鎾ゅ洖</el-button> + <el-button @click="() => {this.approveHandle('CANCEL')}" + :disabled="uniqueStateArr.includes('02accepted')" + v-if="permissions.technology_completeproductstructure_cancel">鎷掔粷</el-button> + <el-button @click="() => {this.deleteAll()}" type="primary" + v-if="permissions.technology_completeproductstructure_batch_delete">鎵归噺鍒犻櫎</el-button> + </template> </ttable> </basic-container> </div> @@ -214,54 +228,7 @@ searchInfoType: 'datetimerange', }, ], - toolbar: [ - // { - // text: '鏂板', - // type: 'primary', - // fun: this.addOrUpdateHandle, - // disabled: false, - // permitArr: [] - // }, - { - type: 'primary', - text: '浜у搧缁撴瀯鐢熸垚BOM', - fun: this.addByStructureHandle, - disabled: false, - permitArr: [], - }, - { - text: '鎵瑰噯', - fun: () => { - this.approveHandle('ACCEPT') - }, - disabled: false, - permitArr: ['01draft'], - }, - { - text: '鎾ゅ洖', - fun: () => { - this.approveHandle('REVOKE') - }, - disabled: false, - permitArr: ['02accepted'], - }, - { - text: '鎷掔粷', - fun: () => { - this.approveHandle('CANCEL') - }, - disabled: false, - permitArr: ['02accepted'], - }, - { - text: '鍒犻櫎', - fun: () => { - this.deleteAll() - }, - disabled: false, - permitArr: [], - }, - ], + toolbar: [], operator: [ { text: '鍒犻櫎', @@ -291,6 +258,7 @@ label: '宸插彇娑�', }, ], + uniqueStateArr: [], bomTypeDbOptions: [], } }, @@ -333,6 +301,10 @@ }, // 鏂板 / 淇敼 addOrUpdateHandle(row) { + if(!this.permissions.technology_completeproductstructure_edit && row.id!=null){ + this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�") + return + } this.$router.push({ name: 'completeProductStructure', params: { id: row == null ? null : row.id }, @@ -341,8 +313,6 @@ // 鎸変骇鍝佺粨鏋勭敓鎴怋OM addByStructureHandle() { addByStructure().then((res) => { - // let result = Array.from(new Set(res.data.data)) - // this.$message.success(result.join(',')) console.log(res.data.data); let mes=""; res.data.data.forEach(item=>{ @@ -355,13 +325,13 @@ }) this.getData() }) - // this.$message({ - // message: '宸插湪鍚庡彴鐢熸垚BOM锛岃鎵ц缁撴潫鍚庡埛鏂伴〉闈�', - // type: 'success', - // }) }, // 鍒犻櫎 deleteHandle(row) { + if(!this.permissions.technology_completeproductstructure_del){ + this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�") + return + } this.$confirm('鏄惁纭鍒犻櫎缂栧彿涓�' + row.number, '鎻愮ず', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', @@ -453,21 +423,22 @@ uniqueStateArr.push(stateArr[i]) } } + this.uniqueStateArr = uniqueStateArr // 寰幆琛ㄥご鎸夐挳锛屽垽鏂瘡涓寜閽殑permitArr鏄惁瀹屽叏鍖呭惈閫変腑鐘舵�侊紝鑻ュ畬鍏ㄥ寘鍚紝鍒欐寜閽寒锛屽惁鍒欐寜閽伆 - var toolbar = this.table.toolbar - for (var j = 0; j < toolbar.length; j++) { - if ( - uniqueStateArr.every((val) => - toolbar[j].permitArr.length <= 0 - ? true - : toolbar[j].permitArr.includes(val) - ) - ) { - toolbar[j].disabled = false - } else { - toolbar[j].disabled = true - } - } + // var toolbar = this.table.toolbar + // for (var j = 0; j < toolbar.length; j++) { + // if ( + // uniqueStateArr.every((val) => + // toolbar[j].permitArr.length <= 0 + // ? true + // : toolbar[j].permitArr.includes(val) + // ) + // ) { + // toolbar[j].disabled = false + // } else { + // toolbar[j].disabled = true + // } + // } // 灏嗛�変腑璁板綍璧嬪�肩粰multipleSelection this.multipleSelection = val }, -- Gitblit v1.9.3