multiple/assets/favicon/HYJCfavicon.ico
@@ -152,7 +152,8 @@ startDate: "", // 请假开始时间 endDate: "", // 请假结束时间 price: null, // 报销金额 location: "" // 出差地点 location: "", // 出差地点 storageBlobDTOS: [] }, rules: { approveId: [{ required: false, message: "请输入", trigger: "blur" }], @@ -270,7 +271,7 @@ return } } form.value.storageBlobDTOList = fileList.value form.value.storageBlobDTOS = fileList.value proxy.$refs.formRef.validate(valid => { if (valid) { src/views/collaborativeApproval/approvalProcess/index.vue
@@ -126,20 +126,23 @@ <!-- 弹窗组件 --> <info-form-dia ref="infoFormDia" @close="handleQuery" :approveType="currentApproveType"></info-form-dia> <approval-dia ref="approvalDia" @close="handleQuery" :approveType="currentApproveType"></approval-dia> <FileList ref="fileListRef" /> <FileList v-if="fileDialogVisible" v-model:visible="fileDialogVisible" record-type="approve_process" :record-id="recordId" /> </div> </template> <script setup> import FileList from "./fileList.vue"; import { Search, Plus, Delete, Download, RefreshRight, DocumentChecked } from "@element-plus/icons-vue"; import {onMounted, ref, computed, reactive, toRefs, nextTick, getCurrentInstance} from "vue"; import {onMounted, ref, computed, reactive, toRefs, nextTick, getCurrentInstance, defineAsyncComponent} from "vue"; import {ElMessageBox} from "element-plus"; import { useRoute } from 'vue-router'; import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue"; import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue"; import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js"; import useUserStore from "@/store/modules/user"; const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue")); const userStore = useUserStore(); const route = useRoute(); @@ -337,7 +340,7 @@ name: "附件", type: "text", clickFun: (row) => { downLoadFile(row); openFilesFormDia(row); }, }); } @@ -371,11 +374,17 @@ page.current = 1; getList(); }; const fileListRef = ref(null) const downLoadFile = (row) => { fileListRef.value.open(row.commonFileList) // 打开附件弹窗 const recordId =ref(0) const fileDialogVisible = ref(false) // 打开附件弹框 const openFilesFormDia = async (row) => { recordId.value = row.id fileDialogVisible.value = true } const pagination = (obj) => { page.current = obj.page; page.size = obj.limit; src/views/safeProduction/safeWorkApproval/components/infoFormDia.vue
@@ -218,7 +218,7 @@ approveDeptName: "", approveReason: "", checkResult: "", storageBlobDTOs: [], storageBlobDTOS: [], approverList: [], // 新增字段，存储所有节点的审批人id startDate: "", // 请假开始时间 endDate: "", // 请假结束时间 @@ -298,7 +298,7 @@ approveProcessGetInfo({ id: row.approveId, approveReason: "1" }).then( res => { form.value = { ...res.data }; form.value.storageBlobDTOs = res.data.storageBlobVOS; form.value.storageBlobDTOS = res.data.storageBlobVOS; // 反显审批人 if (res.data && res.data.approveUserIds) { const userIds = res.data.approveUserIds.split(","); @@ -388,7 +388,7 @@ return; } } form.value.storageBlobDTOs = fileList.value; form.value.storageBlobDTOS = fileList.value; proxy.$refs.formRef.validate(valid => { if (valid) { if (operationType.value === "add" || currentApproveStatus.value == 3) { src/views/salesManagement/salesLedger/index.vue
@@ -2655,7 +2655,7 @@ // 发货状态必须是"待发货"或"审核拒绝" const statusStr = shippingStatus ? String(shippingStatus).trim() : ""; return statusStr === "待发货" || statusStr === "审核拒绝"; return statusStr === "待发货" || statusStr === "审核拒绝" || statusStr === "部分发货"; }; // 打开附件弹窗
