From 3a9d58496d5a07458f5e888ed627afd847feb183 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 30 十一月 2023 14:23:58 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/sys/task/already-task.vue | 2 +-
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 29 ++++++++++++++++++++---------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 4442ce9..974750f 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -3,15 +3,15 @@
<el-form ref="dataForm" style="padding-top: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm" label-width="120px" class="warehouseFormAuto">
<div >
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
- <span>{{dataForm.configItemWarehouse.code}}</span>
+ <span>{{dataForm.configItemWarehouse.code || '缂栧彿鑷姩鐢熸垚'}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
<div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="warehouseContentWidth">
- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
+ <el-form-item class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
<el-input v-model="dataForm.project.code" placeholder="璇疯緭鍏ラ」鐩紪鍙�"></el-input>
</el-form-item>
- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
+ <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
<el-input v-model="dataForm.project.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</el-form-item>
<el-form-item label="鐢宠浜�" style="width: 49%">
@@ -93,20 +93,20 @@
<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="!$store.state.user.isAdmin" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�" dict="tristate2" :radio="true"
+ <zt-dict :disabled="getRoleName.indexOf('QA瑙掕壊')===-1" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�" dict="tristate2" :radio="true"
clearable></zt-dict>
</template>
</el-table-column>
<el-table-column align="center" width="120" label="涓嶉�傜敤璇存槑">
<template v-slot="{ row }">
- <el-input v-if="$store.state.user.isAdmin" v-model="row.notApplyExplan" placeholder="涓嶉�傜敤璇存槑"></el-input>
+ <el-input v-if="getRoleName.indexOf('QA瑙掕壊')>=0" v-model="row.notApplyExplan" placeholder="涓嶉�傜敤璇存槑"></el-input>
<span v-else>{{row.notApplyExplan}}</span>
</template>
</el-table-column>
</el-table>
<div class="el-border-top">
<el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
- <zt-dict v-model="dataForm.configItemWarehouse.qaAuditResults" dict="is_pass" :radio="true"
+ <zt-dict :disabled="getRoleName.indexOf('QA瑙掕壊')===-1" v-model="dataForm.configItemWarehouse.qaAuditResults" dict="is_pass" :radio="true"
clearable></zt-dict>
</el-form-item>
<el-form-item label="瀹℃牳浜猴細" style="width: 48%">
@@ -129,11 +129,16 @@
<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 v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�" dict="tristate2" :radio="true"
+ <zt-dict :disabled="getRoleName.indexOf('CM瑙掕壊')===-1" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�" dict="tristate2" :radio="true"
clearable></zt-dict>
</template>
</el-table-column>
- <el-table-column prop="notApplyExplan" align="center" width="120" label="涓嶉�傜敤璇存槑"></el-table-column>
+ <el-table-column prop="notApplyExplan" align="center" width="120" label="涓嶉�傜敤璇存槑">
+ <template v-slot="{ row }">
+ <el-input v-if="getRoleName.indexOf('CM瑙掕壊')>=0" v-model="row.notApplyExplan" placeholder="涓嶉�傜敤璇存槑"></el-input>
+ <span v-else>{{row.notApplyExplan}}</span>
+ </template>
+ </el-table-column>
</el-table>
<div class="el-border-top">
<el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
@@ -155,7 +160,7 @@
</div>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-wt-form-item-margin" label-width="20px" style="width: 85%">
- <zt-dict v-model="dataForm.configItemWarehouse.approvalOpinions" dict="is_pass" :radio="true"
+ <zt-dict :disabled="getRoleName.indexOf('閮ㄩ棬SCCB瑙掕壊')===-1" v-model="dataForm.configItemWarehouse.approvalOpinions" dict="is_pass" :radio="true"
clearable></zt-dict>
</el-form-item>
<el-form-item label-width="80%" label="绛惧瓧锛�" style="width: 65%">
@@ -201,6 +206,7 @@
export default {
data() {
return {
+ disabled:true,
dataForm: {
id: '',
configItemWarehouse:{
@@ -233,6 +239,11 @@
}
}
},
+ computed:{
+ getRoleName(){
+ return this.$store.state.user.roleName || ''
+ },
+ },
methods: {
indexFormat(index){
return index += 1
diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index 1999bc6..fed9f3c 100644
--- a/web/src/views/modules/sys/task/already-task.vue
+++ b/web/src/views/modules/sys/task/already-task.vue
@@ -187,7 +187,7 @@
row2.stepMarker = null
if (row.flowCode === 'wplz') {
this.$nextTick(()=>{
- this.$refs.itemCirculatOrder.$refs.dialog.init(row2.id,row2)
+ this.$refs.itemCirculatOrder.$refs.dialog.init(row2.bizId,row2)
})
} else if (row.flowCode === 'aaa') {
//this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
--
Gitblit v1.9.1