Browse Source

修改bug

master_hella_20240701
liuchen864 4 months ago
parent
commit
0a828b2b38
  1. 98
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
  2. 14
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
  3. 12
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

98
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@ -289,33 +289,33 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
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<CrudSchema[]>([
}
}
},
{
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<CrudSchema[]>([
},
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<CrudSchema[
disabled: true,
}
},
]))
]))

14
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts

@ -16,18 +16,6 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
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<Cru
disabled: true,
}
},
]))
]))

12
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -9,6 +9,7 @@ import { validateHanset, validateEmail } from '@/utils/validator'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as ItemPackageApi from '@/api/wms/itempackage/index'
import {validateInteger} from '@/utils/validator'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
@ -1101,7 +1102,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
{ required: true, message: '请输入生产日期', trigger: 'blur' }
],
packQty: [
{ required: true, message: '请输入包装数量', trigger: 'blur' }
{ required: true, message: '请输入包装数量', trigger: 'blur' },
{ validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
],
poNumber: [
{ required: true, message: '请选择订单号', trigger: 'change' }
@ -1121,6 +1123,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
secondPackQty:[required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
})
export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
@ -1520,11 +1524,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
},
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true,
// disabled: true,
}
},
{
@ -1590,11 +1593,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
},
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
// disabled: true,
}
},
{

Loading…
Cancel
Save