From a6d2ac8b37c95e59e207a20e9fa24b1f6222bf40 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期四, 07 十二月 2023 09:35:43 +0800 Subject: [PATCH] 项目表 --- web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 66 +++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 23 deletions(-) diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue index dfbf98f..cd1a2b4 100644 --- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue +++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue @@ -16,12 +16,12 @@ <el-input v-model="dataForm.project.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input> </el-form-item> <el-form-item label="鐢宠浜�" style="width: 49%"> - <el-input :disabled="stepMarker=='pzxrk_first'" v-model="dataForm.configItemWarehouse.applicant" + <el-input :disabled="stepMarker!=='pzxrk_first'" v-model="dataForm.configItemWarehouse.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉"></el-input> </el-form-item> <el-form-item label="鐢宠鏃ユ湡" style="width: 49%"> <el-date-picker - :disabled="stepMarker=='pzxrk_first'" + :disabled="stepMarker!=='pzxrk_first'" v-model="dataForm.configItemWarehouse.applyDate" type="date" placeholder="璇烽�夋嫨鐢宠鏃ユ湡"> @@ -71,14 +71,7 @@ clearable></zt-dict> </template> </el-table-column> - <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center"> - <template v-slot="{ row }"> - <!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>--> - <table-uploader busi-type="config_item_warehouse" model-name="row" :dataForm="row" - v-model="row.files"/> - </template> - </el-table-column> - <el-table-column fixed="right" label="绠$悊" width="120" align="center"> + <el-table-column v-if="showColumn" fixed="right" label="绠$悊" width="120" align="center"> <template v-slot="{ row }"> <zt-table-button v-if="row.checkId" @click="openCheckOrderWin(row)">淇敼妫�鏌ュ崟 @@ -86,8 +79,13 @@ <zt-table-button v-else-if="',杞欢娴嬭瘯璁″垝锛岃蒋浠舵祴璇曡鏄庯紝杞欢娴嬭瘯璁板綍锛岃蒋浠舵祴璇曟姤鍛�'.indexOf(row.itemName)>0" @click="openCheckOrderWin(row)">鏂板妫�鏌ュ崟 </zt-table-button> - <!-- <table-uploader busi-type="config_item_warehouse" model-name="row" :dataForm="row"--> - <!-- v-model="row.files"/>--> + </template> + </el-table-column> + <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center"> + <template v-slot="{ row }"> + <!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>--> + <table-uploader busi-type="config_item_warehouse" model-name="row" :dataForm="row" + v-model="row.files"/> </template> </el-table-column> </el-table> @@ -120,7 +118,7 @@ <el-table-column prop="examineItem" min-width="300" label="妫�鏌ラ」"></el-table-column> <el-table-column label="妫�鏌ョ粨鏋�" width="250" align="center"> <template slot-scope="scope"> - <zt-dict :disabled="stepMarker=='wplz_qash'" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�" + <zt-dict :disabled="stepMarker!=='wplz_qash'" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�" dict="tristate2" :radio="true" clearable></zt-dict> </template> @@ -134,7 +132,7 @@ </el-table> <div class="el-border-top"> <el-form-item label="瀹℃牳缁撴灉" style="width: 99%"> - <zt-dict :disabled="stepMarker=='wplz_qash'" v-model="dataForm.configItemWarehouse.qaAuditResults" + <zt-dict :disabled="stepMarker!=='wplz_qash'" v-model="dataForm.configItemWarehouse.qaAuditResults" dict="is_pass" :radio="true" clearable></zt-dict> </el-form-item> @@ -173,7 +171,7 @@ </el-table> <div class="el-border-top"> <el-form-item label="瀹℃牳缁撴灉" style="width: 99%"> - <zt-dict :disabled="stepMarker=='wplz_cmsh'" v-model="dataForm.configItemWarehouse.cmAuditResults" + <zt-dict :disabled="stepMarker!=='wplz_cmsh'" v-model="dataForm.configItemWarehouse.cmAuditResults" placeholder="瀹℃牳缁撴灉" dict="is_pass" :radio="true" clearable></zt-dict> </el-form-item> @@ -248,6 +246,7 @@ disabled: true, stepMarker: '', title: '鏌ョ湅', + showColumn:false, menuOptions: [ {pageCode: 'plan', name: '杞欢娴嬭瘯璁″垝'}, {pageCode: 'explain', name: '杞欢娴嬭瘯璇存槑'}, @@ -255,6 +254,7 @@ {pageCode: 'report', name: '杞欢娴嬭瘯鎶ュ憡'}, {pageCode: 'other', name: '鍏朵粬'} ], + pageNameCode: {'杞欢娴嬭瘯璁″垝':'plan', '杞欢娴嬭瘯璇存槑': 'explain', '杞欢娴嬭瘯璁板綍': 'record', '杞欢娴嬭瘯鎶ュ憡': 'report'}, dataForm: { id: '', configItemWarehouse: { @@ -288,11 +288,14 @@ } } }, + created() { + const roleName = localStorage.getItem('roleName') + if (roleName && roleName.includes('QA')) { + this.showColumn = true; + } + }, computed: { - getRoleName() { - console.log(this.$store.state.user.roleName, 'this.$store.state.user.roleName') - return this.$store.state.user.roleName || '' - }, + }, components: { AddOrUpdateCheck @@ -332,7 +335,7 @@ // }, handleCommand(pageCode) { const selectedItem = this.menuOptions.find(item => item.pageCode === pageCode); - console.log(selectedItem,"handleCommand(pageCode) selectedItem") + console.log(selectedItem, "handleCommand(pageCode) selectedItem") if (selectedItem.pageCode === 'other') { this.dataForm.configItemList.push({}) } else if (selectedItem) { @@ -344,11 +347,18 @@ }) }, openCheckOrderWin(row) { - row.projectId = this.dataForm.projectId - this.$refs.addOrUpdate.$refs.dialog.init(null, row) + console.log(row, "openCheckOrderWin(row)") + row.projectId = this.dataForm.projectId + if (!row.pageCode){ + row.pageCode = this.pageNameCode[row.itemName] + console.log(row.itemName,row.pageCode, "row.itemName,openCheckOrderWin(row) row.pageCode") + } + this.$refs.addOrUpdate.$refs.dialog.init(null, row) + }, setCheckId(checkId, row) { - row.checkId = checkId + console.log(checkId, row, "setCheckId(checkId, row)") + this.$set(row, 'checkId', checkId) }, // 鑾峰彇淇℃伅 async getInfo() { @@ -374,6 +384,16 @@ }, // 琛ㄥ崟鎻愪氦 async formSubmit(submitType) { + if (this.showColumn && submitType == 'bl') { + for (let item of this.dataForm.configItemList) { + if (item) { + if (this.pageNameCode[item.itemName] && !item.checkId) { + this.$alert("鏈夋湭鎻愪氦鐨勬鏌ュ崟") + return + } + } + } + } if (submitType == 'tj' || submitType == 'bl') { let flowInfo = { flowCode: 'pzxrk', -- Gitblit v1.9.1