From 398dff4a52018d1c680be4b9e6545d5a65bc2b86 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 8 Apr 2024 09:38:27 +0800 Subject: [PATCH 01/16] =?UTF-8?q?QMS/=E6=A3=80=E9=AA=8C=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionMethod/index.vue | 4 ++++ src/views/qms/inspectionMethod/inspectionMethod.data.ts | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue index fdf4cf9fc..2ed512f72 100644 --- a/src/views/qms/inspectionMethod/index.vue +++ b/src/views/qms/inspectionMethod/index.vue @@ -179,7 +179,11 @@ const openForm = (type: string, row?: any) => { } if(uploadFile){ uploadFile['componentProps']['upData']['tableId'] = currentTime + uploadFile['componentProps']['modelValue']= [] } + }else if(type=='update'){ + const uploadFile = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='videoAddress') + uploadFile['componentProps']['modelValue']= row.filePathListView } basicFormRef.value.open(type, row) diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts index d181e9855..d793f4e0a 100644 --- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts +++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts @@ -64,9 +64,11 @@ export const InspectionMethod = useCrudSchemas(reactive([ upData:{ tableName:'basicInspectionMethod', tableId:'', - // fileType:['doc', 'xls', 'ppt', 'txt'] - } - } + }, + fileType:['doc', 'xls', 'ppt', 'txt'], + modelValue:[] + }, + } }, { From dbe7ec4303f16db90b445c750317ade30342bcdf Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 8 Apr 2024 10:00:01 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0apk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UploadFile/src/UploadFile.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 26e97d622..a05ff581f 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -56,7 +56,7 @@ const props = defineProps({ title: propTypes.string.def('文件上传'), updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL), upData: propTypes.object.def(), - fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] + fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] fileSize: propTypes.number.def(5), // 大小限制(MB) limit: propTypes.number.def(5), // 数量限制 autoUpload: propTypes.bool.def(true), // 自动上传 From 3895c48db4f6ae10c5d3159ba25e1cd39923d076 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 8 Apr 2024 10:00:38 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=8E=E6=89=93=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .../system/systemInstallPackage/systemInstallPackage.data.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index 78976cddd..81e0d3dfb 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:12080' +VITE_BASE_URL='http://192.168.0.113:12080' # 上传路径 -VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api diff --git a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts index c3ed88332..db884d927 100644 --- a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts +++ b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts @@ -96,7 +96,9 @@ export const SystemInstallPackage = useCrudSchemas(reactive([ tableId: '', tableName: '' }, - limit:1 + limit:1, + fileType:['apk'], + fileSize:35 } }, }, From 34fc48450e395b6588335b8e00f98ec678420586 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 8 Apr 2024 10:39:53 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=BF=85=E8=BE=93=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceInvoiced/index.ts | 65 +++++ .../sparepartsrequisitionRequestMain.data.ts | 6 + .../unplannedissueRequestMain.data.ts | 6 + .../unplannedreceiptRequestMain.data.ts | 84 ++++++ .../supplierinvoiceInvoiced/index.vue | 274 ++++++++++++++++++ .../supplierinvoiceInvoiced.data.ts | 149 ++++++++++ 6 files changed, 584 insertions(+) create mode 100644 src/api/wms/supplierinvoiceInvoiced/index.ts create mode 100644 src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue create mode 100644 src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts new file mode 100644 index 000000000..4ec7469ef --- /dev/null +++ b/src/api/wms/supplierinvoiceInvoiced/index.ts @@ -0,0 +1,65 @@ +import request from '@/config/axios' + +export interface SupplierinvoiceInvoicedVO { + id: number + tax: number + projectCode: string + billType: string + recvBillNum: string + asnBillNum: string + supplierCode: string + poNumber: string + poLine: string + purchasePrice: number + invoicableQuantity: number + itemCode: string + uom: string + currency: string + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询待开票列表 +export const getSupplierinvoiceInvoicedPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierinvoice-invoiced/senior', data }) + } else { + return await request.get({ url: `/wms/supplierinvoice-invoiced/page`, params }) + } +} + +// 查询待开票详情 +export const getSupplierinvoiceInvoiced = async (id: number) => { + return await request.get({ url: `/wms/supplierinvoice-invoiced/get?id=` + id }) +} + +// 新增待开票 +export const createSupplierinvoiceInvoiced = async (data: SupplierinvoiceInvoicedVO) => { + return await request.post({ url: `/wms/supplierinvoice-invoiced/create`, data }) +} + +// 修改待开票 +export const updateSupplierinvoiceInvoiced = async (data: SupplierinvoiceInvoicedVO) => { + return await request.put({ url: `/wms/supplierinvoice-invoiced/update`, data }) +} + +// 删除待开票 +export const deleteSupplierinvoiceInvoiced = async (id: number) => { + return await request.delete({ url: `/wms/supplierinvoice-invoiced/delete?id=` + id }) +} + +// 导出待开票 Excel +export const exportSupplierinvoiceInvoiced = async (params) => { + return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplierinvoice-invoiced/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts index 56dee32d7..a7f717be3 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts @@ -341,6 +341,12 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ //表单校验 export const UnplannedissueRequestMainRules = reactive({ + requestTime: [ + { required: true, message: '请输入申请时间', trigger: 'blur' } + ], + dueTime: [ + { required: true, message: '请输入截止时间', trigger: 'blur' } + ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index ba669b9a1..123091620 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -341,6 +341,12 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ //表单校验 export const UnplannedissueRequestMainRules = reactive({ + requestTime: [ + { required: true, message: '请输入申请时间', trigger: 'blur' } + ], + dueTime: [ + { required: true, message: '请输入截止时间', trigger: 'blur' } + ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 145c1496e..d54304c6c 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1027,6 +1027,90 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive + + + + + + + + + + + + + +
+ + + + + + + + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts new file mode 100644 index 000000000..0c8ac6883 --- /dev/null +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -0,0 +1,149 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const SupplierinvoiceInvoicedRules = reactive({ + supplierCode: [required], + poNumber: [required], + currency: [required], + concurrencyStamp: [required], +}) + +export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ + { + label: '项目编码', + field: 'projectCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '单据类型', + field: 'billType', + sort: 'custom', + form: { + component: 'SelectV2' + }, + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'recvBillNum', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '发货单号', + field: 'asnBillNum', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '采购价格', + field: 'purchasePrice', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '可开票数量', + field: 'invoicableQuantity', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '零件号', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '货币', + field: 'currency', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From c8101b0af6d340966a0a139a1d0a9c54f6b226c8 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 8 Apr 2024 10:49:00 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/utils/dict.ts | 2 +- .../supplierinvoiceInvoiced.data.ts | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index 81e0d3dfb..78976cddd 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://192.168.0.113:12080' +VITE_BASE_URL='http://localhost:12080' # 上传路径 -VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api diff --git a/src/utils/dict.ts b/src/utils/dict.ts index c204f0772..4e7d64190 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -313,5 +313,5 @@ export enum DICT_TYPE { REWORK_STATUS='rework_status',//返工返修状态:待返修，返修中，返修完成 REWORK_REPLACE_FLAG = 'rework_replace_flag',//是否有替换件 SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态 - + SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态 } diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index 0c8ac6883..371d09f00 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -30,6 +30,25 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, { label: '单据号', field: 'recvBillNum', From 5184e4a43583453dc2afc089d4cf4485e33b2a2d Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 8 Apr 2024 11:01:03 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=B3=84=E6=BC=8F=E9=80=A0=E6=88=90=E9=A1=B5=E9=9D=A2=E5=8D=A1?= =?UTF-8?q?=E9=A1=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Message/src/Message.vue | 9 +++++++-- src/views/login/components/LoginForm.vue | 2 +- src/views/login/components/MobileForm.vue | 10 ++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index 28f796b3b..ca7fc6107 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -8,7 +8,7 @@ const { push } = useRouter() const activeName = ref('notice') const unreadCount = ref(0) // 未读消息数量 const list = ref([]) // 消息列表 - +const interval = ref() // 获得消息列表 const getList = async () => { list.value = await NotifyMessageApi.getUnreadNotifyMessageList() @@ -35,13 +35,18 @@ onMounted(() => { // 首次加载小红点 getUnreadCount() // 轮询刷新小红点 - setInterval( + interval.value = setInterval( () => { getUnreadCount() }, 1000 * 60 * 2 ) }) +onBeforeUnmount(() => { + if(interval.value){ + clearInterval(interval.value) + } +}) + + + + diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue index 7116df0d8..89e8ab19d 100644 --- a/src/views/qms/inspection/inspectionRecord/index.vue +++ b/src/views/qms/inspection/inspectionRecord/index.vue @@ -35,17 +35,23 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" /> - - + @searchTableSuccessDetail="searchTableSuccessDetail" :isShowAddBtn="false" :detailButtonIsShow="true" /> --> + - diff --git a/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js b/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js index bb71d4420..e0da73e77 100644 --- a/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js +++ b/src/components/bpmnProcessDesigner/src/utils/directive/clickOutSide.js @@ -22,9 +22,13 @@ export default { methodName: binding.expression, bindingFn: binding.value } - - setTimeout(() => { + let timer + timer = setTimeout(() => { document.addEventListener('touchstart', documentHandler) // 为document绑定事件 + if(timer){ + clearTimeout(timer) + timer = null + } }) }, update(el, binding) { diff --git a/src/components/iFrame/src/IFrame.vue b/src/components/iFrame/src/IFrame.vue index 85b3e3c34..5d2626d6d 100644 --- a/src/components/iFrame/src/IFrame.vue +++ b/src/components/iFrame/src/IFrame.vue @@ -14,6 +14,8 @@ const init = () => { height.value = document.documentElement.clientHeight - 94.5 + 'px' loading.value = false } +const timer1 = ref() +const timer2 = ref() console.log(props.src); function populateIframe(iframe, headers) { @@ -37,14 +39,33 @@ function populateIframe(iframe, headers) { onMounted(() => { - setTimeout(() => { + timer1.value = setTimeout(() => { var iframe = document.querySelector("#iframe"); populateIframe(iframe, [["Authorization", 'Bearer ' + getAccessToken()], ["tenant-id", getTenantId()]]); + if(timer1.value){ + clearTimeout(timer1.value) + timer1.value = 0 + } }, 300); - setTimeout(() => { + timer2.value = setTimeout(() => { init() + if(timer2.value){ + clearTimeout(timer2.value) + timer2.value = 0 + } }, 300) }) + +onBeforeUnmount(() => { + if(timer1.value){ + clearTimeout(timer1.value) + timer1.value = 0 + } + if(timer2.value){ + clearTimeout(timer2.value) + timer2.value = 0 + } +})