From e3e35ace6ff48882dadaa7d8ea408e864670f951 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 30 十一月 2023 11:15:27 +0800
Subject: [PATCH] 项目表
---
web/packages/components/zt-dict/src/zt-dict.vue | 4 ++--
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 11 ++++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/web/packages/components/zt-dict/src/zt-dict.vue b/web/packages/components/zt-dict/src/zt-dict.vue
index 23c02b1..e943ef1 100644
--- a/web/packages/components/zt-dict/src/zt-dict.vue
+++ b/web/packages/components/zt-dict/src/zt-dict.vue
@@ -3,8 +3,8 @@
<el-select :value="dictValue" @change="changeProjectMajor" @input="$emit('input', $event)" :placeholder="placeholder" clearable style="width: 100%;" v-if="showType === 'select'" :disabled="disabled">
<el-option :label="data.dictLabel" v-for="data in dicts" :key="data.dictValue" :value ="data.dictValue">{{data.dictLabel}}</el-option>
</el-select>
- <div v-if="showType === 'radio'" :disabled="disabled">
- <el-radio-group :value="dictValue" @input="$emit('input', $event)">
+ <div v-if="showType === 'radio'">
+ <el-radio-group :value="dictValue" @input="$emit('input', $event)" :disabled="disabled">
<el-radio :label="data.dictValue" v-for="data in dicts" :key="data.dictValue">{{data.dictLabel}}</el-radio>
<el-input class="radio-input" v-if="isOtherOptionSelected" v-model="inputName"></el-input>
</el-radio-group>
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index fbc1277..4442ce9 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
<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">
@@ -93,11 +93,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="!$store.state.user.isAdmin" 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 align="center" width="120" label="涓嶉�傜敤璇存槑">
+ <template v-slot="{ row }">
+ <el-input v-if="$store.state.user.isAdmin" 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%">
--
Gitblit v1.9.1