From 5fddaa7e0c967135ec825bfa6f26e1ca5eda2381 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 19:00:24 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B-=E4=B8=BB=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=A2=9E=E5=8A=A0=E8=BE=85=E5=8A=A9=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/MainFinderCollectEditModal.vue    | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
index a08e0d4..77d861d 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
@@ -30,6 +30,28 @@
       </a-form-item>
       <!--   不符合和待验证   -->
       <template v-if="[EvaluationResult.INCONFORMITY.value, EvaluationResult.TO_BE_VERIFIED.value].includes(model.result)">
+        <!--   不满足要求的现状  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')">
+          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')"
+                      :maxLength="500"
+                      :autoSize="{minRows: 4, maxRows: 6}"
+                      v-decorator="['unsatisfiedRequire', validatorRules.unsatisfiedRequire]" />
+        </a-form-item>
+        <!--   辅助说明材料  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial')">
+          <j-upload :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial')"
+                    return-id
+                    multiple
+                    :file-type="canUploadType"
+                    v-decorator="['unsatisfiedRequireAttach', validatorRules.unsatisfiedRequireAttach]" />
+        </a-form-item>
+        <!--   整改方案  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')">
+          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')"
+                      :maxLength="500"
+                      :autoSize="{minRows: 4, maxRows: 6}"
+                      v-decorator="['correctionSolution', validatorRules.correctionSolution]" />
+        </a-form-item>
         <!--   整改周期  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')">
           <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')"
@@ -42,26 +64,6 @@
                    :maxLength="50"
                    v-decorator="['correctionCost', validatorRules.correctionCost]" />
         </a-form-item>
-        <!--   共用后本项目所需费用  -->
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')">
-          <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')"
-                   :maxLength="50"
-                   v-decorator="['commonalityCost', validatorRules.commonalityCost]" />
-        </a-form-item>
-        <!--   不满足要求的现状  -->
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')">
-          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')"
-                      :maxLength="500"
-                      :autoSize="{minRows: 4, maxRows: 6}"
-                      v-decorator="['unsatisfiedRequire', validatorRules.unsatisfiedRequire]" />
-        </a-form-item>
-        <!--   整改方案  -->
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')">
-          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')"
-                      :maxLength="500"
-                      :autoSize="{minRows: 4, maxRows: 6}"
-                      v-decorator="['correctionSolution', validatorRules.correctionSolution]" />
-        </a-form-item>
         <!--   与其他项目共用性  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects')">
           <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects')"
@@ -69,6 +71,12 @@
                       :autoSize="{minRows: 4, maxRows: 6}"
                       v-decorator="['commonality', validatorRules.commonality]" />
         </a-form-item>
+        <!--   共用后本项目所需费用  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')">
+          <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')"
+                   :maxLength="50"
+                   v-decorator="['commonalityCost', validatorRules.commonalityCost]" />
+        </a-form-item>
       </template>
       <!--   符合和不涉及   -->
       <template v-else-if="[EvaluationResult.CONFORM_TO.value, EvaluationResult.NOT_INVOLVE.value].includes(model.result)">
@@ -156,7 +164,9 @@ export default {
           rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing') }],
           validateTrigger: 'blur'
         }
-      }
+      },
+      // 本系统限制可以上传的文件格式
+      canUploadType: 'pdf,docx,doc,xlsx,xls,ppt,pptx,jpg,jpeg,png'
     }
   },
   methods: {