From d88faab9fd9966a816d63ce9564e28603299fe18 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Tue, 27 Feb 2024 14:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          | 29 +++++++++++++----
 .../deviceAccounts/deviceAccounts.data.ts     |  8 +++++
 .../deviceMaintainOrderMain.data.ts           | 12 ++-----
 .../device/deviceMaintainOrderMain/index.vue  | 32 +++++++++++++++----
 .../mold/moldAccounts/moldAccounts.data.ts    |  8 +++++
 5 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index d88b999..45da9ea 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -117,6 +117,7 @@
       :apiCreate="apiCreate"
       :fromeWhere="fromeWhere"
       :isDetail="true"
+      @onChange="onChange"
       @searchTableSuccess="searchTableSuccess"
       :detailData="detailData"
       @submitForm="submitForm"
@@ -135,7 +136,6 @@ import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 import { isString } from '@/utils/is'
-import { Console } from 'console'
 
 defineOptions({ name: 'Detail' })
 
@@ -277,6 +277,12 @@ const props = defineProps({
     required: false,
     default: true
   },
+  // 表格按钮权限控制
+  buttonControllFunction: {
+    type: Function,
+    required: false,
+    default: undefined
+  },
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -350,7 +356,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
       let detailButtonAdd: any = []
       detailButtonAdd = props.isShowAddBtn?[
         defaultButtons.defaultAddBtn({
-          hide: isShowMainButton(row, ['1'])
+          hide: !isShowMainButton(row, 'add')
         })
       ]:[]
       HeadButttondata.value = [...detailButtonAdd]
@@ -359,10 +365,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
         buttondata.value = [
           ...[
             defaultButtons.mainListEditBtn({
-              hide: isShowMainButton(row, ['1'])
+              hide: !isShowMainButton(row, 'edit')
             }), // 编辑
             defaultButtons.mainListDeleteBtn({
-              hide: isShowMainButton(row, ['1'])
+              hide: !isShowMainButton(row, 'delete')
             })
           ], // 删除
           ...props.buttondataTable
@@ -404,7 +410,12 @@ detailAllSchemasRef.value = props.detailAllSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
-  return false
+  if (props.buttonControllFunction != undefined) {
+    return props.buttonControllFunction(row, val)
+  } else {
+    return true
+  }
+  
 }
 
 // 获得表格的各种操作
@@ -504,7 +515,8 @@ const emit = defineEmits([
   'detailOpenForm',
   'tableFormButton',
   'openImage',
-  'detailSubmitForm'
+  'detailSubmitForm',
+  'detailOnChange'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -576,6 +588,11 @@ watch(
     getList()
   }
 )
+
+function onChange(field, cur, item) {
+  emit('detailOnChange', field, cur, item)
+}
+
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts b/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts
index 9063836..fe7b0f6 100644
--- a/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts
+++ b/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts
@@ -226,6 +226,14 @@ export const DeviceAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
   },
+
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom', 
+    isSearch: false,
+    isForm: false,
+  },
   
   {
     label: '操作',
diff --git a/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts b/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts
index 190ce4a..3536fd3 100644
--- a/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts
+++ b/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts
@@ -1,19 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { selectAllFactoryArea } from '@/api/system/dept'
-import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
-import { useUserStore } from '@/store/modules/user'
 import { selecUserByType } from '@/api/system/dept'
-import * as DeviceMaintenanceMainApi from '@/api/eam/device/deviceMaintenanceMain'
 import { dateFormatter } from '@/utils/formatTime'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
-const userStore = useUserStore()
 const factoryList = await selectAllFactoryArea()
-const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({})
 const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: undefined, flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: undefined, flag: undefined })
-const engineerList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: undefined, flag: 2})
-const repairList = await DeviceMaintenanceMainApi.getDeviceMainTempList('DEVICE')
 
 // 表单校验
 export const DeviceMaintainOrderMainRules = reactive({
@@ -270,7 +263,7 @@ export const DeviceMaintainOrderDetailRules = reactive({
     actualMinutes: [required],
     chargePeoples: [required],
     completionTime: [required],
-    engineer: [required]
+    engineer: [required],
 })
 
 export const DeviceMaintainOrderDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -396,7 +389,8 @@ export const DeviceMaintainOrderDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Input',
       componentProps: {
-        type:'textarea'
+        type: 'textarea',
+        disabled: true,
       }
     }
   },
diff --git a/src/views/eam/device/deviceMaintainOrderMain/index.vue b/src/views/eam/device/deviceMaintainOrderMain/index.vue
index e7cc4d6..fad6798 100644
--- a/src/views/eam/device/deviceMaintainOrderMain/index.vue
+++ b/src/views/eam/device/deviceMaintainOrderMain/index.vue
@@ -61,7 +61,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
-      :isSearchTableItem="true"
+    :isSearchTableItem="true"
   />
 
   <!-- 详情 -->
@@ -83,6 +83,8 @@
     :detailValidate="detailValidate"
     @detailSubmitForm="detailSubmitForm"
     :isSearchTableItem="true"
+    :buttonControllFunction="buttonControllFunction"
+    @detailOnChange="detailOnChange"
   />
 
   <!-- 导入 -->
@@ -260,11 +262,7 @@ const onChange = (field, cur, item) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   DeviceMaintainOrderMain.allSchemas.formSchema[0].componentProps.disabled = false
-  if (val == 'view') {
-    showView.value = true
-    urls.value = row.filePathList
-    viewKey.value += 1
-  } else if (val == 'edit') {
+  if (val == 'edit') {
     // 编辑
     openForm('update', row)
     DeviceMaintainOrderMain.allSchemas.formSchema[0].componentProps.disabled = true
@@ -496,4 +494,26 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await DeviceMaintainOrderMainApi.importTemplate()
 })
+
+function buttonControllFunction(row, val) {
+  if (val == 'delete') {
+    return false
+  } else {
+    return true
+  }
+}
+
+function detailOnChange(field, cur, item) {
+  if (field == 'status') {
+    if (cur == '1') {
+      DeviceMaintainOrderDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
+      DeviceMaintainOrderDetailRules.uncompleted = [required]
+    } else {
+      DeviceMaintainOrderDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
+      DeviceMaintainOrderDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.value = ''
+      delete DeviceMaintainOrderDetailRules.uncompleted;
+    }
+  }
+}
+
 </script>
diff --git a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts
index 361ad72..1a2ec94 100644
--- a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts
+++ b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts
@@ -129,6 +129,14 @@ export const MoldAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
   },
+
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom', 
+    isSearch: false,
+    isForm: false,
+  },
   
   {
     label: '操作',