eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

master
songguoqiang 7 months ago
parent
d943bd6112 5348685124
commit
5f3c095c10
6 changed files with 140 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
  2. 62
      src/views/eam/basic/deviceMaintenance/index.vue
  3. 62
      src/views/eam/basic/moldMaintenance/index.vue
  4. 44
      src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
  5. 28
      src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts
  6. 28
      src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts

44
src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
View File

@ -129,28 +129,28 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select'
},
},
{
label: '涂装保养周期-月份',
field: 'executionCycleMonth',
dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select'
},
},
{
label: '涂装保养周期-星期',
field: 'executionCycleWeek',
dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select'
},
},
// {
// label: '涂装保养周期-月份',
// field: 'executionCycleMonth',
// dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
// dictClass: 'string',
// sort: 'custom',
// isSearch: false,
// form: {
// component: 'Select'
// },
// },
// {
// label: '涂装保养周期-星期',
// field: 'executionCycleWeek',
// dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
// dictClass: 'string',
// sort: 'custom',
// isSearch: false,
// form: {
// component: 'Select'
// },
// },
{
label: '人数',
field: 'peoples',

62
src/views/eam/basic/deviceMaintenance/index.vue
View File

@ -110,38 +110,38 @@ const updateFormValue = reactive({
const openDataOld = ref()
const openDataNew = ref()
const operatType = ref('')
const tzDeptId = ref()
// const tzDeptId = ref()
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
if(formField == 'deviceNumber' && val[0].factoryAreaNumber == tzDeptId.value){
DeviceMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycle'
}).componentProps.disabled = true
DeviceMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleMonth'
}).componentProps.disabled = false
DeviceMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleWeek'
}).componentProps.disabled = false
}else{
DeviceMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycle'
}).componentProps.disabled = false
DeviceMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleMonth'
}).componentProps.disabled = true
DeviceMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleWeek'
}).componentProps.disabled = true
}
// if(formField == 'deviceNumber' && val[0].factoryAreaNumber == tzDeptId.value){
// DeviceMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycle'
// }).componentProps.disabled = true
// DeviceMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleMonth'
// }).componentProps.disabled = false
// DeviceMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleWeek'
// }).componentProps.disabled = false
// }else{
// DeviceMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycle'
// }).componentProps.disabled = false
// DeviceMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleMonth'
// }).componentProps.disabled = true
// DeviceMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleWeek'
// }).componentProps.disabled = true
// }
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
setV['executionCycle'] = null
setV['executionCycleMonth'] = null
setV['executionCycleWeek'] = null
// setV['executionCycleMonth'] = null
// setV['executionCycleWeek'] = null
formRef.setValues(setV)
})
}
@ -212,13 +212,13 @@ const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
openDataOld.value = row
updateFormValue.remark = ''
DeptApi.getSimpleDeptList().then(res=>{
res.forEach(item=>{
if(item.busiType == 'TZ'){
tzDeptId.value = item.id
}
})
})
// DeptApi.getSimpleDeptList().then(res=>{
// res.forEach(item=>{
// if(item.busiType == 'TZ'){
// tzDeptId.value = item.id
// }
// })
// })
basicFormRef.value.open(type, row)
}

62
src/views/eam/basic/moldMaintenance/index.vue
View File

@ -111,33 +111,33 @@ const operatType = ref('')
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
if(formField == 'deviceNumber' && val[0].factoryAreaNumber == tzDeptId.value){
MoldMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycle'
}).componentProps.disabled = true
MoldMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleMonth'
}).componentProps.disabled = false
MoldMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleWeek'
}).componentProps.disabled = false
}else{
MoldMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycle'
}).componentProps.disabled = false
MoldMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleMonth'
}).componentProps.disabled = true
MoldMaintenance.allSchemas.formSchema.find(item=>{
return item.field == 'executionCycleWeek'
}).componentProps.disabled = true
}
// if(formField == 'deviceNumber' && val[0].factoryAreaNumber == tzDeptId.value){
// MoldMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycle'
// }).componentProps.disabled = true
// MoldMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleMonth'
// }).componentProps.disabled = false
// MoldMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleWeek'
// }).componentProps.disabled = false
// }else{
// MoldMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycle'
// }).componentProps.disabled = false
// MoldMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleMonth'
// }).componentProps.disabled = true
// MoldMaintenance.allSchemas.formSchema.find(item=>{
// return item.field == 'executionCycleWeek'
// }).componentProps.disabled = true
// }
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
setV['executionCycle'] = null
setV['executionCycleMonth'] = null
setV['executionCycleWeek'] = null
// setV['executionCycleMonth'] = null
// setV['executionCycleWeek'] = null
formRef.setValues(setV)
})
}
@ -205,17 +205,17 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */
const basicFormRef = ref()
const tzDeptId = ref()
// const tzDeptId = ref()
const openForm = (type: string, row?: any) => {
openDataOld.value = row
updateFormValue.remark = ''
DeptApi.getSimpleDeptList().then(res=>{
res.forEach(item=>{
if(item.busiType == 'TZ'){
tzDeptId.value = item.id
}
})
})
// DeptApi.getSimpleDeptList().then(res=>{
// res.forEach(item=>{
// if(item.busiType == 'TZ'){
// tzDeptId.value = item.id
// }
// })
// })
basicFormRef.value.open(type, row)
}

44
src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
View File

@ -127,28 +127,28 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select'
},
},
{
label: '涂装保养周期-月份',
field: 'executionCycleMonth',
dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select'
},
},
{
label: '涂装保养周期-星期',
field: 'executionCycleWeek',
dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select'
},
},
// {
// label: '涂装保养周期-月份',
// field: 'executionCycleMonth',
// dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
// dictClass: 'string',
// sort: 'custom',
// isSearch: false,
// form: {
// component: 'Select'
// },
// },
// {
// label: '涂装保养周期-星期',
// field: 'executionCycleWeek',
// dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
// dictClass: 'string',
// sort: 'custom',
// isSearch: false,
// form: {
// component: 'Select'
// },
// },
{
label: '人数',
field: 'peoples',

28
src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts
View File

@ -41,20 +41,20 @@ export const DeviceMaintainPlan = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.MOLD_EXECUTION_CYCLE,
dictClass: 'string',
},
{
label: '涂装保养周期-月',
field: 'cycleMonth',
sort: 'custom',
dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
dictClass: 'string',
},
{
label: '涂装保养周期-周',
field: 'cycleWeek',
sort: 'custom',
dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
dictClass: 'string',
},
// {
// label: '涂装保养周期-月',
// field: 'cycleMonth',
// sort: 'custom',
// dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
// dictClass: 'string',
// },
// {
// label: '涂装保养周期-周',
// field: 'cycleWeek',
// sort: 'custom',
// dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
// dictClass: 'string',
// },
// {
// label: '次数',
// field: 'times',

28
src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts
View File

@ -42,20 +42,20 @@ export const MoldMaintainPlan = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.MOLD_EXECUTION_CYCLE,
dictClass: 'string',
},
{
label: '涂装保养周期-月',
field: 'cycleMonth',
sort: 'custom',
dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
dictClass: 'string',
},
{
label: '涂装保养周期-周',
field: 'cycleWeek',
sort: 'custom',
dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
dictClass: 'string',
},
// {
// label: '涂装保养周期-月',
// field: 'cycleMonth',
// sort: 'custom',
// dictType: DICT_TYPE.SPECIAL_CYCLE_MONTH,
// dictClass: 'string',
// },
// {
// label: '涂装保养周期-周',
// field: 'cycleWeek',
// sort: 'custom',
// dictType: DICT_TYPE.SPECIAL_CYCLE_WEEK,
// dictClass: 'string',
// },
// {
// label: '次数',
// field: 'times',

Write Preview
Loading…
Cancel
Save