Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
songguoqiang 6 months ago
parent
commit
be559ca5c7
  1. 2
      src/components/SearchTable/src/SearchTable.vue
  2. 8
      src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
  3. 24
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  4. 59
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
  5. 2
      src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts

2
src/components/SearchTable/src/SearchTable.vue

@ -93,7 +93,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
HeadButttondata.value = [ HeadButttondata.value = [
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
] ]
debugger
searchDialogVisible.value = true searchDialogVisible.value = true
formFieldRef.value = formField formFieldRef.value = formField
searchFieldRef.value = searchField searchFieldRef.value = searchField

8
src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts

@ -257,6 +257,14 @@ export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '到包装号', label: '到包装号',
field: 'toPackingNumber', field: 'toPackingNumber',

24
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },{
message: '请选择从仓库代码!', message: '请选择从仓库代码!',
key: 'warehouseCode', key: 'warehouseCode',
value: 'fromWarehouseCode', value: 'fromWarehouseCode',
isMainValue: true isMainValue: true
} }
] ]
item.form.componentProps.searchCondition = [ item.form.componentProps.searchCondition = [
{ {
@ -255,12 +255,12 @@ const butttondata = (row, $index) => {
return [] return []
} }
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), //
defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), //
// defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), //
] ]

59
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as LocationApi from '@/api/wms/location' import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as ItempackageApi from '@/api/wms/itempackage'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as confgiApi from '@/api/infra/config' import * as confgiApi from '@/api/infra/config'
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
const queryParams = { const queryParams = {
@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({
available: [required], available: [required],
departmentCode: [required], departmentCode: [required],
concurrencyStamp: [required], concurrencyStamp: [required],
packUnit: [required],
}) })
export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
@ -531,6 +536,60 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 120 width: 120
}, },
}, },
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码',
searchField: 'code',
searchTitle: '库位信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.selectBusinessTypeToLocation,
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码',
searchField: 'code',
searchTitle: '库位信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.selectBusinessTypeToLocation,
}
},
table: {
width: 120
},
},
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格',
searchField: 'packUnit',
searchTitle: '包装规格',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackageApi.getItempackagingPage,
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格',
searchField: 'packUnit',
searchTitle: '包装规格',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackageApi.getItempackagingPage,
}
},
table: {
width: 120
},
},
{ {
label: '到库区类型', label: '到库区类型',
field: 'toAreaTypes', field: 'toAreaTypes',

2
src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts

@ -4,6 +4,8 @@ import { dateFormatter } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const MesBarCodeRules = reactive({ export const MesBarCodeRules = reactive({
available: [required], available: [required],
lowerLim: [required],
partNumber: [required],
}) })
export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([

Loading…
Cancel
Save