修改法规清单的列表设置

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

@@ -863,7 +863,7 @@
             headFieldEn: 'Process Status',
             field: 'designFlowStatusName',
             affirmFlag: '1',
-            key: 24 ,
+            key: 24,
             moduleFlag: '法规清单'
           },
           {
@@ -1496,6 +1496,7 @@
                 this.visibleRoleSwitching = false
                 this.confirmLoadingRoleSwitching = false
                 this.$emit('getRoleSwitch', this.formInlineRoleSwitching.roleSwitchingCode)
+                this.selectedRowKeys = []
                 this.getList()
               } else {
                 this.confirmLoadingRoleSwitching = false
@@ -1868,97 +1869,6 @@
         }
       },
 
-      initiateTaskConfirmationClick(name) {
-        this.timeName = name
-        this.listTitle = this.$t('taskConfirmationDeadline')
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          let isTrue = true
-          this.TaskSuccessList = []
-          this.TaskWarningList = []
-          let dataList = []
-          for (let i = 0; i < this.dataSource.length; i++) {
-            for (let j = 0; j < selectedRowKeys.length; j++) {
-              if (this.dataSource[i].id == selectedRowKeys[j]) {
-                dataList.push(this.dataSource[i])
-              }
-            }
-          }
-          for (let i = 0; i < dataList.length; i++) {
-            if ((dataList[i].taskAffirmStatus == 'Not started' || dataList[i].taskAffirmStatus == 'Rejected') &&
-              dataList[i].inventoryAffirmStatus == 'Accepted') {
-              if (dataList[i].engineeringInterfacePerson) {
-                if (dataList[i].verifyDeliverableType) {
-                  if (dataList[i].verifyDueDate && dataList[i].verifyDutyId
-                    && dataList[i].verifyInitiatorId) {
-                  } else {
-                    this.TaskWarningList.push(
-                    < div > { dataList[i].serialNumber + this.$t('pleaseConformityVerification') } < /div>)
-                    continue
-                    // isTrue = false
-                    // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
-                    // return
-                  }
-                }
-
-                if (dataList[i].prehomoDeliverableType) {
-                  if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId
-                    && dataList[i].prehomoInitiatorId) {
-                  } else {
-                    this.TaskWarningList.push(
-                    < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
-                    continue
-                    // isTrue = false
-                    // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
-                    // return
-                  }
-                }
-
-                if (dataList[i].designDeliverableType) {
-                  if (dataList[i].designDueDate && dataList[i].designDutyId
-                    && dataList[i].designInitiatorId) {
-                  } else {
-                    this.TaskWarningList.push(
-                    < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>)
-                    continue
-                    // isTrue = false
-                    // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
-                    // return
-                  }
-                }
-                this.TaskSuccessList.push(dataList[i])
-              } else {
-                this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('theProjectContactEmpty') } < /div>)
-                // isTrue = false
-                // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty'))
-                // return
-              }
-            } else {
-              this.TaskWarningList.push(
-              < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>)
-              // isTrue = false
-              // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected'))
-              // return
-            }
-          }
-          if (this.TaskSuccessList && this.TaskSuccessList.length > 0) {
-            this.visible = true
-            this.formInline = {}
-          } else {
-            let that = this
-            this.$warning({
-              content: (
-                < div >
-                { that.TaskWarningList }
-                < /div>
-            )
-          })
-          }
-        } else {
-          this.$message.warning(this.$t('selectLeastOne'))
-        }
-      },
-
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
@@ -2198,7 +2108,7 @@
           if (dataList[i].verifyFlowStatus == 'List to be checked') {
             if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
               this.requestsNum++
-              _this.startProcess(dataList[i], 2, this.requestsNum)
+              _this.startProcess(dataList[i], 4, this.requestsNum)
             }
           } else {
             _this.detailedWarningList.push(

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

@@ -272,11 +272,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
         } else if (row.flowType == '4') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -306,11 +302,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
         }
       },
       searchQuery(value) {

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

@@ -109,7 +109,7 @@
           },
           {
             title: this.$t('Tasknode'),
-            dataIndex: 'taskDefinitionKeyName',
+            dataIndex: 'name',
             align: 'left',
             width: 180,
             ellipsis: true

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

@@ -160,7 +160,7 @@
           {
             title: this.$t('areaOfResponsibility'),
             align: 'left',
-            dataIndex: '',
+            dataIndex: 'dutyTerritoryName',
             ellipsis: true,
             width: 120
           },
@@ -204,7 +204,7 @@
           {
             title: this.$t('areaOfResponsibility'),
             align: 'left',
-            dataIndex: '',
+            dataIndex: 'dutyTerritoryName',
             ellipsis: true,
             width: 120
           },

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

@@ -178,6 +178,7 @@
         })
       },
       getList(row, title) {
+        console.log(row)
         this.queryData = row
         this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay)
         this.loading = true

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

@@ -296,11 +296,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
         }
       },
       searchQuery(value) {

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

@@ -4,7 +4,7 @@
       <div class="header-text">
         {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey
         == 'dezrrtjjfw'
-        ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
+        ? $t('personLiableConfirm'):$t('sponsorReview')}}
       </div>
     </div>
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">