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

解决测试bug，解决冲突

master
ljlong_2630 8 months ago
parent
b7cdfd88bf
commit
168862a6a0
9 changed files with 174 additions and 69 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. 50
      src/views/eam/basic/item/item.data.ts
  2. 32
      src/views/eam/device/deviceinspectionjob/index.vue
  3. 22
      src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts
  4. 12
      src/views/eam/device/devicemaintainjob/index.vue
  5. 32
      src/views/eam/device/devicemaintenancejob/index.vue
  6. 34
      src/views/eam/mold/moldinspectionjob/index.vue
  7. 16
      src/views/eam/mold/moldmaintainjob/index.vue
  8. 9
      src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts
  9. 36
      src/views/eam/mold/moldmaintenancejob/index.vue

50
src/views/eam/basic/item/item.data.ts
View File

@ -219,31 +219,31 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{ // {
label: '是否可用', // label: '是否可用',
field: 'available', // field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, // dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // dictClass: 'string',
isSearch: false, // isSearch: false,
isTable: true, // isTable: true,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
tableForm: { // tableForm: {
type: 'Select', // type: 'Select',
inactiveValue: 'FALSE', // inactiveValue: 'FALSE',
disabled: true // disabled: true
}, // },
form: { // form: {
component: 'Switch', // component: 'Switch',
value: 'TRUE', // value: 'TRUE',
componentProps: { // componentProps: {
inactiveValue: 'FALSE', // inactiveValue: 'FALSE',
activeValue: 'TRUE' // activeValue: 'TRUE'
} // }
} // }
}, // },
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',

32
src/views/eam/device/deviceinspectionjob/index.vue
View File

@ -142,12 +142,20 @@ const { tableObject, tableMethods } = useTable({
// 获得表格的各种操作 // 获得表格的各种操作
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
const judgeHasAddFunc = () => {
const rolesOk = userStore.roles.find(item => {
return item == 'device_class_worker_role' || item == 'device_class_Engineer_role' || item == 'tech_class_worker_role' || item == 'tech_class_Engineer_role'
})
if (rolesOk != undefined && rolesOk != null && rolesOk.length > 0) {
return true
} else {
return false
}
}
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'eam:deviceInspectionMain:create'}), // 新增 defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc()) }), // 新增
// defaultButtons.defaultImportBtn({hasPermi:'eam:deviceInspectionMain:import'}), // 导入
// defaultButtons.defaultExportBtn({ hasPermi: 'eam:deviceInspectionMain:export' }), // 导出
defaultButtons.defaultAddBtn({ hide: !(userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker') || userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer')) }), // 新增
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null), // 设置
@ -189,7 +197,7 @@ const butttondata = (row) => {
return [ return [
// defaultButtons.mainListEditBtn({hasPermi:'eam:deviceInspectionMain:update'}), // 编辑 // defaultButtons.mainListEditBtn({hasPermi:'eam:deviceInspectionMain:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'eam:deviceInspectionMain:delete'}), // 删除 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:deviceInspectionMain:delete'}), // 删除
defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED')}), // 编辑 defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance))}), // 编辑
defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修 defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修
defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成 defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成
] ]
@ -530,19 +538,19 @@ const openFormCallBack = (type, row, masterParmas, callback) => {
function buttonControllFunction(row, val) { function buttonControllFunction(row, val) {
if (val == 'delete') { if (val == 'delete') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
} }
} else if (val == 'edit') { } else if (val == 'edit') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
} }
} else if(val == 'add') { } else if(val == 'add') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED') { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
@ -552,6 +560,14 @@ function buttonControllFunction(row, val) {
} }
} }
function isReceiver(orderPerson) {
if (orderPerson == userStore?.getUser?.id) {
return true
} else {
return false
}
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {

22
src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts
View File

@ -142,6 +142,15 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.DEVICE_MOLD_TYPE, dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string', dictClass: 'string',
}, },
{
label: '接单人员',
field: 'maintenance',
sort: 'custom',
isSearch: false,
table: {
width: '150',
},
},
{ {
label: '接单时间', label: '接单时间',
field: 'receiveTime', field: 'receiveTime',
@ -159,19 +168,6 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
}, },
{
label: '接单人员',
field: 'maintenance',
sort: 'custom',
isSearch: false,
table: {
width: '150',
},
form: {
component: 'InputNumber',
value: 0
},
},
{ {
label: '完成时间', label: '完成时间',
field: 'finishedTime', field: 'finishedTime',

12
src/views/eam/device/devicemaintainjob/index.vue
View File

@ -501,13 +501,13 @@ function buttonControllFunction(row, val) {
if (val == 'delete') { if (val == 'delete') {
return false return false
} else if (val == 'edit') { } else if (val == 'edit') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
} }
} else if(val == 'add') { } else if(val == 'add') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED') { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
@ -517,6 +517,14 @@ function buttonControllFunction(row, val) {
} }
} }
function isReceiver(orderPerson) {
if (orderPerson == userStore?.getUser?.id) {
return true
} else {
return false
}
}
function detailOnChange(field, cur, item,formRef) { function detailOnChange(field, cur, item,formRef) {
if (field == 'status') { if (field == 'status') {
if (cur == '1') { if (cur == '1') {

32
src/views/eam/device/devicemaintenancejob/index.vue
View File

@ -227,9 +227,22 @@ const { tableObject, tableMethods } = useTable({
// 获得表格的各种操作 // 获得表格的各种操作
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
const judgeHasAddFunc = () => {
const rolesOk = userStore.roles.find(item => {
return item == 'device_class_worker_role' || item == 'device_class_Engineer_role' || item == 'tech_class_worker_role' || item == 'tech_class_Engineer_role'
})
if (rolesOk != undefined && rolesOk != null && rolesOk.length > 0) {
return true
} else {
return false
}
}
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc()) }), // 新增
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null) // 设置 defaultButtons.defaultSetBtn(null) // 设置
@ -272,7 +285,7 @@ const isShowMainButton = (row, val) => {
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED')}), // 编辑 defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance) )}), // 编辑
defaultButtons.acceptOrderBtn({ defaultButtons.acceptOrderBtn({
hide: !( hide: !(
row.status == 'PENDING' row.status == 'PENDING'
@ -754,19 +767,19 @@ const openFormCallBack = (type, row, masterParmas, callback) => {
function buttonControllFunction(row, val) { function buttonControllFunction(row, val) {
if (val == 'delete') { if (val == 'delete') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance) ) {
return false return false
} else { } else {
return true return true
} }
} else if (val == 'edit') { } else if (val == 'edit') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance) ) {
return false return false
} else { } else {
return true return true
} }
} else if(val == 'add') { } else if(val == 'add') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED') { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance) ) {
return false return false
} else { } else {
return true return true
@ -777,6 +790,15 @@ function buttonControllFunction(row, val) {
} }
function isReceiver(orderPerson) {
if (orderPerson == userStore?.getUser?.id) {
return true
} else {
return false
}
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

34
src/views/eam/mold/moldinspectionjob/index.vue
View File

@ -143,12 +143,22 @@ const { tableObject, tableMethods } = useTable({
// 获得表格的各种操作 // 获得表格的各种操作
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
const judgeHasAddFunc = () => {
const rolesOk = userStore.roles.find(item => {
return item == 'mold_class_worker_role' || item == 'mold_class_worker_role'
})
if (rolesOk != undefined && rolesOk != null && rolesOk.length > 0) {
return true
} else {
return false
}
}
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'eam:moldInspectionMain:create'}), // 新增 defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc())}), // 新增
// defaultButtons.defaultImportBtn({hasPermi:'eam:moldInspectionMain:import'}), // 导入
// defaultButtons.defaultExportBtn({ hasPermi: 'eam:moldInspectionMain:export' }), // 导出
defaultButtons.defaultAddBtn(null), // 新增
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null), // 设置
@ -187,7 +197,7 @@ const butttondata = (row) => {
return [ return [
// defaultButtons.mainListEditBtn({hasPermi:'eam:moldInspectionMain:update'}), // 编辑 // defaultButtons.mainListEditBtn({hasPermi:'eam:moldInspectionMain:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'eam:moldInspectionMain:delete'}), // 删除 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:moldInspectionMain:delete'}), // 删除
defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED')}), // 编辑 defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance))}), // 编辑
defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修 defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修
defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成 defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成
] ]
@ -517,19 +527,19 @@ const openFormCallBack = (type, row, masterParmas, callback) => {
function buttonControllFunction(row, val) { function buttonControllFunction(row, val) {
if (val == 'delete') { if (val == 'delete') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
} }
} else if (val == 'edit') { } else if (val == 'edit') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
} }
} else if(val == 'add') { } else if(val == 'add') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED') { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
@ -539,6 +549,14 @@ function buttonControllFunction(row, val) {
} }
} }
function isReceiver(orderPerson) {
if (orderPerson == userStore?.getUser?.id) {
return true
} else {
return false
}
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

16
src/views/eam/mold/moldmaintainjob/index.vue
View File

@ -496,13 +496,13 @@ function buttonControllFunction(row, val) {
if (val == 'delete') { if (val == 'delete') {
return false return false
} else if (val == 'edit') { } else if (val == 'edit') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance) ) {
return false return false
} else { } else {
return true return true
} }
} else if(val == 'add') { } else if(val == 'add') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED') { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
@ -552,6 +552,18 @@ const openFormCallBack = (type, row, masterParmas, callback) => {
} }
callback() callback()
} }
function isReceiver(orderPerson) {
if (orderPerson == userStore?.getUser?.id) {
return true
} else {
return false
}
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

9
src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts
View File

@ -134,6 +134,15 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.DEVICE_MOLD_TYPE, dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string', dictClass: 'string',
}, },
{
label: '接单人员',
field: 'maintenance',
sort: 'custom',
isSearch: false,
table: {
width: '150',
},
},
{ {
label: '接单时间', label: '接单时间',
field: 'receiveTime', field: 'receiveTime',

36
src/views/eam/mold/moldmaintenancejob/index.vue
View File

@ -230,14 +230,31 @@ const { tableObject, tableMethods } = useTable({
// 获得表格的各种操作 // 获得表格的各种操作
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
const judgeHasAddFunc = () => {
const rolesOk = userStore.roles.find(item => {
return item == 'mold_class_worker_role' || item == 'mold_class_worker_role'
})
if (rolesOk != undefined && rolesOk != null && rolesOk.length > 0) {
return true
} else {
return false
}
}
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc())}), // 新增
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null) // 设置 defaultButtons.defaultSetBtn(null) // 设置
] ]
// 头部按钮事件 // 头部按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { if (val == 'add') {
@ -282,7 +299,7 @@ const isShowMainButton = (row, val) => {
// 列表-操作按钮 // 列表-操作按钮
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED')}), // 编辑 defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED') && isReceiver(row.maintenance)}), // 编辑
defaultButtons.acceptOrderBtn({ defaultButtons.acceptOrderBtn({
hide: !( hide: !(
row.status == 'PENDING' && row.status == 'PENDING' &&
@ -720,7 +737,7 @@ const onChangeSec = (field, cur, item,formRefSec) => {
} }
if (field == 'factoryAreaNumber') { if (field == 'factoryAreaNumber') {
selecUserByType({ classType: 'DEVICE', factoryAreaNumber: cur, flag: null }).then(res => { selecUserByType({ classType: 'MOLD', factoryAreaNumber: cur, flag: null }).then(res => {
repairUser.value = res repairUser.value = res
const setV = {} const setV = {}
setV['maintenance'] = '' setV['maintenance'] = ''
@ -765,19 +782,19 @@ const submitFormSec = async (formType, data) => {
function buttonControllFunction(row, val) { function buttonControllFunction(row, val) {
if (val == 'delete') { if (val == 'delete') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
} }
} else if (val == 'edit') { } else if (val == 'edit') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' ) { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance) ) {
return false return false
} else { } else {
return true return true
} }
} else if(val == 'add') { } else if(val == 'add') {
if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED') { if (row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
return false return false
} else { } else {
return true return true
@ -788,6 +805,13 @@ function buttonControllFunction(row, val) {
} }
function isReceiver(orderPerson) {
if (orderPerson == userStore?.getUser?.id) {
return true
} else {
return false
}
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {

Write Preview
Loading…
Cancel
Save