Browse Source

修复bug

master_hella_20240701
chenfang 6 months ago
parent
commit
b2de7b8415
  1. 2
      src/api/wms/balance/index.ts
  2. 46
      src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
  3. 1
      src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
  4. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
  5. 1
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  6. 24
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

2
src/api/wms/balance/index.ts

@ -83,7 +83,7 @@ export const getBalancePageByBusinessType = async (params) => {
} }
// 查询库存余额列表根据业务类型 // 查询库存余额列表根据业务类型的物料类型
export const getBalancePageByBusinessTypeByItemType = async (params) => { export const getBalancePageByBusinessTypeByItemType = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch

46
src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@ -29,8 +29,13 @@ const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
// 表单校验 // 表单校验
export const CallmaterialsRules = reactive({ export const CallmaterialsRules = reactive({
itemCode: [required], itemCode: [required],
itemName: [required], packUnit: [required],
barcodeString: [required] qty: [required],
productionLineCode: [required],
callmaterialQtySum: [required],
warehouseCode: [required],
workshopCode: [required],
workStationCode: [required],
}) })
export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
@ -72,7 +77,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
isSearch:true, isSearch:true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段 searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
@ -91,12 +96,45 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '包装数量', label: '叫料包装数量',
field: 'qty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 120 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: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {

1
src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@ -90,6 +90,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
} else if (formField == 'packUnit') { } else if (formField == 'packUnit') {
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
setV['packUnit'] = val[0]['packUnit'] setV['packUnit'] = val[0]['packUnit']
setV['callmaterialQty'] = val[0]['packQty']
}else { }else {
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
} }

2
src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@ -615,7 +615,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
}, },
{ {
label: '是否冻结', label: '是否冻结',
field: 'available', field: 'frozen',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',

1
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -94,7 +94,6 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns]) const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns])
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage // getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage //
}) })

24
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 * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' 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 * as OwnerApi from '@/api/wms/owner'
import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
@ -15,10 +15,16 @@ const queryParams = {
pageSize:10, pageSize:10,
pageNo:1, pageNo:1,
code:'InventoryChangeRequest' code:'InventoryChangeRequest'
}
const businessTypeQueryParams = {
pageSize:10,
pageNo:1,
code:'Change'
} }
const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData =data?.list[0]||{} const requestsettingData =data?.list[0]||{}
const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
const businessTypeData =businessTypeValue?.list[0]||{}
// 获取当前操作人的部门 // 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table' import { TableColumn } from '@/types/table'
@ -374,7 +380,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
searchField: 'packingNumber', searchField: 'packingNumber',
searchTitle: '库存余额信息', searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas, searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
searchCondition: [{
key: 'businessType',
value: businessTypeData.code,
}]
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -384,7 +394,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
searchField: 'packingNumber', searchField: 'packingNumber',
searchTitle: '库存余额信息', searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas, searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
searchCondition: [{
key: 'businessType',
value: businessTypeData.code,
}]
} }
} }
}, },
@ -841,7 +855,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}, },
{ {
label: '是否冻结', label: '是否冻结',
field: 'available', field: 'frozen',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',

Loading…
Cancel
Save