Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -293,7 +293,7 @@ export default {
       },
       roleSwitchListEn: {
         '0': 'R&H Studio',
-        '1': 'studio',
+        '1': 'Regulation',
         '2': 'homo',
         '4': 'Regulatory Engineer/Certification Engineer',
         '11': 'R&H Manager',

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -234,7 +234,7 @@
                 <div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
                      v-if='currentPersonRole == "homo"'>
                   <a-icon type="setting"/>
-                  {{$t('Adjustareasofresponsibility')}}
+                  {{$t('BatchSetting')}}
                 </div>
                 <!--      认证工程师分配填写人-->
                 <div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '>
@@ -272,17 +272,20 @@
               {{$t('dataExport')}}
             </div>
             <!--      导出列表-->
-            <div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
+            <div @click="Derivedlist" class="operator-text"
+                 v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
               <a-icon type="export"/>
               {{$t('Derivedlist')}}
             </div>
             <!--      引用参数-->
-            <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
+            <div @click="referenceparameter" class="operator-text"
+                 v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
               <a-icon type="plus"/>
               {{$t('referenceparameter')}}
             </div>
             <!--            保存-->
-            <div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
+            <div @click="handlePreservation(1)" class="operator-text"
+                 v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
               <a-icon type="check-circle"/>
               {{$t('tempSave')}}
             </div>
@@ -359,12 +362,14 @@
 
           <div class="table-operator" v-if="this.$route.query.it">
             <!--      导出-->
-            <div @click="handleExport('1')" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
+            <div @click="handleExport('1')" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
               <a-icon type="export" :rotate="-90"/>
               {{$t('dataExport')}}
             </div>
             <!--      导出列表-->
-            <div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
+            <div @click="Derivedlist" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
               <a-icon type="export" :rotate="-90"/>
               {{$t('Derivedlist')}}
             </div>
@@ -455,7 +460,7 @@
                @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
     <!--    </a-modal>-->
     <!--    调整责任领域-->
-    <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
+    <a-modal v-model="Adjustareasofrespon" :title="$t('BatchSetting')" width='620px' :footer="null">
       <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
                             @GetgetTableList='GetgetTableList'
                             @AdjustareasofresponAll='AdjustareasofresponAll'/>
@@ -631,27 +636,27 @@
       @ok="exportok"
       @cancel="exportvisiblecancel"
     >
-<!--      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
-            <a-table
-              class="table"
-              :components="drag(columnsexport,'columnsexport')"
-              :columns="columnsexport"
-              :pagination="false"
-              rowKey="id"
-              :scroll="{x: '100%',y: 400}"
-              :data-source="dataSourceexport"
-              :loading="loading"
-            >
+      <!--      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
+      <a-table
+        class="table"
+        :components="drag(columnsexport,'columnsexport')"
+        :columns="columnsexport"
+        :pagination="false"
+        rowKey="id"
+        :scroll="{x: '100%',y: 400}"
+        :data-source="dataSourceexport"
+        :loading="loading"
+      >
              <span slot="operation" slot-scope="text,record">
                 <a @click="exportdata(record)" v-if="record.state == '1'">{{$t('download')}}</a>
                 <a style="margin-left: 5px;" @click="exportdelete(record)">{{$t('delete')}}</a>
              </span>
-<!--              <span slot="detailText" slot-scope="text,record">-->
-<!--                    <span class="text" :title="text">-->
-<!--                     {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
-<!--                    </span>-->
-<!--              </span>-->
-            </a-table>
+        <!--              <span slot="detailText" slot-scope="text,record">-->
+        <!--                    <span class="text" :title="text">-->
+        <!--                     {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
+        <!--                    </span>-->
+        <!--              </span>-->
+      </a-table>
       <div class="page" v-if="dataSourceexport.length > 0">
         <a-pagination
           :show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -706,7 +711,7 @@
         </a-row>
       </a-form-model>
     </a-modal>
-<!--    数据导出异步弹窗-->
+    <!--    数据导出异步弹窗-->
     <a-modal
       :title="$t('dataExport')"
       :width="500"
@@ -736,7 +741,7 @@
 <script>
   import TableCollection from '@/components/tableCollection/index'
   import parameterColumn from '../dialog/parametercolumn'
-  import { getAction, postAction, downloadFile ,deleteAction } from '../../../api/manage'
+  import { getAction, postAction, downloadFile, deleteAction } from '../../../api/manage'
   import eventBUs from '../../../common/event'
   import customizeList from './customizeList'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
@@ -774,7 +779,7 @@
       globalAdvancedQuery,
       batchUpdateDeadline
     },
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       this.statusList = [
         {
@@ -894,7 +899,7 @@
             title: this.$t('status'),
             align: 'left',
             dataIndex: 'stateText',
-            width: 120,
+            width: 120
           },
           {
             title: this.$t('Exporttime'),
@@ -1162,9 +1167,9 @@
       }
       if (this.$route.query.statusFlag == '1') {
         this.formInline.state = '1'
-      } else if(this.$route.query.statusFlag == '2'){
+      } else if (this.$route.query.statusFlag == '2') {
         this.formInline.state = '2'
-      }else if(this.$route.query.statusFlag == '4'){
+      } else if (this.$route.query.statusFlag == '4') {
         this.formInline.state = '4'
       }
       // clearTimeout(this.timeBatch)
@@ -1206,7 +1211,13 @@
     methods: {
       ...mapGetters(['userInfo']),
       getQueryDutyTerritory() {
-        getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => {
+        let url = ''
+        if(this.$route.query.it){
+          url = '/params/collectManifest/queryDutyTerritoryHistory'
+        }else{
+          url = '/params/collectManifest/queryDutyTerritory'
+        }
+        getAction(url, { id: this.$route.query.id }).then((res) => {
           if (res.success) {
             // res.result.push(
             //   {
@@ -1272,20 +1283,29 @@
         this.visibleRoleSwitching = false
       },
       bringInTheProjectInterfaceClick() {
-        let query = {
-          paramsManifestId: this.paramsManifest.id,
-          projectId: this.$route.query.projectId
-        }
-        this.textLoading = true
-        getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
-          if (res.success) {
-            this.$message.success(this.$t('OperationSuccessful'))
-            this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
-          } else {
-            this.$message.warning(this.$t('operationFailed'))
+        if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) {
+          let ids = []
+          this.selectedRowKeysValue.forEach(res => {
+            ids.push(res.id)
+          })
+          let query = {
+            paramsManifestId: this.paramsManifest.id,
+            ids: ids.join(','),
+            projectId: this.$route.query.projectId
           }
-          this.textLoading = false
-        })
+          this.textLoading = true
+          getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+            this.textLoading = false
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
       handleOkRoleSwitching() {
         if (this.$route.query.type == '1') {
@@ -1574,7 +1594,7 @@
         // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
       },
       // 导出列表
-      Derivedlist(){
+      Derivedlist() {
         this.exportvisible = true
         this.expoteList()
       },
@@ -1587,22 +1607,22 @@
         this.pageSizehistory = pageSize
         this.expoteList()
       },
-      exportok(){
+      exportok() {
         this.exportvisible = false
       },
-      exportvisiblecancel(){
+      exportvisiblecancel() {
         this.exportvisible = false
       },
-      exportsubmit(){
+      exportsubmit() {
         this.ExportFailed = false
       },
-      exportcancel(){
+      exportcancel() {
         this.ExportFailed = false
       },
-      exportdata(item){
+      exportdata(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId })
       },
-      exportdelete(item){
+      exportdelete(item) {
         this.$confirm({
           title: this.$t('confirmDeletion'),
           content: '',
@@ -1661,8 +1681,8 @@
               paramsTemplatePublishVersion: 1,
               cut: this.cut,
               userTypes: this.currentPersonRole,
-              exportName: this.$route.query.projectName.slice(0,-3)+ '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')'+'-' + this.$route.query.version,
-              isHistory:this.isHistroy
+              exportName: this.$route.query.projectName.slice(0, -3) + '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')' + '-' + this.$route.query.version,
+              isHistory: this.isHistroy
             }
             let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
             getAction('/params/collectManifest/exportAll', query).then((res) => {
@@ -2325,7 +2345,7 @@
         let selectedRowKeysValue = []
         data.forEach(res => {
           if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
-            res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') {
+            res.state == 'Rejected by homo engineer' || res.state == 'Modify' || res.state == '变更') {
             selectedRowKeysValue.push(res)
           }
         })
@@ -2509,7 +2529,7 @@
                     if (keyNameOne[l].type == 'pull_more') {
                       keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',')
                     }
-                    if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
+                    if ((keyNameOne[l].dataValue == undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
                       this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
                       return
                     }