From c9e5a66dd2fc0cb9e28391197c428d859356e3bd Mon Sep 17 00:00:00 2001 From: zhousq Date: Mon, 6 May 2024 11:52:50 +0800 Subject: [PATCH 01/44] =?UTF-8?q?2024-05-06=20=E5=B7=A5=E5=BA=8F=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/process/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/mes/process/index.vue b/src/views/mes/process/index.vue index 3c1a70321..8e49c9816 100644 --- a/src/views/mes/process/index.vue +++ b/src/views/mes/process/index.vue @@ -283,13 +283,13 @@ const changeTabs = (data) =>{ tabsCreateApi = ProcessApi.createPatternRelation tmpPopList = PatternPopList.allSchemas } - else if(data.prop == 'ItembasicTab'){ - apiPage.value = ProcessApi.getItembasicPage - detailAllSchemas.value = ItembasicTab.allSchemas - tabsDeleteApi = ProcessApi.deleteItembasicRelation - tabsCreateApi = ProcessApi.createItembasicRelation - tmpPopList = ItembasicPopList.allSchemas - } + // else if(data.prop == 'ItembasicTab'){ + // apiPage.value = ProcessApi.getItembasicPage + // detailAllSchemas.value = ItembasicTab.allSchemas + // tabsDeleteApi = ProcessApi.deleteItembasicRelation + // tabsCreateApi = ProcessApi.createItembasicRelation + // tmpPopList = ItembasicPopList.allSchemas + // } } /** 详情操作 */ From 07ba572b92d572e0ce39b854fc2e9bfa914378cf Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 7 May 2024 13:26:57 +0800 Subject: [PATCH 02/44] =?UTF-8?q?PDF=EF=BC=8C=E5=9B=BE=E7=89=87=E9=A2=84?= =?UTF-8?q?=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 25 +++++++- src/components/Detail/src/Detail.vue | 10 +++- src/components/PreviewPDF/index.vue | 60 +++++++++++++++++++ .../supplierdeliverRecordMain/index.vue | 38 +++++++++++- .../supplierdeliverRequestMain/index.vue | 1 + 5 files changed, 128 insertions(+), 6 deletions(-) create mode 100644 src/components/PreviewPDF/index.vue diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index ef289c6a8..cb68ced7d 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -16,17 +16,20 @@
{{ item.size }}KB
来自 {{ item.nickname }}
- - + + +
{{ formatDate(item.createTime) }}
+ diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index d3308ecf0..3428a8a8f 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -223,6 +223,7 @@ const props = defineProps({ default: ()=>({ label: '附件', showDownload:false, + showPreview:false, hiddenDelete:false }) }, @@ -460,10 +461,14 @@ const getFileList = async () => { } } // 获取其他附件列表篇 -const getAnnexFileList = async (row:id) => { - console.log('getAnnexFileList') +const getAnnexFileList = async (row) => { props.annexTable?.forEach(async (item) => { let requstData = {...remarksData.data,tableName: item?.tableName} + if(item?.queryParams){ + item?.queryParams?.forEach(queryItem => { + requstData[queryItem.queryField] = row[queryItem.rowField] + }); + } const annexList = await FileApi.getFileList(requstData) const annexData = annexTableData.value.find(annex=>annex.label === item.label) if(annexData){ @@ -476,6 +481,7 @@ const getAnnexFileList = async (row:id) => { annexList, hasSubDetail:item.hasSubDetail||false, subDetailTableData:item.subDetailTableData, + showPreview:item.showPreview||false, // 是否展示预览按钮 showDownload:item.showDownload||false, // 是否展示下载按钮 hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮 }) diff --git a/src/components/PreviewPDF/index.vue b/src/components/PreviewPDF/index.vue new file mode 100644 index 000000000..696f1b105 --- /dev/null +++ b/src/components/PreviewPDF/index.vue @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 4c6a3afae..660f8b0e2 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -53,6 +53,31 @@ import download from '@/utils/download' +import * as SupplierdeliverInspectionDetailApi from '@/api/wms/supplierdeliverInspectionDetail' +import {   SupplierdeliverInspectionDetail,SupplierdeliverInspectionDetailRules} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data' import { SupplierdeliverRecordMain,SupplierdeliverRecordMainRules, SupplierdeliverRecordDetail,SupplierdeliverRecordDetailRules,SupplierdeliverRecordDetailPickingNumer } from './supplierdeliverRecordMain.data' import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain' import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail' +import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' @@ -197,9 +225,17 @@ const { getList:getDetailList } = detatableMethods const { wsCache } = useCache() /** 详情操作 */ const detailRef = ref() -const openDetail = (row: any, titleName: any, titleValue: any) => { +const openDetail = async (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) + //获取申请中的masterId + const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({ + getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口 + }) + const { getList:requestGetList } = requestTableMethods + requestTableObject.params.number = 'REQ0120240506-0002' + await requestGetList() + row.annexMasterId = requestTableObject.tableList[0].masterId detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain') } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index abe1f8cbc..4002104d1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -82,6 +82,7 @@ prop: 'uploadFile', tableName:'SupplierdeliverInspectionDetail', hasSubDetail:true, // 附件中是否展示明细表 + showPreview:true, // 附件中是否展示预览按钮 align:'left', //明细表数据 subDetailTableData:{ From 9143fdec2b7ecd233dbd260cdeaecfde0c03e885 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 7 May 2024 13:31:01 +0800 Subject: [PATCH 03/44] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 1 + src/components/PreviewPDF/index.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 3428a8a8f..ad389ea97 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -103,6 +103,7 @@ - + From 24ed368b866dd016a7dca8e65d16bbbd4fdc1298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 7 May 2024 13:38:37 +0800 Subject: [PATCH 04/44] =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionJob/inspectionJobMain/index.ts | 6 + src/utils/disposition/defaultButtons.ts | 14 ++ .../qms/inspection/inspectionJob/addForm.vue | 128 ++++++++++++++++++ .../qms/inspection/inspectionJob/index.vue | 1 - 4 files changed, 148 insertions(+), 1 deletion(-) diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts index 2b59a7401..aca7fd268 100644 --- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts +++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts @@ -22,6 +22,11 @@ export const createInspectionJobMain = async (data) => { return await request.post({ url: `/qms/inspection-job-main/create`, data }) } +// 暂存检验任务 +export const stagingInspectionJobMain = async (data) => { + return await request.post({ url: `/qms/inspection-job-main/staging`, data }) +} + // 修改检验任务 export const updateInspectionJobMain = async (data) => { return await request.put({ url: `/qms/inspection-job-main/update`, data }) @@ -46,6 +51,7 @@ export const abandonInspectionJobMain = async (id) => { export const closeInspectionJobMain = async (id) => { return await request.put({ url: `/qms/inspection-job-main/close?id=` + id }) } + // 导出检验申请 Excel export const exportInspectionJobMain = async (params) => { return await request.download({ url: `/qms/inspection-job-main/export-excel`, params }) diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 164f2c295..1d967ae75 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -187,6 +187,20 @@ export function formCloseBtn(option:any) { }) } +// form表单-关闭按钮 +export function formStagingBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`btn.暂存`).replace('btn.', ''), + name: 'staging', + hide: false, + + color: '', + float:'right', + hasPermi: '' + }) +} + + // drawer抽屉头部-编辑按钮 export function drawerEditBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 8d3704a9a..c38c44d2d 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -522,6 +522,10 @@ const buttonBaseClick =async(val) => { // await InspectionJobMainApi.abandonInspectionJobMain(data.value.id) dialogVisible.value = false } + // 暂存 + else if (val == 'staging') { + staging() + } } // 传递给父类 const emit = defineEmits(['submitForm', 'searchTableSuccess']) @@ -661,12 +665,136 @@ const submitForm = async () => { console.log(111) } } + + +const staging = async () => { + try { + console.log(data.value.subList) + const elForm = unref(formMainRef)?.getElFormRef() + // 校验表单 + if (!elForm) return + const valid = await elForm.validate() + if (!valid) return + // 校验包装列表 + + console.log(11,data.value.packageList) + if(data.value.packageList?.length>0){ + const validateForm1 = await tableFormRef.value.validateForm() + if (!validateForm1) return + let isPass = data.value.packageList.some(cur=>parseFloat(cur.sampleAmount)>parseFloat(cur.amount)) + if(isPass){ + message.error(`采样数量不能大于数量`) + return + } + // let number = 0 + // data.value.packageList.forEach(cur=>{ + // number += parseFloat(cur.sampleAmount) + // }) + // number = number.toFixed('2') + // if(number != data.value.sampleTotalAmount){ + // message.error(`采样数量之和必须等于采样总数量`) + // return + // } + } + + const bol2 = await validateForm(formFeaturesRef.value) + if (!bol2) { + message.error(`模板中有检验工序和检验特性未填写完全`) + return + } + // 判断数组是否有未填的选项 + let arrBol = [] + let isOutweigh = []//结束时间是否大于开始时间 + let numberList = []//判断合格数量和不合格数量之和是否等于主表数量 + let parseFloatList = []//判断合格数量和不合格数量是否是整数 + data.value.subList.forEach((item, index) => { + if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) { + arrBol.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.qualifiedQuantity || !cur.unqualifiedQuantity + } + ) + ) + } + if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) { + arrBol.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.inspectionValue + } + ) + ) + } + if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) { + arrBol.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return !cur.qualitativeCode + } + ) + ) + } + // 开始时间大于结束时间放入数组中 + if (item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime) { + isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime) + } + // 合格数量和不合格数量之和不能是小数 + if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) { + parseFloatList.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + return String(cur.qualifiedQuantity).indexOf('.')>-1 || String(cur.unqualifiedQuantity).indexOf('.')>-1 + } + ) + ) + // 合格数量和不合格数量之和不等于总数量 + numberList.push( + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( + (cur, key) => { + console.log(12,cur.qualifiedQuantity) + console.log(13,cur.unqualifiedQuantity) + console.log(14,item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) + return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) + } + ) + ) + } + }) + let isEmpty1 = arrBol.some(item=>item == true) + let isEmptyNumberList = numberList.some(item=>item == true) + let isParseFloat = parseFloatList.some(item=>item == true) + if(isEmpty1){ + message.error('检验工序和检验特性有字段未填写完全') + return; + } + if(isOutweigh?.length>0){ + message.error('检验特性中有开始时间大于结束时间') + return; + } + if(isParseFloat){ + message.error('合格数量和不合格数量之和不可以是小数') + return; + } + if(isEmptyNumberList){ + message.error('合格数量和不合格数量之和必须等于样品份数') + return; + } + await InspectionJobMainApi.stagingInspectionJobMain(data.value) + message.success('暂存成功!') + } catch { + console.log(111) + } +} + + /** 弹窗按钮 */ let Butttondata: any = [] if (props.footButttondata) { Butttondata = props.footButttondata } else { Butttondata = [ + defaultButtons.formStagingBtn(null), // 暂存 defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formCloseBtn(null) // 关闭 ] diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue index 1c3b1f33b..5b24b0c84 100644 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ b/src/views/qms/inspection/inspectionJob/index.vue @@ -203,7 +203,6 @@ const list = ref([]) detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain') } //执行 - const formRef = ref() const execute = async (type : string, row ?: number) => { formRef.value.open(type, row) From 94607246fc5effdfea74ecf1bd32badc461e7da0 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 7 May 2024 13:41:48 +0800 Subject: [PATCH 05/44] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierinvoiceRequestMain/index.ts | 7 ++- .../supplierinvoiceRequestMain.data.ts | 47 ++++++++++++++++++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index ced9da32c..46de378c8 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -123,4 +123,9 @@ export const exportSupplierinvoiceRequestDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplierinvoice-request-main/get-import-template' }) -} \ No newline at end of file +} + +// 根据角色编码获取用户列表 +export const queryUserInfoByRoleCode = async (params) => { + return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCode`, params }) +} diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index b66207815..80ce64aa3 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -3,6 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' import { accountantFormart } from '@/utils/formatter' import * as SupplierApi from '@/api/wms/supplier' +import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' const { t } = useI18n() // 国际化 @@ -27,6 +28,29 @@ const requestsettingData = data?.list[0] || {} userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] +/** + * @returns {Array} 采购员列表 + */ +export const PurchaseMemberInfo = useCrudSchemas(reactive([ + { + label: '用户编号', + field: 'id' + }, + { + label: '用户名称', + field: 'username', + table: { + width: 180, + }, + }, + { + label: '用户昵称', + field: 'nickname', + table: { + width: 180, + }, + } +])) /** * @returns {Array} 采购订单或者采购退货单 @@ -481,14 +505,30 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, }, { - label: '采购审批人', + label: '采购员', field: 'procurementCreator', sort: 'custom', sortTableDefault:1003, table: { width: 150 }, - isForm: false, + isForm: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择采购员', // 输入框占位文本 + searchField: 'id', // 查询弹窗赋值字段 + searchTitle: '采购员信息', // 查询弹窗标题 + searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类 + searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'roleCode', // 查询列表中字段 + value: 'purchase', // 指查询具体值 + isMainValue: false // 表示查询条件不是主表的字段的值 + }] + } + } }, { label: '采购审批时间', @@ -709,6 +749,9 @@ export const SupplierinvoiceRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + procurementCreator: [ + { required: true, message: '请选择采购员', trigger: 'change' } + ], }) From 21349dfd57c7f6f15731ac7efd0792086c87d67f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 7 May 2024 13:58:09 +0800 Subject: [PATCH 06/44] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceRequestMain/index.ts | 3 ++- .../supplierinvoiceRequestMain.data.ts | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 46de378c8..f3846f143 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -127,5 +127,6 @@ export const importTemplate = () => { // 根据角色编码获取用户列表 export const queryUserInfoByRoleCode = async (params) => { - return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCode`, params }) + return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCodePage`, params }) + } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 80ce64aa3..d15548267 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -34,7 +34,10 @@ const requestsettingData = data?.list[0] || {} export const PurchaseMemberInfo = useCrudSchemas(reactive([ { label: '用户编号', - field: 'id' + field: 'id', + table: { + width: 180, + }, }, { label: '用户名称', From 0dfc8213f906ce386719a099511aa574458f14ae Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 7 May 2024 14:42:51 +0800 Subject: [PATCH 07/44] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=8A=A5=E5=91=8A=EF=BC=8C=E6=96=87=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 9 ++++++++- src/components/Detail/src/Detail.vue | 2 ++ src/components/UploadFile/src/UploadFile.vue | 2 +- .../supplierdeliverInspectionDetail.data.ts | 1 + .../supplierdeliver/supplierdeliverRequestMain/index.vue | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index cb68ced7d..7d5f0e142 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -3,7 +3,7 @@
-
@@ -48,6 +48,13 @@ const props = defineProps({ type: Object, required: true }, + fileType:{ + type:Array, + required: false, + default: () => { + return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'] + } + }, showPreview: { type: Boolean, required: false diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index ad389ea97..9ce1534df 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -103,6 +103,7 @@ { annexList, hasSubDetail:item.hasSubDetail||false, subDetailTableData:item.subDetailTableData, + fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'], showPreview:item.showPreview||false, // 是否展示预览按钮 showDownload:item.showDownload||false, // 是否展示下载按钮 hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮 diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 33de112d5..05ce5f239 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(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] + fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] fileSize: propTypes.number.def(5), // 大小限制(MB) limit: propTypes.number.def(5), // 数量限制 autoUpload: propTypes.bool.def(true), // 自动上传 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index e125b7976..34c890aa4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -15,6 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive Date: Tue, 7 May 2024 14:59:19 +0800 Subject: [PATCH 08/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9vue=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../counter/counter.data.ts | 0 .../{basicDataManage => }/counter/index.vue | 0 .../dynamicRule/dynamicRule.data.ts | 0 .../dynamicRule/index.vue | 0 src/views/qms/inspectionJob/addForm.vue | 860 ++++++++++++++++++ .../{inspection => }/inspectionJob/detail.vue | 0 src/views/qms/inspectionJob/index.vue | 314 +++++++ .../inspectionJob/inspectionJobMain.data.ts | 0 .../inspectionRecord/addForm.vue | 0 .../inspectionRecord/detail.vue | 0 .../inspectionRecord/index.vue | 0 .../inspectionRecordMain.data.ts | 0 .../inspectionRequest/index.vue | 0 .../inspectionRequestMain.data.ts | 0 .../inspectionScheme/addForm.vue | 6 +- .../inspectionScheme/index.vue | 0 .../inspectionScheme/inspectionScheme.data.ts | 0 .../inspectionStage/index.vue | 0 .../inspectionStage/inspectionStage.data.ts | 0 .../inspectionTemplate/addForm.vue | 4 +- .../inspectionTemplate/index.vue | 0 .../inspectionTemplate.data.ts | 0 .../selectedProject/index.vue | 0 .../selectedProject/selectedProject.data.ts | 0 .../selectedSet/index.vue | 0 .../selectedSet/selectedSet.data.ts | 0 26 files changed, 1179 insertions(+), 5 deletions(-) rename src/views/qms/{basicDataManage => }/counter/counter.data.ts (100%) rename src/views/qms/{basicDataManage => }/counter/index.vue (100%) rename src/views/qms/{basicDataManage => }/dynamicRule/dynamicRule.data.ts (100%) rename src/views/qms/{basicDataManage => }/dynamicRule/index.vue (100%) create mode 100644 src/views/qms/inspectionJob/addForm.vue rename src/views/qms/{inspection => }/inspectionJob/detail.vue (100%) create mode 100644 src/views/qms/inspectionJob/index.vue rename src/views/qms/{inspection => }/inspectionJob/inspectionJobMain.data.ts (100%) rename src/views/qms/{inspection => }/inspectionRecord/addForm.vue (100%) rename src/views/qms/{inspection => }/inspectionRecord/detail.vue (100%) rename src/views/qms/{inspection => }/inspectionRecord/index.vue (100%) rename src/views/qms/{inspection => }/inspectionRecord/inspectionRecordMain.data.ts (100%) rename src/views/qms/{inspection => }/inspectionRequest/index.vue (100%) rename src/views/qms/{inspection => }/inspectionRequest/inspectionRequestMain.data.ts (100%) rename src/views/qms/{basicDataManage => }/inspectionScheme/addForm.vue (99%) rename src/views/qms/{basicDataManage => }/inspectionScheme/index.vue (100%) rename src/views/qms/{basicDataManage => }/inspectionScheme/inspectionScheme.data.ts (100%) rename src/views/qms/{basicDataManage => }/inspectionStage/index.vue (100%) rename src/views/qms/{basicDataManage => }/inspectionStage/inspectionStage.data.ts (100%) rename src/views/qms/{basicDataManage => }/inspectionTemplate/addForm.vue (99%) rename src/views/qms/{basicDataManage => }/inspectionTemplate/index.vue (100%) rename src/views/qms/{basicDataManage => }/inspectionTemplate/inspectionTemplate.data.ts (100%) rename src/views/qms/{basicDataManage => }/selectedProject/index.vue (100%) rename src/views/qms/{basicDataManage => }/selectedProject/selectedProject.data.ts (100%) rename src/views/qms/{basicDataManage => }/selectedSet/index.vue (100%) rename src/views/qms/{basicDataManage => }/selectedSet/selectedSet.data.ts (100%) diff --git a/src/views/qms/basicDataManage/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts similarity index 100% rename from src/views/qms/basicDataManage/counter/counter.data.ts rename to src/views/qms/counter/counter.data.ts diff --git a/src/views/qms/basicDataManage/counter/index.vue b/src/views/qms/counter/index.vue similarity index 100% rename from src/views/qms/basicDataManage/counter/index.vue rename to src/views/qms/counter/index.vue diff --git a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts similarity index 100% rename from src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts rename to src/views/qms/dynamicRule/dynamicRule.data.ts diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue similarity index 100% rename from src/views/qms/basicDataManage/dynamicRule/index.vue rename to src/views/qms/dynamicRule/index.vue diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue new file mode 100644 index 000000000..8d3704a9a --- /dev/null +++ b/src/views/qms/inspectionJob/addForm.vue @@ -0,0 +1,860 @@ + + + + diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspectionJob/detail.vue similarity index 100% rename from src/views/qms/inspection/inspectionJob/detail.vue rename to src/views/qms/inspectionJob/detail.vue diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue new file mode 100644 index 000000000..dcc7d81b3 --- /dev/null +++ b/src/views/qms/inspectionJob/index.vue @@ -0,0 +1,314 @@ + + + diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts similarity index 100% rename from src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts rename to src/views/qms/inspectionJob/inspectionJobMain.data.ts diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue similarity index 100% rename from src/views/qms/inspection/inspectionRecord/addForm.vue rename to src/views/qms/inspectionRecord/addForm.vue diff --git a/src/views/qms/inspection/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue similarity index 100% rename from src/views/qms/inspection/inspectionRecord/detail.vue rename to src/views/qms/inspectionRecord/detail.vue diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue similarity index 100% rename from src/views/qms/inspection/inspectionRecord/index.vue rename to src/views/qms/inspectionRecord/index.vue diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts similarity index 100% rename from src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts rename to src/views/qms/inspectionRecord/inspectionRecordMain.data.ts diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue similarity index 100% rename from src/views/qms/inspection/inspectionRequest/index.vue rename to src/views/qms/inspectionRequest/index.vue diff --git a/src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts similarity index 100% rename from src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts rename to src/views/qms/inspectionRequest/inspectionRequestMain.data.ts diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue similarity index 99% rename from src/views/qms/basicDataManage/inspectionScheme/addForm.vue rename to src/views/qms/inspectionScheme/addForm.vue index e199200ac..540a2dc53 100644 --- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -637,7 +637,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate' import { SearchTable } from '@/components/SearchTable' import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data' -import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data' +import { InspectionTemplateMain } from '@/views/qms/inspectionTemplate/inspectionTemplate.data' import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import * as ItemBasicApi from '@/api/wms/itembasic' @@ -645,9 +645,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则 -import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则 +import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集 -import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集 +import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集 import {validateTwoNum} from '@/utils/validator' const message = useMessage() // 消息弹窗 diff --git a/src/views/qms/basicDataManage/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionScheme/index.vue rename to src/views/qms/inspectionScheme/index.vue diff --git a/src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts similarity index 100% rename from src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts rename to src/views/qms/inspectionScheme/inspectionScheme.data.ts diff --git a/src/views/qms/basicDataManage/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionStage/index.vue rename to src/views/qms/inspectionStage/index.vue diff --git a/src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts b/src/views/qms/inspectionStage/inspectionStage.data.ts similarity index 100% rename from src/views/qms/basicDataManage/inspectionStage/inspectionStage.data.ts rename to src/views/qms/inspectionStage/inspectionStage.data.ts diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/inspectionTemplate/addForm.vue similarity index 99% rename from src/views/qms/basicDataManage/inspectionTemplate/addForm.vue rename to src/views/qms/inspectionTemplate/addForm.vue index aa72e0a49..3ac8f2979 100644 --- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue +++ b/src/views/qms/inspectionTemplate/addForm.vue @@ -431,9 +431,9 @@ import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程 import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法 import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法 import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则 -import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则 +import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集 -import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集 +import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集 import { validateInteger,validateTwoNum,validateMaxNumber5,validateNumSix } from '@/utils/validator' const message = useMessage() // 消息弹窗 diff --git a/src/views/qms/basicDataManage/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue similarity index 100% rename from src/views/qms/basicDataManage/inspectionTemplate/index.vue rename to src/views/qms/inspectionTemplate/index.vue diff --git a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts similarity index 100% rename from src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts rename to src/views/qms/inspectionTemplate/inspectionTemplate.data.ts diff --git a/src/views/qms/basicDataManage/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue similarity index 100% rename from src/views/qms/basicDataManage/selectedProject/index.vue rename to src/views/qms/selectedProject/index.vue diff --git a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts b/src/views/qms/selectedProject/selectedProject.data.ts similarity index 100% rename from src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts rename to src/views/qms/selectedProject/selectedProject.data.ts diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue similarity index 100% rename from src/views/qms/basicDataManage/selectedSet/index.vue rename to src/views/qms/selectedSet/index.vue diff --git a/src/views/qms/basicDataManage/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts similarity index 100% rename from src/views/qms/basicDataManage/selectedSet/selectedSet.data.ts rename to src/views/qms/selectedSet/selectedSet.data.ts From 502840f7e811f544a42dd84216629ff026a11f55 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 7 May 2024 16:34:24 +0800 Subject: [PATCH 09/44] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain/index.vue | 1 + .../supplierinvoiceRequestMain.data.ts | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 94704b3d3..233abdeed 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -545,6 +545,7 @@ const submitForm = async (formType, data) => { } try { if (formType === 'create') { + data.productionLineCode = data.subList[0].productionLineCode; await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data) message.success(t('common.createSuccess')) } else { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index d15548267..9fa564e5a 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -453,7 +453,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( { label: '创建者', field: 'creator', - sort: 'custom', table: { width: 150 }, @@ -508,9 +507,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, }, { - label: '采购员', + label: '采购价格审批人', field: 'procurementCreator', - sort: 'custom', sortTableDefault:1003, table: { width: 150 From e4161abac8db842a8199597baee645a96c525eca Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 7 May 2024 16:36:56 +0800 Subject: [PATCH 10/44] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=B2=E8=AE=B2/?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=BF=90=E5=BC=80=E5=8F=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/relegateRequest/index.ts | 73 ++++++ .../itemManage/relegateRequest/index.vue | 233 +++++++++++++++++ .../relegateRequest/relegateRequest.data.ts | 243 ++++++++++++++++++ .../deliverplan/saleMain/saleMain.data.ts | 18 +- .../saleShipmentMainRequest/index.vue | 35 ++- .../saleShipmentMain.data.ts | 162 +++++++----- 6 files changed, 684 insertions(+), 80 deletions(-) create mode 100644 src/api/wms/relegateRequest/index.ts create mode 100644 src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue create mode 100644 src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts diff --git a/src/api/wms/relegateRequest/index.ts b/src/api/wms/relegateRequest/index.ts new file mode 100644 index 000000000..a26e8c360 --- /dev/null +++ b/src/api/wms/relegateRequest/index.ts @@ -0,0 +1,73 @@ +import request from '@/config/axios' + +export interface RelegateRequestVO { + id: number + itemCode: string + downItemCode: string + businessType: string + uom: string + qty: number + fromBatch: string + fromPackingNumber: string + fromLocationCode: string + fromAreaTypes: string + fromAreaCodes: string + fromWarehouseCode: string + toPackingNumber: string + toBatch: string + toLocationCode: string + toWarehouseCode: string + toAreaTypes: string + toAreaCodes: string + number: string + available: string + remark: string + departmentCode: string + siteId: number + extraProperties: string + status: string + concurrencyStamp: number + serialNumber: string + ruleUserId: number +} + +// 查询物料降级信息列表 +export const getRelegateRequestPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/relegate-request/senior', data }) + } else { + return await request.get({ url: `/wms/relegate-request/page`, params }) + } +} + +// 查询物料降级信息详情 +export const getRelegateRequest = async (id: number) => { + return await request.get({ url: `/wms/relegate-request/get?id=` + id }) +} + +// 新增物料降级信息 +export const createRelegateRequest = async (data: RelegateRequestVO) => { + return await request.post({ url: `/wms/relegate-request/create`, data }) +} + +// 修改物料降级信息 +export const updateRelegateRequest = async (data: RelegateRequestVO) => { + return await request.put({ url: `/wms/relegate-request/update`, data }) +} + +// 删除物料降级信息 +export const deleteRelegateRequest = async (id: number) => { + return await request.delete({ url: `/wms/relegate-request/delete?id=` + id }) +} + +// 导出物料降级信息 Excel +export const exportRelegateRequest = async (params) => { + return await request.download({ url: `/wms/relegate-request/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/relegate-request/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue new file mode 100644 index 000000000..e60621efe --- /dev/null +++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue @@ -0,0 +1,233 @@ + + + diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts new file mode 100644 index 000000000..d5dee49f8 --- /dev/null +++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts @@ -0,0 +1,243 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + +// 表单校验 +export const RelegateRequestRules = reactive({ + itemCode: [required], + downItemCode: [required], + businessType: [required], + available: [required], + departmentCode: [required], + concurrencyStamp: [required], +}) + +export const RelegateRequest = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择物料代码', + searchField: 'itemCode', + searchTitle: '客户物料基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } + }, + { + label: '降级后物料代码', + field: 'downItemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + form: { + componentProps: { + disabled: true, + } + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + form: { + componentProps: { + disabled: true, + } + }, + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + form: { + componentProps: { + disabled: true, + } + }, + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + form: { + componentProps: { + disabled: true, + } + }, + }, + { + label: '从库区类型', + field: 'fromAreaTypes', + sort: 'custom', + isForm:false, + }, + { + label: '从库区代码', + field: 'fromAreaCodes', + sort: 'custom', + isForm:false, + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + isForm:false, + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + isForm:false, + }, + { + label: '到库区类型', + field: 'toAreaTypes', + sort: 'custom', + isForm:false, + }, + { + label: '到库区代码', + field: 'toAreaCodes', + sort: 'custom', + isForm:false, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isForm:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isForm:false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + form: { + component: 'InputNumber', + value: 0 + }, + isForm:false, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isForm:false, + }, + { + 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')] + } + }, + isForm: false, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isForm: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isForm:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '工作流流水号', + field: 'serialNumber', + isForm:false, + sort: 'custom', + }, + { + label: '权限所属人员id', + field: 'ruleUserId', + sort: 'custom', + isForm:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 4a5107150..623f4d311 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -4,6 +4,9 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' +import * as PackageunitApi from '@/api/wms/packageunit' +import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data' + import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' @@ -357,15 +360,20 @@ export const SaleDetail = useCrudSchemas(reactive([ { label: '包装规格', field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select' + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '包装规格信息', // 查询弹窗标题 + searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类 + searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法 + } } }, { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index d22258d89..cb188aa14 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -42,8 +42,6 @@ { +const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { - const setV = {} + if (type == 'tableForm') { + row['soLine'] = val[0]['lineNumber'] + row['soNumber'] = val[0]['number'] + row['itemCode'] = val[0]['itemCode'] + row['projectCode'] = val[0]['projectCode'] + row['uom'] = val[0]['uom'] + }else { + const setV = {} if(formField == 'CustomerCode') { setV['CustomerCode'] = val[0]['CustomerCode'] } else { setV[formField] = val[0][searchField] } formRef.setValues(setV) + } }) } @@ -121,7 +127,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] + if(formField == 'soLine') { + setV['soLine'] = val[0]['lineNumber'] + setV['soNumber'] = val[0]['number'] + setV['itemCode'] = val[0]['itemCode'] + setV['projectCode'] = val[0]['projectCode'] + setV['uom'] = val[0]['uom'] + }else { + setV[formField] = val[0][searchField] + } formRef.setValues(setV) }) } @@ -247,9 +261,18 @@ const submitForm = async (formType, data) => { } } +/** + * tableForm方法 +*/ +const tableFormKeys = {} +SaleShipmentDetail.allSchemas.tableFormColumns.forEach(item => { + tableFormKeys[item.field] = item.default ? item.default : '' +}) + // 添加明细 const handleAddTable = () => { - tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys))) + let tableForm = JSON.parse(JSON.stringify(tableFormKeys)) + tableData.value.push(tableForm) } // 删除明细 const handleDeleteTable = (item, index) => { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index 98ab99139..8f9dbb872 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -4,8 +4,8 @@ import { dateFormatter } from '@/utils/formatTime' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' -import * as SaleMainApi from '@/api/wms/saleMain' -import { SaleMain } from '@/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data' +import * as SaleDetailApi from '@/api/wms/saleDetail' +import { SaleDetail } from '@/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -65,6 +65,7 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isForm: false, }, { label: '发票时间', @@ -87,6 +88,13 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ } }, }, + { + label: '地点', + field: 'siteId', + sort: 'custom', + isSearch: true, + hiddenInMain: true, + }, { label: '部门', field: 'departmentCode', @@ -243,33 +251,13 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + tableForm: { + type: 'Select', + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + disabled: true } } }, @@ -285,8 +273,8 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择销售订单行', searchField: 'lineNumber', searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -300,27 +288,35 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择销售订单行', searchField: 'lineNumber', searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'customerCode', + value: 'customerCode', + isMainValue: true }] } } }, { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - isSearch: true, - }, - { - label: '包装号', - field: 'packingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', isSearch: true, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '批次', @@ -329,59 +325,81 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ isSearch: true, }, { - label: '库存状态', - field: 'inventoryStatus', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', isSearch: true, - form: { - component: 'Radio' - }, + isForm: false, + isTableForm: false }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', isSearch: true, + isForm: false, + isTableForm: false }, + { - label: '主表ID', - field: 'masterId', + label: '库存状态', + field: 'inventoryStatus', + // dictType: DICT_TYPE.INVENTORY_STATUS, + // dictClass: 'string', + isTable: true, sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 }, + isTableForm: false, + hiddenInMain: true, + isForm: false, }, { - label: '物品代码', - field: 'itemCode', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', isSearch: true, + isTableForm: false }, + { label: '物品名称', field: 'itemName', sort: 'custom', - isSearch: true, + table: { + width: 150 + }, + isForm: false, + isTableForm: false }, { label: '物品描述1', - field: 'itemDesc1', + field: 'itemName', sort: 'custom', - isSearch: true, + table: { + width: 150 + }, + isForm: false, + isTableForm: false }, { label: '物品描述2', - field: 'itemDesc2', + field: 'itemName', sort: 'custom', - isSearch: true, + table: { + width: 150 + }, + isForm: false, + isTableForm: false }, { label: '项目代码', field: 'projectCode', sort: 'custom', isSearch: true, + isTableForm: false, + hiddenInMain: true, }, { label: '数量', @@ -392,14 +410,29 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', - isSearch: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '备注', field: 'remark', sort: 'custom', isSearch: true, + isTableForm: false }, { label: '创建时间', @@ -416,16 +449,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ } }, isForm: false, - }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, + isTableForm: false }, { label: '操作', From f8a9e4e1339db4401d52f9b5eca3f442fc6bb23f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 7 May 2024 16:37:26 +0800 Subject: [PATCH 11/44] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=91=98=EF=BC=8C?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 5 ++++- src/components/Form/src/Form.vue | 18 +++++++++++++++--- src/components/SearchTable/src/SearchTable.vue | 17 ++++++++++++++--- .../supplierinvoiceRequestMain.data.ts | 1 + 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 3c2a924e4..cc20819b4 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -15,6 +15,7 @@ :schema="formSchema" :is-col="true" @opensearchTable="opensearchTable" + @hiddenFilterButton="hiddenSearchTableFilterButton" @clearSearchInput="clearSearchInput" @onChange="onChange" @onBlur="onBlur" @@ -433,7 +434,9 @@ const opensearchTable = ( searchDetailSchemas ) } - +const hiddenSearchTableFilterButton = ()=>{ + searchTableRef.value.hiddenFilterButton() +} const clearSearchInput = (field)=>{ emit('clearSearchInput',field) } diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index fdfc8441c..535381792 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -55,7 +55,7 @@ export default defineComponent({ vLoading: propTypes.bool.def(false), labelPosition: propTypes.string.def('left'), }, - emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter'], + emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton'], setup(props, { slots, expose, emit }) { // element form 实例 const elFormRef = ref>() @@ -278,7 +278,14 @@ export default defineComponent({ item?.componentProps?.multiple, item?.componentProps?.isConcatDetailSchemas, item?.componentProps?.searchDetailSchemas, - )}}/> + ) + + //隐藏筛选按钮 + if(item?.componentProps?.hiddenFilterButton){ + emit('hiddenFilterButton') + } + + }}/> ) } @@ -316,7 +323,12 @@ export default defineComponent({ item?.componentProps?.multiple, item?.componentProps?.isConcatDetailSchemas, item?.componentProps?.searchDetailSchemas, - )}}/> + ) + //隐藏筛选按钮 + if(item?.componentProps?.hiddenFilterButton){ + emit('hiddenFilterButton') + } + }}/> ) } diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 5cdb3feda..f57fd7360 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -50,9 +50,9 @@ const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 // 列表头部按钮 -const HeadButttondata = [ +const HeadButttondata = ref([ defaultButtons.defaultFilterBtn(null), // 筛选 -] +]) /** 打开弹窗 */ const getListRef = ref() @@ -70,6 +70,9 @@ const multipleBol = ref(false) const searchConditionRef = ref() const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => { + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null), // 筛选 + ] dialogTitle.value = titleName tableObjectRef.value = tableObject searchDialogVisible.value = true @@ -79,6 +82,10 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any tableColumns.value = allSchemas.tableColumns } const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => { + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null), // 筛选 + ] + searchDialogVisible.value = true formFieldRef.value = formField searchFieldRef.value = searchField @@ -112,6 +119,10 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s getList() } +const hiddenFilterButton = ()=>{ + HeadButttondata.value = [] +} + // 筛选提交 const searchFormClick = (searchData) => { console.log(99, rowRef.value) @@ -153,7 +164,7 @@ const searchFormClick = (searchData) => { getListRef.value() // 刷新当前列表 } -defineExpose({ open,openData }) // 提供 open 方法，用于打开弹窗 +defineExpose({ open,openData,hiddenFilterButton }) // 提供 open 方法，用于打开弹窗 // Table 组件 ref const searchTableRef = ref() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 9fa564e5a..c78a98cee 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -518,6 +518,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 + hiddenFilterButton:true,//是否隐藏筛选按钮 searchListPlaceholder: '请选择采购员', // 输入框占位文本 searchField: 'id', // 查询弹窗赋值字段 searchTitle: '采购员信息', // 查询弹窗标题 From 9e24f458c662163457c496be22f2315d5cdf7c32 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 7 May 2024 16:58:28 +0800 Subject: [PATCH 12/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspection/inspectionJob/addForm.vue | 988 ------------------ .../qms/inspection/inspectionJob/index.vue | 313 ------ 2 files changed, 1301 deletions(-) delete mode 100644 src/views/qms/inspection/inspectionJob/addForm.vue delete mode 100644 src/views/qms/inspection/inspectionJob/index.vue diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue deleted file mode 100644 index c38c44d2d..000000000 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ /dev/null @@ -1,988 +0,0 @@ - - - - diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue deleted file mode 100644 index 5b24b0c84..000000000 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ /dev/null @@ -1,313 +0,0 @@ - - - From 9c0aa8803a39247f36e8735c03e5a05c03579798 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 7 May 2024 17:04:07 +0800 Subject: [PATCH 13/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4f12652d0..6795cf0cf 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ form: { searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 + hiddenFilterButton:true,//是否隐藏筛选按钮 searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 searchCondition: [{ From a190db262813c5d034578d6f68d5e3a9a6df7a35 Mon Sep 17 00:00:00 2001 From: zhousq Date: Tue, 7 May 2024 17:30:12 +0800 Subject: [PATCH 14/44] =?UTF-8?q?2024-05-07=20=E4=BF=AE=E6=94=B9=E6=8E=92?= =?UTF-8?q?=E4=BA=A7bug=EF=BC=8C=E5=90=8E=E7=AB=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E3=80=81=E5=AE=8C=E5=B7=A5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/workScheduling/index.ts | 24 ++- .../mes/orderDay/components/schedule.vue | 2 +- src/views/mes/orderDay/index.vue | 4 +- src/views/mes/orderDay/orderDay.data.ts | 8 +- .../mes/workScheduling/components/finish.vue | 121 ++++++++++++++++ .../mes/workScheduling/components/report.vue | 137 ++++++++++++++++++ src/views/mes/workScheduling/index.vue | 37 ++++- .../mes/workScheduling/workScheduling.data.ts | 2 +- 8 files changed, 321 insertions(+), 14 deletions(-) create mode 100644 src/views/mes/workScheduling/components/finish.vue create mode 100644 src/views/mes/workScheduling/components/report.vue diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts index d17a72c52..7df13e502 100644 --- a/src/api/mes/workScheduling/index.ts +++ b/src/api/mes/workScheduling/index.ts @@ -47,4 +47,26 @@ export const exportWorkScheduling = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/mes/workScheduling/get-import-template' }) -} \ No newline at end of file +} +// 完工 +export const completeHandle = async (data) => { + return await request.post({ url: `/mes/workScheduling/completeHandle`, data }) +} +//报工 +export const reportWorkByProcess = async (data) => { + return await request.post({ url: `/mes/work-scheduling-detail/reportWorkByProcess`, data }) +} +//检查当前节点是否可以完工 +export const getNodePosition = async (params) => { + return await request.get({ url: `/mes/workScheduling/getNodePosition`, params }) +} +//获取当前工序的员工列表 +export const getCurrentWorkerList = async (params) => { + return await request.get({ url: `/mes/workScheduling/getCurrentWorkerList`, params }) +} +//获取当前工单的工序列表 +export const getProcessList = async (params) => { + return await request.get({ url: `/mes/workScheduling/getProcessList`, params }) +} + + diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 89b4d112c..1373e120d 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -202,7 +202,7 @@ diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index fc421c5e3..134854079 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -197,7 +197,7 @@ const buttonBaseClick = (val, item) => { } const publishClosed=()=>{ //console.log('publishClosed') - getList() + getList() } // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { @@ -282,7 +282,7 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + await getList() } /** 详情操作 */ diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index 3c97730b6..8397adc6b 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -11,9 +11,9 @@ export const OrderDayRules = reactive({ // batchCode: [ // { required: false, message: '请输入一个日计划编号', trigger: 'blur' } // ], - planNoMonth: [ - { required: true, message: '请输入一个月计划编号', trigger: 'blur' } - ], + // planNoMonth: [ + // { required: true, message: '请输入一个月计划编号', trigger: 'blur' } + // ], productCode: [ { required: true, message: '请选择一个产品', trigger: 'blur' } ], @@ -214,7 +214,7 @@ export const OrderDay = useCrudSchemas(reactive([ dictClass: 'string', form: { component: 'Switch', - value: 'TRUE', + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' diff --git a/src/views/mes/workScheduling/components/finish.vue b/src/views/mes/workScheduling/components/finish.vue new file mode 100644 index 000000000..e01d5f681 --- /dev/null +++ b/src/views/mes/workScheduling/components/finish.vue @@ -0,0 +1,121 @@ + + diff --git a/src/views/mes/workScheduling/components/report.vue b/src/views/mes/workScheduling/components/report.vue new file mode 100644 index 000000000..9b387097c --- /dev/null +++ b/src/views/mes/workScheduling/components/report.vue @@ -0,0 +1,137 @@ + + diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue index 19577fe7a..3982490fe 100644 --- a/src/views/mes/workScheduling/index.vue +++ b/src/views/mes/workScheduling/index.vue @@ -67,7 +67,8 @@ @searchTableSuccessDetail="searchTableSuccessDetail" :key="count" /> - + + @@ -81,7 +82,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from './components/Detail.vue' -import { async } from '@antv/x6/lib/registry/marker/async' +import Report from './components/report.vue' +import Finish from './components/finish.vue' defineOptions({ name: 'MesWorkScheduling' }) @@ -172,9 +174,13 @@ const butttondata=(row) =>{ return [ defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), - //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // + defaultButtons.mainListHandleBtn({label:"开工",name:'start',hide: isShowMainButton(row,['0']),hasPermi:'mes:workScheduling:update'}), + defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['1'] ),hasPermi:'mes:workScheduling:update'}), + defaultButtons.mainListHandleBtn({label:"完工",name:'finish',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), + defaultButtons.mainListHandleBtn({label:"叫料",name:'callMaterial',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), ]} - +const reportRef=ref() +const reportFinishRef=ref() // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 @@ -185,6 +191,14 @@ const buttonTableClick = async (val, row) => { changeBillStatus(row,"3") }else if (val == 'resume') { // 恢复 changeBillStatus(row,"1") + }else if(val=='start'){ + changeBillStatus(row,"1") + }else if(val=='report'){ + reportRef.value.openDetail(row,"报工") + }else if(val=='finish'){ + finishReport(row) + } else if(val=='callMaterial'){ + } } @@ -193,7 +207,20 @@ const basicFormRef = ref() const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } - +//完工报工 +const finishReport=async(row)=>{ + let params={ + planDayCode:row.planMasterCode, + processCode:row.workingNode + } + //console.log("workscheduling-finishReport-213",row) + let res=await WorkSchedulingApi.getNodePosition(params) + if(res==='end'){ + reportFinishRef.value.openDetail(row,"完工") + }else{ + message.alert("当前工序不是完工工序，不能进行完工操作！") + } +} // form表单提交 const formsSuccess = async (formType,data) => { var isHave =WorkScheduling.allSchemas.formSchema.some(function (item) { diff --git a/src/views/mes/workScheduling/workScheduling.data.ts b/src/views/mes/workScheduling/workScheduling.data.ts index 29dde4d40..8edb043b5 100644 --- a/src/views/mes/workScheduling/workScheduling.data.ts +++ b/src/views/mes/workScheduling/workScheduling.data.ts @@ -164,7 +164,7 @@ export const WorkScheduling = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 'wrapContent', fixed: 'right' } } From e3321fe969bde06c7057c9e6b4acbe7a7e219229 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 7 May 2024 17:32:02 +0800 Subject: [PATCH 15/44] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/schedule.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 1373e120d..0795b866d 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -280,7 +280,7 @@ const showMaterialsData=ref() //物料信息分页展示 const page=ref({ total:0, current:1, - size:5 + size:7 }) /*班组数据*/ const teamData = ref([]) @@ -412,8 +412,8 @@ const getProcessroute = async () => { currentNode.value = graphJson.value.cells[0] // 手动触发点击事件 nodeClick('','','',currentNode.value,'') - - + + } //获取配置的工序信息 const getConfigProcessRouteNode= async () => { @@ -714,14 +714,14 @@ const handleCurrentChangeM=(value: number)=>{ let index=(value-1)*page.value.size page.value.current=value showMaterialsData.value=materialsData.value.slice(index,index+page.value.size) - + } const handlePrevClickM=(value: number)=>{ page.value.current=value-1 if(page.value.current==0) { page.value.current=1 } - + } const handleNextClickM=(value: number)=>{ page.value.current=value+1 From 924dc6d7d85e8a55928116acd98171439df80672 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 8 May 2024 09:27:55 +0800 Subject: [PATCH 16/44] =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 49653cb14..d7e0c75b0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -345,6 +345,15 @@ defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑 defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除 + { + label: '打印', + name: 'mian_print', + hide: null, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + } ] } @@ -378,6 +387,8 @@ const handleImport = () => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) + } else if( val == 'mian_print'){ // 打印 + handleDocumentPrint(row.masterId) } } From 6cf78af238dc907ea7285fef22d5cfee0011a21d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 8 May 2024 09:52:37 +0800 Subject: [PATCH 17/44] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index c78a98cee..09dfa85af 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -724,9 +724,6 @@ export const SupplierinvoiceRequestMainRules = reactive({ required, { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'} ], - invoiceTime: [ - { required: true, message: '请选择发票日期', trigger: 'change' } - ], supplierCode: [ { required: true, message: '请选择供应商代码', trigger: 'change' } ], From 9166841c478d5642c3b864268d98c76ab39f993a Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 8 May 2024 10:03:32 +0800 Subject: [PATCH 18/44] =?UTF-8?q?2024-05-08=20=E4=BF=AE=E6=AD=A3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/schedule.vue | 11 ++++++----- src/views/mes/orderDay/index.vue | 13 +++++++++---- src/views/mes/workScheduling/index.vue | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 1373e120d..3dd728f6e 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -201,7 +201,7 @@ @@ -470,6 +470,10 @@ const opensearchTable = ( ) } +const handleClose=()=>{ + dialogVisible.value = false, + emit('close') +} const publishPlan=()=>{ message.confirm("确认发布当前计划？","question").then(async () => { //isPublish.value=true @@ -478,10 +482,7 @@ const publishPlan=()=>{ doPublishPlan() }finally{ formLoading.value=false; } - // loading.value = false, - dialogVisible.value = false, - //isPublish.value=false, - emit('close') + handleClose() }).catch(() => { message.info("已取消发布") }) diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index 134854079..6c4e7e617 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -82,6 +82,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import orderDetail from './components/orderDetail.vue' import scheduleDetail from './components/schedule.vue' +import { async } from '@antv/x6/lib/registry/marker/async' defineOptions({ name: 'MesOrderDay' }) @@ -196,8 +197,11 @@ const buttonBaseClick = (val, item) => { } } const publishClosed=()=>{ - //console.log('publishClosed') - getList() + console.log('orderday-publishClosed-200') + nextTick(() => { + getList() + }) + } // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { @@ -242,7 +246,7 @@ const butttondata = (row) => { // 列表-操作按钮事件 -const buttonTableClick = async (val, row) => { +const buttonTableClick = (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 @@ -252,6 +256,7 @@ const buttonTableClick = async (val, row) => { }else if(val=='stopPlan'){ //终止计划 stopPlan(row.id) } + getList() } /** 添加/修改操作 */ @@ -325,7 +330,7 @@ const handleExport = async () => { } const stopPlan = async (id) => { await OrderDayApi.stopPlan(id) - getList() + //getList() } /** 导入 */ const importFormRef = ref() diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue index 3982490fe..d7a9a97cd 100644 --- a/src/views/mes/workScheduling/index.vue +++ b/src/views/mes/workScheduling/index.vue @@ -200,6 +200,7 @@ const buttonTableClick = async (val, row) => { } else if(val=='callMaterial'){ } + getList() } /** 添加/修改操作 */ From 3c056dfa4c951d558ed07732a7cbd368a2920b6d Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 8 May 2024 10:06:47 +0800 Subject: [PATCH 19/44] 20240508 --- src/views/mes/orderDay/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index 6c4e7e617..80205ed2d 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -197,7 +197,7 @@ const buttonBaseClick = (val, item) => { } } const publishClosed=()=>{ - console.log('orderday-publishClosed-200') + //console.log('orderday-publishClosed-200') nextTick(() => { getList() }) @@ -328,8 +328,8 @@ const handleExport = async () => { exportLoading.value = false } } -const stopPlan = async (id) => { - await OrderDayApi.stopPlan(id) +const stopPlan = (id) => { + OrderDayApi.stopPlan(id) //getList() } /** 导入 */ From f008fe1011c7bfdbe95e6684316e3ceaa1048a92 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 8 May 2024 10:07:28 +0800 Subject: [PATCH 20/44] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96tab=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/schedule.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index c369aad9e..3a336f737 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -327,6 +327,7 @@ const searchTeamList = () => { } /** 打开弹窗 */ const open = async (type: string, row?: any, titleName?: any) => { + activeName.value = 'workstation' currentNode.value.name='' currentNode.value.id='' //首次打开页面，将数据清空 From 91f23b323c8f910931aa88674e44aacb9145a696 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 8 May 2024 10:43:02 +0800 Subject: [PATCH 21/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/workScheduling/workScheduling.data.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/mes/workScheduling/workScheduling.data.ts b/src/views/mes/workScheduling/workScheduling.data.ts index 8edb043b5..260976f11 100644 --- a/src/views/mes/workScheduling/workScheduling.data.ts +++ b/src/views/mes/workScheduling/workScheduling.data.ts @@ -118,7 +118,8 @@ export const WorkScheduling = useCrudSchemas(reactive([ }, { label: '执行状态', - field: 'flagDo', + // field: 'flagDo', + field: 'status', sort: 'custom', isSearch: true, isForm:false, @@ -163,6 +164,7 @@ export const WorkScheduling = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + // width: '220px', table: { width: 'wrapContent', fixed: 'right' @@ -194,7 +196,7 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive([ isForm:false, isDetail:false, }, - + { label: '创建时间', field: 'createTime', @@ -295,7 +297,7 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive([ }, sort: 'custom', }, - + { label: '计划数量', field: 'planCount', @@ -359,7 +361,7 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, - + { label: '生产人', field: 'receivePerson', From 593db5392e91bdd8ad04308ee577199c1f063696 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 8 May 2024 10:43:54 +0800 Subject: [PATCH 22/44] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=EF=BC=88=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/workScheduling/workScheduling.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mes/workScheduling/workScheduling.data.ts b/src/views/mes/workScheduling/workScheduling.data.ts index 260976f11..890ceff4b 100644 --- a/src/views/mes/workScheduling/workScheduling.data.ts +++ b/src/views/mes/workScheduling/workScheduling.data.ts @@ -164,7 +164,7 @@ export const WorkScheduling = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, - // width: '220px', + width: '220px', table: { width: 'wrapContent', fixed: 'right' From 268c4a37eafa9d749fe578ab8b6bb612694fc2aa Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 8 May 2024 11:31:16 +0800 Subject: [PATCH 23/44] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRecordMain.data.ts | 91 +++++++++++-------- .../productdismantleRequestMain.data.ts | 35 +++++-- 2 files changed, 77 insertions(+), 49 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts index de6e44621..b1dcbbd0c 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts @@ -150,6 +150,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '部门', field: 'departmentCode', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -159,7 +160,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -169,6 +170,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '业务类型', field: 'businessType', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -177,6 +179,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '备注', field: 'remark', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -185,6 +188,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '创建者', field: 'creator', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -200,6 +204,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -230,7 +235,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -240,6 +245,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '从库区代码范围', field: 'fromAreaCodes', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -250,7 +256,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -323,6 +329,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive table: { width: 150 }, - isForm: false + isForm: false, + isTable:false, }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 }, - isForm: false + isForm: false, }, { label: '从库区代码范围', @@ -162,7 +163,8 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isForm: false + isForm: false, + isTable: false, }, { label: '业务类型', @@ -177,7 +179,8 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive disabled: true } }, - isForm: false + isForm: false, + isTable:false, }, { label: '备注', @@ -208,6 +211,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive valueFormat: 'x', } }, + isTable: false, isForm: false, }, { @@ -217,6 +221,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -269,6 +274,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, isForm:false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name @@ -325,6 +331,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -334,6 +341,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, isForm: false }, { @@ -341,7 +349,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -362,7 +370,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -383,7 +391,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -782,6 +790,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive Date: Wed, 8 May 2024 11:35:21 +0800 Subject: [PATCH 24/44] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productrepairRequestMain/productrepairRequestMain.data.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 23c1a5c49..b0156b9a8 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -592,9 +592,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive { label: 'Bom来源库位代码', field: 'fromLocationCode', - sort: 'custom', table: { - width: 160 + width: 190 }, sortTableDefault:18, tableForm: { From 4d9301728b4c9a95f2d110958d3f6a7dd55ee802 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 8 May 2024 11:36:07 +0800 Subject: [PATCH 25/44] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/saleShipmentDetailRecord/index.ts | 65 ++++ src/api/wms/saleShipmentMain/index.ts | 30 ++ src/api/wms/saleShipmentMainRecord/index.ts | 56 ++++ .../deliverplan/saleMain/saleMain.data.ts | 8 + .../saleShipmentMainRecord/index.vue | 224 ++++++++++++++ .../saleShipmentMainRecord.data.ts | 278 ++++++++++++++++++ .../saleShipmentMainRequest/index.vue | 30 +- .../saleShipmentMain.data.ts | 16 +- 8 files changed, 700 insertions(+), 7 deletions(-) create mode 100644 src/api/wms/saleShipmentDetailRecord/index.ts create mode 100644 src/api/wms/saleShipmentMainRecord/index.ts create mode 100644 src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue create mode 100644 src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts diff --git a/src/api/wms/saleShipmentDetailRecord/index.ts b/src/api/wms/saleShipmentDetailRecord/index.ts new file mode 100644 index 000000000..4f22239d0 --- /dev/null +++ b/src/api/wms/saleShipmentDetailRecord/index.ts @@ -0,0 +1,65 @@ +import request from '@/config/axios' + +export interface SaleShipmentDetailRecordVO { + id: number + soNumber: string + soLine: string + fromOwnerCode: string + packingNumber: string + batch: string + inventoryStatus: string + fromLocationCode: string + masterId: number + number: string + itemCode: string + itemName: string + itemDesc1: string + itemDesc2: string + projectCode: string + qty: number + uom: string + remark: string + concurrencyStamp: string + siteId: number +} + +// 查询销售发运记录子列表 +export const getSaleShipmentDetailRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/sale-shipment-detail-record/senior', data }) + } else { + return await request.get({ url: `/wms/sale-shipment-detail-record/page`, params }) + } +} + +// 查询销售发运记录子详情 +export const getSaleShipmentDetailRecord = async (id: number) => { + return await request.get({ url: `/wms/sale-shipment-detail-record/get?id=` + id }) +} + +// 新增销售发运记录子 +export const createSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => { + return await request.post({ url: `/wms/sale-shipment-detail-record/create`, data }) +} + +// 修改销售发运记录子 +export const updateSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => { + return await request.put({ url: `/wms/sale-shipment-detail-record/update`, data }) +} + +// 删除销售发运记录子 +export const deleteSaleShipmentDetailRecord = async (id: number) => { + return await request.delete({ url: `/wms/sale-shipment-detail-record/delete?id=` + id }) +} + +// 导出销售发运记录子 Excel +export const exportSaleShipmentDetailRecord = async (params) => { + return await request.download({ url: `/wms/sale-shipment-detail-record/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/sale-shipment-detail-record/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts index e03719231..c8768bea2 100644 --- a/src/api/wms/saleShipmentMain/index.ts +++ b/src/api/wms/saleShipmentMain/index.ts @@ -61,4 +61,34 @@ export const exportSaleShipmentMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' }) +} + +// 关闭-销售发运申请 +export const closeSaleShipmentMain = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-request/close?id=` + id }) +} + +// 重新添加-销售发运申请 +export const reAddSaleShipmentMain = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-request/reAdd?id=` + id }) +} + +// 提交审批-销售发运申请 +export const submitSaleShipmentMain = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-request/submit?id=` + id }) +} + +// 审批驳回-销售发运申请 +export const refusedSaleShipmentMain = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-request/refused?id=` + id }) +} + +// 审批通过-销售发运申请 +export const agreeSaleShipmentMain = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-request/agree?id=` + id }) +} + +// 处理-销售发运申请 +export const handleSaleShipmentMain = async (id) => { + return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/saleShipmentMainRecord/index.ts b/src/api/wms/saleShipmentMainRecord/index.ts new file mode 100644 index 000000000..60a87d971 --- /dev/null +++ b/src/api/wms/saleShipmentMainRecord/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface SaleShipmentMainRecordVO { + id: number + requestNumber: string + customerCode: string + invoiceTime: Date + executeTime: Date + available: string + departmentCode: string + number: string + businessType: string + extraProperties: string + siteId: string +} + +// 查询销售发运记录主列表 +export const getSaleShipmentMainRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/sale-shipment-main-record/senior', data }) + } else { + return await request.get({ url: `/wms/sale-shipment-main-record/page`, params }) + } +} + +// 查询销售发运记录主详情 +export const getSaleShipmentMainRecord = async (id: number) => { + return await request.get({ url: `/wms/sale-shipment-main-record/get?id=` + id }) +} + +// 新增销售发运记录主 +export const createSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => { + return await request.post({ url: `/wms/sale-shipment-main-record/create`, data }) +} + +// 修改销售发运记录主 +export const updateSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => { + return await request.put({ url: `/wms/sale-shipment-main-record/update`, data }) +} + +// 删除销售发运记录主 +export const deleteSaleShipmentMainRecord = async (id: number) => { + return await request.delete({ url: `/wms/sale-shipment-main-record/delete?id=` + id }) +} + +// 导出销售发运记录主 Excel +export const exportSaleShipmentMainRecord = async (params) => { + return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 623f4d311..28c996130 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -364,6 +364,14 @@ export const SaleDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格代码', + searchField: 'code', + searchTitle: '包装规格信息', + searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类 + searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法 + }, form: { // labelMessage: '信息提示说明！！！', componentProps: { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue new file mode 100644 index 000000000..97a295c57 --- /dev/null +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -0,0 +1,224 @@ + + + diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts new file mode 100644 index 000000000..ba4ba4a2b --- /dev/null +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -0,0 +1,278 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const SaleShipmentMainRecordRules = reactive({ +}) + +export const SaleShipmentMainRecord = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '客户代码', + field: 'customerCode', + sort: 'custom', + isSearch: true, + }, + { + label: '发票时间', + field: 'invoiceTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '执行时间', + field: 'executeTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch: true, + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isSearch: true, + }, + + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } + }, + isForm: false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const SaleShipmentDetailRecordRules = reactive({ +}) + +export const SaleShipmentDetailRecord = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '销售订单号', + field: 'soNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '销售订单行', + field: 'soLine', + sort: 'custom', + isSearch: true, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + isSearch: true, + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: true, + }, + { + label: '库存状态', + field: 'inventoryStatus', + sort: 'custom', + isSearch: true, + form: { + component: 'Radio' + }, + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + isSearch: true, + }, + { + label: '主表ID', + field: 'masterId', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '物品名称', + field: 'itemName', + sort: 'custom', + isSearch: true, + }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + isSearch: true, + }, + { + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + isSearch: true, + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + isSearch: true, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + isSearch: true, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + isSearch: true, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } + }, + isForm: false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: true, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index cb188aa14..9821f5356 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -77,7 +77,7 @@ /> - + diff --git a/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts b/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts new file mode 100644 index 000000000..64274deec --- /dev/null +++ b/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts @@ -0,0 +1,110 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import { fa } from 'element-plus/es/locale' + +// 表单校验 +export const InvoicingcalendarRules = reactive({ + beginDay: [required], + endDay: [required], + concurrencyStamp: [required], +}) + +export const Invoicingcalendar = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + isTable: false + }, + { + label: '开始日期', + field: 'beginDay', + sort: 'custom', + dictType: DICT_TYPE.SYSTEM_DAY, + dictClass: 'string', + }, + { + label: '结束日期', + field: 'endDay', + sort: 'custom', + dictType: DICT_TYPE.SYSTEM_DAY, + dictClass: 'string', + }, + { + label: '描述', + field: 'descriiption', + sort: 'custom', + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + 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')] + } + }, + isForm: false, + isTable: false, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isTable: false, + isForm:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isTable: false, + isForm:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isTable: false, + isForm:false, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From 6b37f2218dab3ca3ff701ab82cc54ecb14299433 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 8 May 2024 17:12:58 +0800 Subject: [PATCH 38/44] =?UTF-8?q?=E9=9D=9E=E5=BC=80=E7=A5=A8=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceRequestMain/index.ts | 6 ++++++ .../supplierinvoiceRequestMain/index.vue | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index f3846f143..89ef00539 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -56,6 +56,12 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => { return await request.delete({ url: `/wms/supplierinvoice-request-main/delete?id=` + id }) } +// 校验控制是否可以开票逻辑 +export const checkInvoicingCalendar = async (params) => { + return await request.get({ url: `/wms/supplierinvoice-request-main/checkInvoicingCalendar`, params }) +} + + // 打开供应商发货申请主 export const opeSupplierinvoiceRequestMain = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-request-main/open?id=` + id }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index b835723b1..64e72c704 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -395,8 +395,15 @@ const handleImport = () => { /** 添加/修改操作 */ const formRef = ref() const openForm = async (type : string, row ?: number) => { - tableData.value = [] // 重置明细数据 - formRef.value.open(type, row) + // 校验是否可以开票 + SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => { + if(res.flag){ + message.alertWarning(res.msg) + return + } + tableData.value = [] // 重置明细数据 + formRef.value.open(type, row) + }) } // 获取部门 用于详情 部门回显 From 11e3ec42afcb7d46dbe8cbeb7f57b7e31690838c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 8 May 2024 17:15:31 +0800 Subject: [PATCH 39/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B8=8E=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/supplierManage/invoicingcalendar/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue index dc85e24ed..3309c3eff 100644 --- a/src/views/wms/supplierManage/invoicingcalendar/index.vue +++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue @@ -166,9 +166,17 @@ const formsSuccess = async (formType,data) => { if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; if (formType === 'create') { + if(data.beginDay > data.endDay){ + message.error('开始日期要小于截止日期') + return; + } await InvoicingcalendarApi.createInvoicingcalendar(data) message.success(t('common.createSuccess')) } else { + if(data.beginDay > data.endDay){ + message.error('开始日期要小于截止日期') + return; + } await InvoicingcalendarApi.updateInvoicingcalendar(data) message.success(t('common.updateSuccess')) } From 04a4d0d1690b6b0ae9433bee186bba167591d787 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 8 May 2024 17:21:40 +0800 Subject: [PATCH 40/44] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Breadcrumb/src/Breadcrumb.vue | 4 +- .../src/components/useRenderMenuTitle.tsx | 4 +- .../components/TagsView/src/TagsView.vue | 2 +- src/locales/en-US.ts | 71 ++++++++++++++++++- src/locales/zh-CN.ts | 70 +++++++++++++++++- .../supplierManage/purchaseprice/index.vue | 2 +- .../supplierManage/supplier/index.vue | 2 +- .../supplierManage/supplieritem/index.vue | 4 +- .../inspect/inspectRecordMain/index.vue | 4 +- .../purchasereceiptRecordMain/index.vue | 12 ++-- .../purchasereceiptRequestMain/index.vue | 2 +- .../purchasereturnRecordMain/index.vue | 2 +- .../sparereceiptRequestMain/index.vue | 2 +- .../demandforecastingMain/index.vue | 6 +- .../supplierdeliver/purchaseMain/index.vue | 2 +- .../purchasePlanMain/index.vue | 8 +-- .../supplierdeliverRecordMain/index.vue | 8 +-- .../supplierdeliverRequestMain/index.vue | 46 ++++++------ .../supplierdeliverBasicForm.vue | 4 +- .../purchaseclaimRequestMain/index.vue | 16 ++--- .../supplierinvoiceRecordMain/index.vue | 12 ++-- .../supplierinvoiceRequestMain/index.vue | 52 +++++++------- .../supplierinvoiceInvoiced/index.vue | 20 +++--- 23 files changed, 244 insertions(+), 111 deletions(-) diff --git a/src/layout/components/Breadcrumb/src/Breadcrumb.vue b/src/layout/components/Breadcrumb/src/Breadcrumb.vue index de0366543..f1a2f65d6 100644 --- a/src/layout/components/Breadcrumb/src/Breadcrumb.vue +++ b/src/layout/components/Breadcrumb/src/Breadcrumb.vue @@ -54,10 +54,10 @@ export default defineComponent({ {meta?.icon && breadcrumbIcon.value ? ( <> - {t(v?.meta?.title)} + {t(`ts.${v?.meta?.title}`).replace('ts.','')} ) : ( - t(v?.meta?.title) + t(`ts.${v?.meta?.title}`).replace('ts.','') )} ) diff --git a/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx b/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx index fc30b9006..1887789f6 100644 --- a/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx +++ b/src/layout/components/Menu/src/components/useRenderMenuTitle.tsx @@ -9,10 +9,10 @@ export const useRenderMenuTitle = () => { return icon ? ( <> - {t(title as string)} + {t(`ts.${title}` as string).replace('ts.','')} ) : ( - {t(title as string)} + {t(`ts.${title}` as string).replace('ts.','')} ) } diff --git a/src/layout/components/TagsView/src/TagsView.vue b/src/layout/components/TagsView/src/TagsView.vue index 7db0cf6f3..ae4d1c47f 100644 --- a/src/layout/components/TagsView/src/TagsView.vue +++ b/src/layout/components/TagsView/src/TagsView.vue @@ -367,7 +367,7 @@ watch( :size="12" class="mr-5px" /> - {{ t(item?.meta?.title as string) }} + {{ t(`ts.${item?.meta?.title}` as string).replace('ts.','') }} { }); if(isHave){ if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') + message.error(t('ts.失效时间要大于生效时间')) return; } } diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index fc18a5f62..896737aac 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -174,7 +174,7 @@ const formsSuccess = async (formType, data) => { }) if (isHave) { if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) { - message.error('失效时间要大于生效时间') + message.error(t('ts.失效时间要大于生效时间')) return } } diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index 21a8c4451..b3c637e76 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > @@ -182,7 +182,7 @@ const formsSuccess = async (formType,data) => { }); if(isHave){ if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') + message.error(t('ts.失效时间要大于生效时间')) return; } } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue index 2a56e32c3..5c294f156 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue @@ -151,10 +151,10 @@ const buttonTableClick = async (val, row) => { /** 生成采购上架申请按钮操作 */ const handlePutawayRequest = async (number:string) => { try{ - await message.confirm(t('确认生成上架申请吗？')) + await message.confirm(t('ts.确认生成上架申请吗？')) tableObject.loading = true await InspectRecordMainApi.createPutAwayRequest(number) - message.success(t('上架申请生成成功')) + message.success(t('ts.上架申请生成成功')) await getList() }catch{}finally{ tableObject.loading = false diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 7f2d548d9..1e642d36c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -177,10 +177,10 @@ const buttonTableClick = async (val, row) => { /** 生成采购上架申请按钮操作 */ const handleCreatePutawayRequest = async (number:string) => { try{ - await message.confirm(t('确认生成上架申请吗？')) + await message.confirm(t('ts.确认生成上架申请吗？')) tableObject.loading = true await PurchasereceiptRecordMainApi.createPutawayRequest(number) - message.success(t('上架申请生成成功')) + message.success(t('ts.上架申请生成成功')) await getList() }catch{}finally{ tableObject.loading = false @@ -190,10 +190,10 @@ const handleCreatePutawayRequest = async (number:string) => { /** 生成到货检验申请按钮操作 */ const handleCreateInspectRequest = async (number:string) => { try{ - await message.confirm(t('确认生成到货检验申请吗？')) + await message.confirm(t('ts.确认生成到货检验申请吗？')) tableObject.loading = true await PurchasereceiptRecordMainApi.createInspectRequest(number) - message.success(t('到货检验申请生成成功')) + message.success(t('ts.到货检验申请生成成功')) await getList() }catch{}finally{ tableObject.loading = false @@ -227,7 +227,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: '查看其他包装规格', + label: t('ts.查看其他包装规格'), name: 'viewParentPickingNumber', hide: false, type: 'primary', @@ -268,7 +268,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) - download.excel(data, '采购收货记录主.xlsx') + download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 6db8c5f17..4d02d9832 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -402,7 +402,7 @@ const submitFormLabel = async (formType, data) => { console.log("data==",data) data.subList = detatableData.tableList console.log("detatableData",detatableData) - await message.confirm('是否为此数据生成标签？') + await message.confirm(t('ts.是否为此数据生成标签？')) await PurchasereceiptRequestMainApi.genLabel(data) //genLabelId.value isCreateLabel.value = true message.success('创建标签成功') diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index cbdf89c3e..fc338441d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -168,7 +168,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) - download.excel(data, '采购退货记录主.xlsx') + download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 3cc878b4f..bd6cfee45 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -407,7 +407,7 @@ const { getList:getDetailList } = detatableMethods // 生成标签按钮操作 const submitFormLabel = async (formType, data) => { try { - await message.confirm('是否为此数据生成标签？') + await message.confirm(t('ts.是否为此数据生成标签？')) await PurchasereceiptRequestMainApi.genLabel(genLabelId.value) isCreateLabel.value = true message.success('创建标签成功') diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index b28319c50..ae3c06032 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -268,7 +268,7 @@ const handleClose = async (id : number) => { const handlePublish = async (id : number) => { try { // 发布的二次确认 - await message.confirm('是否发布所选中数据？') + await message.confirm(t('ts.是否发布所选中数据？')) tableObject.loading = true // 发起发布 await DemandforecastingMainApi.publishPurchaseMain(id) @@ -330,7 +330,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params) - download.excel(data, '要货预测主.xlsx') + download.excel(data, `${t('ts.要货预测主')}.xlsx`) } catch { } finally { exportLoading.value = false @@ -383,7 +383,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '要货预测主导入模版.xlsx' + templateTitle: `${t('ts.要货预测主导入模版')}.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 6a3e8286f..8e43e847f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -141,7 +141,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc }) } if(repeatCode.length>0){ - message.warning(`物料代码${repeatCode.join(',')}已经存在`); + message.warning(`${t('ts.物料代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); } if(val.length>0){ //frm表单回显 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 3131050bc..44ad7b932 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -410,7 +410,7 @@ const { wsCache } = useCache() const handleReOpen = async (id : number) => { try { // 打开的二次确认 - await message.confirm('是否重新打开所选中数据？') + await message.confirm(t('ts.是否重新打开所选中数据？')) tableObject.loading = true // 发起打开 await PurchasePlanMainApi.openPurchasePlanMain(id) @@ -538,7 +538,7 @@ const { wsCache } = useCache() if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) { flag = true; - message.error('要货计划数量不得大于订单数量-已计划数量') + message.error(t('ts.要货计划数量不得大于订单数量-已计划数量')) return }else{ data.subList.push(item) // 拼接子表数据参数 @@ -556,7 +556,7 @@ const { wsCache } = useCache() try { if (formType === 'create') { if(data.subList.length == 0){ - message.error('子列表数量不能空') + message.error(t('ts.子列表数量不能空')) return } await PurchasePlanMainApi.createPurchasePlanMain(data) @@ -584,7 +584,7 @@ const { wsCache } = useCache() }).then(res => { if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) { - message.error('要货计划数量不得大于订单数量-已计划数量') + message.error(t('ts.要货计划数量不得大于订单数量-已计划数量')) tag = false } else { tag = true diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 660f8b0e2..41cc2505d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -196,10 +196,10 @@ const buttonTableClick = async (val, row) => { /** 生成采购收货申请按钮操作 */ const handlerCreatePurchasereceiptRequest = async (number:string) => { try{ - await message.confirm(t('确认生成采购申请吗？')) + await message.confirm(t('ts.确认生成采购申请吗？')) tableObject.loading = true await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number) - message.success(t('采购申请生成成功')) + message.success(t('ts.采购申请生成成功')) await getList() }catch{}finally{ tableObject.loading = false @@ -241,7 +241,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: '查看其他包装规格', + label: t('ts.查看其他包装规格'), name: 'viewParentPickingNumber', hide: false, type: 'primary', @@ -273,7 +273,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(tableObject.params) - download.excel(data, '供应商发货记录主.xlsx') + download.excel(data, `${t('ts.供应商发货记录主')}.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 8f167e845..91dbdbc82 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -438,7 +438,7 @@ const butttondata = (row,$index) => { }), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除 { - label: '生成标签', + label: t('ts.生成标签'), name: 'ssbq', hide: isShowMainButtonLabel(row, ['3']), type: 'primary', @@ -451,7 +451,7 @@ const butttondata = (row,$index) => { //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印 // 生成记录 { - label: '发货', + label: t('ts.发货'), name: 'genRecords', hide: isShowMainButton(row, ['3']), type: 'primary', @@ -496,7 +496,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'ssbq') { await SupplierdeliverRequestMainApi.selfCheckReport(row.masterId).then(async (res) => { if(!res){ - message.warning("请先上传自检报告!") + message.warning(t('ts.请先上传自检报告!')) return }else{ // 生成标签 @@ -642,7 +642,7 @@ const handleUploadQualityReport = async (row) => { if(uploadFile){ uploadFile['componentProps']['upData']['tableId'] = row.masterId } - ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},'上传质检报告','上传质检报告')//创建标签页面 createLabel 标题 + ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},t('ts.上传质检报告'),t('ts.上传质检报告'))//创建标签页面 createLabel 标题 const tableFormKeys = {} SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => { @@ -675,11 +675,11 @@ const submitFormUploadQualityReport = async (formType, data) => { const handleSub = async (id: number) => { try { // 提交审批的二次确认 - await message.confirm('是否提交审批所选中数据？') + await message.confirm(t('ts.是否提交审批所选中数据？')) tableObject.loading = true // 发起提交审批 await SupplierdeliverRequestMainApi.subSupplierdeliverRequestMain(id) - message.success(t('提交审批成功!')) + message.success(t('ts.提交审批成功!')) // 刷新列表 await getList() } catch {}finally{ @@ -691,11 +691,11 @@ const handleSub = async (id: number) => { const handleApp = async (id: number) => { try { // 审批通过的二次确认 - await message.confirm('是否审批通过所选中数据？') + await message.confirm(t('ts.是否审批通过所选中数据？')) tableObject.loading = true // 发起审批通过 await SupplierdeliverRequestMainApi.appSupplierdeliverRequestMain(id) - message.success(t('审批通过成功!')) + message.success(t('ts.审批通过成功!')) // 刷新列表 await getList() } catch {}finally{ @@ -707,11 +707,11 @@ const handleApp = async (id: number) => { const handleTur = async (id: number) => { try { // 驳回的二次确认 - await message.confirm('是否驳回所选中数据？') + await message.confirm(t('ts.是否驳回所选中数据？')) tableObject.loading = true // 发起驳回 await SupplierdeliverRequestMainApi.rejSupplierdeliverRequestMain(id) - message.success(t('驳回成功!')) + message.success(t('ts.驳回成功!')) // 刷新列表 await getList() } catch {}finally{ @@ -725,11 +725,11 @@ const genRecords = async (id: number) => { try { await SupplierdeliverRequestMainApi.selfCheckReport(id).then(async res => { if(!res){ - message.warning("请先上传自检报告!") + message.warning(t('ts.请先上传自检报告!')) return }else{ // 处理的二次确认 - await message.confirm('是否处理所选中数据？') + await message.confirm(t('ts.是否处理所选中数据？')) getLoading = ElLoading.service({ lock: true, text: 'loading...', @@ -737,7 +737,7 @@ const genRecords = async (id: number) => { }) // 发起处理 SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => { - message.success(t('处理成功!')) + message.success(t('ts.处理成功!')) // 刷新列表 getList() // 单据打印 @@ -763,7 +763,7 @@ const handleExport = async () => { const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain( tableObject.params ) - download.excel(data, '供应商发货申请主.xlsx') + download.excel(data, `${'ts.供应商发货申请主'}.xlsx`) } catch { } finally { exportLoading.value = false @@ -786,10 +786,10 @@ const submitFormLabel = async (formType, data) => { console.log("data==",data) data.subList = detatableData.tableList console.log("detatableData",detatableData) - await message.confirm('是否为此数据生成标签？') + await message.confirm(t('ts.是否为此数据生成标签？')) await SupplierdeliverRequestMainApi.genLabel(data) isCreateLabel.value = true - message.success('创建标签成功') + message.success(t('ts.创建标签成功')) getList() } finally { formLabelRef.value.formLoading = false @@ -820,7 +820,7 @@ const labelPrint = async (row) => { tableColumns.forEach((item) => { item.width = item.table?.width || 150 }) - searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) + searchTableRef.value.openData(t('ts.标签信息'),tableObjectPrint,{tableColumns},true) } // 批量打印--供应商发货申请 @@ -831,7 +831,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r // rows = [...rows,...item.selectionRows.map(item1=>item1.number)] // }) if(val.length == 0){ - message.warning("请先选择要打印的数据!") + message.warning(t('ts.请先选择要打印的数据')) return } // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) @@ -841,7 +841,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r window.open(src.value + '&asn_number=' + res) }).catch(err => { console.log(err) - message.error('创建标签失败') + message.error(t('ts.创建标签失败')) }) } @@ -884,7 +884,7 @@ const submitForm = async (formType, data) => { } }) if (isHave) { - message.error('生产日期不可以大于过期日期') + message.error(t('ts.生产日期不可以大于过期日期')) formRef.value.formLoading = false return } @@ -893,7 +893,7 @@ const submitForm = async (formType, data) => { let planArriveStr = formatDate(data.planArriveTime); if(planArriveStr > planArriveTimeStr.value){ let confirmFlag = false; - await message.confirm("计划到货时间大于要货计划送达日期是否继续？").then(() => { + await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续？')).then(() => { console.log("选择了OK") //选择OK }).catch(() => { @@ -908,7 +908,7 @@ const submitForm = async (formType, data) => { } } if(tableData.value.length <= 0){ - message.warning(`子表明细不能为空!`) + message.warning(t('ts.子表明细不能为空!')) formRef.value.formLoading = false return; } @@ -935,7 +935,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '供应商发货申请主导入模版.xlsx' + templateTitle: `${t('ts.供应商发货申请主导入模版')}.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 23fec491f..c18d01ef5 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -267,7 +267,7 @@ const submitForm = async (formType, data) => { } }) if (isHave) { - message.error('生产日期不可以大于过期日期') + message.error(t('ts.生产日期不可以大于过期日期')) formRef.value.formLoading = false return } @@ -276,7 +276,7 @@ const submitForm = async (formType, data) => { let planArriveStr = formatDate(data.planArriveTime); if(planArriveStr > planArriveTimeStr.value){ let confirmFlag = false; - await message.confirm("计划到货时间大于要货计划送达日期是否继续？").then(() => { + await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续？')).then(() => { console.log("选择了OK") //选择OK }).catch(() => { diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index 855f7ed3a..59795e6a7 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -339,11 +339,11 @@ const handleSub = async (id : number) => { try { // 提交审批的二次确认 - await message.confirm('是否提交审批所选中数据？') + await message.confirm(t('ts.是否提交审批所选中数据？')) tableObject.loading = true // 发起提交审批 await PurchaseclaimRequestMainApi.subPurchaseclaimRequestMain(id) - message.success(t('提交审批成功!')) + message.success(t('ts.提交审批成功!')) tableObject.loading = false // 刷新列表 await getList() @@ -356,11 +356,11 @@ const handleApp = async (id : number) => { try { // 审批通过的二次确认 - await message.confirm('是否审批通过所选中数据？') + await message.confirm(t('ts.是否审批通过所选中数据？')) tableObject.loading = true // 发起审批通过 await PurchaseclaimRequestMainApi.appPurchaseclaimRequestMain(id) - message.success(t('审批通过成功!')) + message.success(t('ts.审批通过成功!')) tableObject.loading = false // 刷新列表 await getList() @@ -373,11 +373,11 @@ const handleTur = async (id : number) => { try { // 驳回的二次确认 - await message.confirm('是否驳回所选中数据？') + await message.confirm(t('ts.是否驳回所选中数据？')) tableObject.loading = true // 发起驳回 await PurchaseclaimRequestMainApi.rejPurchaseclaimRequestMain(id) - message.success(t('驳回成功!')) + message.success(t('ts.驳回成功!')) tableObject.loading = false // 刷新列表 await getList() @@ -390,11 +390,11 @@ const genRecords = async (id : number) => { try { // 处理的二次确认 - await message.confirm('是否处理所选中数据？') + await message.confirm(t('ts.是否处理所选中数据？')) tableObject.loading = true // 发起处理 await PurchaseclaimRequestMainApi.genRecordsPurchaseclaimRequestMain(id) - message.success(t('处理成功!')) + message.success(t('ts.处理成功!')) tableObject.loading = false // 刷新列表 await getList() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 1333f4297..7489d6331 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -29,7 +29,7 @@ v-model:sort="tableObject.sort" > @@ -54,26 +54,26 @@ { // 发起导出 exportLoading.value = true const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordMain(tableObject.params) - download.excel(data, '供应商发票记录主.xlsx') + download.excel(data, `${t('ts.供应商发票记录主')}.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 64e72c704..297095d5d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -75,23 +75,23 @@ @@ -146,7 +146,7 @@ const butttondata = (row) =>{ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除 // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), { - label: '审核通过', + label: t('ts.审核通过'), name: 'agree', hide: isShowMainButton(row, ['1']), type: 'primary', @@ -155,7 +155,7 @@ const butttondata = (row) =>{ hasPermi: 'wms:supplierinvoice-invoiced:agree' }, { - label: '作废', + label: t('ts.作废'), name: 'refuse', hide: isShowMainButton(row, ['1']), type: 'danger', @@ -192,7 +192,7 @@ const formsSuccess = async (formType,data) => { }); if(isHave){ if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') + message.error(t('ts.失效时间要大于生效时间')) return; } } @@ -232,11 +232,11 @@ const handleDelete = async (id: number) => { const handleAgree = async (id : number) => { try { // 审批通过的二次确认 - await message.confirm('是否审批通过所选中数据？') + await message.confirm(t('ts.是否审批通过所选中数据？')) tableObject.loading = true // 发起审批通过 await SupplierinvoiceInvoicedApi.agreeSupplierinvoiceInvoiced(id) - message.success(t('审批通过成功!')) + message.success(t('ts.审批通过成功!')) tableObject.loading = false // 刷新列表 await getList() @@ -250,11 +250,11 @@ const handleAgree = async (id : number) => { const handleRefuse = async (id : number) => { try { // 审批通过的二次确认 - await message.confirm('是否审批拒绝所选中数据？') + await message.confirm(t('ts.是否审批拒绝所选中数据？')) tableObject.loading = true // 发起审批通过 await SupplierinvoiceInvoicedApi.refuseSupplierinvoiceInvoiced(id) - message.success(t('审批成功!')) + message.success(t('ts.审批成功!')) tableObject.loading = false // 刷新列表 await getList() @@ -272,7 +272,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoiced(tableObject.params) - download.excel(data, '待开票.xlsx') + download.excel(data, `${t('ts.待开票')}.xlsx`) } catch { } finally { exportLoading.value = false @@ -287,7 +287,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '待开票导入模版.xlsx' + templateTitle: `${t('ts.待开票导入模版')}.xlsx`'' }) // 导入成功之后 const importSuccess = () => { From 62f341a1afb8603f4627224ae0674f363aa3eb9c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 8 May 2024 17:22:21 +0800 Subject: [PATCH 41/44] =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 68 ------------------- 1 file changed, 68 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index a5deb903f..30d80979c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1638,74 +1638,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive([ - { - label: '上传质检报告', - field: 'uploadFile', - sort: 'custom', - isTable:false, - isTableForm:false, - form: { - component: 'UploadFile', - componentProps: { - upData:{ - tableId: '', - tableName: 'UploadQualityReport', - fileType:['apk'], - fileSize:100 - }, - limit:1, - } - }, - }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - isForm:false, - isTableForm:true, - table: { - width: 150, - }, - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - isForm:false, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select' - } - }, - { - label: '供应商批次', - field: 'batch', - sort: 'custom', - isForm:false, - table: { - width: 150 - }, - }, - { - label: '发货数量', - field: 'planQty', - table: { - width: 150 - }, - isForm:false, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - } - }, -])) export const SupplierdeliverRequestPackage = useCrudSchemas(reactive([ { label: '包装号', From 2e2037adc4eaa12652d5b0c1eda1f66cf5cde65b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 9 May 2024 08:32:09 +0800 Subject: [PATCH 42/44] =?UTF-8?q?=E9=BB=98=E8=AE=A4false?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/packageunit/packageunit.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 711c13d61..d8aa930bf 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -144,7 +144,7 @@ export const Packageunit = useCrudSchemas(reactive([ isSearch: false, form: { component: 'Switch', - value: 'TRUE', + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' @@ -435,7 +435,7 @@ export const PackageunitCopy = useCrudSchemas(reactive([ isSearch: false, form: { component: 'Switch', - value: 'TRUE', + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' From 25091102f35cb1c0bcd46e7e142ead3056d8fe3e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 9 May 2024 08:44:04 +0800 Subject: [PATCH 43/44] =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 2 +- src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 44ad7b932..1746c7afc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -292,7 +292,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 { - label: '创建供应商发货申请', + label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', hide: isShowMainButton(row, ['1']), type: 'primary', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 7489d6331..698788841 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -73,7 +73,7 @@ hiddenDelete:true, }]" :annexAlias="{ - label:t('ts.其他附件') + label:t('ts.其他附件'), showDownload:true, hiddenDelete:true }" diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index d61a4619b..f25e4cbdb 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -287,7 +287,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: `${t('ts.待开票导入模版')}.xlsx`'' + templateTitle: `${t('ts.待开票导入模版')}.xlsx` }) // 导入成功之后 const importSuccess = () => { From 504d4e1214644888128ec0fda02b962d44ea6140 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 9 May 2024 09:12:34 +0800 Subject: [PATCH 44/44] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/rowDrop/index.vue | 6 +++--- src/locales/en-US.ts | 6 ++++++ src/locales/zh-CN.ts | 6 ++++++ .../supplierdeliver/purchasePlanMain/index.vue | 2 +- .../supplierinvoiceRequestMain/index.vue | 16 ++++++++-------- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue index db148737f..15d0707a5 100644 --- a/src/components/rowDrop/index.vue +++ b/src/components/rowDrop/index.vue @@ -59,9 +59,9 @@ const handlecheckedchange = (value: string[]) => { } const reset = () => { - ElMessageBox.confirm('重置后，字段设置将恢复初始设置，是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + ElMessageBox.confirm(t('ts.重置后，字段设置将恢复初始设置，是否继续?'), t('ts.提示'), { + confirmButtonText: t('ts.确定'), + cancelButtonText: t('ts.取消'), type: 'warning' }).then(() => { RedisApi.deleteRedis(routeName.value).then(() => { diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index f4754ae6c..2e762d638 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -659,6 +659,7 @@ export default { 银行:'Bank', 币种:'Currency Kind', 税率:'Tax Rate', + '税率(%)':'Tax Rate(%)', 生效时间:'Effective Time', 失效时间:'Expiration Time', 供应商物料代码:'Supplier material code', @@ -1055,6 +1056,11 @@ export default { analysis: 'Analysis', workplace: 'Workplace' }, + '重置后，字段设置将恢复初始设置，是否继续?':'After reset, the field Settings will be restored to the initial Settings. Do you want to continue?', + 提示:'Tip', + 凭证号:'voucher number', + 采购价格审批人:'Purchasing price approver', + 供应商发货单号:'Supplier\'s invoice number' }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 3e352eab6..064cc88b7 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -659,6 +659,7 @@ export default { 银行:'银行', 币种:'币种', 税率:'税率', + '税率(%)':'税率(%)', 生效时间:'生效时间', 失效时间:'失效时间', 供应商物料代码:'供应商物料代码', @@ -1055,6 +1056,11 @@ export default { analysis: '分析页', workplace: '工作台' }, + '重置后，字段设置将恢复初始设置，是否继续?':'重置后，字段设置将恢复初始设置，是否继续?', + 提示:'提示', + 凭证号:'凭证号', + 采购价格审批人:'采购价格审批人', + 供应商发货单号:'供应商发货单号' }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 1746c7afc..004da5d03 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -294,7 +294,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ { label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', - hide: isShowMainButton(row, ['1']), + hide: isShowMainButton(row, ['3']), type: 'primary', icon: '', color: '', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 297095d5d..37ac30524 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -298,7 +298,7 @@ defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开 defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // 提交审批 { - label: '采购通过', + label: t('ts.采购通过'), name: 'purchase_mainPlanSub', hide: isShowMainButton(row, ['2','7']), type: 'primary', @@ -307,7 +307,7 @@ hasPermi: 'wms:supplierinvoice-request-main:app', link: true, // 文本展现按钮 },{ - label: '采购驳回', + label: t('ts.采购驳回'), name: 'purchase_mainPlanTur', hide: isShowMainButton(row, ['2','7']), type: 'danger', @@ -316,7 +316,7 @@ hasPermi: 'wms:supplierinvoice-request-main:rej' }, { - label: '供应商确认', + label: t('ts.供应商确认'), name: 'invoice_sent_out', hide: isShowMainButton(row, ['8']), type: 'danger', @@ -325,7 +325,7 @@ hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut' }, { - label: '财务通过', + label: t('ts.财务通过'), name: 'finance_mainPlanSub', hide: isShowMainButton(row, ['4']), type: 'primary', @@ -334,7 +334,7 @@ hasPermi: 'wms:supplierinvoice-request-main:financeApp', link: true, // 文本展现按钮 },{ - label: '财务驳回', + label: t('ts.财务驳回'), name: 'finance_mainPlanTur', hide: isShowMainButton(row, ['4']), type: 'danger', @@ -346,7 +346,7 @@ defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除 { - label: '打印', + label: t('ts.打印'), name: 'mian_print', hide: null, type: 'primary', @@ -634,11 +634,11 @@ const handleImport = () => { try { if (formType === 'create') { if(data.subList.length == 0){ - message.warning("请添明细数据") + message.warning(t('ts.请添明细数据')) return; } if(data.subList.length > 999){ - message.warning("明细数据条数已超过最大数量限制【999条】") + message.warning(t('ts.明细数据条数已超过最大数量限制【999条】')) return; } await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)