修改上传多个文件

2024-08-20 16:22:46 +08:00
parent c952a2fc70
commit a6ab528220
7 changed files with 152 additions and 78 deletions
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -1375,6 +1375,7 @@ const uploadFileName = val => {
 const removeFile = (file: any, uploadFiles: any) => {
    console.log(file, uploadFiles)
 }
+
 // 终端台账信息
 const deviceFilePath = ref('')
 //验收检验报告单
@@ -1431,12 +1432,12 @@ const choose = (e: any) => {
 const disabledDate = time => {
    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
 }
-const importType = ref(0)
+const importType = ref(null)
 const resendId = ref('')
 const open = async (row: any) => {
-    console.log("🚀 ~ open ~ row:", row.row)
+    console.log('🚀 ~ open ~ row:', row.row)
    let flag = row.row ? true : false
-    importType.value = 0
+    importType.value = null
    if (!flag) await getPowerCompanyList(false)
    title.value = row.title
    dialogFormVisible.value = true
@@ -1517,6 +1518,7 @@ const confirmForm = async (flag: boolean) => {
        confirmFormData.saveOrCheckflag = '1'
        confirmFormData.reporter = adminInfo.$state.id
        confirmFormData.orgId = adminInfo.$state.deptId
+        confirmFormData.importType = importType.value
        confirmFormData.supervisionTempDeviceReportParam.commissioningTime =
            confirmFormData?.supervisionTempDeviceReportParam?.commissioningTime?.replace('T', ' ') || ''

@@ -1564,6 +1566,7 @@ const confirmForm = async (flag: boolean) => {
                    otherAttachments: form.value.otherAttachments.length == 0 ? '' : otherAttachments?.value //其他附件
                }
                confirmFormData.saveOrCheckflag = '2'
+                confirmFormData.importType = importType.value
                if (title.value == '终端信息') {
                    addTerminalFormData(confirmFormData).then((res: any) => {
                        if (res.code == 'A0000') {
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -191,59 +191,85 @@
        <el-descriptions-item label="合同号">
            {{ detailData.supervisionTempDeviceReport?.contractNumber }}
        </el-descriptions-item>
-        <el-descriptions-item label="信息安全检测报告" v-if="detailData?.informationSecurityTestReport">
+        <el-descriptions-item label="信息安全检测报告">
            <el-icon class="elView" v-if="detailData?.informationSecurityTestReport?.name">
                <View @click="openFile(detailData?.informationSecurityTestReport?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.informationSecurityTestReport.url">
+            <a
+                target="_blank"
+                :href="detailData?.informationSecurityTestReport?.url"
+                v-if="detailData?.informationSecurityTestReport?.name"
+            >
                {{ detailData?.informationSecurityTestReport.name }}
            </a>
        </el-descriptions-item>
-        <el-descriptions-item label="验收检验报告单" v-if="detailData?.acceptanceInspectionReportSingle">
+        <el-descriptions-item label="验收检验报告单">
            <el-icon class="elView" v-if="detailData?.acceptanceInspectionReportSingle?.name">
                <View @click="openFile(detailData?.acceptanceInspectionReportSingle?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.acceptanceInspectionReportSingle.url">
-                {{ detailData?.acceptanceInspectionReportSingle.name }}
+            <a
+                target="_blank"
+                :href="detailData?.acceptanceInspectionReportSingle?.url"
+                v-if="detailData?.acceptanceInspectionReportSingle?.name"
+            >
+                {{ detailData?.acceptanceInspectionReportSingle?.name }}
            </a>
        </el-descriptions-item>
-        <el-descriptions-item label="验收检验报告" v-if="detailData?.acceptanceInspectionReport">
+        <el-descriptions-item label="验收检验报告">
            <el-icon class="elView" v-if="detailData?.acceptanceInspectionReport?.name">
                <View @click="openFile(detailData?.acceptanceInspectionReport?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.acceptanceInspectionReport.url">
-                {{ detailData?.acceptanceInspectionReport.name }}
+            <a
+                target="_blank"
+                :href="detailData?.acceptanceInspectionReport?.url"
+                v-if="detailData?.acceptanceInspectionReport?.name"
+            >
+                {{ detailData?.acceptanceInspectionReport?.name }}
            </a>
        </el-descriptions-item>
-        <el-descriptions-item label="型式实验报告" v-if="detailData?.typeExperimentReport">
-            <el-icon class="elView" v-if="detailData?.typeExperimentReport.name">
-                <View @click="openFile(detailData?.typeExperimentReport.name)" />
+        <el-descriptions-item label="型式实验报告">
+            <el-icon class="elView" v-if="detailData?.typeExperimentReport?.name">
+                <View @click="openFile(detailData?.typeExperimentReport?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.typeExperimentReport.url">
-                {{ detailData?.typeExperimentReport.name }}
+            <a
+                target="_blank"
+                v-if="detailData?.typeExperimentReport?.name"
+                :href="detailData?.typeExperimentReport?.url"
+            >
+                {{ detailData?.typeExperimentReport?.name }}
            </a>
        </el-descriptions-item>
-        <el-descriptions-item label="出厂检验报告" v-if="detailData?.factoryInspectionReport">
-            <el-icon class="elView" v-if="detailData?.factoryInspectionReport.name">
-                <View @click="openFile(detailData?.factoryInspectionReport.name)" />
+        <el-descriptions-item label="出厂检验报告">
+            <el-icon class="elView" v-if="detailData?.factoryInspectionReport?.name">
+                <View @click="openFile(detailData?.factoryInspectionReport?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.factoryInspectionReport.url">
-                {{ detailData?.factoryInspectionReport.name }}
+            <a
+                target="_blank"
+                :href="detailData?.factoryInspectionReport?.url"
+                v-if="detailData?.factoryInspectionReport?.name"
+            >
+                {{ detailData?.factoryInspectionReport?.name }}
            </a>
        </el-descriptions-item>
-        <el-descriptions-item label="性能检测报告" v-if="detailData?.performanceTestReport">
-            <el-icon class="elView" v-if="detailData?.performanceTestReport.name">
-                <View @click="openFile(detailData?.performanceTestReport.name)" />
+        <el-descriptions-item label="性能检测报告">
+            <el-icon class="elView" v-if="detailData?.performanceTestReport?.name">
+                <View @click="openFile(detailData?.performanceTestReport?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.performanceTestReport.url">
-                {{ detailData?.performanceTestReport.name }}
+            <a
+                target="_blank"
+                :href="detailData?.performanceTestReport?.url"
+                v-if="detailData?.performanceTestReport?.name"
+            >
+                {{ detailData?.performanceTestReport?.name }}
            </a>
        </el-descriptions-item>
-        <el-descriptions-item label="其他附件" v-if="detailData?.otherAttachments">
-            <el-icon class="elView" v-if="detailData?.otherAttachments.name">
-                <View @click="openFile(detailData?.otherAttachments.name)" />
+        <el-descriptions-item label="其他附件">
+            <el-icon class="elView" v-if="detailData?.otherAttachments?.name">
+                <View @click="openFile(detailData?.otherAttachments?.name)" />
            </el-icon>
-            <a target="_blank" :href="detailData?.otherAttachments.url">{{ detailData?.otherAttachments.name }}</a>
+            <a target="_blank" :href="detailData?.otherAttachments?.url" v-if="detailData?.otherAttachments?.name">
+                {{ detailData?.otherAttachments?.name }}
+            </a>
        </el-descriptions-item>
    </el-descriptions>
 </template>
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -122,43 +122,6 @@ const tableStore = new TableStore({
                4: '已取消'
            }
        },
-
-        // { field: 'substation', title: '所属变电站', minWidth: 170 },
-        // {
-        //     field: 'userType',
-        //     title: '用户性质',
-        //     minWidth: 150,
-        //     formatter: (obj: any) => {
-        //         const userType = obj.row.userType
-        //         return getUserTypeName(userType)
-        //     }
-        // },
-
-        // { field: 'informationSecurityTestReport', title: '信息安全检测报告', minWidth: 170 },
-        // { field: 'otherAttachments', title: '其他附件', minWidth: 170 },
-        // { field: 'orgName', title: '填报部门名称'},
-        // { field: 'performanceTestReport', title: '性能检测报告', minWidth: 170 },
-
-        // {
-        //     field: 'userStatus',
-        //     title: '用户状态',
-        //     minWidth: 100,
-        //     render: 'tag',
-        //     custom: {
-        //         0: 'primary',
-        //         1: 'primary',
-        //         2: 'success',
-        //         3: 'warning'
-        //     },
-        //     replaceValue: {
-        //         0: '可研',
-        //         1: '建设',
-        //         2: '运行',
-        //         3: '退运'
-        //     }
-        // },
-        // { field: 'substation', title: '变电站', minWidth: 100 },
-        // { field: 'createTime', title: '开始时间', minWidth: 170 },
        {
            title: '操作',
            minWidth: 150,
@@ -172,18 +135,29 @@ const tableStore = new TableStore({
                    icon: 'el-icon-EditPen',
                    render: 'basicButton',
                    disabled: row => {
-                        return row.importType == 1 ? false : !row.processInstanceId
+                        return row.importType != null || !row.processInstanceId
                    },
                    click: row => {
-                        if (row.importType == 1) {
-                            userId.value = row.id
-                            dialogShow.value = true
-                        } else {
-                            flag.value = true
-                            handleAudit(row.processInstanceId, row.historyInstanceId)
-                        }
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                    }
                },
+
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.importType != 1
+                    },
+                    click: row => {
+                        userId.value = row.id
+                        dialogShow.value = true
+                    }
+                },
+
                {
                    name: 'edit',
                    title: '编辑',