der提交加参数

2022-05-20 15:39:15 +08:00
parent c9e5b0eac6
commit f5b32c89dd
6 changed files with 32 additions and 16 deletions
@@ -862,4 +862,7 @@ module.exports = {
  fillInProjectDelivery:'Fill in project delivery',
  Resubmit:'Resubmit',
  Quantity:'Quantity',
+  pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results',
+  pleaseReviewTask:'Please add the engineering confirmation information for this review task',
+  pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned',
 }
@@ -596,11 +596,11 @@ module.exports = {
  certificationType: '认证类型',
  certificationLevel: '认证级别',
  areaOfResponsibility: '责任领域',
-  confirmationOfDesignConformity: '设计符合性确认',
+  confirmationOfDesignConformity: '法规设计符合性确认',
  Deliverables: '交付物',
  personLiable: '责任人',
  PrehomoConfirmation: 'Pre-Homo确认',
-  verificationAndConformityconfirmation: '验证符合性确认',
+  verificationAndConformityconfirmation: '法规验证符合性确认',
  StandardImplementationDate: '标准实施日期',
  regulatoryEngineer: '法规工程师',
  certifiedEngineer: '认证工程师',
@@ -867,4 +867,7 @@ module.exports = {
  fillInProjectDelivery:'填写工程交付',
  Resubmit:'重新提交',
  Quantity:'数量',
+  pleaseConfirmationResults:'请根据工程确认结果选择符合性状态',
+  pleaseReviewTask:'请您添加对该条审查任务的工程确认信息',
+  pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
 }
@@ -3,6 +3,8 @@
    <div class="box-text">
      <div class="header-text">
        {{$t('engineeringConfirmation')}}
+        <a-icon :title="$t('pleaseReviewTask')"
+                type="question-circle" />
      </div>
    </div>
    <div class="header-content">
@@ -394,11 +396,8 @@
        columnsAll: [
          {
            title: 'ID',
-            dataIndex: 'index',
-            key: 'index',
+            dataIndex: 'serialNumber',
            align: 'left',
-            width: 140,
-            customRender: (text, record, index) => `${index + 1}`
          },
          {
            title: this.$t('completedBy'),
@@ -4,6 +4,9 @@
      <div class="header-text">
        {{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'
        ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
+        <a-icon :title="$route.query.TaskKey == 'zrrclrw'?$t('pleaseConfirmationResults'):$t('pleaseReviewTask')"
+                v-if="$route.query.TaskKey == 'zrrclrw'"
+                type="question-circle"/>
      </div>
    </div>
    <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
@@ -125,18 +128,20 @@
            </div>
            <a-form-model-item class="itemModel">
              <span class="text-header">
-                 {{formInline.approvalOpinion}}
+                 {{formInline.PersonChargeFeedback}}
              </span>
            </a-form-model-item>
          </div>
        </a-col>
      </a-row>
-      <div class="box-text" v-if="$route.query.TaskKey == 'fqrsh'">
+      <div class="box-text" v-if="$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay">
        <div class="header-text">
          {{$t('sponsorReview')}}
+          <a-icon :title="$t('pleaseWillBeReturned')"
+                  type="question-circle"/>
        </div>
      </div>
-      <a-row :gutter="24" v-if="$route.query.TaskKey == 'fqrsh'">
+      <a-row :gutter="24" v-if="$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay">
        <a-col :span="24">
          <div class="box-title-text">
            <div class="title-text">
@@ -221,7 +226,7 @@
      this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
      if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') {
        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.approvalOpinion = this.queryBy.approvalOpinion
+        this.formInline.PersonChargeFeedback = this.$route.query.PersonChargeFeedback
        this.formInline = { ...this.formInline }
      }
      if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') {
@@ -231,9 +236,11 @@
        this.formInline = { ...this.formInline }
      }
      if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') {
-        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.approvalOpinion = this.queryBy.approvalOpinion
-        this.formInline = { ...this.formInline }
+        if (!this.$route.query.isDisplay) {
+          this.formInline.reviewResult = this.queryBy.reviewResult || undefined
+          this.formInline.approvalOpinion = this.$route.query.PersonChargeFeedback
+          this.formInline = { ...this.formInline }
+        }
      }
    },
    methods: {
@@ -296,7 +296,8 @@
              remarks: 'designRemark',
              projectName: this.$route.query.projectName,
              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.designTaskDetailId
+              primaryKeyId: val.designTaskDetailId,
+              PersonChargeFeedback:val.designPersonChargeFeedback,
            }
            break
          case 2:
@@ -319,7 +320,8 @@
              remarks: 'prehomoRemark',
              projectName: this.$route.query.projectName,
              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.prehomoTaskDetailId
+              primaryKeyId: val.prehomoTaskDetailId,
+              PersonChargeFeedback:val.prehomoPersonChargeFeedback,
            }
            break
          case 3:
@@ -342,7 +344,8 @@
              remarks: 'verifyRemark',
              projectName: this.$route.query.projectName,
              projectNameId: this.$route.query.projectNameId,
-              primaryKeyId: val.verifyTaskDetailId
+              primaryKeyId: val.verifyTaskDetailId,
+              PersonChargeFeedback:val.verifyPersonChargeFeedback,
            }
            break
        }
@@ -286,6 +286,7 @@
        this.visible = true
        this.title = this.$t('add')
        this.formInline = {}
+        this.getNameList()
        this.formInline.studioEngineerName = this.userInfo().username
        this.formInline.studioEngineer = this.userInfo().id
        this.$nextTick(() => {