权限更新

src/utils/dict.ts

@@ -300,5 +300,6 @@ export enum DICT_TYPE {
   ADJUST_STATUS = 'adjust_status', //盘点调整状态
   APP_DEVICE_MOLD_TYPE = 'app_device_mold_type', //设备/模具/工艺：类型
   ITEM_SUBJECT = 'item_subject', //备件的科目
+  TURN_TYPE = 'turn_type', //转移类型
   
 }

src/views/eam/device/deviceSpotInspectionRecordMain/index.vue

@@ -179,9 +179,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({
+  // defaultButtons.defaultAddBtn(null), // 新增
-  //   hide: !userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')
-  // }), // 新增
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置

src/views/eam/device/devicemaintainjob/index.vue

@@ -181,7 +181,6 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({
-  //   hide: !userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')
   // }), // 新增
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -226,9 +225,7 @@ const butttondata = (row) => {
     defaultButtons.acceptOrderBtn({
       
       hide: !(
-        row.status == 'PENDING' &&
+        row.status == 'PENDING'
-        (userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer') ||
-        userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker'))
       )
     }), // 接单
     // defaultButtons.turnOrderBtn({
@@ -239,8 +236,7 @@ const butttondata = (row) => {
     // }), // 维修
     // defaultButtons.verifyOrderBtn({
     //   hide: !(
-    //     row.status == 'COMPLETED' &&
+    //     row.status == 'COMPLETED'
-    //     userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer')
     //   )
     // }), // 验证
     defaultButtons.finishOrderBtn({

src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts

@@ -50,7 +50,22 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isTable: true,
   },
-
+  {
+    label: '转办类型',
+    field: 'turnType',
+    sort: 'custom',
+    isDetail: false,
+    isTable: false,
+    isSearch: false,
+    isForm: true,
+    dictType: DICT_TYPE.TURN_TYPE,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      componentProps: {
+      }
+    }
+  },
   {
     label: '设备模具编号',
     field: 'deviceNumber',
@@ -254,6 +269,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: false,
     isTable: true,
+    isForm: false,
     dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
     dictClass: 'string',
     form: {

src/views/eam/device/devicemaintenancejob/index.vue

@@ -198,11 +198,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({
+  defaultButtons.defaultAddBtn(null), // 新增
-    hide: !userStore?.userSelfInfo?.posts?.some((item) => {
-      return item.code == 'worker'
-    })
-  }), // 新增
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -248,8 +244,7 @@ const butttondata = (row) => {
     defaultButtons.mainListEditBtn(null), // 编辑
     defaultButtons.acceptOrderBtn({
       hide: !(
-        row.status == 'PENDING' &&
+        row.status == 'PENDING'
-        userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')
       )
     }), // 接单
     defaultButtons.turnOrderBtn({
@@ -260,16 +255,14 @@ const butttondata = (row) => {
     }), // 维修
     defaultButtons.verifyOrderBtn({
       hide: !(
-        row.status == 'COMPLETED' &&
+        row.status == 'COMPLETED'
-        userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer')
       )
     }), // 验证
     defaultButtons.finishOrderBtn({
       hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id)
     }), // 完成
     defaultButtons.pictureBtn({
-      hide: !(row.filePathList != null && row.filePathList.length > 0 &&
+      hide: !(row.filePathList != null && row.filePathList.length > 0)
-        userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker'))
     }) // 预览报修图片
   ]
 }
@@ -302,6 +295,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'repair') {
     openDetail(row, '代码', row.number)
   } else if (val == 'turnOrder') {
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'turnType'
+    }).show = true
     DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
       return item.field == 'type'
     }).componentProps.options = deviceMoldTypeList

src/views/eam/mold/moldinspectionjob/index.vue

@@ -145,7 +145,7 @@ const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'eam:moldInspectionMain:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'eam:moldInspectionMain:import'}), // 导入
   // defaultButtons.defaultExportBtn({ hasPermi: 'eam:moldInspectionMain:export' }), // 导出
-  defaultButtons.defaultAddBtn({ hide: !(userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker') || userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer')) }), // 新增
+  defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

src/views/eam/mold/moldmaintainjob/index.vue

@@ -182,9 +182,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({
+  // defaultButtons.defaultAddBtn(null), // 新增
-  //   hide: !userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')
-  // }), // 新增
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -228,10 +226,7 @@ const butttondata = (row) => {
     defaultButtons.acceptOrderBtn({
       
       hide: !(
-        row.status == 'PENDING' &&
+        row.status == 'PENDING' && row.status == 1
-        (userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer') ||
-          userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')) ||
-        row.status == 1
       )
     }), // 接单
     // defaultButtons.turnOrderBtn({
@@ -242,8 +237,7 @@ const butttondata = (row) => {
     // }), // 维修
     // defaultButtons.verifyOrderBtn({
     //   hide: !(
-    //     row.status == 'COMPLETED' &&
+    //     row.status == 'COMPLETED'
-    //     userStore?.userSelfInfo?.posts?.some((item) => item.code == 'engineer')
     //   )
     // }), // 验证
     defaultButtons.finishOrderBtn({

src/views/eam/mold/moldmaintenancejob/index.vue

@@ -199,9 +199,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({
+  defaultButtons.defaultAddBtn(null), // 新增
-    hide: !userStore?.userSelfInfo?.posts?.some((item) => item.code == 'worker')
-  }), // 新增
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -307,6 +305,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'acceptOrder') {
     acceptOrder(row)
   } else if (val == 'turnOrder') {
+    MoldMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'turnType'
+    }).isForm = true
     MoldMaintenanceMain.allSchemas.formSchema.find(item => {
       return item.field == 'type'
     }).componentProps.options = deviceMoldTypeList

src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts

@@ -204,6 +204,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: '150',
     },
+    isForm: false,
     isSearch: false,
     isTable: true,
     dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,