sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

HL-5734装配报工&预生产报工申请中班次字段修改

hella_online_20240803
wangyufei 3 weeks ago
parent
0dc725e505
commit
bc7fcab963
2 changed files with 94 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  2. 76
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

71
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
View File

@ -42,7 +42,8 @@ const queryParams = {
} }
const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData = data?.list[0] || {} const requestsettingData = data?.list[0] || {}
const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
console.log('shiftList',shiftList)
// 获取当前操作人的部门 // 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table' import { TableColumn } from '@/types/table'
@ -232,30 +233,48 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
sortTableDefault: 1001, sortTableDefault: 1001,
form: { form: {
// labelMessage: '信息提示说明！！！', component:'Select',
componentProps: { componentProps:{
enterSearch: true, options:shiftList.list,
isSearchList: true, optionsAlias: {
searchListPlaceholder: '请选择班次', labelField: 'code',
searchField: 'code', valueField: 'code'
searchTitle: '班次信息', },
searchAllSchemas: Shift.allSchemas, verificationParams: [{
searchPage: ShiftApi.getShiftPage, key: 'code',
searchCondition: [{ action: '==',
key: 'available', value: '',
value: 'TRUE', isMainValue: false,
isMainValue: false isSearch: true,
}], isFormModel: true,
verificationParams: [{ }], // 失去焦点校验参数
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
} }
} }
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择班次',
// searchField: 'code',
// searchTitle: '班次信息',
// searchAllSchemas: Shift.allSchemas,
// searchPage: ShiftApi.getShiftPage,
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }],
// verificationParams: [{
// key: 'code',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true,
// }], // 失去焦点校验参数
// }
// }
}, },
{ {
label: '收货类型', label: '收货类型',
@ -575,9 +594,9 @@ export const ProductreceiptRequestMainRules = reactive({
// team: [ // team: [
// { required: true, message: '请选择班组代码', trigger: 'change' } // { required: true, message: '请选择班组代码', trigger: 'change' }
// ], // ],
// shift: [ shift: [
// { required: true, message: '请选择班次代码', trigger: 'change' } { required: true, message: '请选择班次代码', trigger: 'change' }
// ], ],
// departmentCode: [ // departmentCode: [
// { required: true, message: '请输入部门', trigger: 'blur' } // { required: true, message: '请输入部门', trigger: 'blur' }
// ], // ],

76
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
View File

@ -43,6 +43,8 @@ const queryParams = {
const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData =data?.list[0]||{} const requestsettingData =data?.list[0]||{}
const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
console.log('shiftList',shiftList)
// 获取当前操作人的部门 // 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table' import { TableColumn } from '@/types/table'
@ -240,30 +242,48 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
sortTableDefault: 1001, sortTableDefault: 1001,
form: { form: {
// labelMessage: '信息提示说明！！！', component:'Select',
componentProps: { componentProps:{
enterSearch: true, options:shiftList.list,
isSearchList: true, optionsAlias: {
searchListPlaceholder: '请选择班次', labelField: 'code',
searchField: 'code', valueField: 'code'
searchTitle: '班次信息', },
searchAllSchemas: Shift.allSchemas, verificationParams: [{
searchPage: ShiftApi.getShiftPage, key: 'code',
searchCondition: [{ action: '==',
key: 'available', value: '',
value: 'TRUE', isMainValue: false,
isMainValue: false isSearch: true,
}], isFormModel: true,
verificationParams: [{ }], // 失去焦点校验参数
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
} }
} }
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择班次',
// searchField: 'code',
// searchTitle: '班次信息',
// searchAllSchemas: Shift.allSchemas,
// searchPage: ShiftApi.getShiftPage,
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }],
// verificationParams: [{
// key: 'code',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true,
// }], // 失去焦点校验参数
// }
// }
}, },
{ {
label: '收货类型', label: '收货类型',
@ -585,9 +605,9 @@ export const ProductreceiptRequestMainRules = reactive({
// team: [ // team: [
// { required: true, message: '请选择班组代码', trigger: 'change' } // { required: true, message: '请选择班组代码', trigger: 'change' }
// ], // ],
// shift: [ shift: [
// { required: true, message: '请选择班次代码', trigger: 'change' } { required: true, message: '请选择班次代码', trigger: 'change' }
// ], ],
// departmentCode: [ // departmentCode: [
// { required: true, message: '请输入部门', trigger: 'blur' } // { required: true, message: '请输入部门', trigger: 'blur' }
// ], // ],
@ -1096,13 +1116,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

Write Preview
Loading…
Cancel
Save