From 6c52d89cec7a1810e074a3c42963606b3a36df9c Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 11 Aug 2022 11:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
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/components/OcrTable/DocTable.vue | 16 ++++++-------
 .../regulationsKanban/components/addModel.vue | 23 +++++++++++++++----
 .../src/views/regulationsKanban/index.vue     |  8 ++++---
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 858bfb1d5..e31731ca3 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -355,7 +355,7 @@ module.exports = {
   templateDownload: 'Download Template',
   textInformation: 'Document Files',
   relatedInformation: 'Relevant Information',
-  RetrieveFiles: 'Retrieve Library File',
+  RetrieveFiles: 'Select Stored File',
   SplitText: 'Split Library File',
   ImportResults: 'Import Split Results',
   copy: 'Copy',
@@ -589,7 +589,7 @@ module.exports = {
   withdraw: 'Withdraw',
   maintenanceList: 'Maintain',
   instructionForUse: 'Instruction',
-  subtitle: 'Sub-Title',
+  subtitle: 'Sub-title',
   scopeOfApplication: 'Scope',
   correspondingStandard: 'Compare EU/CN',
   implementationCategory: 'Usage',
diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue
index f58b83b24..0d0fa270d 100644
--- a/jero-web/src/components/OcrTable/DocTable.vue
+++ b/jero-web/src/components/OcrTable/DocTable.vue
@@ -150,14 +150,14 @@
           if (res.success) {
             var jsonHead = res.result
             this.columns = []
-            this.columns.push(
-              {
-                title: this.$t('serialNumber'),
-                dataIndex: 'index',
-                key: 'index',
-                align: 'center',
-                customRender: (text, record, index) => `${index + 1}`
-              })
+            // this.columns.push(
+            //   {
+            //     title: this.$t('serialNumber'),
+            //     dataIndex: 'index',
+            //     key: 'index',
+            //     align: 'center',
+            //     customRender: (text, record, index) => `${index + 1}`
+            //   })
             jsonHead.forEach((res, index) => {
               this.columns.push({
                 title: res.db_field_txt,
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 67d93b664..56b430397 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -12,10 +12,16 @@
         <a-row :gutter='24'>
           <a-col :span='9'>
             <a-form-model-item :label="$t('areaOfResponsibility')">
-              <j-dict-select-tag class="box-input" v-model="formData.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+              <a-select class="box-input" v-model="formData.dutyTerritory"
+                        :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')">
+                <a-select-option v-for="(element,index) in dutyTerritory" :key="element.value" :value="element.value">
+                  {{element.text}}
+                </a-select-option>
+              </a-select>
+<!--              <j-dict-select-tag class="box-input" v-model="formData.dutyTerritory"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
             </a-form-model-item>
           </a-col>
           <a-col :span='9'>
@@ -99,6 +105,7 @@ export default {
       loading: false,
       editId: '',
       RelatedItemList:[],
+      dutyTerritory:[],
       columns: [
         {
           title: this.$t('areaOfResponsibility'),
@@ -180,6 +187,7 @@ export default {
   mounted() {
     this.loadData()
     this.getRelatedItemList()
+    this.getdutyTerritory()
   },
   methods: {
     getRelatedItemList(){
@@ -207,6 +215,13 @@ export default {
         }
       })
     },
+    getdutyTerritory(){
+      getAction('sys/dict/getDictItems/duty_territory', { }).then((res) => {
+        if (res.success) {
+          this.dutyTerritory = res.result
+        }
+      })
+    },
     // 法规技术评估列表
     handletechnical(){
 
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 61e782c7b..27c048950 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -83,9 +83,9 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
-        <span slot="projectName" slot-scope="text,record" :title="text">
+        <span slot="technicalField" slot-scope="text,record" :title="text">
           <a @click="entryNameClick(record)">
-            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+            {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }}
           </a>
         </span>
         <span slot="operation" slot-scope="text,record">
@@ -183,7 +183,9 @@ export default {
         {
           title: this.$t('technicalField'),
           align: 'center',
-          dataIndex: 'technologyTerritory_dicText'
+          dataIndex: 'technologyTerritory_dicText',
+          width: 350,
+          scopedSlots: { customRender: 'technicalField' }
         },
         {
           title: this.$t('RegulatoryProcessEvaluationResults'),