From 8121a1f6a39957a5796a43850a681ad60e30a900 Mon Sep 17 00:00:00 2001
From: yxhc <825210484@qq.com>
Date: Mon, 26 Aug 2024 17:06:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E9=A1=B9=E6=89=B9=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projectOtherData/二期修改                      |  2 +-
 .../purchaseResults/fillPurchasingResult/index.vue | 11 ++++-
 .../components/approvalDialog.vue                  | 50 ++++++++++++++++++++--
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/projectOtherData/二期修改 b/projectOtherData/二期修改
index 08e8d58..3dfa8ab 100644
--- a/projectOtherData/二期修改
+++ b/projectOtherData/二期修改
@@ -2,4 +2,4 @@
 
 /pages/toDoCenter/components/auditDialog.vue 234行
 
-
+/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue  114行
diff --git a/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue b/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue
index 6f8de82..8225a2d 100644
--- a/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue
+++ b/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue
@@ -45,7 +45,8 @@ const formRef = ref(),
       biddingDoc: [],
       bidDoc: [],
       acceptanceLetter: []
-    }]
+    }],
+    devChangeCode: ''
   }),
   submitLoading = ref(false),
   submit = async (formEl) => {
@@ -64,7 +65,8 @@ const formRef = ref(),
               bidDoc: i.bidDoc && JSON.stringify(changFilesParam(i.bidDoc)),
               acceptanceLetter: i.acceptanceLetter && JSON.stringify(changFilesParam(i.acceptanceLetter))
             }
-          })
+          }),
+          devChangeCode: formData.value.devChangeCode
         }
         try {
           await submitResult(postData)
@@ -109,6 +111,11 @@ onMounted(async () => {
       label-suffix=":"
       scroll-to-error
     >
+      <el-card class="w-full mb-16">
+        <el-form-item label="发改编码" :rules="[{ required: true, message: '请输入' }]" prop="devChangeCode">
+          <el-input v-model="formData.devChangeCode" placeholder="请输入" />
+        </el-form-item>
+      </el-card>
       <el-card v-for="(item,index) in formData.sections" :key="index" class="w-full mb-16">
         <template #header>
           <div class="flex justify-between">
diff --git a/src/pages/projectStoreManage/components/approvalDialog.vue b/src/pages/projectStoreManage/components/approvalDialog.vue
index 8b02aff..d77808a 100644
--- a/src/pages/projectStoreManage/components/approvalDialog.vue
+++ b/src/pages/projectStoreManage/components/approvalDialog.vue
@@ -1,8 +1,18 @@
 <script name="approvalDialog" setup>
-import { ref, getCurrentInstance, watch } from 'vue'
-import { fileFormatVerification, handleFileSuccess, handleFilePreview, handleFileError, fileTypes, fileDesc } from '@/utils/uploadAction.js'
+import { ref, getCurrentInstance, watch, nextTick } from 'vue'
+import {
+  fileFormatVerification,
+  handleFileSuccess,
+  handleFilePreview,
+  handleFileError,
+  fileTypes,
+  fileDesc,
+  reviewFileParam
+} from '@/utils/uploadAction.js'
 import store from '@/store'
 import { projectApprove } from '@/http/apis/projectStoreManage/annualPlanStore'
+import { getProjectDetail } from '@/http/apis/declareMange'
+
 const { proxy } = getCurrentInstance(),
   uploadUrl = store.dictStore.uploadUrl,
   props = defineProps({
@@ -19,7 +29,9 @@ const { proxy } = getCurrentInstance(),
   }),
   emits = defineEmits(['close']),
   formRef = ref(),
-  form = ref({}),
+  form = ref({
+    buildPlanFileId: []
+  }),
   rules = {
     approvedAmount: [{ required: true, message: '请输入批复金额', trigger: 'blur' }],
     approvedDate: [{ required: true, message: '请输入批复时间' }],
@@ -52,11 +64,38 @@ watch(
   async val => {
     if (val) {
       console.log('props.data', props.data)
+      getDetail()
     } else {
       formRef.value.resetFields()
+      detailData.value = {}
     }
   }
 )
+
+const detailData = ref({})
+
+async function getDetail () {
+  const detailRes = await getProjectDetail({ id: props.data.projectId })
+  detailData.value = detailRes.data
+
+  form.value.buildPlanFileId = reviewFileParam(JSON.parse(detailData.value.constructionPlanFile))
+}
+
+const upload = ref()
+import { genFileId } from 'element-plus'
+
+function handleExceed (files) {
+  form.value.buildPlanFileId = []
+  upload.value.clearFiles()
+  const file = files[0]
+  file.uid = genFileId()
+
+  nextTick(() => {
+    upload.value.handleStart(file)
+    upload.value.submit() // 手动上传
+  })
+}
+
 </script>
 
 <template>
@@ -159,6 +198,7 @@ watch(
             prop="buildPlanFileId"
           >
             <el-upload
+              ref="upload"
               v-model:file-list="form.buildPlanFileId"
               class="w-full"
               :action="uploadUrl"
@@ -167,10 +207,12 @@ watch(
               :before-upload="file=>fileFormatVerification(file, {types: fileTypes})"
               :accept="fileTypes.map(i=>`.${i}`).join(',')"
               multiple
+              :auto-upload="true"
+              :on-exceed="handleExceed"
               :limit="1"
               :on-preview="handleFilePreview"
             >
-              <el-button type="primary">上传附件</el-button>
+              <el-button type="primary">更新</el-button>
               <template #tip>
                 <div class="el-upload__tip">支持{{ fileDesc }}文件</div>
               </template>