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

jero-web/src/common/lang/en-us.js

@@ -601,7 +601,7 @@ module.exports = {
   selectSplitListDisplay: 'Please select whether to split the document list for display',
   selectDisplayList: 'Please select whether to display in list',
   documentSplitDisplay: 'Document splitting module display',
-  VirtualListName: 'Market List Name',
+  VirtualListName: 'Market Regulation List Name',
   CertificationListName:'Certification List Name',
   listStatus: 'List Status',
   creater: 'Creater',

jero-web/src/common/lang/zh-cn.js

@@ -611,7 +611,7 @@ module.exports = {
   selectSplitListDisplay: '请选择是否文档拆分列表展示',
   selectDisplayList: '请选择是否列表展示',
   documentSplitDisplay: '文档拆分模块展示',
-  VirtualListName: '市场清单名称',
+  VirtualListName: '市场法规清单名称',
   CertificationListName:'认证清单名称',
   VirtualList: '市场清单',
   listStatus: '清单状态',

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

@@ -645,7 +645,6 @@
             align: 'left',
             dataIndex: 'title',
             width: 180,
-            fixed: 'left',
             scopedSlots: { customRender: 'titleName' }
           },
           {

jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue

@@ -8,6 +8,7 @@
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      @change="tableOnChange"
       :data-source="dataSource"
       :columns="columns"
     >
@@ -65,7 +66,7 @@
             dataIndex: 'projectName',
             scopedSlots: { customRender: 'RelatedItems' },
             ellipsis: true,
-            width: 392
+            width: 300
           },
           {
             title: this.$t('standardInformation'),
@@ -73,7 +74,7 @@
             dataIndex: 'standardInfo',
             scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
-            width: 353
+            width: 300
           },
           {
             title: this.$t('taskType'),
@@ -343,6 +344,17 @@
         this.pageSize = pageSize
         this.getList()
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'flowTypeShow') {
+          this.orderByField = 'flowType'
+        } else if (sorter.columnKey == 'taskDefinitionKeyName') {
+          this.orderByField = 'taskDefinitionKey'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -353,6 +365,8 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...queryParam
         }
         this.loading = true

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -40,6 +40,14 @@
         <span slot="approvalResult" slot-scope="text,result">
             {{approvalResult[text]}}
         </span>
+        <span slot="approvalOpinion" slot-scope="text,result">
+      <a-tooltip placement="top">
+        <template slot="title">
+          <span>{{text}}</span>
+        </template>
+        {{text}}
+      </a-tooltip>
+        </span>
         <span slot="resultofhandling" slot-scope="text,result">
             <span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
                  {{result.operatorResultName}}
@@ -159,7 +167,8 @@
             dataIndex: 'approvalOpinion',
             align: 'left',
             width: 200,
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'approvalOpinion' }
           },
           {
             title: this.$t('resultofhandling'),
@@ -186,7 +195,7 @@
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
-          },
+          }
         ]
       }
     },

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -10,6 +10,7 @@
       :rowKey="(record)=>JSON.stringify(record)"
       :data-source="dataSource"
       :columns="columns"
+      @change="tableOnChange"
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
     >
       <!--         -->
@@ -78,7 +79,7 @@
             dataIndex: 'projectName',
             ellipsis: true,
             scopedSlots: { customRender: 'RelatedItems' },
-            width: 339
+            width: 300
           },
           {
             title: this.$t('standardInformation'),
@@ -86,13 +87,14 @@
             dataIndex: 'standardInfo',
             ellipsis: true,
             scopedSlots: { customRender: 'standardInformation' },
-            width: 265
+            width: 300
           },
           {
             title: this.$t('taskType'),
             align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,
+            sorter: true,
             width: 183
           },
           {
@@ -100,6 +102,7 @@
             align: 'left',
             dataIndex: 'taskDefinitionKeyName',
             ellipsis: true,
+            sorter: true,
             width: 183
           },
           {
@@ -122,6 +125,7 @@
             dataIndex: 'endTime',
             ellipsis: true,
             width: 172,
+            sorter: true,
             scopedSlots: { customRender: 'endTime' }
           },
           // {
@@ -417,6 +421,17 @@
         this.pageSize = pageSize
         this.getList()
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'flowTypeShow') {
+          this.orderByField = 'flowType'
+        } else if (sorter.columnKey == 'taskDefinitionKeyName') {
+          this.orderByField = 'taskDefinitionKey'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -427,6 +442,8 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...queryParam
         }
         this.loading = true

jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue

@@ -139,7 +139,9 @@
         return true
       },
       isDrawerClass() {
-        if (this.queryData.TaskKey == 'dezrrtjjfw' || this.queryData.TaskKey == 'zrrtjjfw') {
+        if (this.queryData.TaskKey == 'dezrrtjjfw' ||
+          this.queryData.TaskKey == 'zrrtjjfw' ||
+          this.queryData.TaskKey == 'fggcssh') {
           return true
         }
         return false
@@ -263,6 +265,7 @@
           operatorType: 'taskAffirmQuery'
         }
         this.queryBy.approvalOpinion = ''
+        this.queryBy.approvalFile = ''
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
             this.queryProject = res.result[0] || {}

jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

@@ -8,6 +8,7 @@
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      @change="tableOnChange"
       :data-source="dataSource"
       :columns="columns"
     >
@@ -71,7 +72,7 @@
             dataIndex: 'projectName',
             ellipsis: true,
             scopedSlots: { customRender: 'RelatedItems' },
-            width: 392
+            width: 300
           },
           {
             title: this.$t('standardInformation'),
@@ -79,7 +80,7 @@
             dataIndex: 'standardInfo',
             ellipsis: true,
             scopedSlots: { customRender: 'standardInformation' },
-            width: 353
+            width: 300
           },
           {
             title: this.$t('taskType'),
@@ -337,6 +338,17 @@
         this.pageSize = pageSize
         this.getList()
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'flowTypeShow') {
+          this.orderByField = 'flowType'
+        } else if (sorter.columnKey == 'taskDefinitionKeyName') {
+          this.orderByField = 'taskDefinitionKey'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
@@ -347,6 +359,8 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...queryParam
         }
         this.loading = true

jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue

@@ -49,6 +49,9 @@
               <a-radio value="Transfer" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'zrrqr'">
                 {{$t('turnToDo')}}
               </a-radio>
+              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">
+                {{this.$t('PersonnelSelection')}}
+              </a-button>
               <span>
                 {{this.formInline.dezrrSubmitUserName}}
               </span>
@@ -71,7 +74,8 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row :gutter="24" v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw'">
+      <a-row :gutter="24"
+             v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'fggcssh'">
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
@@ -111,6 +115,7 @@
     data() {
       return {
         formInline: {},
+        isPersonnel: false,
         reviewResult: {
           'launch': this.$t('Launch'),
           'Compliance': this.$t('accord'),
@@ -171,7 +176,6 @@
       if (this.queryBy.disposeResult == 'To be tracked' || this.queryBy.disposeResult == 'Non-Compliance') {
         this.isAdopt = true
       }
-      console.log(this.isAdopt)
     },
     methods: {
       submit(callBack) {
@@ -181,11 +185,16 @@
           }
         })
       },
+      PersonnelSelectionClick() {
+        this.$refs.SelectedByRef.getPush()
+      },
       reviewResultChange(value) {
         if (value.target.value == 'Transfer') {
-          this.$refs.SelectedByRef.getPush()
+          this.isPersonnel = true
+          // this.$refs.SelectedByRef.getPush()
         } else {
           this.$refs.SelectedByRef.visible = false
+          this.isPersonnel = false
           this.formInline.secondChargePersonUserId = ''
           this.formInline.dezrrSubmitUserName = ''
           this.formInline.dezrrSubmitUserId = ''

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -76,7 +76,7 @@
         </a-row>
       </a-form>
     </div>
-    <div class="table-operator" style="margin-bottom: 8px"
+    <div class="table-operator" style="margin-bottom: 0"
          v-if="tabActive == $t('toDoProcess')">
       <div @click="TaskresponsibilityrecognitionClick"
            class="operator-text">

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -304,6 +304,7 @@
             align: 'left',
             dataIndex: 'category',
             width: 200,
+            sorter: true,
             // fixed: 'left',
             ellipsis: true
           },
@@ -313,12 +314,14 @@
             dataIndex: 'inspectionItem',
             width: 200,
             ellipsis: true,
+            sorter: true,
             // fixed: 'left',
             scopedSlots: { customRender: 'inspectionItems' }
           },
           {
             title: this.$t('configurationItem'),
             align: 'left',
+            sorter: true,
             dataIndex: 'configItem',
             width: 200,
             ellipsis: true
@@ -326,6 +329,7 @@
           {
             title: 'WVTA ID',
             align: 'left',
+            sorter: true,
             dataIndex: 'wvtaId',
             width: 200,
             ellipsis: true
@@ -335,6 +339,7 @@
             align: 'left',
             dataIndex: 'serialNumber',
             width: 210,
+            sorter: true,
             ellipsis: true
           },
           {
@@ -342,11 +347,13 @@
             align: 'left',
             dataIndex: 'dutyTerritoryName',
             width: 200,
+            sorter: true,
             ellipsis: true
           },
           {
             title: this.$t('typeOfDeliverables'),
             align: 'left',
+            sorter: true,
             dataIndex: 'deliverableTypeName',
             width: 330,
             ellipsis: true
@@ -500,18 +507,10 @@
       },
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
-        if (sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText') {
-          this.orderByField = 'shi4Yong4Fan4Wei2'
-        } else if (sorter.columnKey == 'state_dictText') {
-          this.orderByField = 'state'
-        } else if (sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') {
-          this.orderByField = 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
-        } else if (sorter.columnKey == 'implementTime') {
-          this.orderByField = 'implement_time'
-        } else if (sorter.columnKey == 'dutyTerritory_dictText') {
+        if (sorter.columnKey == 'dutyTerritoryName') {
           this.orderByField = 'dutyTerritory'
-        } else if (sorter.columnKey == 'attestationRank_dictText') {
-          this.orderByField = 'attestationRank'
+        } else if (sorter.columnKey == 'deliverableTypeName') {
+          this.orderByField = 'deliverableType'
         } else {
           this.orderByField = sorter.columnKey
         }