Merge branch 'develop' into release-test

@@ -281,20 +281,20 @@ const setBaseFormItemsValue = (info) => {
       let quality = baseFormItems.value.find(item => item.field == 'qualityEvaluationInstitutionGuid');
       if (info['isQualityAssessment'] === 'Y') {
         quality && (quality.visible = true);
-        uploadFormItems.value[2].visible = true;
+        uploadFormItems.value[1].visible = true;
       } else {
         quality && (quality.visible = false);
-        uploadFormItems.value[2].visible = false;
+        uploadFormItems.value[1].visible = false;
       }
     } else if (item.field == 'isCostAssessment') {
       item.default = info[item.field];
       let quality = baseFormItems.value.find(item => item.field == 'costAssessmentInstitutionGuid');
       if (info['isCostAssessment'] === 'Y') {
         quality && (quality.visible = true);
-        uploadFormItems.value[3].visible = true;
+        uploadFormItems.value[2].visible = true;
       } else {
         quality && (quality.visible = false);
-        uploadFormItems.value[3].visible = false;
+        uploadFormItems.value[2].visible = false;
       }
     } else {
       item.default = info[item.field];
@@ -1614,15 +1614,15 @@ const uploadFormItems: any = ref([
     field: 'registerLetter',
     visible: true,
   },
-  {
-    label: '承诺函附件',
-    tip: '支持扩展名：doc .docx .pdf .jpg .png',
-    type: 'upload-file',
-    accept: '.doc, .docx, .pdf, .jpg, .png',
-    required: false,
-    default: [],
-    field: 'commitmentLetter',
-  },
+  // {
+  //   label: '承诺函附件',
+  //   tip: '支持扩展名：doc .docx .pdf .jpg .png',
+  //   type: 'upload-file',
+  //   accept: '.doc, .docx, .pdf, .jpg, .png',
+  //   required: false,
+  //   default: [],
+  //   field: 'commitmentLetter',
+  // },
   {
     label: '上传质量评估报告',
     tip: '支持扩展名：.png, .pdf，单个文件不得大于5M',
@@ -1643,6 +1643,15 @@ const uploadFormItems: any = ref([
     field: 'assessmentFile',
     visible: false,
   },
+  {
+    label: '承诺函附件',
+    tip: '支持扩展名：doc .docx .pdf .jpg .png',
+    type: 'upload-file',
+    accept: '.doc, .docx, .pdf, .jpg, .png',
+    required: false,
+    default: [],
+    field: 'commitmentLetter',
+  },
 ]);
 
 const uploadFormRules = ref({
@@ -2004,7 +2013,7 @@ onBeforeMount(() => {
             if (res?.code == proxy.$passCode) {
               Object.assign(attachDataInfo.value, res.data || {});
               uploadFormItems.value[0].templateUrl = attachDataInfo.value.register_letter;
-              uploadFormItems.value[1].templateUrl = attachDataInfo.value['commitment-letter'];
+              uploadFormItems.value[3].templateUrl = attachDataInfo.value['commitment-letter'];
               setUploadFormItemsValue(draftDetailInfo.value);
             } else {
               ElMessage.error(res.msg);