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/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/api/wms/location/index.ts b/src/api/wms/location/index.ts index ff0a8435c..231f14ed8 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -85,6 +85,16 @@ export const selectBusinessTypeToLocation = async (params) => { } } +export const selectBusinessTypeOutLocation = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/location/pageBusinessTypeOutLocationSenior', data }) + } else { + return request.get({ url: `/wms/location/pageBusinessTypeOutLocation`, params }) + } +} + export const selectPageItemAreaToLocation = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index dc47bf030..11531274d 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -115,4 +115,9 @@ export const getLabelDetailPage = async (params) => { // 根据库存余额获取包装信息进行打印标签 export const getBalanceToPackage = async (packingNumber: String) => { return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber}) +} + +// 根据库存余额获取包装信息进行打印标签--批量打印 +export const getBalanceToPackageSelection = async (data: any) => { + return await request.post({ url: `/wms/balance/batchPrintLabel` ,data}) } \ No newline at end of file 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 @@ diff --git a/src/views/mes/holiday/holiday.data.ts b/src/views/mes/holiday/holiday.data.ts index 55096dbd7..cf0937d6b 100644 --- a/src/views/mes/holiday/holiday.data.ts +++ b/src/views/mes/holiday/holiday.data.ts @@ -89,7 +89,7 @@ export const Holiday = useCrudSchemas(reactive([ label: '状态', field: 'status', sort: 'custom', - dictType: DICT_TYPE.QUALIFY_STATUS, + dictType: DICT_TYPE.COMMON_STATUS, dictClass: 'string', isForm: true, isSearch: false, @@ -98,7 +98,7 @@ export const Holiday = useCrudSchemas(reactive([ component: 'Switch', value: '1', componentProps: { - inactiveValue: '2', + inactiveValue: '0', activeValue: '1' } }, diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts index 614e2ef7f..3ab45c4fc 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' }] } @@ -141,6 +142,7 @@ export const HrPersonAbility = useCrudSchemas(reactive([ componentProps: { isSearchList: true, // 开启查询弹窗 searchTitle: '能力矩阵信息', // 查询弹窗标题 + searchListPlaceholder: '请选择 能力编号', // 输入框占位文本 searchAllSchemas: AbilityInfo.allSchemas, // 查询弹窗所需类 searchField: 'ablityCode', // 查询弹窗赋值字段 searchPage: AbilityInfoApi.getAbilityInfoPage, // 查询弹窗所需分页方法 diff --git a/src/views/mes/item/index.vue b/src/views/mes/item/index.vue index 81515d30d..b274a01cc 100644 --- a/src/views/mes/item/index.vue +++ b/src/views/mes/item/index.vue @@ -81,7 +81,11 @@ const tableColumns = ref(Item.allSchemas.tableColumns) const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} + //console.log("item-search-success-84-val",val) + //console.log("item-search-success-84-formField",formField) setV[formField] = val[0][searchField] + setV["itemType"] = val[0]["groupCode"] + //setV[] = val[0][searchField] formRef.setValues(setV) }) } diff --git a/src/views/mes/item/item.data.ts b/src/views/mes/item/item.data.ts index ef09018c2..146ed1730 100644 --- a/src/views/mes/item/item.data.ts +++ b/src/views/mes/item/item.data.ts @@ -1,14 +1,15 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -import * as QualitygroupApi from '@/api/mes/qualitygroup' -import { Qualitygroup } from '../qualitygroup/qualitygroup.data' - +import * as QualityclassApi from '@/api/mes/qualityclass' +import { Qualityclass } from '@/views/mes/qualityclass/qualityclass.data' +// import * as QualitygroupApi from '@/api/mes/qualitygroup' +// import { Qualitygroup } from '@/views/mes/qualitygroup/qualitygroup.data' // 表单校验 export const ItemRules = reactive({ - concurrencyStamp: [required], - itemCode: [{ required: true, message: '请输入编码', trigger: 'blur' }], - itemType: [required], - dataType: [required] + itemCode: [{ required: true, message: '请输入项目编码', trigger: 'blur' }], + itemName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }], + qmsClass: [{ required: true, message: '请选择一个质检类别', trigger: 'blur' }], + dataType:[{ required: true, message: '请选择一个数据类型！', trigger: 'blur' }], }) export const Item = useCrudSchemas(reactive([ @@ -111,19 +112,40 @@ export const Item = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, + // { + // label: '分组编码', + // field: 'itemType', + // sort: 'custom', + // isSearch: true, + // // form: { + // // componentProps: { + // // isSearchList: true, // 开启查询弹窗 + // // searchTitle: '质检分组', // 查询弹窗标题 + // // searchListPlaceholder: '请选择质检分组', // 输入框占位文本 + // // searchAllSchemas: Qualitygroup.allSchemas, // 查询弹窗所需类 + // // searchField: 'code', // 查询弹窗赋值字段 + // // searchPage: QualitygroupApi.getQualitygroupPage, // 查询弹窗所需分页方法 + // // searchCondition: [{ + // // key: 'status', + // // value: '1', + // // action: '==' + // // }] + // // } + // // } + // }, { - label: '类别编码', - field: 'itemType', + label: '质检科目编码', + field: 'qmsClass', sort: 'custom', isSearch: true, form: { componentProps: { isSearchList: true, // 开启查询弹窗 - searchTitle: '质检科目信息', // 查询弹窗标题 - searchListPlaceholder: '请选择 类别编码', // 输入框占位文本 - searchAllSchemas: Qualitygroup.allSchemas, // 查询弹窗所需类 + searchTitle: '质检分组', // 查询弹窗标题 + searchListPlaceholder: '请选择质检分组', // 输入框占位文本 + searchAllSchemas: Qualityclass.allSchemas, // 查询弹窗所需类 searchField: 'code', // 查询弹窗赋值字段 - searchPage: QualitygroupApi.getQualitygroupPage, // 查询弹窗所需分页方法 + searchPage: QualityclassApi.getQualityclassPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'status', value: '1', @@ -132,13 +154,6 @@ export const Item = useCrudSchemas(reactive([ } } }, - { - label: '质检科目编码', - field: 'qmsClass', - sort: 'custom', - isSearch: true, - - }, { label: '数据类型', field: 'dataType', @@ -187,7 +202,7 @@ export const Item = useCrudSchemas(reactive([ isForm: true, form: { component: 'Switch', - value: '2', + value: '1', componentProps: { inactiveValue: '2', activeValue: '1' diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts index 908906fb6..9461a665f 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 + // } + // ] } } }, @@ -79,7 +80,7 @@ export const MesOrderMonthMain = useCrudSchemas(reactive([ isTable: false }, { - label: '创建者用户名', + label: '创建者ID', field: 'creator', sort: 'custom', isSearch: true, diff --git a/src/views/mes/qualityclass/qualityclass.data.ts b/src/views/mes/qualityclass/qualityclass.data.ts index ddc384661..8978ddcdd 100644 --- a/src/views/mes/qualityclass/qualityclass.data.ts +++ b/src/views/mes/qualityclass/qualityclass.data.ts @@ -1,11 +1,13 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' - +import * as QualitygroupApi from '@/api/mes/qualitygroup' +import { Qualitygroup } from '@/views/mes/qualitygroup/qualitygroup.data' // 表单校验 export const QualityclassRules = reactive({ - concurrencyStamp: [required], - code: [{ required: true, message: '请输入代码', trigger: 'blur' }], - name: [required], + + code: [{ required: true, message: '请输入编码', trigger: 'blur' }], + name: [{ required: true, message: '请输入名称', trigger: 'blur' }], + groupCode: [{ required: true, message: '请选择一个分组', trigger: 'blur' }], }) export const Qualityclass = useCrudSchemas(reactive([ @@ -108,10 +110,27 @@ export const Qualityclass = useCrudSchemas(reactive([ isSearch: true, }, { - label: '分组类别', + label: '分组', field: 'groupCode', sort: 'custom', isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择一个分组', // 输入框占位文本 + multiple:false, + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '分组编码', // 查询弹窗标题 + searchAllSchemas: Qualitygroup.allSchemas, // 查询弹窗所需类 + searchPage: QualitygroupApi.getQualitygroupPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'status', + value: '1', + isMainValue: false + }] + } + } }, { label: '状态', @@ -124,7 +143,7 @@ export const Qualityclass = useCrudSchemas(reactive([ isTable: true, form: { component: 'Switch', - value: '2', + value: '1', componentProps: { inactiveValue: '2', activeValue: '1' diff --git a/src/views/mes/qualitygroup/qualitygroup.data.ts b/src/views/mes/qualitygroup/qualitygroup.data.ts index 7cf7a5bf9..9744622c9 100644 --- a/src/views/mes/qualitygroup/qualitygroup.data.ts +++ b/src/views/mes/qualitygroup/qualitygroup.data.ts @@ -3,9 +3,8 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const QualitygroupRules = reactive({ - concurrencyStamp: [required], - code: [required], - name: [required], + code: [{ required: true, message: '请输入编码', trigger: 'blur' }], + name: [{ required: true, message: '请输入名称', trigger: 'blur' }], }) export const Qualitygroup = useCrudSchemas(reactive([ @@ -102,17 +101,17 @@ export const Qualitygroup = useCrudSchemas(reactive([ isSearch: true, }, { - label: '编码名称', + label: '分组名称', field: 'name', sort: 'custom', isSearch: true, }, - { - label: '分组类别', - field: 'groupCode', - sort: 'custom', - isSearch: true, - }, + // { + // label: '分组类别', + // field: 'groupCode', + // sort: 'custom', + // isSearch: true, + // }, { label: '状态', field: 'status', @@ -124,7 +123,7 @@ export const Qualitygroup = useCrudSchemas(reactive([ isTable: true, form: { component: 'Switch', - value: '2', + value: '1', componentProps: { inactiveValue: '2', activeValue: '1' diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index 50c88e58b..8ef670d05 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -319,8 +319,8 @@ export const abilityPopList = useCrudSchemas(reactive([ searchAllSchemas: AbilityInfo.allSchemas, // 查询弹窗所需类 searchPage: AbilityInfoApi.getAbilityInfoPage, // 查询弹窗所需分页方法 searchCondition: [{ - key: 'available', - value: 'TRUE', + key: 'status', + value: '1', isMainValue: false }] } diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts index 164257fd3..c94c25f57 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts +++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts @@ -215,10 +215,10 @@ export const Saleprice = useCrudSchemas(reactive([ //表单校验 export const SalepriceRules = reactive({ - customercode: [ + customerCode: [ { required: true, message: '请输入客户代码', trigger: 'blur' } ], - itemcode: [ + itemCode: [ { required: true, message: '请输入物料代码', trigger: 'blur' } ], currency: [ @@ -233,4 +233,4 @@ export const SalepriceRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index d4662694f..507cd83f6 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -396,6 +396,9 @@ export const LocationRules = reactive({ warehouseCode: [ { required: true, message: '请输入仓库代码', trigger: 'change' } ], + qadLocationCode: [ + { required: true, message: '请QAD库位代码', trigger: 'change' } + ], areaCode: [ { required: true, message: '请输入库区代码', trigger: 'change' } ], diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 216b92563..6c1e22092 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, // 查询弹窗所需类 @@ -90,6 +95,23 @@ export const Callmaterials = useCrudSchemas(reactive([ } } }, + { + label: '叫料包装数量', + field: 'callmaterialQty', + sort: 'custom', + table: { + width: 120 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + style: {width:'100%'}, + min: 0, + precision: 6 + } + } + }, { label: '包装数量', field: 'qty', @@ -106,6 +128,23 @@ export const Callmaterials = useCrudSchemas(reactive([ } } }, + { + label: '叫料总数量', + field: 'callmaterialQtySum', + sort: 'custom', + table: { + width: 120 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + style: {width:'100%'}, + min: 0, + precision: 6 + } + } + }, { label: '计量单位', // 发料申请 与当前物料计量单位做匹配 ： 原PACK_UNIT 修改：UOM field: 'uom', diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 620c91a76..ba361799f 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -49,6 +49,12 @@ :apiCreate="CallmaterialsApi.createCallmaterials" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + :sumFormDataByForm ="(formRef,formModel)=>{ + const {qty=0,callmaterialQty=0} = formModel + formRef.value.setValues({ + callmaterialQtySum:qty*callmaterialQty, + }) + }" /> @@ -90,6 +96,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/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(',')) } // 筛选提交 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index d0531a644..53b7e8806 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -16,7 +16,7 @@ - - + - + - + - + -
-
规则条件
- - +
+
规则条件
+ + - - - - - - - -
@@ -141,7 +141,7 @@
@@ -150,14 +150,14 @@
-
-
规则配置
- +
+
规则配置
+ - + - - + - - + - - + - - + - - + - - + + - - + + @@ -363,7 +365,8 @@ const options = reactive({ //月台列表 dockList: [], //在途库位列表 - locationList: [] + locationList: [], + originLocationList: [] }) // 弹窗按钮 const Butttondata = ref([ @@ -407,15 +410,35 @@ const getFormWarehouseList = async () => { const getFormDockList = async () => { options.dockList = await getDockList() } +const filterMethodFromLocation = (query: string) => { + if (query) { + options.locationList = options.originLocationList.filter((item) => { + return item?.code.includes(query) + }) + } else { + options.locationList = [...options.originLocationList] + } +} // 获取库位列表 const getFormLocationList = async () => { - options.locationList = await getLocationList({ type: 'TRANSPORT' }) + if(!options.locationList || options.locationList.length==0){ + options.originLocationList = await getLocationList({ type: 'TRANSPORT' }) + options.locationList = [...options.originLocationList] + }else{ + options.locationList = [] + let timer = setTimeout(()=>{ + options.locationList = [...options.originLocationList] + if(timer){ + clearTimeout(timer) + } + },2000) + } } getFormSupplierList() getFormWarehouseList() getFormDockList() -getFormLocationList() + /** 打开弹窗 */ const open = async (type: string, strategyCode: string, id?: number) => { @@ -469,6 +492,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { defaultButtons.formCloseBtn(null) // 关闭 ] } + getFormLocationList() } defineExpose({ open }) // 提供 open 方法，用于打开弹窗 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 69b2ddad1..c1c28fdab 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -628,7 +628,7 @@ const options = reactive({ ], //供应商列表 supplierList: [], - orignSupplierList: [], + originSupplierList: [], // 物料类型列表 itemTypeOptions: [ { value: 'ItemType', label: '物料类型' }, @@ -673,21 +673,23 @@ const buttonBaseClick = (val, item) => { } // 获取供应商列表 const getFormSupplierList = async () => { - options.orignSupplierList = await getSupplierList() - options.supplierList = [...options.orignSupplierList] + + options.originSupplierList = await getSupplierList() + options.supplierList = [...options.originSupplierList] } // 获取客户列表 const getFormCustomerList = async () => { - options.supplierList = await getCustomerList() - options.supplierList = [...options.orignSupplierList] + + options.originSupplierList = await getCustomerList() + options.supplierList = [...options.originSupplierList] } const filterMethod = (query: string) => { if (query) { - options.supplierList = options.orignSupplierList.filter((item) => { + options.supplierList = options.originSupplierList.filter((item) => { return item.name.includes(query) }) } else { - options.supplierList = [...options.orignSupplierList] + options.supplierList = [...options.originSupplierList] } } @@ -744,7 +746,7 @@ const filterMethodWarehouseList = (query: string) => { return item.code.includes(query) }) } else { - options.warehouseList = [] + options.warehouseList = options.originWarehouseList } } // 选择仓库/库位/库位组/库区 diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index 1b990aeeb..dd20a2146 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -9,13 +9,10 @@ import { QadProject } from '../qadProject/qadProject.data' export const SubjectAccountRules = reactive({ code: [required], usageDescription: [required], - costecentreId: [required], costecentreCode: [required], - costecentreType: [required], projectId: [required], projectCode: [required], available: [required], - concurrencyStamp: [required], }) export const SubjectAccount = useCrudSchemas(reactive([ @@ -61,7 +58,7 @@ export const SubjectAccount = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'costcentreCode', // 查询弹窗赋值字段 - searchTitle: '物料基础信息', // 查询弹窗标题 + searchTitle: '成本中心信息', // 查询弹窗标题 searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法 searchCondition: [{ diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index caacdf50e..e58df3e48 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -5,7 +5,9 @@ import { dateFormatter, formatDate } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' -import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data' +import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' + +import { DeliverRecordMain,DeliverRecordDetail } from '../../deliver/deliverRecordMain/deliverRecordMain.data' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data' @@ -23,6 +25,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag import * as ItemPackageApi from '@/api/wms/itempackage/index' import * as CustomerreturnRequestApi from '@/api/wms/customerreturnRequestMain' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' const { t } = useI18n() // 国际化 const dateTime = new Date().getTime() @@ -48,6 +52,7 @@ const userDeptArray:any = [userDept] /** * @returns {Array} 客户退货申请主表 */ + export const CustomerreturnRequestMain = useCrudSchemas(reactive([ { label: '单据号', @@ -87,8 +92,10 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: '发货记录信息', // 查询弹窗标题 + isConcatDetailSchemas:true, // 是否主子表合并 searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类 - searchPage: DeliverRecordMainApi.getDeliverRecordMainPage, // 查询弹窗所需分页方法 + searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类 + searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', @@ -893,14 +900,20 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm: { - disabled: true + isSearch: true, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'toLocationCode', + searchTitle: '到库位代码', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: 'CustomerReject', + isMainValue: false + }] }, - form: { - componentProps: { - disabled: true - } - } }, { label: '库存状态', @@ -1062,6 +1075,9 @@ export const CustomerreturnRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], + toLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'blur' } + ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index ee33f9cee..388c2682b 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -292,7 +292,18 @@ const butttondata = (row,$index) => { defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreturn-request-main:handle'}), // 处理 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除 + { + label: '生成标签', + name: 'ssbq', + hide: isShowMainButton(row, ['3']), + type: 'primary', + icon: '', + color: '', + hasPermi: '', + link: true // 文本展现按钮 + }, + defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除 ] } @@ -406,27 +417,33 @@ const submitFormLabel = async (formType, data) => { } } const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL -const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - +const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const showLabelRef = ref() const labelPrint = async (row) => { - tableObject.loading = true - const defaultParams = {'moduleName':'supplier','recordNumber':row.number} - const {tableObject:tableObjectPrint ,tableMethods} = useTable({ - defaultParams, - getListApi: PackageApi.getLabelDetailPage // 分页接口 - }) - - // 获得表格的各种操作 - const { getList:getListPrint } = tableMethods - getListPrint() - tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns - tableColumns.forEach((item) => { - item.width = item.table?.width || 150 + console.log(row.packingNumber,445555555555555); + PackageApi.getBalanceToPackage(row.packingNumber).then(res => { + console.log(777,res); + if (res.productionLineCode != null) { + labelType.value = 'zz' + } else { + labelType.value = 'cg' + } + PackageApi.batchPrintingLable((res.number)).then((resLable) =>{ + console.log(159,resLable ) + // 判断是采购还是制造 + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + console.log(159,resLable ) + window.open(src.value+'&asn_number='+resLable) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+resLable) + } + }) + }).catch(err => { + console.log(err) }) - showLabelRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) } /** 添加/修改操作 */ diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index beead66f4..93e3a6943 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -16,7 +16,8 @@ -