From 0e6a8a363252daee6f082231a6fa33c237018041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 14 Mar 2023 16:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  4 +--
 jero-web/src/common/lang/zh-cn.js             |  3 +-
 .../documentManage/tags/dialog/DicList.vue    | 29 ++++++++++++++++++-
 .../documentManage/tags/tabs/TagContent.vue   | 15 +++++-----
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a3cae3c90..84df9ad14 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1432,6 +1432,6 @@ module.exports = {
   onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected',
   youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved',
   batchmodify:'Whether to batch modify',
-  onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected'
-
+  onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected',
+  type:'type',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 94cd7224c..0794ef912 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1534,5 +1534,6 @@ module.exports = {
   onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
   youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据',
   batchmodify:'是否批量修改',
-  onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据'
+  onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据',
+  type:'类型',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
index 383f989e0..aea21c70d 100644
--- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue
@@ -55,6 +55,15 @@
           <a-form-model-item :label="$t('enName')" prop="enName">
             <a-input v-model.trim="form.enName" :placeholder="$t('PleaseEnterYourEnglishName')"/>
           </a-form-model-item>
+          <a-form-model-item :label="$t('type')" prop="valueType" v-if="record.id == '1635543933669818369'">
+            <a-select v-model="form.valueType"
+                      :placeholder="$t('pleaseSelect')"
+                      allowClear>
+              <a-select-option :value="item.id" v-for="(item, index) in valueTypeList" :key="item.id">
+                {{item.name}}
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
           <a-form-model-item :label="$t('ParentName')" prop="pid" v-if="parentVisible">
             <a-select v-model="form.pid" @change="handleChange" :placeholder="$t('pleaseSelect')" allowClear>
               <a-select-option :value="item.id" v-for="(item, index) in parentDataPid" :key="item.id">
@@ -105,6 +114,20 @@
           pageSize: 10
         },//查询条件
         form: {},
+        valueTypeList:[
+          {
+            id:'file',
+            name:this.$t('enclosure')
+          },
+          {
+            id:'text',
+            name:this.$t('text')
+          },
+          {
+            id:'N/A',
+            name:'NA'
+          }
+        ],
         newVisible: false,
         rules: {
           name: [
@@ -112,6 +135,9 @@
             { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
             { validator: this.test }
           ],
+          valueType:[
+            { required: true, message: this.$t('type') + this.$t('cannotEmpty'), trigger: 'change' },
+          ],
           itemText: [
             { required: true, message: this.$t('enterName'), trigger: 'blur' },
             { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
@@ -147,7 +173,8 @@
         editPId: '',
         tabletreeDataSource: [],
         flag: false,  //提交表单标识
-        parentDataPid: []
+        parentDataPid: [],
+        valueTypeVisible:true
       }
     },
     watch: {
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
index 58ca41b03..74bcfe483 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
@@ -73,8 +73,9 @@
 
       <template slot="action" slot-scope="text, record">
         <a class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
-        <a class="action-edit" @click="actionEdit(record)" v-has="'dict:edit'">{{$t('edit')}}</a>
-        <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dict:logicDelete'">{{$t('delete')}}</a>
+        <a class="action-edit" v-if="record.id != '1635543933669818369'" @click="actionEdit(record)" v-has="'dict:edit'">{{$t('edit')}}</a>
+        <a class="action-delete" v-if="record.id != '1635543933669818369'" href="javascript:;" @click="onDelete(record)"
+           v-has="'dict:logicDelete'">{{$t('delete')}}</a>
       </template>
       <template slot="describe" slot-scope="text, record">
         <span class="text" :title="text">
@@ -124,7 +125,7 @@
       // tabTable,
       DicList
     },
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         title: this.$t('add'),
@@ -244,13 +245,13 @@
             this.loading = false
             this.total = res.result.total
             this.tableData = [...res.result.records]
-          }else{
+          } else {
             this.loading = false
           }
         })
-      //  .finally(() => {
-      //  this.loading = false
-      //})
+        //  .finally(() => {
+        //  this.loading = false
+        //})
       },
       //查询
       searchQuery() {