From 0a828b2b38328563067da117fbd763f91b1afd68 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 24 May 2024 13:07:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../putawayJobMain/putawayJobMain.data.ts | 98 +++++++++---------- .../putawayRecordMain.data.ts | 14 +-- .../supplierdeliverRequestMain.data.ts | 12 ++- 3 files changed, 57 insertions(+), 67 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts index 15034e48b..7658c53e8 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts @@ -289,33 +289,33 @@ export const PutawayJobMain = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, + // { + // label: '到仓库代码', + // field: 'toWarehouseCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, + // { + // label: '从库区代码范围', + // field: 'fromAreaCodes', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, + // { + // label: '到库区代码范围', + // field: 'toAreaCodes', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, { label: '自动完成', field: 'autoComplete', @@ -506,15 +506,15 @@ export const PutawayJobMain = useCrudSchemas(reactive([ } } }, - { - label: '物料号', - field: 'code', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, + // { + // label: '物料号', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, { label: '来源库位', field: 'fromLocationCode', @@ -542,18 +542,18 @@ export const PutawayJobMain = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '单位', - field: 'unit', - sort: 'custom', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', - isSearch: false, - table: { - width: 150 - }, - isTable: false, - }, + // { + // label: '单位', + // field: 'unit', + // sort: 'custom', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + // isSearch: false, + // table: { + // width: 150 + // }, + // isTable: false, + // }, { label: '操作', field: 'action', @@ -1265,4 +1265,4 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive([ sortSearchDefault:1, isSearch: true }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:1, - }, { label: '申请单号', field: 'requestNumber', @@ -1272,4 +1260,4 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive([ @@ -1520,11 +1524,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive Date: Fri, 24 May 2024 14:18:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/tenant/index.ts | 10 +++++++++- .../mes/hrPersonAbility/hrPersonAbility.data.ts | 5 +++-- .../mes/ordermonthplan/mesOrderMonthMain.data.ts | 13 +++++++------ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index 176c37579..1e11e2dd1 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -33,7 +33,15 @@ export interface TenantExportReqVO { // 查询租户列表 export const getTenantPage = (params: TenantPageReqVO) => { - return request.get({ url: '/system/tenant/page', params }) + console.log(params) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return request.post({ url: '/system/tenant/senior', data }) + } else { + return request.get({ url: '/system/tenant/page', params }) + } + // return request.get({ url: '/system/tenant/page', params }) } // 查询租户详情 diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts index 614e2ef7f..8e7d12dd6 100644 --- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts +++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts @@ -123,10 +123,11 @@ export const HrPersonAbility = useCrudSchemas(reactive([ searchTitle: '人员信息', // 查询弹窗标题 searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类 searchField: 'username', // 查询弹窗赋值字段 + searchListPlaceholder: '请选择 人员工号', // 输入框占位文本 searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法 searchCondition: [{ - action: "==", - column: 'userType', + action: '==', + key: 'userType', value: 'WORKER' }] } diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts index 908906fb6..05d07d7d7 100644 --- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts +++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts @@ -46,12 +46,13 @@ export const MesOrderMonthMain = useCrudSchemas(reactive([ searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类 searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法 isHideFilterButton: true, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // action: '==', + // // isMainValue: false + // } + // ] } } }, From 03d929b01fda118ae3e3b48d471a869f413c96d3 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 24 May 2024 14:20:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 20 ++++--------------- .../Form/src/components/useRenderSelect.tsx | 5 +---- src/components/Form/src/helper.ts | 7 +------ src/components/Table/src/Table.vue | 5 +---- src/utils/disposition/defaultButtons.ts | 4 ++-- src/views/login/components/LoginForm.vue | 2 +- 6 files changed, 10 insertions(+), 33 deletions(-) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 9fbf4a233..f55aed8cc 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -175,10 +175,7 @@ export default defineComponent({ const Com = componentMap['Divider'] as ReturnType let labelName = item?.label || '' if(item?.label){ - labelName = t(`ts.${item?.label}`) - if(labelName === 'ts.' + item?.label){ - labelName = item?.label - } + labelName = t(`ts.${item?.label}`).replace('ts.','') } return isDivider ? ( {labelName} @@ -227,18 +224,12 @@ export default defineComponent({ if (item?.labelMessage) { let labelName = item.label || '' if(item.label){ - labelName = t(`ts.${item.label}`) - if(labelName === 'ts.' + item.label){ - labelName = item.label - } + labelName = t(`ts.${item.label}`).replace('ts.','') } let labelMessage = item.labelMessage || '' if(item.labelMessage){ - labelMessage = t(`ts.${item.labelMessage}`) - if(labelMessage === 'ts.' + item.labelMessage){ - labelMessage = item.labelMessage - } + labelMessage = t(`ts.${item.labelMessage}`).replace('ts.','') } formItemSlots.label = () => { return ( @@ -367,10 +358,7 @@ export default defineComponent({ } let labelName = item.label || '' if(item.label){ - labelName = t(`ts.${item.label}`) - if(labelName === 'ts.' + item.label){ - labelName = item.label - } + labelName = t(`ts.${item.label}`).replace('ts.','') } return ( diff --git a/src/components/Form/src/components/useRenderSelect.tsx b/src/components/Form/src/components/useRenderSelect.tsx index 4a8a18a79..30f6d73d6 100644 --- a/src/components/Form/src/components/useRenderSelect.tsx +++ b/src/components/Form/src/components/useRenderSelect.tsx @@ -35,10 +35,7 @@ export const useRenderSelect = (slots: Slots) => { const { label, value, ...other } = option const zhName = labelAlias ? option[labelAlias] : label;//中文名称 - let labelName = t(`ts.${zhName}`) - if(labelName === 'ts.' + zhName){ - labelName = zhName - } + let labelName = t(`ts.${zhName}`).replace('ts.','') return ( { let labelName = schema.label || '' if(schema.label){ - labelName = t(`ts.${schema.label}`) - if(labelName === 'ts.' + schema.label){ - labelName = ' '+schema.label - }else{ - labelName = ' ' + labelName - } + labelName = ' '+t(`ts.${schema.label}`).replace('ts.','') } if (textMap.includes(schema?.component as string)) { diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index af95f8b2d..5b785c699 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -283,10 +283,7 @@ export default defineComponent({ return [...[renderTableExpand()], ...[renderTableSelection()]].concat( (columnsChildren || columns).map((v) => { const zhName = v.label || '';//中文名称 - let labelName = t(`ts.${v.label}`) - if(labelName === 'ts.' + zhName){ - labelName = zhName - } + let labelName = t(`ts.${v.label}`).replace('ts.','') // 自定生成序号 if (v.type === 'index') { return ( diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 73101cc39..1a2ad0cca 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -289,7 +289,7 @@ export function mainListDisableBtn(option:any) { // 主列表-中止按钮1 export function mainListSuspend1Btn(option:any) { return __defaultBtnOption(option,{ - label: t(`ts.中止`), + label: t(`ts.中止`).replace('ts.',''), name: 'suspend', hide: false, type: 'danger', @@ -624,7 +624,7 @@ export function mainListPurchasePlanModBtn(option:any) { // 主列表-要货计划流程-下架按钮 export function mainListPurchasePlanWitBtn(option:any) { return __defaultBtnOption(option,{ - label: t(`ts.下架`), + label: t(`ts.下架`).replace('ts.',''), name: 'mainPurPlanWit', hide: false, type: 'danger', diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 2c2c33fd7..a28e0101a 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -15,7 +15,7 @@ From b3028383fe5da3294c3a22fdb41ee0c8101d0603 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 24 May 2024 14:34:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/labelManage/locationLabel/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index 04ec8d045..79d4d6b7d 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -187,17 +187,17 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const src = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken()) // 标签打印 const handlePoint = async (row) => { - window.open(src.value+'&id='+row.id) + window.open(src.value+'&relateNumber='+row.id) } -const srcPoint = ref(BASE_URL + '/jmreport/view/953469704945139712?token=' + getAccessToken()) +// const srcPoint = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken()) const handleSelectionPoint = async ()=>{ let rows:any = [] selectionRows.value.forEach(item=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.id)] }) console.log('批量打印',rows.join(',')) - window.open(srcPoint.value+'&relateNumber='+rows.join(',')) + window.open(src.value+'&relateNumber='+rows.join(',')) } // 筛选提交 From b2de7b84159354d7f871724e0501ca6bf509ae21 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 24 May 2024 15:00:44 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 2 +- .../callmaterials/callmaterials.data.ts | 46 +++++++++++++++++-- .../labelManage/callmaterials/index.vue | 1 + .../inventorychangeRecordMain.data.ts | 2 +- .../inventorychangeRequestMain/index.vue | 1 - .../inventorychangeRequestMain.data.ts | 24 ++++++++-- 6 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 6ddf5473a..cb17a3200 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -83,7 +83,7 @@ export const getBalancePageByBusinessType = async (params) => { } -// 查询库存余额列表根据业务类型 +// 查询库存余额列表根据业务类型的物料类型 export const getBalancePageByBusinessTypeByItemType = async (params) => { if (params.isSearch) { delete params.isSearch diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 216b92563..5c852da86 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -29,8 +29,13 @@ const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN") // 表单校验 export const CallmaterialsRules = reactive({ itemCode: [required], - itemName: [required], - barcodeString: [required] + packUnit: [required], + qty: [required], + productionLineCode: [required], + callmaterialQtySum: [required], + warehouseCode: [required], + workshopCode: [required], + workStationCode: [required], }) export const Callmaterials = useCrudSchemas(reactive([ @@ -72,7 +77,7 @@ export const Callmaterials = useCrudSchemas(reactive([ componentProps: { isSearch:true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '物料包装信息', // 查询弹窗标题 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 @@ -91,12 +96,45 @@ export const Callmaterials = useCrudSchemas(reactive([ } }, { - label: '包装数量', + label: '叫料包装数量', field: 'qty', sort: 'custom', table: { width: 120 }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + style: {width:'100%'}, + min: 0, + precision: 6 + } + } + }, + { + label: '包装数量', + field: 'callmaterialQty', + sort: 'custom', + table: { + width: 120 + }, + form: { + component: 'InputNumber', + componentProps: { + style: {width:'100%'}, + min: 0, + precision: 6 + } + } + }, + { + label: '叫料总数量', + field: 'callmaterialQtySum', + sort: 'custom', + table: { + width: 120 + }, form: { component: 'InputNumber', componentProps: { diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 620c91a76..1aa4b89a4 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -90,6 +90,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } else if (formField == 'packUnit') { setV['uom'] = val[0]['uom'] setV['packUnit'] = val[0]['packUnit'] + setV['callmaterialQty'] = val[0]['packQty'] }else { setV[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts index bcb4a54d9..bd30dfe67 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts @@ -615,7 +615,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, { label: '是否冻结', - field: 'available', + field: 'frozen', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 9da46ac24..56525c2a8 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -94,7 +94,6 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns]) - const { tableObject, tableMethods } = useTable({ getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage // 分页接口 }) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index d9bb40b13..b29734a9b 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -4,7 +4,7 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' - +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' import * as OwnerApi from '@/api/wms/owner' import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' @@ -15,10 +15,16 @@ const queryParams = { pageSize:10, pageNo:1, code:'InventoryChangeRequest' +} +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'Change' } const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData =data?.list[0]||{} - + const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) + const businessTypeData =businessTypeValue?.list[0]||{} // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' @@ -374,7 +380,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive Date: Fri, 24 May 2024 15:26:56 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceInvoiced.data.ts | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index 62db027ef..da35415d0 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -68,57 +68,60 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ }, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS, - dictClass: 'string', - isTable: true, - isForm:false, + label: '供应商代码', + field: 'supplierCode', sort: 'custom', + isSearch: true, table: { width: 150 }, - isSearch: true, - form: { - value: '1', - componentProps: { - disabled: true - } - } }, { - label: '物流单据号', - field: 'recvBillNum', + label: '订单号', + field: 'poNumber', sort: 'custom', - isSearch: true, table: { width: 150 }, }, { - label: '发货单号', - field: 'asnBillNum', + label: '物流单据号', + field: 'recvBillNum', sort: 'custom', + isSearch: true, table: { width: 150 }, }, { - label: '供应商代码', - field: 'supplierCode', + label: '发货单号', + field: 'asnBillNum', sort: 'custom', table: { width: 150 }, }, { - label: '订单号', - field: 'poNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, sort: 'custom', table: { width: 150 }, + isSearch: true, + form: { + value: '1', + componentProps: { + disabled: true + } + } }, + + { label: '订单行', field: 'poLine',