From 90ad8fbf448b1f13f1e0eef4f92cc6283aea3ccc Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 17 Aug 2022 11:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 25 ++++++-------
 .../src/components/tableCollection/index.vue  | 10 +++++-
 .../ParameterItemCollectionList.vue           |  2 +-
 .../regulationsKanban/components/addModel.vue | 36 +++++++++----------
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 3d2a8abce..ecce064fb 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -278,6 +278,18 @@
       <!--      文本+下拉多选-->
       <div v-else-if='detailDate.controlType === "6"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull_more"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      mode="multiple" class='selectWid'
+                      :disabled="item.isLock == '1' ? true: false" allowClear>
+              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.label ">
+                      {{ item.label }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
           <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
@@ -369,18 +381,7 @@
                               v-model="item.dataValue"/>
             </div>
           </div>
-          <div v-if='item.type==="pull_more"'>
-            <a-select v-model="item.dataValue"
-                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                      mode="multiple" class='selectWid'
-                      :disabled="item.isLock == '1' ? true: false" allowClear>
-              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
-                    </span>
-              </a-select-option>
-            </a-select>
-          </div>
+
         </div>
       </div>
       <!--      文本+附件-->
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 63bcabf5f..fdafa80b7 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -25,6 +25,9 @@
           <span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
           <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
         </div>
+        <span slot="ParameterDescription" slot-scope="text,record" :title="text">
+            {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}
+        </span>
 
         <span slot="operationbtn" slot-scope="record">
            <span v-if='currentPersonRole === "homo"'>
@@ -627,7 +630,7 @@
                   title: res.db_field_txt,
                   dataIndex: res.db_field_name,
                   align: 'center',
-                  ellipsis: true,
+                  // ellipsis: true,
                   sorter: res.sort,
                   width: 160
                 })
@@ -640,6 +643,11 @@
                     customRender: 'operationzr'
                   }
                 }
+                if(res.click2){
+                  this.columns[index].scopedSlots = {
+                    customRender: 'ParameterDescription'
+                  }
+                }
                 if (res.click) {
                   // 工程接口人列表修改
                   this.columns[index].scopedSlots = {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index b2ce60267..aaef47f42 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -49,7 +49,7 @@
                       <div class="title-text" :title="$t('NareaOfResponsibility')">
                         <span>{{$t('NareaOfResponsibility')}}</span>
                       </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
                                          :type="'select'"
                                          :triggerChange="false" :dictCode="'duty_territory'"/>
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index b3a67398c..f780a80e4 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -58,28 +58,28 @@
 
       @change='handleTableChange'>
       <span slot="status" slot-scope="text,record" :title="text" >
-        <a v-if="record.designFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a>
-        <a v-if="record.designFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a>
-        <a v-if="record.designFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a>
-        <a v-if="record.designFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a>
-        <a v-if="record.designFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a>
-        <a v-if="record.designFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ text }}</a>
       </span>
       <span slot="statusprehomo" slot-scope="text,record" :title="text" >
-        <a v-if="record.prehomoFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ text }}</a>
       </span>
       <span slot="filstatuse" slot-scope="text,record" :title="text" >
-        <a v-if="record.verifyFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ text }}</a>
       </span>
 
 <!--      <template slot="file" slot-scope="text, record">-->