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

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

@@ -456,6 +456,40 @@
         </a-row>
       </a-form-model>
     </a-modal>
+    <a-modal
+      :title="$t('question')"
+      :width="500"
+      :visible="visibleQuestion"
+      :confirm-loading="confirmLoadingQuestion"
+      :maskClosable="false"
+      @ok="handleOkQuestion"
+      @cancel="handleCancelQuestion"
+    >
+      <a-form-model :model="formInlineQuestion" class="formAdd" :rules="rulesRoleQuestion"
+                    ref="ruleFormQuestion">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-index">
+              <div class="title-text-Comment">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('roleSwitching')">{{ $t('roleSwitching') }}</span>
+              </div>
+              <a-form-model-item class="itemModelComment" :prop="'roleSwitchingCode'">
+                <a-select allowClear :placeholder="$t('pleaseSelect')+$t('roleSwitching')"
+                          v-model="formInlineRoleSwitching.question">
+                  <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
+                  <a-select-option :value="item.roleCode" v-for="item in questionList">
+                 <span class="itemOption-index" :title="item.roleName">
+                     {{ item.roleName }}
+                </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
     <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
     <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
@@ -510,6 +544,8 @@
     data() {
       return {
         toggleSearchStatus: false,
+        visibleQuestion: false,
+        confirmLoadingQuestion: false,
         roleSwitchingList: [],
         listTitle: '',
         orderBy: '1',
@@ -1155,12 +1191,20 @@
       //流程状态点击事件
       designFlowStatusClick(row, name) {
         let query = {}
+        let TaskKey = ''
         if (name == this.$t('designComplianceReview')) {
+          if (row.designFlowStatus == 'Task to be confirmed') {
+            TaskKey = 'zrrqr'
+          } else if (row.designFlowStatus == 'Results to be submitted') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.designFlowStatus == 'Results to be reviewed') {
+            TaskKey = 'fggcssh'
+          }
           query = {
-            actiProcInstId: row.actiProcInstId,
+            actiProcInstId: row.designPId,
             projectTaskInventoryId: row.id,
             projectLibraryId: row.projectLibraryId,
-            TaskKey: row.taskDefinitionKey,
+            TaskKey: TaskKey,
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
@@ -1174,9 +1218,16 @@
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId
           }
-        }else{
+        } else {
+          if (row.verifyFlowStatus == 'Task to be confirmed') {
+            TaskKey = 'zrrqr'
+          } else if (row.verifyFlowStatus == 'Results to be submitted') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.verifyFlowStatus == 'Results to be reviewed') {
+            TaskKey = 'fggcssh'
+          }
           query = {
-            actiProcInstId: row.actiProcInstId,
+            actiProcInstId: row.verifyPId,
             projectTaskInventoryId: row.id,
             projectLibraryId: row.projectLibraryId,
             TaskKey: row.taskDefinitionKey,
@@ -1191,7 +1242,7 @@
             projectName: row.projectName,
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
+            primaryKeyId: row.primaryKeyId
           }
         }
         this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
@@ -1740,6 +1791,7 @@
         this.queryParamQuery = sqp
         this.getList()
       },
+
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if (sorter.columnKey == 'attestationRank_dictText') {
@@ -1751,6 +1803,7 @@
         }
         this.getList()
       },
+
       getHeader() {
         getAction('head/headCustomEO/list', {
           moduleFlag: '法规清单'

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

@@ -213,6 +213,9 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          if (row.taskDefinitionKey == 'fqlc'){
+            row.taskId = ''
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,
@@ -278,6 +281,9 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          if (row.taskDefinitionKey == 'fqlc'){
+            row.taskId = ''
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,

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

@@ -208,6 +208,9 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          if (row.taskDefinitionKey == 'fqlc'){
+            row.taskId = ''
+          }
           query = {
             router: row.router,
             taskIds:row.taskId,
@@ -272,6 +275,9 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          if (row.taskDefinitionKey == 'fqlc'){
+            row.taskId = ''
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,