附件名称

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240703173018"
+  "value": "20240703181707"
 }

src/views/debit-pay/start-work/components/order/dataModal.vue

@@ -1,15 +1,27 @@
 <template>
-    <hc-new-dialog widths="500px" :show="isShow" :title="modalTitle" :loading="modalSaving" @save="modalSave" @close="modalClose">
+    <hc-new-dialog
+        widths="500px" :show="isShow" :title="modalTitle" :loading="modalSaving" @save="modalSave"
+        @close="modalClose"
+    >
         <el-scrollbar>
             <hc-card-item>
-                <el-form ref="baseFormRef" :model="baseForm" :rules="baseFormRules" label-position="top" label-width="auto">
+                <el-form
+                    ref="baseFormRef" :model="baseForm" :rules="baseFormRules" label-position="top"
+                    label-width="auto"
+                >
                     <el-form-item label="计量期：" prop="meterPeriodId">
                         <el-select v-model="baseForm.meterPeriodId" placeholder="选择计量期" filterable clearable block>
-                            <el-option v-for="item in key1Data" :key="item.id" :label="item.periodName" :value="item.id" />
+                            <el-option
+                                v-for="item in key1Data" :key="item.id" :label="item.periodName"
+                                :value="item.id"
+                            />
                         </el-select>
                     </el-form-item>
                     <el-form-item label="业务日期：">
-                        <el-date-picker v-model="baseForm.businessDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" />
+                        <el-date-picker
+                            v-model="baseForm.businessDate" class="block" format="YYYY-MM-DD" type="date"
+                            value-format="YYYY-MM-DD"
+                        />
                     </el-form-item>
                     <el-form-item label="计量金额：">
                         <el-input v-model="baseForm.meterMoney" @change="changeMoney" />
@@ -23,20 +35,20 @@
                 </el-form>
             </hc-card-item>
             <!-- 附件列表 -->
-            <hc-card-item class="mt-3" title="附件列表" extra-text="可上传:图片、Excel、PDF、Word文件">
+            <hc-card-item class="mt-3">
                 <el-form :model="baseForm" label-position="top">
+                    <el-form-item label="附件名称：">
+                        <el-input v-model="baseForm.fileNames" type="textarea" />
+                    </el-form-item>
+                    <div class="hc-flex mb-10px" style="color: #1d4590;">
+                        <div class="flex-1">附件列表</div>
+                        <div>可上传:图片、Excel、PDF、Word文件</div>
+                    </div>
                     <el-form-item label="">
                         <hc-form-upload
-                            v-model="baseForm.fileList"
-                            is-res
-                            :options="{
-                                type: 'list',
-                                props: hProps,
-                                isArr: true,
-                                num: 0,
-                            }"
-                            @success="uploadFileSuccess"
-                            @change="formItemChange"
+                            v-model="baseForm.fileList" is-res
+                            :options="{ type: 'list', props: hProps, isArr: true, num: 0 }"
+                            @success="uploadFileSuccess" @change="formItemChange"
                         />
                     </el-form-item>
                 </el-form>
@@ -52,12 +64,13 @@ import { formValidate, getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import periodApi from '~api/debit-pay/material/periods.js'
 import orderApi from '~api/debit-pay/start-work/order.js'
 import { isNumberReg } from '~uti/tools'
+
 const props = defineProps({
     ids: {
         type: [String, Number],
         default: '',
     },
-    infoData:{
+    infoData: {
         type: Object,
         default: () => ({}),
     },
@@ -77,9 +90,9 @@ const hProps = ref({
 const baseForm = ref({})
 const modalTitle = ref('开工预付款计量单新增')
 //获取开工预付款总额
-const getStartAmountData = async ()=>{
+const getStartAmountData = async () => {
     const { error, code, data } = await orderApi.getStartAmount({
-       contractId:contractId.value,
+        contractId: contractId.value,
 
     })
     if (!error && code === 200) {
@@ -105,7 +118,7 @@ watch(() => [
         modalTitle.value = '开工预付款计量单修改'
     } else {
 
-        baseForm.value = { fileList:[] }
+        baseForm.value = { fileList: [] }
         fileName.value = []
         modalTitle.value = '开工预付款计量单新增'
     }
@@ -134,15 +147,15 @@ watch(isShow, (val) => {
 
 //计量期
 const key1Data = ref([])
-const getKey1Data = async ()=>{
+const getKey1Data = async () => {
     const { error, code, data } = await periodApi.allPeriod({
-       contractId:contractId.value,
-       type:2,
+        contractId: contractId.value,
+        type: 2,
     })
     if (!error && code === 200) {
         key1Data.value = getArrValue(data)
         if (key1Data.value.length > 0) {
-            baseForm.value.meterPeriodId = key1Data.value[ key1Data.value.length - 1].id
+            baseForm.value.meterPeriodId = key1Data.value[key1Data.value.length - 1].id
         }
     } else {
         key1Data.value = []
@@ -153,7 +166,7 @@ const getKey1Data = async ()=>{
 const baseFormRef = ref(null)
 // const baseForm = ref({})
 const baseFormRules = {
-    meterPeriodId:{
+    meterPeriodId: {
         required: true,
         trigger: 'blur',
         message: '请选择材料计量期',
@@ -161,11 +174,11 @@ const baseFormRules = {
 }
 const modalSaving = ref(false)
 const modalSave = async () => {
- const res = await formValidate(baseFormRef.value)
- if (!res) {
-    return false
- }
-key1Data.value.forEach((ele)=>{
+    const res = await formValidate(baseFormRef.value)
+    if (!res) {
+        return false
+    }
+    key1Data.value.forEach((ele) => {
         if (ele.id === baseForm.value.meterPeriodId) {
             baseForm.value.periodName = ele.periodName
             baseForm.value.periodNumber = ele.periodNumber
@@ -174,9 +187,9 @@ key1Data.value.forEach((ele)=>{
     modalSaving.value = true
     if (ids.value.length < 1) {
         const { error, code, msg } = await orderApi.add({
-        ...baseForm.value,
-        contractId:contractId.value,
-        projectId:projectId.value,
+            ...baseForm.value,
+            contractId: contractId.value,
+            projectId: projectId.value,
         })
         //判断状态
         modalSaving.value = false
@@ -189,9 +202,9 @@ key1Data.value.forEach((ele)=>{
         }
     } else if (ids.value.length > 0) {
         const { error, code, msg } = await orderApi.update({
-        ...baseForm.value,
-        contractId:contractId.value,
-        projectId:projectId.value,
+            ...baseForm.value,
+            contractId: contractId.value,
+            projectId: projectId.value,
         })
         //判断状态
         modalSaving.value = false
@@ -213,7 +226,7 @@ const modalClose = () => {
 }
 
 //改变计量金额
-const changeMoney = (val)=>{
+const changeMoney = (val) => {
     //如果为空
     let momey = val
     const isMeter = isNumberReg(momey)
@@ -238,7 +251,7 @@ const uploadFileSuccess = ({ res }, resolve) => {
     }
 }
 
-const formItemChange = (data)=>{
+const formItemChange = (data) => {
     fileName.value = data
 }
 </script>

src/views/debit-pay/start-work/order.vue

@@ -55,12 +55,17 @@
                             <hc-info-table-td width="auto" colspan="3">{{ infoData?.applyCause }}</hc-info-table-td>
                         </tr>
                     </hc-info-table>
+                    <template v-if="infoData.fileNames">
+                        <div class="mt-5">附件名称</div>
+                        <div class="hc-file-names mt-3">
+                            {{ infoData.fileNames }}
+                        </div>
+                    </template>
                     <div class="mt-5">附件列表</div>
                     <div class="mt-3">
                         <template v-if="infoData?.fileList?.length > 0">
                             <el-check-tag v-for="item in infoData?.fileList" :key="item.id" checked class="mr-2" @click="viewFile(item)">{{ item.fileName }}</el-check-tag>
                         </template>
-
                         <hc-empty v-else />
                     </div>
                 </hc-card-item>
@@ -213,7 +218,7 @@ const delRowClick = (row)=>{
             await removeProPay(row.id)
             resolve() //关闭弹窗的回调
      })
-    
+
 }
 const removeProPay = async (id) => {
     const { error, code, msg } = await mainApi.remove({
@@ -251,5 +256,11 @@ const reportFinish = () => {
 </script>
 
 <style scoped lang="scss">
-
+.hc-file-names {
+    position: relative;
+    background: white;
+    padding: 5px 10px;
+    border-radius: 3px;
+    font-size: 14px;
+}
 </style>

src/views/tasks/components/hc-data/start-work-form.vue

@@ -30,12 +30,15 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-form-item label="附件名称：">
+                    <el-input v-model="baseForm.fileNames" type="textarea" disabled />
+                </el-form-item>
             </el-form>
         </hc-card-item>
         <!-- 附件列表 -->
-        <hc-card-item class="mt-3" title="附件列表">
+        <hc-card-item title="附件列表">
             <template #extra>
-                <span class="text-[13px] text-orange font-400">可上传 图片(png、jpg、jpeg)、Excel(xls、xlsx)、PDF、Word(doc、docx)文件</span>
+                <span class="text-[13px] text-orange font-400">可上传 图片、Excel、PDF、Word文件</span>
             </template>
             <el-form :model="baseForm" label-position="left" label-width="auto">
                 <el-form-item label="上传附件">