处理完成

src/views/projectManage/addProject.vue

@@ -266,6 +266,7 @@ const activeCollapse = reactive([
   "项目批复信息",
   "其他",
   "投决计划",
+  "投评报告及测算表",
   "项目投资资金流量表",
   "项目资本金现金流量表",
   "能建方现金流量表",
@@ -288,7 +289,7 @@ let projectId = route.query.projectId;
 const lxType = computed(() => formData.projectLzType?.toString());
 const jcType = computed(() => jcFormData.projectLzType?.toString());
 const isDaibanUser = computed(() =>
-  formData?.daibanUsers?.includes(userInfo?.id),
+  formData?.daibanUsers?.includes(userInfo?.id)
 );
 
 // 表单禁用状态：基于流程节点 + 待办人判断
@@ -306,26 +307,25 @@ const jcFormDisabled = computed(() => {
 });
 
 const showSave = computed(
-  () => !isPreview && (!formData.id || formData.projectCreator === userInfo?.id),
+  () => !isPreview && (!formData.id || formData.projectCreator === userInfo?.id)
 );
 const showSubmitLixiang = computed(
-  () => lxType.value === "1" && formData.projectCreator === userInfo?.id,
+  () => lxType.value === "1" && formData.projectCreator === userInfo?.id
 );
 const showSubmitJuece = computed(
-  () =>
-    jcType.value === "7" && formData.projectCreator === userInfo?.id,
+  () => jcType.value === "7" && formData.projectCreator === userInfo?.id
 );
 const showFirstAudit = computed(
-  () => isDaibanUser.value && lxType.value === "3",
+  () => isDaibanUser.value && lxType.value === "3"
 );
 const showAuditLixiang = computed(
-  () => isDaibanUser.value && hasApproveRole && lxType.value === "4",
+  () => isDaibanUser.value && hasApproveRole && lxType.value === "4"
 );
 const showAuditJuece = computed(
-  () => isDaibanUser.value && jcType.value === "8",
+  () => isDaibanUser.value && jcType.value === "8"
 );
 const showApprove = computed(
-  () => isDaibanUser.value && hasApproveRole && lxType.value === "2",
+  () => isDaibanUser.value && hasApproveRole && lxType.value === "2"
 );
 
 // 下载文件
@@ -348,7 +348,7 @@ const downloadTemplate = async (type) => {
       headers: {
         Authorization: token.value,
       },
-    },
+    }
   )
     .then((res) => res.blob())
     .then((blob) => {
@@ -385,7 +385,7 @@ const finance = useFinanceTables();
 const getObjSums = (obj, objkey) => {
   return Object.entries(obj).reduce(
     (acc, [key, item]) => acc.plus(new Decimal(item[objkey] || 0)),
-    new Decimal(0),
+    new Decimal(0)
   );
 };
 
@@ -516,7 +516,7 @@ const getProjectInfo = () => {
           ?.children || [];
       resource.jcQxgjList.value =
         resource.jcDsgjList.value.filter(
-          (item) => item.key == jcData.dsjngjjw,
+          (item) => item.key == jcData.dsjngjjw
         )[0]?.children || [];
       resource.jcTzsxejflList.value =
         resource.tzsxyjflList.filter((item) => item.key == jcData.tzsxyjfl)[0]

src/views/projectManage/addProject/components/JueceApproval.vue

@@ -400,7 +400,7 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="审核处室" label-width="160">
-                  <el-input v-model="jcFormData.shcs" />
+                  <el-input v-model="jcFormData.jcpfshcs" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
@@ -415,7 +415,7 @@
 
               <el-col :span="24">
                 <el-form-item label="批复文件" :label-width="130">
-                  <FileUploader v-model="lcbspData" />
+                  <FileUploader v-model="jcFormData.jcpfwj" />
                 </el-form-item>
               </el-col>
             </el-row>

src/views/projectManage/addProject/components/JueceBasicInfo.vue

@@ -72,7 +72,7 @@
                 <el-form-item label="是否能建重大或重要投资项目">
                   <CommonSelector
                     :radio="true"
-                    v-model="jcFormData.sfnjzdhzytzxm"
+                    v-model="jcFormData.sfnjzdhzytz"
                     dictName="sf"
                   />
                 </el-form-item>
@@ -589,8 +589,8 @@
                 <div class="col-title">投资指南分类</div>
                 <el-form-item label="2+9布局分类">
                   <CommonSelector
-                    v-model="jcFormData.tzznyjfl"
-                    dictName="tzzn"
+                    v-model="jcFormData.bjfl"
+                    dictName="layoutType"
                     @change="changeJcTzznyjfl"
                   />
                 </el-form-item>
@@ -674,7 +674,7 @@
                 <el-form-item label="是否列入国资委负面清单">
                   <CommonSelector
                     :radio="true"
-                    v-model="jcFormData.sfjntbjgl"
+                    v-model="jcFormData.sflrgzwfmqd"
                     dictName="sf"
                   />
                 </el-form-item>
@@ -1415,7 +1415,7 @@
               </el-table-column>
             </el-table>
             <el-form-item label="里程碑计划审批表" :label-width="130">
-              <FileUploader v-model="lcbspData" />
+              <FileUploader v-model="jcFormData.tpbgjcsb" />
             </el-form-item>
           </el-collapse-item>
           <el-collapse-item title="投评决策资料" name="投评决策资料">

src/views/projectManage/addProject/components/JueceFinance.vue

 <template>
   <div class="tab-content">
     <div class="tab-content">
-                    <el-form
-                      :model="jcFormData"
-                      :label-width="150"
-                      :disabled="isPreview"
-                    >
+      <el-form :model="jcFormData" :label-width="150" :disabled="isPreview">
         <el-collapse v-model="activeCollapse">
+          <el-collapse-item title="投评报告及测算表" name="投评报告及测算表">
+            <FileUploader v-model="jcFormData.tpbgjcsb" />
+          </el-collapse-item>
+
           <el-collapse-item title="投决计划" name="投决计划">
             <div class="tab-handle">
               <el-button
@@ -17,8 +17,7 @@
               >
               <el-upload
                 :action="
-                                windowConfig.baseUrl +
-                                '/api/template/importExcelTempData'
+                  windowConfig.baseUrl + '/api/template/importExcelTempData'
                 "
                 :headers="{ Authorization: token }"
                 :show-file-list="false"
@@ -26,14 +25,9 @@
                   tampName: 'tjjh',
                   projectId: formData.id,
                 }"
-                              :on-success="
-                                (res, file) => importTjjh(res.data, file)
-                              "
+                :on-success="(res, file) => importTjjh(res.data, file)"
               >
-                              <el-button
-                                type="primary"
-                                size="small"
-                                style="margin-left: 12px"
+                <el-button type="primary" size="small" style="margin-left: 12px"
                   >导入数据</el-button
                 >
               </el-upload>
@@ -73,9 +67,7 @@
                             scope_.row[col.children[1].key] ||
                             scope_.row[col.children[1].key] === 0
                           "
-                                        v-model="
-                                          scope_.row[col_.key.toString()]
-                                        "
+                          v-model="scope_.row[col_.key.toString()]"
                           :min="0"
                           :max="99999999999.99999999"
                           controls-position="right"
@@ -102,8 +94,7 @@
               >
               <el-upload
                 :action="
-                                windowConfig.baseUrl +
-                                '/api/template/importExcelTempData'
+                  windowConfig.baseUrl + '/api/template/importExcelTempData'
                 "
                 :headers="{ Authorization: token }"
                 :show-file-list="false"
@@ -111,14 +102,9 @@
                   tampName: 'xmtzzjll',
                   projectId: formData.id,
                 }"
-                              :on-success="
-                                (res, file) => importXmtzzjll(res.data, file)
-                              "
+                :on-success="(res, file) => importXmtzzjll(res.data, file)"
               >
-                              <el-button
-                                type="primary"
-                                size="small"
-                                style="margin-left: 12px"
+                <el-button type="primary" size="small" style="margin-left: 12px"
                   >导入数据</el-button
                 >
               </el-upload>
@@ -158,9 +144,7 @@
                             scope_.row[col.children[1].key] ||
                             scope_.row[col.children[1].key] === 0
                           "
-                                        v-model="
-                                          scope_.row[col_.key.toString()]
-                                        "
+                          v-model="scope_.row[col_.key.toString()]"
                           :min="0"
                           :max="99999999999.99999999"
                           controls-position="right"
@@ -187,8 +171,7 @@
               >
               <el-upload
                 :action="
-                                windowConfig.baseUrl +
-                                '/api/template/importExcelTempData'
+                  windowConfig.baseUrl + '/api/template/importExcelTempData'
                 "
                 :headers="{ Authorization: token }"
                 :show-file-list="false"
@@ -196,14 +179,9 @@
                   tampName: 'xmzbjxjll',
                   projectId: formData.id,
                 }"
-                              :on-success="
-                                (res, file) => importXmzbjxjll(res.data, file)
-                              "
+                :on-success="(res, file) => importXmzbjxjll(res.data, file)"
               >
-                              <el-button
-                                type="primary"
-                                size="small"
-                                style="margin-left: 12px"
+                <el-button type="primary" size="small" style="margin-left: 12px"
                   >导入数据</el-button
                 >
               </el-upload>
@@ -243,9 +221,7 @@
                             scope_.row[col.children[1].key] ||
                             scope_.row[col.children[1].key] === 0
                           "
-                                        v-model="
-                                          scope_.row[col_.key.toString()]
-                                        "
+                          v-model="scope_.row[col_.key.toString()]"
                           :min="0"
                           :max="99999999999.99999999"
                           controls-position="right"
@@ -259,10 +235,7 @@
               </el-table-column>
             </el-table>
           </el-collapse-item>
-                        <el-collapse-item
-                          title="能建方现金流量表"
-                          name="能建方现金流量表"
-                        >
+          <el-collapse-item title="能建方现金流量表" name="能建方现金流量表">
             <div class="tab-handle">
               <el-button
                 type="primary"
@@ -272,8 +245,7 @@
               >
               <el-upload
                 :action="
-                                windowConfig.baseUrl +
-                                '/api/template/importExcelTempData'
+                  windowConfig.baseUrl + '/api/template/importExcelTempData'
                 "
                 :headers="{ Authorization: token }"
                 :show-file-list="false"
@@ -281,14 +253,9 @@
                   tampName: 'njfxjll',
                   projectId: formData.id,
                 }"
-                              :on-success="
-                                (res, file) => importNjfxjll(res.data, file)
-                              "
+                :on-success="(res, file) => importNjfxjll(res.data, file)"
               >
-                              <el-button
-                                type="primary"
-                                size="small"
-                                style="margin-left: 12px"
+                <el-button type="primary" size="small" style="margin-left: 12px"
                   >导入数据</el-button
                 >
               </el-upload>
@@ -328,9 +295,7 @@
                             scope_.row[col.children[1].key] ||
                             scope_.row[col.children[1].key] === 0
                           "
-                                        v-model="
-                                          scope_.row[col_.key.toString()]
-                                        "
+                          v-model="scope_.row[col_.key.toString()]"
                           :min="0"
                           :max="99999999999.99999999"
                           controls-position="right"
@@ -354,8 +319,7 @@
               >
               <el-upload
                 :action="
-                                windowConfig.baseUrl +
-                                '/api/template/importExcelTempData'
+                  windowConfig.baseUrl + '/api/template/importExcelTempData'
                 "
                 :headers="{ Authorization: token }"
                 :show-file-list="false"
@@ -363,14 +327,9 @@
                   tampName: 'lrb',
                   projectId: formData.id,
                 }"
-                              :on-success="
-                                (res, file) => importLrb(res.data, file)
-                              "
+                :on-success="(res, file) => importLrb(res.data, file)"
               >
-                              <el-button
-                                type="primary"
-                                size="small"
-                                style="margin-left: 12px"
+                <el-button type="primary" size="small" style="margin-left: 12px"
                   >导入数据</el-button
                 >
               </el-upload>
@@ -410,9 +369,7 @@
                             scope_.row[col.children[1].key] ||
                             scope_.row[col.children[1].key] === 0
                           "
-                                        v-model="
-                                          scope_.row[col_.key.toString()]
-                                        "
+                          v-model="scope_.row[col_.key.toString()]"
                           :min="0"
                           :max="99999999999.99999999"
                           controls-position="right"
@@ -434,15 +391,32 @@
 
 <script setup>
 import { inject } from "vue";
+import FileUploader from "@/components/FileUploader/index.vue";
+
 const {
-  jcFormData, formData, isPreview, activeCollapse,
-  jcTjjhData, tjglColumns,
-  xmtzzjllData, xmtzzjllColumns,
-  xmzbjxjllData, xmzbjxjllColumns,
-  njfxjllData, njfxjllColumns,
-  lrbData, lrbColumns,
+  jcFormData,
+  tpbgjcsbData,
+  formData,
+  isPreview,
+  tpbgjcsb,
+  activeCollapse,
+  jcTjjhData,
+  tjglColumns,
+  xmtzzjllData,
+  xmtzzjllColumns,
+  xmzbjxjllData,
+  xmzbjxjllColumns,
+  njfxjllData,
+  njfxjllColumns,
+  lrbData,
+  lrbColumns,
   downloadTemplate,
-  importTjjh, importXmtzzjll, importXmzbjxjll, importNjfxjll, importLrb,
-  windowConfig, token,
+  importTjjh,
+  importXmtzzjll,
+  importXmzbjxjll,
+  importNjfxjll,
+  importLrb,
+  windowConfig,
+  token,
 } = inject("jcShared");
 </script>