Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213

# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -26,8 +26,10 @@
             </div>
           </div>
           <a-table
+            v-if="isTrue"
             ref="table"
             size="middle"
+            :components="drag(columns,'columns')"
             :loading="loading"
             :pagination="false"
             :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
@@ -71,7 +73,7 @@
       </div>
     </div>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
-    <viewFileModel ref="viewFileModelRef"/>
+    <viewFileModel ref="viewFileModelRef" @visible="sVisible"/>
   </div>
 </template>
 
@@ -81,6 +83,7 @@
   import { getAction, putAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import { postAction } from '../../../../api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'evaluationResultsList',
@@ -88,12 +91,14 @@
       uploadFile,
       viewFileModel
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         loading: false,
         total: 0,
         pageSize: 10,
         pageNo: 1,
+        isTrue: true,
         flag: false,
         dataSource: [],
         formInline: {},
@@ -173,6 +178,9 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      sVisible(){
+        this.getDataAdmin()
+      },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
@@ -218,7 +226,7 @@
           actiProcInstId: this.actiProcInstId
         }
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
-          this.$route.query.serialNumber + ' ' + this.$t('evaluationResults') + '.zip', query)
+          this.$route.query.serialNumber+ ' ' +this.$t('evaluationResults') + '.zip', query)
       },
       getData() {
         this.formInline = JSON.parse(JSON.stringify(this.$route.query))
@@ -260,6 +268,12 @@
       seeFileClick(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
       },
+      getDataAdmin(){
+        this.isTrue = false
+        setTimeout(()=>{
+          this.isTrue = true
+        },100)
+      },
       endProcessClick() {
         let query = {
           ids: this.$route.query.id
@@ -279,7 +293,7 @@
 </script>
 
 <style scoped lang="less">
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;
@@ -385,6 +399,10 @@
     text-align: right;
   }
 
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important;
+  }
+
   .operator-text-index {
     display: inline-block;
     /*margin-right: 16px;*/

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -13,6 +13,7 @@
         <a-table
           ref="table"
           size="middle"
+          :components="drag(columns,'columns')"
           :loading="loading"
           :pagination="false"
           :scroll="{x: '100%'}"
@@ -137,6 +138,7 @@
   import moment from 'moment'
   import eventBUs from '../../../../common/event'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'initiatingProcess',
@@ -147,6 +149,7 @@
       footerProcess,
       PersonnelSelection
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -100,6 +100,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 260px)'}"
@@ -141,9 +142,11 @@
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         //url传参严格按照当前命名
@@ -462,4 +465,8 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
+  ::v-deep .ant-table-placeholder {
+    margin-top: 8px !important;
+  }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue

@@ -17,6 +17,7 @@
           </div>
         </div>
         <a-table
+          :components="drag(columns,'columns')"
           :columns="columns"
           :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
           :data-source="dataList"
@@ -54,12 +55,14 @@
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import classificationMaintenanceAdd from './classificationMaintenanceAdd'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'classificationMaintenanceModel',
     components: {
       classificationMaintenanceAdd
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         url: {

jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue

@@ -60,6 +60,7 @@
         </a-form>
       </div>
       <a-table
+        :components="drag(columns,'columns')"
         :columns="columns"
         :rowKey="(record)=>JSON.stringify(record)"
         :scroll="{x: 1200}"
@@ -93,6 +94,7 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'listAddModel',
@@ -100,6 +102,7 @@
       globalAdvancedQuery
     },
     props: ['url'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         toggleSearchStatus: false,
@@ -113,31 +116,36 @@
             title: this.$t('standard'),
             dataIndex: 'serial_number',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('title'),
             dataIndex: 'title',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('zoneOfApplication'),
             dataIndex: 'region',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('ImplementationDate'),
             dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('vehicleInProductionDate'),
             dataIndex: 'implement_time',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           }
         ],
         dataList: [],

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -674,7 +674,7 @@
   }
 </style>
 <style scoped lang="less">
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -3,7 +3,7 @@
     <div class="search-detail-wrap">
       <div class="box-content-left">
         <div class="classification">{{$t('classification')}}:</div>
-        <template v-for="tag in tagList">
+        <template v-for='tag in tagList.slice(0,4)' v-if='!toggleSearchStatus'>
           <a-checkable-tag
             :key="tag.id"
             :title="tag.problemLabel"
@@ -13,6 +13,24 @@
             {{ tag.problemLabel }}
           </a-checkable-tag>
         </template>
+        <template v-for='tag in tagList' v-if='toggleSearchStatus'>
+          <a-checkable-tag
+            :key="tag.id"
+            :title="tag.problemLabel"
+            :checked="selectedTags.indexOf(tag.id) > -1"
+            @change="checked => handleChange(tag.id, checked)"
+          >
+            {{ tag.problemLabel }}
+          </a-checkable-tag>
+        </template>
+        <div style='display: inline-block;margin-bottom: 7px;'>
+        <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+          <a @click="handleToggleSearch">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+      </span>
+      </div>
       </div>
       <div class="box-content-content">
         <div class="box-content-content-index"
@@ -207,6 +225,7 @@
         total: 0,
         selectedTags: [],
         loading: false,
+        toggleSearchStatus: false,
         queryBase: {},
         pageSize: 10,
         queryForm: {},
@@ -444,6 +463,9 @@
           this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(val)))
         })
       },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      }
     }
   }
 </script>

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -73,6 +73,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -130,6 +131,7 @@
   import fillAdd from './modules/fillAdd'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'RegulationMonthlyFill',
@@ -137,6 +139,7 @@
       fillTable,
       fillAdd
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         //url传参严格按照当前命名

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -35,6 +35,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -88,12 +89,14 @@
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import { Base64 } from 'js-base64'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'RegulationMonthlyManagement',
     components: {
       managementAdd
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         //url传参严格按照当前命名

jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue

@@ -61,6 +61,7 @@
       </div>
       <div style="width: 100%">
         <a-table
+          :components="drag(columns,'columns')"
           :columns="columns"
           rowKey="id"
           :scroll="{x: 1200}"
@@ -96,12 +97,14 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'addModel',
     components: {
       globalAdvancedQuery
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     props: {
     },
     data() {
@@ -116,19 +119,22 @@
             title: this.$t('standard'),
             dataIndex: 'serial_number',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('title'),
             dataIndex: 'title',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('zoneOfApplication'),
             dataIndex: 'region',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           // {
           //   title: this.$t('status'),
@@ -146,13 +152,15 @@
             title: this.$t('ImplementationDate'),
             dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('vehicleInProductionDate'),
             dataIndex: 'implement_time',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           }
           // {
           //   title: this.$t('correspondingStandard'),

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -22,6 +22,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:500}"
@@ -55,12 +56,14 @@
 <script>
   import fillTableAdd from './fillTableAdd'
   import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'fillTable',
     components: {
       fillTableAdd
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         visible: false,

jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue

@@ -84,6 +84,7 @@
       </div>
     </div>
     <a-table
+      :components="drag(columns,'columns')"
       :columns="columns"
       :scroll="{x: '100%'}"
       :data-source="dataList"
@@ -131,6 +132,7 @@
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import ImportFile from '@/components/ImportFile/index'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'TermInformation',
@@ -139,6 +141,7 @@
       ImportFile
     },
     props: ['gatherResultList'],
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         url: {
@@ -158,25 +161,29 @@
             title: this.$t('clauseName'),
             dataIndex: 'itemName',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 234
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
             align: 'left',
-            scopedSlots: { customRender: 'clauseContent' }
+            scopedSlots: { customRender: 'clauseContent' },
+            width: 234
           },
           {
             title: this.$t('evaluationMethod'),
             dataIndex: 'evaluationMethods',
             align: 'left',
-            scopedSlots: { customRender: 'evaluationMethod' }
+            scopedSlots: { customRender: 'evaluationMethod' },
+            width: 234
           },
           {
             title: this.$t('Assessor'),
             dataIndex: 'Assessor',
             align: 'left',
-            scopedSlots: { customRender: 'Assessor' }
+            scopedSlots: { customRender: 'Assessor' },
+            width: 234
           },
           {
             title: this.$t('operation'),

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue

@@ -92,6 +92,7 @@
                 <a-table
                   ref="table"
                   size="middle"
+                  :components="drag(columns,'columns')"
                   :loading="loading"
                   :pagination="false"
                   :scroll="{x: '100%',y:'calc(100vh - 260px)'}"
@@ -130,6 +131,7 @@
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import viewFileModel from '@/components/viewFileModel/index'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'evaluationResultsClause',
@@ -137,6 +139,7 @@
       PersonnelSelection,
       viewFileModel
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         queryParam: {},
@@ -161,70 +164,70 @@
           {
             title: this.$t('clauseNo'),
             dataIndex: 'itemNum',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160
           },
           {
             title: this.$t('clauseName'),
             dataIndex: 'itemName',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
-            align: 'center',
+            align: 'left',
             width: 260,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('Assessor'),
             dataIndex: 'evaluatorName',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160
           },
           {
             title: this.$t('evaluationMethod'),
             dataIndex: 'evaluationMethodsName',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160
           },
           {
             title: this.$t('complianceResults'),
             dataIndex: 'complianceResultName',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160
           },
           {
             title: this.$t('nameTechnicalDocument'),
             dataIndex: 'technicalFileName',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 260
           },
           {
             title: this.$t('chapter'),
             dataIndex: 'section',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 260
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'opinion',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 260
           },
           {
             title: this.$t('enclosure'),
             dataIndex: 'accessoryFile',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160,
             scopedSlots: { customRender: 'accessoryFile' }
@@ -232,7 +235,7 @@
           {
             title: this.$t('feedbackTime'),
             dataIndex: 'feedbackTime',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             width: 160
           }
@@ -327,7 +330,7 @@
 </script>
 
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -57,6 +57,7 @@
                 <a-table
                   ref="table"
                   size="middle"
+                  :components="drag(columns,'columns')"
                   :loading="loading"
                   :pagination="false"
                   :scroll="{x: '100%',y:350}"
@@ -85,6 +86,7 @@
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import viewFileModel from '@/components/viewFileModel/index'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'evaluationResultsWhole',
@@ -92,6 +94,7 @@
       PersonnelSelection,
       viewFileModel
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         queryParam: {},
@@ -156,6 +159,7 @@
             title: this.$t('problemDescription'),
             dataIndex: 'issueOrSuggest',
             align: 'left',
+            width: 573,
             ellipsis: true
           },
           {
@@ -264,7 +268,7 @@
 </script>
 
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;
@@ -433,6 +437,10 @@
   /deep/.ant-table-column-title{
     font-weight: bold!important;
   }
+
+  ::v-deep .ant-table-placeholder{
+    margin-top: 8px !important;
+  }
 </style>
 <style>
   .box-clause .ant-card-body {

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -14,6 +14,7 @@
           <a-table
             ref="table"
             size="middle"
+            :components="drag(columns,'columns')"
             :loading="loading"
             :pagination="false"
             :scroll="{x: '100%'}"
@@ -244,6 +245,7 @@
   import moment from 'moment'
   import eventBUs from '../../../../common/event'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'evaluationInitiationProcess',
@@ -256,6 +258,7 @@
       standardDecompositionSheet,
       TermInformation
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -103,6 +103,7 @@
       <a-table
         ref="table"
         size="middle"
+        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
@@ -181,12 +182,14 @@
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import processInformation from './components/processInformation'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
     components: {
       processInformation
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         //url传参严格按照当前命名
@@ -585,4 +588,8 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
+  ::v-deep .ant-table-placeholder {
+    margin-top: 8px !important;
+  }
 </style>