From d96683b1c5cdcbd53c6a983663c3bff0acc39239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 3 Aug 2023 18:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=AE=A1=E7=90=86CN=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=B8=85=E5=8D=95=E7=9A=84=E8=B4=A3=E4=BB=BB=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParameterItemCollectionList.vue           | 71 +++++++++++++++----
 1 file changed, 58 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 7438dfd48..2409c227d 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -70,10 +70,24 @@
                       <div class="title-text" :title="$t('NareaOfResponsibility')">
                         <span>{{$t('NareaOfResponsibility')}}</span>
                       </div>
-                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                                          :type="'select'"
-                                          :triggerChange="false" :dictCode="'duty_territory'"/>
+                      <a-select
+                        class="box-input"
+                        mode="multiple"
+                        v-model="formInline.dutyTerritory"
+                        :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')">
+                        <a-select-option
+                          v-for="(item,index) in dutyTerritoryList"
+                          :key="index"
+                          :value="item.key">
+                    <span class="itemOption" :title="item.value">
+                     {{ item.value}}
+                    </span>
+                        </a-select-option>
+                      </a-select>
+                      <!--                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+                      <!--                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"-->
+                      <!--                                          :type="'select'"-->
+                      <!--                                          :triggerChange="false" :dictCode="'duty_territory'"/>-->
                     </div>
                   </a-col>
                   <template v-if="toggleSearchStatus">
@@ -247,7 +261,8 @@
               {{$t('Assignedby')}}
             </div>
             <!--      导出-->
-            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
+            <div @click="handleExport" class="operator-text"
+                 v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
               <a-icon type="export"/>
               {{$t('dataExport')}}
             </div>
@@ -602,14 +617,15 @@
       >
         <a-row :gutter="24">
           <a-col :span="24">
-            <div class="box-title-text" >
+            <div class="box-title-text">
               <div class="title-text" :title="$t('exportOption')" style='margin-top: -17px;'>
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('exportOption')">
                 {{$t('exportOption')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="exportOption">
-                <a-select class="box-input" allowClear v-model="dataExportformInline.exportOption" :placeholder="$t('PleaseSelect')+$t('exportOption')">
+                <a-select class="box-input" allowClear v-model="dataExportformInline.exportOption"
+                          :placeholder="$t('PleaseSelect')+$t('exportOption')">
                   <a-select-option :value="'1'">
                     {{$t('includeTitle')}}
                   </a-select-option>
@@ -973,8 +989,8 @@
         },
         rules: {},
         dataExportrules: {
-          exportOption:[
-            { required: true, message: this.$t('PleaseSelect')+this.$t('exportOption'), trigger: 'change' }
+          exportOption: [
+            { required: true, message: this.$t('PleaseSelect') + this.$t('exportOption'), trigger: 'change' }
           ]
         },
         FreezeList: [], // 冻结字段
@@ -998,7 +1014,8 @@
         NotSelectedNoEngineerValue: [],
         paramsManifest: {},
         timeBatch: '',
-        timer: ''
+        timer: '',
+        dutyTerritoryList: []
       }
     },
     props: {
@@ -1014,6 +1031,7 @@
       window.addEventListener('keyup', this.handleKeyup)
       window.addEventListener('click', this.handleClick)
       this.GetgetLoginUserType()
+      this.getQueryDutyTerritory()
       console.log(this.currentPersonRole)
       if (this.$route.query.type == '1') {
         this.handleOkRoleSwitching()
@@ -1056,6 +1074,15 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getQueryDutyTerritory() {
+        getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
+      },
       handleKeyup() {
         clearTimeout(this.timer)
         clearTimeout(this.timeBatch)
@@ -1397,9 +1424,9 @@
         // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
       },
       // 导出确定
-      handleExportSubmit(){
+      handleExportSubmit() {
         this.$refs.dataExportruleForm.validate(valid => {
-          if(valid){
+          if (valid) {
             this.$message.success(this.$t('Intheexport'))
             let long = localStorage.getItem('language')
             this.cut = ''
@@ -1411,7 +1438,7 @@
             let query = {
               paramsManifestId: this.paramsManifest.id,
               paramsTemplateId: this.$route.query.paramsTemplateId,
-              exportOption:this.dataExportformInline.exportOption,
+              exportOption: this.dataExportformInline.exportOption,
               paramsTemplatePublishVersion: 1,
               cut: this.cut,
               userTypes: this.currentPersonRole,
@@ -2710,11 +2737,13 @@
     height: 42px;
     line-height: 36px;
   }
+
   .itemModel {
     width: 100%;
     display: inline-block;
     margin-top: 2px;
   }
+
   .box-input .ant-select-selection {
     height: 38px !important;
   }
@@ -2887,6 +2916,14 @@
     color: #00B3BE;
   }
 
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
 </style>
 <style lang='less'>
   .popconfirmIndex .ant-popover-message-title {
@@ -2906,4 +2943,12 @@
   .popconfirmDetailsText .anticon-exclamation-circle {
     display: none !important;
   }
+
+  .ant-select-selection--multiple {
+    overflow: auto;
+  }
+
+  .ant-select-selection--multiple::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
 </style>
\ No newline at end of file