修改法规清单

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

@@ -279,7 +279,7 @@
             TaskKey: row.taskDefinitionKey,
             isDisplay: true,
             flowType: 2,
-            Sponsor: 'designInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'designDutyName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
@@ -296,7 +296,7 @@
           //   query: query
           // })
           // window.open(newUrl.href, '_blank')
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)),this.$t('designComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
 
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
@@ -349,7 +349,7 @@
             TaskKey: row.taskDefinitionKey,
             flowType: 4,
             isDisplay: true,
-            Sponsor: 'verifyInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'verifyDutyName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
@@ -366,8 +366,7 @@
           //   query: query
           // })
           // window.open(newUrl.href, '_blank')
-          this.visible = true
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
-          this.title = this.$t('verificationComplianceReview')
         }
       },
       searchQuery(value) {

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

@@ -91,15 +91,7 @@
             value: 'projectName'
           },
           {
-            title: this.$t('targetMarket'),
+            title: this.$t('regulationNo'),
-            value: 'targetMarket_dictText'
-          },
-          {
-            title: this.$t('subtitle'),
-            value: 'subtitle'
-          },
-          {
-            title: this.$t('standard'),
             value: 'serialNumber',
             type: '4'
           },
@@ -107,6 +99,10 @@
             title: this.$t('title'),
             value: 'title'
           },
+          {
+            title: this.$t('subtitle'),
+            value: 'subtitle'
+          },
           {
             title: this.$t('applicableSupplement'),
             value: 'applicableSupplement'
@@ -126,16 +122,14 @@
     },
     computed: {
       isSendBack() {
-        if (this.queryData.TaskKey == 'fqrsh' && this.queryData.isDisplay) {
+        if (this.queryData.TaskKey == 'zrrtjjfw' || this.queryData.TaskKey == 'fggcssh' || this.queryData.TaskKey == 'dezrrtjjfw') {
           return true
         }
         return false
       },
       isAdopt() {
-        if (this.queryData.TaskKey == 'fqrsh' && this.queryData.isDisplay) {
+        if (this.queryData.TaskKey == 'fggcssh') {
-          if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') {
+          return true
-            return true
-          }
         }
         return false
       },
@@ -154,13 +148,13 @@
         return false
       },
       isCancel() {
-        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
+        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') {
           return true
         }
         return false
       },
       isConfirm() {
-        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
+        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') {
           return true
         }
         return false
@@ -244,45 +238,9 @@
           }
         })
       },
-      dreSubmit(val) {
+      confirm(operatorTime) {
-        let query = {
-          id: this.queryPersonInCharge.id,
-          engineerFeedbackContent: val.engineerFeedbackContent,
-          fileId: val.fileId,
-          flowType: this.$route.query.flowType,
-          actiProcInstId: this.$route.query.actiProcInstId,
-          deliveryRequirements: val.deliveryRequirements,
-          engineeringInterfacePersonReply: this.queryPersonInCharge.engineeringInterfacePersonReply
-        }
-        putAction(this.url.dreSubmit, query).then((res) => {
-          if (res.success) {
-            this.$message.success(this.$t('OperationSuccessful'))
-            if (this.$route.query.router) {
-              this.$router.push({
-                path: '/projectRegulationTasks'
-              })
-            } else {
-              this.$router.push({
-                path: '/ProjectDetails',
-                query: {
-                  type: '103',
-                  ...this.$route.query
-                }
-              })
-            }
-            // setTimeout(() => {
-            //   this.loading = false
-            //   window.close()
-            // }, 1000)
-          } else {
-            this.loading = false
-            this.$message.warning(this.$t('operationFailed'))
-          }
-        })
-      },
-      confirm(operatorTime){
         this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
-          this.completeTask({operatorTime: operatorTime, ...res })
+          this.completeTask({ operatorTime: operatorTime, ...res })
         })
       },
       completeTask(value) {

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

@@ -9,10 +9,10 @@
     </div>
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
       <a-row :gutter="24">
-        <a-col :span="24">
+        <a-col :span="24" v-if="query.TaskKey != 'fggcssh'">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required" v-if="query.isDisplay">*</span>
+              <span class="Required">*</span>
               <span class="title-text-text" :title="$t('resultofhandling')">{{$t('resultofhandling')}}</span>
             </div>
             <a-form-model-item class="itemModel" :prop="query.isDisplay?'':'disposeResult'">
@@ -30,6 +30,12 @@
                 <a-radio value="Returned" v-if="query.TaskKey == 'dezrrqr'">
                   {{$t('sendBack')}}
                 </a-radio>
+                <a-radio value="Compliance" v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw'">
+                  {{$t('accord')}}
+                </a-radio>
+                <a-radio value="Non-Compliance" v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw'">
+                  {{$t('nonConformity')}}
+                </a-radio>
                 <a-radio value="To be tracked" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw'">
                   {{$t('Tracked')}}
                 </a-radio>
@@ -53,13 +59,29 @@
             </div>
             <a-form-model-item class="itemModel" prop="approvalOpinion">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
-                          :disabled="!query.isDisplay?true:false"
                           v-model="formInline.approvalOpinion"
                           :rows="4"/>
             </a-form-model-item>
           </div>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-if="this.query.TaskKey == 'zrrtjjfw' || this.query.TaskKey == 'dezrrtjjfw'">
+        <a-col :span="24">
+          <div class="box-title-text">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <a-button type="primary" class="button-text"
+                        @click="clickButtonToUpload('approvalFile')">
+                {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
+                formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                }}
+              </a-button>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-row>
     </a-form-model>
     <uploadFile ref="uploadFile"
                 :disabled="!query.isDisplay?true:false"