diff --git a/src/views/design/drawing/DrawingTable.vue b/src/views/design/drawing/DrawingTable.vue new file mode 100644 index 0000000..093d5fe --- /dev/null +++ b/src/views/design/drawing/DrawingTable.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/src/views/design/drawing/index.vue b/src/views/design/drawing/index.vue index af5bc1f..ba69f16 100644 --- a/src/views/design/drawing/index.vue +++ b/src/views/design/drawing/index.vue @@ -7,11 +7,11 @@ - + @@ -33,65 +33,55 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -101,8 +91,9 @@ import { listDrawing, getDrawing, delDrawing, addDrawing, updateDrawing } from '@/api/design/drawing'; import { DrawingVO, DrawingQuery, DrawingForm } from '@/api/design/drawing/types'; import { useUserStoreHook } from '@/store/modules/user'; -import { LeaveVO } from '@/api/workflow/leave/types'; +import { LeaveVO } from '@/api/workflow/leave/types'; import { cancelProcessApply } from '@/api/workflow/instance'; +import DrawingTable from './DrawingTable.vue'; // 获取用户 store const userStore = useUserStoreHook(); @@ -110,6 +101,8 @@ const userStore = useUserStoreHook(); const currentProject = computed(() => userStore.selectedProject); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { drawing_file_type, wf_business_status } = toRefs(proxy?.useDict('drawing_file_type', 'wf_business_status')); +console.log(drawing_file_type); + const drawingList = ref([]); const loading = ref(true); const showSearch = ref(true); @@ -121,6 +114,7 @@ const fileList = ref([]); // 存储上传的文件列表 const selectedFile = ref(null); // 当前选中的文件 const queryFormRef = ref(); const drawingFormRef = ref(); +const activeName = ref('1'); const dialog = reactive({ visible: false, title: '', @@ -235,7 +229,7 @@ const handleUpdate = async (row?: DrawingVO) => { proxy.$router.push({ path: `/workflow/drawing/indexEdit`, query: { - id: row.id, + id: row.id, type: 'update' } }); @@ -249,10 +243,12 @@ const handleDelete = async (row?: DrawingVO) => { proxy?.$modal.msgSuccess('删除成功'); await getList(); }; + const handleView = (row) => { - var url= row.file.url + var url = row.file.url; window.open(url, '_blank'); }; + /** 查看按钮操作 */ const handleViewInfo = (row?: LeaveVO) => { proxy.$tab.closePage(proxy.$route); @@ -264,6 +260,7 @@ const handleViewInfo = (row?: LeaveVO) => { } }); }; + /** 撤销按钮操作 */ const handleCancelProcessApply = async (id: string) => { await proxy?.$modal.confirm('是否确认撤销当前单据?'); @@ -276,7 +273,14 @@ const handleCancelProcessApply = async (id: string) => { await getList(); proxy?.$modal.msgSuccess('撤销成功'); }; + +const handleClick = (val) => { + queryParams.value.pageNum = 1; + queryParams.value.fileType = val.props.name; + getList(); +}; + onMounted(() => { getList(); }); - + \ No newline at end of file diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue index b859f0a..0b1613a 100644 --- a/src/views/design/drawing/indexEdit.vue +++ b/src/views/design/drawing/indexEdit.vue @@ -1,54 +1,86 @@ @@ -60,7 +92,7 @@ import ApprovalRecord from '@/components/Process/approvalRecord.vue'; import ApprovalButton from '@/components/Process/approvalButton.vue'; import { StartProcessBo } from '@/api/workflow/workflowCommon/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -import { DrawingForm } from '@/api/design/drawing/types'; +import { DrawingForm } from '@/api/design/drawing/types'; import { useUserStoreHook } from '@/store/modules/user'; import { updateDrawing, getDrawing, addDrawing } from '@/api/design/drawing'; @@ -75,15 +107,15 @@ const loading = ref(true); const routeParams = ref>({}); const flowCodeOptions = [ { - value:currentProject.value?.id+ '_changedrawing', + value: currentProject.value?.id + '_changedrawing', label: '变更图纸审批' }, { - value: currentProject.value?.id+ '_blueprintdrawing', + value: currentProject.value?.id + '_blueprintdrawing', label: '蓝图审批' }, { - value: currentProject.value?.id+ '_processdrawing', + value: currentProject.value?.id + '_processdrawing', label: '过程图纸审批' } ]; @@ -277,3 +309,107 @@ onMounted(() => { }); }); + diff --git a/src/views/design/specialScheme/indexEdit.vue b/src/views/design/specialScheme/indexEdit.vue index 32a5fee..4719ff0 100644 --- a/src/views/design/specialScheme/indexEdit.vue +++ b/src/views/design/specialScheme/indexEdit.vue @@ -1,49 +1,81 @@ @@ -90,7 +122,7 @@ const submitFormData = ref({ const taskVariables = ref>({}); const flowCodeOptions = [ { - value: currentProject.value?.id+ '_specialScheme', + value: currentProject.value?.id + '_specialScheme', label: '专项方案审批' } ]; @@ -259,3 +291,107 @@ onMounted(() => { }); }); + diff --git a/src/views/materials/materialsEquipment/partyA/index.vue b/src/views/materials/materialsEquipment/partyA/index.vue deleted file mode 100644 index 8505953..0000000 --- a/src/views/materials/materialsEquipment/partyA/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/views/materials/materialsEquipment/partyA/materialIssue/index.vue b/src/views/materials/materialsEquipment/partyA/materialIssue/index.vue index 7eb458c..d8a351c 100644 --- a/src/views/materials/materialsEquipment/partyA/materialIssue/index.vue +++ b/src/views/materials/materialsEquipment/partyA/materialIssue/index.vue @@ -25,9 +25,6 @@ - - - 搜索 重置 @@ -277,42 +274,45 @@ const dialog = reactive({ title: '' }); -const initFormData: MaterialIssueForm = { - id: undefined, - projectId: currentProject.value?.id, - materialSource: '1', - formCode: undefined, - projectName: undefined, - materialName: undefined, - orderingUnit: undefined, - supplierUnit: undefined, - issueUnit: undefined, - storageUnit: undefined, - defectDescription: undefined, - certCount: undefined, - certCountFileId: undefined, - reportCount: undefined, - reportCountFileId: undefined, - techDocCount: undefined, - techDocCountFileId: undefined, - licenseCount: undefined, - licenseCountFileId: undefined, - remark: undefined, - itemList: [ - { - id: undefined, - specification: undefined, - unit: undefined, - stockQuantity: undefined, - issuedQuantity: undefined, - remainingQuantity: undefined, - name: undefined, - remark: undefined - } - ] +// 定义一个函数来生成初始表单数据 +const getInitFormData = () => { + return { + id: undefined, + projectId: currentProject.value?.id, + materialSource: '1', + formCode: undefined, + projectName: undefined, + materialName: undefined, + orderingUnit: undefined, + supplierUnit: undefined, + issueUnit: undefined, + storageUnit: undefined, + defectDescription: undefined, + certCount: undefined, + certCountFileId: undefined, + reportCount: undefined, + reportCountFileId: undefined, + techDocCount: undefined, + techDocCountFileId: undefined, + licenseCount: undefined, + licenseCountFileId: undefined, + remark: undefined, + itemList: [ + { + id: undefined, + specification: undefined, + unit: undefined, + stockQuantity: undefined, + issuedQuantity: undefined, + remainingQuantity: undefined, + name: undefined, + remark: undefined + } + ] + }; }; const data = reactive>({ - form: { ...initFormData }, + form: getInitFormData(), queryParams: { pageNum: 1, pageSize: 10, @@ -352,7 +352,7 @@ const cancel = () => { /** 表单重置 */ const reset = () => { - form.value = { ...initFormData }; + form.value = getInitFormData(); materialIssueFormRef.value?.resetFields(); }; diff --git a/src/views/materials/materialsEquipment/partyA/materialIssue/word/index.vue b/src/views/materials/materialsEquipment/partyA/materialIssue/word/index.vue index ae3d441..c560a8c 100644 --- a/src/views/materials/materialsEquipment/partyA/materialIssue/word/index.vue +++ b/src/views/materials/materialsEquipment/partyA/materialIssue/word/index.vue @@ -182,7 +182,7 @@ const onOpen = (path: string) => { }; // 导出 const onLoad = async () => { - await downLoadOss({ id: formData.value.id }, '/design/designChange/export/word', '设计变更单.zip'); + await downLoadOss({ id: formData.value.id }, '/materials/materialIssue/export/word', '设计材料设备领料单.zip'); }; // 关闭弹窗 diff --git a/src/views/materials/materialsEquipment/partyA/materialReceive/index.vue b/src/views/materials/materialsEquipment/partyA/materialReceive/index.vue index 5842206..5415284 100644 --- a/src/views/materials/materialsEquipment/partyA/materialReceive/index.vue +++ b/src/views/materials/materialsEquipment/partyA/materialReceive/index.vue @@ -203,7 +203,7 @@ - + @@ -225,7 +225,7 @@ - 注意:请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件 + 注意:请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件 @@ -288,42 +288,44 @@ const dialog = reactive({ visible: false, title: '' }); - -const initFormData: MaterialReceiveForm = { - id: undefined, - projectId: currentProject.value?.id, - materialSource: '1', - formCode: undefined, - projectName: undefined, - materialName: undefined, - contractName: undefined, - orderingUnit: undefined, - supplierUnit: undefined, - defectDescription: undefined, - certCount: undefined, - certCountFileId: undefined, - reportCount: undefined, - reportCountFileId: undefined, - techDocCount: undefined, - techDocCountFileId: undefined, - licenseCount: undefined, - licenseCountFileId: undefined, - storageType: [], - remark: undefined, - itemList: [ - { - name: undefined, - specification: undefined, - unit: undefined, - quantity: undefined, - acceptedQuantity: undefined, - shortageQuantity: undefined, - remark: undefined - } - ] +const getInitFormData = () => { + return { + id: undefined, + projectId: currentProject.value?.id, + materialSource: '1', + formCode: undefined, + projectName: undefined, + materialName: undefined, + contractName: undefined, + orderingUnit: undefined, + supplierUnit: undefined, + defectDescription: undefined, + certCount: undefined, + certCountFileId: undefined, + reportCount: undefined, + reportCountFileId: undefined, + techDocCount: undefined, + techDocCountFileId: undefined, + licenseCount: undefined, + licenseCountFileId: undefined, + storageType: [], + remark: undefined, + itemList: [ + { + name: undefined, + specification: undefined, + unit: undefined, + quantity: undefined, + acceptedQuantity: undefined, + shortageQuantity: undefined, + remark: undefined + } + ] + }; }; +const initFormData: MaterialReceiveForm = {}; const data = reactive>({ - form: { ...initFormData }, + form: getInitFormData(), queryParams: { pageNum: 1, pageSize: 10, @@ -359,7 +361,7 @@ const cancel = () => { /** 表单重置 */ const reset = () => { - form.value = { ...initFormData }; + form.value = getInitFormData(); materialReceiveFormRef.value?.resetFields(); }; @@ -395,10 +397,10 @@ const handleUpdate = async (row?: MaterialReceiveVO) => { const _id = row?.id || ids.value[0]; const res = await getMaterialReceive(_id); Object.assign(form.value, res.data); - if(form.value.storageType.length){ + if (form.value.storageType.length) { form.value.storageType = form.value.storageType.split(','); - }else{ - form.value.storageType=[] + } else { + form.value.storageType = []; } dialog.visible = true; dialog.title = '修改物料接收单'; diff --git a/src/views/materials/materialsEquipment/partyA/materialReceive/word/index.vue b/src/views/materials/materialsEquipment/partyA/materialReceive/word/index.vue index 7eafbc9..4a4312d 100644 --- a/src/views/materials/materialsEquipment/partyA/materialReceive/word/index.vue +++ b/src/views/materials/materialsEquipment/partyA/materialReceive/word/index.vue @@ -172,7 +172,7 @@ const onOpen = (path: string) => { }; // 导出 const onLoad = async () => { - await downLoadOss({ id: formData.value.id }, '/design/designChange/export/word', '设计变更单.zip'); + await downLoadOss({ id: formData.value.id }, '/materials/materialReceive/export/word', '材料设备验收单.zip'); }; // 关闭弹窗 diff --git a/src/views/materials/materialsEquipment/partyB/index.vue b/src/views/materials/materialsEquipment/partyB/index.vue deleted file mode 100644 index f5bbf3d..0000000 --- a/src/views/materials/materialsEquipment/partyB/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/views/materials/materialsEquipment/partyB/materialIssue/index.vue b/src/views/materials/materialsEquipment/partyB/materialIssue/index.vue index f764dc4..53c6c05 100644 --- a/src/views/materials/materialsEquipment/partyB/materialIssue/index.vue +++ b/src/views/materials/materialsEquipment/partyB/materialIssue/index.vue @@ -25,9 +25,6 @@ - - - 搜索 重置 @@ -230,8 +227,10 @@ - 注意:请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件 - + 注意:请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件 @@ -276,43 +275,45 @@ const dialog = reactive({ visible: false, title: '' }); - -const initFormData: MaterialIssueForm = { - id: undefined, - projectId: currentProject.value?.id, - materialSource: '2', - formCode: undefined, - projectName: undefined, - materialName: undefined, - orderingUnit: undefined, - supplierUnit: undefined, - issueUnit: undefined, - storageUnit: undefined, - defectDescription: undefined, - certCount: undefined, - certCountFileId: undefined, - reportCount: undefined, - reportCountFileId: undefined, - techDocCount: undefined, - techDocCountFileId: undefined, - licenseCount: undefined, - licenseCountFileId: undefined, - remark: undefined, - itemList: [ - { - id: undefined, - specification: undefined, - unit: undefined, - stockQuantity: undefined, - issuedQuantity: undefined, - remainingQuantity: undefined, - name: undefined, - remark: undefined - } - ] +const getInitFormData = () => { + return { + id: undefined, + projectId: currentProject.value?.id, + materialSource: '2', + formCode: undefined, + projectName: undefined, + materialName: undefined, + orderingUnit: undefined, + supplierUnit: undefined, + issueUnit: undefined, + storageUnit: undefined, + defectDescription: undefined, + certCount: undefined, + certCountFileId: undefined, + reportCount: undefined, + reportCountFileId: undefined, + techDocCount: undefined, + techDocCountFileId: undefined, + licenseCount: undefined, + licenseCountFileId: undefined, + remark: undefined, + itemList: [ + { + id: undefined, + specification: undefined, + unit: undefined, + stockQuantity: undefined, + issuedQuantity: undefined, + remainingQuantity: undefined, + name: undefined, + remark: undefined + } + ] + }; }; +const initFormData: MaterialIssueForm = {}; const data = reactive>({ - form: { ...initFormData }, + form: getInitFormData(), queryParams: { pageNum: 1, pageSize: 10, @@ -352,7 +353,7 @@ const cancel = () => { /** 表单重置 */ const reset = () => { - form.value = { ...initFormData }; + form.value = getInitFormData(); materialIssueFormRef.value?.resetFields(); }; diff --git a/src/views/materials/materialsEquipment/partyB/materialIssue/word/index.vue b/src/views/materials/materialsEquipment/partyB/materialIssue/word/index.vue index ae3d441..c560a8c 100644 --- a/src/views/materials/materialsEquipment/partyB/materialIssue/word/index.vue +++ b/src/views/materials/materialsEquipment/partyB/materialIssue/word/index.vue @@ -182,7 +182,7 @@ const onOpen = (path: string) => { }; // 导出 const onLoad = async () => { - await downLoadOss({ id: formData.value.id }, '/design/designChange/export/word', '设计变更单.zip'); + await downLoadOss({ id: formData.value.id }, '/materials/materialIssue/export/word', '设计材料设备领料单.zip'); }; // 关闭弹窗 diff --git a/src/views/materials/materialsEquipment/partyB/materialReceive/index.vue b/src/views/materials/materialsEquipment/partyB/materialReceive/index.vue index dc7218d..40aedf3 100644 --- a/src/views/materials/materialsEquipment/partyB/materialReceive/index.vue +++ b/src/views/materials/materialsEquipment/partyB/materialReceive/index.vue @@ -224,8 +224,10 @@ - 注意:请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件 - 注意:请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件 @@ -278,42 +280,43 @@ const dialog = reactive({ visible: false, title: '' }); - -const initFormData: MaterialReceiveForm = { - id: undefined, - projectId: currentProject.value?.id, - materialSource: '2', - formCode: undefined, - projectName: undefined, - materialName: undefined, - contractName: undefined, - orderingUnit: undefined, - supplierUnit: undefined, - defectDescription: undefined, - certCount: undefined, - certCountFileId: undefined, - reportCount: undefined, - reportCountFileId: undefined, - techDocCount: undefined, - techDocCountFileId: undefined, - licenseCount: undefined, - licenseCountFileId: undefined, - storageType: [], - remark: undefined, - itemList: [ - { - name: undefined, - specification: undefined, - unit: undefined, - quantity: undefined, - acceptedQuantity: undefined, - shortageQuantity: undefined, - remark: undefined - } - ] +const getInitFormData = () => { + return { + id: undefined, + projectId: currentProject.value?.id, + materialSource: '2', + formCode: undefined, + projectName: undefined, + materialName: undefined, + contractName: undefined, + orderingUnit: undefined, + supplierUnit: undefined, + defectDescription: undefined, + certCount: undefined, + certCountFileId: undefined, + reportCount: undefined, + reportCountFileId: undefined, + techDocCount: undefined, + techDocCountFileId: undefined, + licenseCount: undefined, + licenseCountFileId: undefined, + storageType: [], + remark: undefined, + itemList: [ + { + name: undefined, + specification: undefined, + unit: undefined, + quantity: undefined, + acceptedQuantity: undefined, + shortageQuantity: undefined, + remark: undefined + } + ] + }; }; const data = reactive>({ - form: { ...initFormData }, + form: getInitFormData(), queryParams: { pageNum: 1, pageSize: 10, @@ -349,7 +352,7 @@ const cancel = () => { /** 表单重置 */ const reset = () => { - form.value = { ...initFormData }; + form.value = getInitFormData(); materialReceiveFormRef.value?.resetFields(); }; @@ -385,10 +388,10 @@ const handleUpdate = async (row?: MaterialReceiveVO) => { const _id = row?.id || ids.value[0]; const res = await getMaterialReceive(_id); Object.assign(form.value, res.data); - if(form.value.storageType.length){ + if (form.value.storageType.length) { form.value.storageType = form.value.storageType.split(','); - }else{ - form.value.storageType=[] + } else { + form.value.storageType = []; } dialog.visible = true; dialog.title = '修改物料接收单'; diff --git a/src/views/materials/materialsEquipment/partyB/materialReceive/word/index.vue b/src/views/materials/materialsEquipment/partyB/materialReceive/word/index.vue index 7eafbc9..4a4312d 100644 --- a/src/views/materials/materialsEquipment/partyB/materialReceive/word/index.vue +++ b/src/views/materials/materialsEquipment/partyB/materialReceive/word/index.vue @@ -172,7 +172,7 @@ const onOpen = (path: string) => { }; // 导出 const onLoad = async () => { - await downLoadOss({ id: formData.value.id }, '/design/designChange/export/word', '设计变更单.zip'); + await downLoadOss({ id: formData.value.id }, '/materials/materialReceive/export/word', '材料设备验收单.zip'); }; // 关闭弹窗