修复测试bug

8 months ago · 337211da6d
6 changed files with 136 additions and 16 deletions
--- a/src/views/eam/device/deviceinspectionjob/index.vue
+++ b/src/views/eam/device/deviceinspectionjob/index.vue
@ -146,7 +146,7 @@ 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) {
+  if (rolesOk != undefined && rolesOk != null) {
    return true
  } else {
    return false
--- a/src/views/eam/device/devicemaintainjob/index.vue
+++ b/src/views/eam/device/devicemaintainjob/index.vue
@ -225,7 +225,7 @@ const butttondata = (row) => {
    defaultButtons.acceptOrderBtn({
      
      hide: !(
-        row.status == 'PENDING'
+        row.status == 'PENDING' && judgeIsTheClass(row)
      )
    }), // 接单
    // defaultButtons.turnOrderBtn({
@ -497,6 +497,22 @@ onMounted(async () => {
  importTemplateData.templateUrl = await DeviceMaintainOrderMainApi.importTemplate()
 })

+
+const judgeIsTheClass = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_worker_role' || item == 'tech_class_Engineer_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
 function buttonControllFunction(row, val) {
  if (val == 'delete') {
    return false
--- a/src/views/eam/device/devicemaintenancejob/index.vue
+++ b/src/views/eam/device/devicemaintenancejob/index.vue
@ -232,7 +232,53 @@ 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) {
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
+const judgeIsTheClass = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_worker_role' || item == 'tech_class_Engineer_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
+
+const judgeIsTheClassEngineer = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_Engineer_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_Engineer_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
+const judgeIsTheClassWorker = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_worker_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_worker_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
    return true
  } else {
    return false
@ -288,22 +334,22 @@ const butttondata = (row) => {
    defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance) )}), // 编辑
    defaultButtons.acceptOrderBtn({
      hide: !(
-        row.status == 'PENDING'
+        row.status == 'PENDING' && judgeIsTheClass(row)
      )
    }), // 接单
    defaultButtons.turnOrderBtn({
-      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id)
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id  && !row.hasDetails)
    }), // 转办
    defaultButtons.repairBtn({
      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id)
    }), // 维修
    defaultButtons.verifyOrderBtn({
      hide: !(
-        row.status == 'COMPLETED'
+        row.status == 'COMPLETED' && judgeIsTheClassEngineer(row)
      )
    }), // 验证
    defaultButtons.finishOrderBtn({
-      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id)
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id && row.hasDetails)
    }), // 完成
    defaultButtons.pictureBtn({
      hide: !(row.filePathList != null && row.filePathList.length > 0)
--- a/src/views/eam/mold/moldinspectionjob/index.vue
+++ b/src/views/eam/mold/moldinspectionjob/index.vue
@ -146,9 +146,9 @@ const { getList, setSearchParams } = tableMethods

 const judgeHasAddFunc = () => {
  const rolesOk = userStore.roles.find(item => {
-    return item == 'mold_class_worker_role' || item == 'mold_class_worker_role'
+    return item == 'mold_class_worker_role' || item == 'mold_class_Engineer_role'
  })
-  if (rolesOk != undefined && rolesOk != null && rolesOk.length > 0) {
+  if (rolesOk != undefined && rolesOk != null) {
    return true
  } else {
    return false
--- a/src/views/eam/mold/moldmaintainjob/index.vue
+++ b/src/views/eam/mold/moldmaintainjob/index.vue
@ -226,7 +226,7 @@ const butttondata = (row) => {
    defaultButtons.acceptOrderBtn({
      
      hide: !(
-        row.status == 'PENDING'
+        row.status == 'PENDING' && judgeIsTheClass(row)
      )
    }), // 接单
    // defaultButtons.turnOrderBtn({
@ -563,6 +563,21 @@ function isReceiver(orderPerson) {
 }


+const judgeIsTheClass = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_worker_role' || item == 'tech_class_Engineer_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+

 /** 初始化 **/
 onMounted(async () => {
--- a/src/views/eam/mold/moldmaintenancejob/index.vue
+++ b/src/views/eam/mold/moldmaintenancejob/index.vue
@ -234,9 +234,54 @@ const { getList, setSearchParams } = tableMethods

 const judgeHasAddFunc = () => {
  const rolesOk = userStore.roles.find(item => {
-    return item == 'mold_class_worker_role' || item == 'mold_class_worker_role'
+    return item == 'mold_class_worker_role' || item == 'mold_class_Engineer_role'
  })
-  if (rolesOk != undefined && rolesOk != null && rolesOk.length > 0) {
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
+const judgeIsTheClass = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_worker_role' || item == 'tech_class_Engineer_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
+const judgeIsTheClassEngineer = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_Engineer_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_Engineer_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
+    return true
+  } else {
+    return false
+  }
+}
+
+const judgeIsTheClassWorker = (row) => {
+  const rolesOk = userStore.roles.find(item => {
+    if (row.type == 'DEVICE') {
+      return item == 'device_class_worker_role'
+    }else if (row.type == 'TECH') {
+      return item == 'tech_class_worker_role'
+    }
+  })
+  if (rolesOk != undefined && rolesOk != null) {
    return true
  } else {
    return false
@ -302,8 +347,7 @@ const butttondata = (row) => {
    defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance)) }), // 编辑
    defaultButtons.acceptOrderBtn({
      hide: !(
-        row.status == 'PENDING' &&
-        userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')
+        row.status == 'PENDING' && judgeIsTheClass(row)
      )
    }), // 接单
    defaultButtons.turnOrderBtn({
@ -314,8 +358,7 @@ const butttondata = (row) => {
    }), // 维修
    defaultButtons.verifyOrderBtn({
      hide: !(
-        row.status == 'COMPLETED' &&
-        userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer')
+        row.status == 'COMPLETED' && judgeIsTheClassEngineer(row)
      )
    }), // 验证
    defaultButtons.finishOrderBtn({