diff --git a/src/utils/dict.ts b/src/utils/dict.ts index becdd3c..f6a3de0 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -275,5 +275,9 @@ export enum DICT_TYPE { LOCATION_AREA_TYPE = 'location_area_type', // 库区类型 DEVICEMOLDITEMS_STATUS = 'devicemolditems_status', // 项类型 DEVICE_MOLD_TYPE = 'device_mold_type', // 设备/模具类型 + TRANSACTION_TYPE = 'transaction_Type', // 事务类型 + RESULT = 'result', // 事务类型 + + } diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts index 60c926a..5965dcd 100644 --- a/src/views/eam/basic/item/item.data.ts +++ b/src/views/eam/basic/item/item.data.ts @@ -21,40 +21,60 @@ export const Item = useCrudSchemas(reactive([ }, }, { - label: '名称', + label: '备件名称', field: 'name', sort: 'custom', isSearch: true, }, { - label: '品牌', - field: 'brand', - sort: 'custom', - }, - { - label: '规格型号', + label: '规格', field: 'specifications', sort: 'custom', }, { label: '是否存储', field: 'isConstant', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { - label: '科目代码', + label: '科目', field: 'subject', sort: 'custom', }, - { - label: '枚举', - field: 'classification', - sort: 'custom', - }, { label: '单位', field: 'uom', sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select' + } }, { label: '单价', @@ -94,11 +114,30 @@ export const Item = useCrudSchemas(reactive([ field: 'financer', sort: 'custom', }, - { label: '是否以旧换新', field: 'isRadeIn', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '是否可用', diff --git a/src/views/eam/basic/location/location.data.ts b/src/views/eam/basic/location/location.data.ts index 8504751..aa480c6 100644 --- a/src/views/eam/basic/location/location.data.ts +++ b/src/views/eam/basic/location/location.data.ts @@ -24,7 +24,7 @@ export const Location = useCrudSchemas(reactive([ }, }, { - label: '名称', + label: '库位名称', field: 'name', sort: 'custom', isSearch: true, @@ -130,4 +130,4 @@ export const Location = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/eam/basic/locationArea/locationArea.data.ts b/src/views/eam/basic/locationArea/locationArea.data.ts index 5872cbe..151e3ca 100644 --- a/src/views/eam/basic/locationArea/locationArea.data.ts +++ b/src/views/eam/basic/locationArea/locationArea.data.ts @@ -21,12 +21,12 @@ export const LocationArea = useCrudSchemas(reactive([ }, }, { - label: '名称', + label: '库区名称', field: 'name', sort: 'custom', isSearch: true, }, - + { label: '类型', field: 'type', @@ -39,7 +39,7 @@ export const LocationArea = useCrudSchemas(reactive([ }, }, { - label: '是否可用', + label: '状态', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', @@ -63,15 +63,15 @@ export const LocationArea = useCrudSchemas(reactive([ } } }, - - { - label: '描述', - field: 'description', - sort: 'custom', - table: { - width: 150 - }, + + { + label: '描述', + field: 'description', + sort: 'custom', + table: { + width: 150 }, + }, { label: '操作', diff --git a/src/views/eam/basic/supplier/supplier.data.ts b/src/views/eam/basic/supplier/supplier.data.ts index eecd01f..07e75d1 100644 --- a/src/views/eam/basic/supplier/supplier.data.ts +++ b/src/views/eam/basic/supplier/supplier.data.ts @@ -19,7 +19,7 @@ export const Supplier = useCrudSchemas(reactive([ }, }, { - label: '名称', + label: '供应商名称', field: 'name', sort: 'custom', isSearch: true, @@ -31,69 +31,41 @@ export const Supplier = useCrudSchemas(reactive([ isSearch: true, }, { - label: '地址', - field: 'address', - sort: 'custom', - isSearch: true, - }, - { - label: '国家', - field: 'country', - sort: 'custom', - isSearch: true, - }, - { - label: '城市', - field: 'city', + label: '联系人', + field: 'contacts', sort: 'custom', - isSearch: true, }, { - label: '电话', + label: '联系电话', field: 'phone', sort: 'custom', isSearch: true, }, { - label: '传真', - field: 'fax', - sort: 'custom', - }, - { - label: '邮编', - field: 'postId', - sort: 'custom', - }, - { - label: '联系人', - field: 'contacts', + label: '状态', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select', - inactiveValue: 'FALSE', - disabled: true - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, { label: '备注', field: 'remark', @@ -108,4 +80,4 @@ export const Supplier = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts b/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts index e6e6a69..c0dcfdb 100644 --- a/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts +++ b/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts @@ -37,9 +37,9 @@ export const DeviceAccounts = useCrudSchemas(reactive([ field: 'type', sort: 'custom', isSearch: true, - form: { - component: 'SelectV2' - }, + form: { + component: 'Select' + }, }, { label: '所属厂区编号', @@ -135,4 +135,4 @@ export const DeviceAccounts = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/eam/device/deviceAllot/deviceAllot.data.ts b/src/views/eam/device/deviceAllot/deviceAllot.data.ts index b39c039..1b75d6e 100644 --- a/src/views/eam/device/deviceAllot/deviceAllot.data.ts +++ b/src/views/eam/device/deviceAllot/deviceAllot.data.ts @@ -38,7 +38,7 @@ export const DeviceAllot = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/device/deviceInspectionMain/deviceInspectionMain.data.ts b/src/views/eam/device/deviceInspectionMain/deviceInspectionMain.data.ts index 8fd16fc..c8a7210 100644 --- a/src/views/eam/device/deviceInspectionMain/deviceInspectionMain.data.ts +++ b/src/views/eam/device/deviceInspectionMain/deviceInspectionMain.data.ts @@ -69,7 +69,7 @@ export const DeviceInspectionMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts b/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts index b1b08de..416c2d4 100644 --- a/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts +++ b/src/views/eam/device/deviceMaintainOrderMain/deviceMaintainOrderMain.data.ts @@ -127,7 +127,7 @@ export const deviceMaintainOrderMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts b/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts index d84cacd..335c015 100644 --- a/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts +++ b/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts @@ -28,7 +28,7 @@ export const DeviceMaintainPlan = useCrudSchemas(reactive([ field: 'maintenanceType', sort: 'custom', form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -51,7 +51,7 @@ export const DeviceMaintainPlan = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts b/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts index 8b9e35d..da5a3e0 100644 --- a/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts +++ b/src/views/eam/device/deviceMaintenanceMain/deviceMaintenanceMain.data.ts @@ -70,7 +70,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/device/deviceRepair/deviceRepair.data.ts b/src/views/eam/device/deviceRepair/deviceRepair.data.ts index 6b63029..93a7a43 100644 --- a/src/views/eam/device/deviceRepair/deviceRepair.data.ts +++ b/src/views/eam/device/deviceRepair/deviceRepair.data.ts @@ -55,7 +55,7 @@ export const DeviceRepair = useCrudSchemas(reactive([ field: 'faultType', sort: 'custom', form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -64,7 +64,7 @@ export const DeviceRepair = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts index 2f2373a..f853ce3 100644 --- a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts +++ b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts @@ -57,7 +57,7 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '是否账内库TRUE账内FALSE账外', + label: '是否账内库', field: 'isInAccount', sort: 'custom', }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - }, { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '操作', diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index 0609fde..628c851 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -10,7 +10,7 @@ export const ItemApplyMainRules = reactive({ export const ItemApplyMain = useCrudSchemas(reactive([ { - label: '编号', + label: '申请编号', field: 'number', sort: 'custom', isSearch: true, @@ -21,12 +21,12 @@ export const ItemApplyMain = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '维修申领、以旧换新字典', + label: '维修申领、以旧换新', field: 'type', sort: 'custom', - form: { - component: 'SelectV2' - }, + form: { + component: 'Select' + }, }, { label: '申领人id', @@ -115,25 +115,33 @@ export const ItemApplyMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - }, + { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, + { label: '操作', field: 'action', @@ -143,4 +151,4 @@ export const ItemApplyMain = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/eam/item/itemLocationInRecord/itemLocationInRecord.data.ts b/src/views/eam/item/itemLocationInRecord/itemLocationInRecord.data.ts index d0e668f..efe9a54 100644 --- a/src/views/eam/item/itemLocationInRecord/itemLocationInRecord.data.ts +++ b/src/views/eam/item/itemLocationInRecord/itemLocationInRecord.data.ts @@ -13,7 +13,7 @@ export const ItemLocationInRecordRules = reactive({ export const ItemLocationInRecord = useCrudSchemas(reactive([ { - label: '编号唯一标识', + label: '编号', field: 'itemNumber', sort: 'custom', isSearch: true, @@ -24,12 +24,29 @@ export const ItemLocationInRecord = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '事务类型IN、OUT', + label: '事务类型', field: 'transactionType', + dictType: DICT_TYPE.TRANSACTION_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - form: { - component: 'SelectV2' - }, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '库存动作', @@ -42,9 +59,9 @@ export const ItemLocationInRecord = useCrudSchemas(reactive([ field: 'businessType', sort: 'custom', isSearch: true, - form: { - component: 'SelectV2' - }, + form: { + component: 'Select' + }, }, { label: '库存状态', @@ -55,7 +72,7 @@ export const ItemLocationInRecord = useCrudSchemas(reactive([ }, }, { - label: '计量单位从备件中获取', + label: '计量单位', field: 'uom', sort: 'custom', }, @@ -80,24 +97,30 @@ export const ItemLocationInRecord = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - }, { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '操作', @@ -108,4 +131,4 @@ export const ItemLocationInRecord = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/eam/item/itemLocationOutRecord/itemLocationOutRecord.data.ts b/src/views/eam/item/itemLocationOutRecord/itemLocationOutRecord.data.ts index 19bf891..65fb2fe 100644 --- a/src/views/eam/item/itemLocationOutRecord/itemLocationOutRecord.data.ts +++ b/src/views/eam/item/itemLocationOutRecord/itemLocationOutRecord.data.ts @@ -13,7 +13,7 @@ export const ItemLocationOutRecordRules = reactive({ export const ItemLocationOutRecord = useCrudSchemas(reactive([ { - label: '编号唯一标识', + label: '编号', field: 'itemNumber', sort: 'custom', isSearch: true, @@ -23,13 +23,31 @@ export const ItemLocationOutRecord = useCrudSchemas(reactive([ field: 'locationNumber', sort: 'custom', }, + { - label: '事务类型IN、OUT', + label: '事务类型', field: 'transactionType', + dictType: DICT_TYPE.TRANSACTION_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - form: { - component: 'SelectV2' - }, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '库存动作', @@ -42,9 +60,9 @@ export const ItemLocationOutRecord = useCrudSchemas(reactive([ field: 'businessType', sort: 'custom', isSearch: true, - form: { - component: 'SelectV2' - }, + form: { + component: 'Select' + }, }, { label: '库存状态', @@ -55,7 +73,7 @@ export const ItemLocationOutRecord = useCrudSchemas(reactive([ }, }, { - label: '计量单位从备件中获取', + label: '计量单位', field: 'uom', sort: 'custom', }, @@ -80,24 +98,30 @@ export const ItemLocationOutRecord = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - }, { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '操作', @@ -108,4 +132,4 @@ export const ItemLocationOutRecord = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/eam/item/itemLocationRecord/itemLocationRecord.data.ts b/src/views/eam/item/itemLocationRecord/itemLocationRecord.data.ts index 00b2407..0fc1251 100644 --- a/src/views/eam/item/itemLocationRecord/itemLocationRecord.data.ts +++ b/src/views/eam/item/itemLocationRecord/itemLocationRecord.data.ts @@ -28,7 +28,7 @@ export const ItemLocationRecord = useCrudSchemas(reactive([ field: 'transactionType', sort: 'custom', form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -43,7 +43,7 @@ export const ItemLocationRecord = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts index 75af293..a75f679 100644 --- a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts +++ b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts @@ -11,13 +11,13 @@ export const ItemMaintenanceRules = reactive({ export const ItemMaintenance = useCrudSchemas(reactive([ { - label: '代码', + label: '编号', field: 'number', sort: 'custom', isSearch: true, }, { - label: '备件代码', + label: '备件编号', field: 'itemNumber', sort: 'custom', isSearch: true, @@ -28,10 +28,29 @@ export const ItemMaintenance = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '维修结果YES、NO', + label: '事务类型', field: 'result', - sort: 'custom', + dictType: DICT_TYPE.RESULT, + dictClass: 'string', isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '创建时间', @@ -49,24 +68,31 @@ export const ItemMaintenance = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - }, - { + + { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '操作', diff --git a/src/views/eam/item/itemOrderMain/index.vue b/src/views/eam/item/itemOrderMain/index.vue index 1176f11..beb75f3 100644 --- a/src/views/eam/item/itemOrderMain/index.vue +++ b/src/views/eam/item/itemOrderMain/index.vue @@ -52,9 +52,7 @@ - - - + diff --git a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts index 8d7ea4a..3d31a85 100644 --- a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts +++ b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts @@ -10,7 +10,7 @@ export const ItemOrderMainRules = reactive({ export const ItemOrderMain = useCrudSchemas(reactive([ { - label: '订单号唯一标识', + label: '订单号', field: 'number', sort: 'custom', isSearch: true, @@ -82,9 +82,9 @@ export const ItemOrderMain = useCrudSchemas(reactive([ label: '付款方式', field: 'paymentType', sort: 'custom', - form: { - component: 'SelectV2' - }, + form: { + component: 'Select' + }, }, { label: '注册地', @@ -122,24 +122,30 @@ export const ItemOrderMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '地点ID', - field: 'siteId', - sort: 'custom', - }, { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { label: '操作', diff --git a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts index 631907e..c41a232 100644 --- a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts +++ b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts @@ -37,7 +37,7 @@ export const MoldAccounts = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/mold/moldInspectionMain/moldInspectionMain.data.ts b/src/views/eam/mold/moldInspectionMain/moldInspectionMain.data.ts index 2ed1c14..a5e4e45 100644 --- a/src/views/eam/mold/moldInspectionMain/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldInspectionMain/moldInspectionMain.data.ts @@ -69,7 +69,7 @@ export const MoldInspectionMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/mold/moldMaintainOrderMain/moldMaintainOrderMain.data.ts b/src/views/eam/mold/moldMaintainOrderMain/moldMaintainOrderMain.data.ts index 5284e00..3842d9c 100644 --- a/src/views/eam/mold/moldMaintainOrderMain/moldMaintainOrderMain.data.ts +++ b/src/views/eam/mold/moldMaintainOrderMain/moldMaintainOrderMain.data.ts @@ -127,7 +127,7 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts b/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts index e170316..b992252 100644 --- a/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts +++ b/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts @@ -28,7 +28,7 @@ export const MoldMaintainPlan = useCrudSchemas(reactive([ field: 'maintenanceType', sort: 'custom', form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -51,7 +51,7 @@ export const MoldMaintainPlan = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/mold/moldMaintenanceMain/moldMaintenanceMain.data.ts b/src/views/eam/mold/moldMaintenanceMain/moldMaintenanceMain.data.ts index bdd66a1..9faec0e 100644 --- a/src/views/eam/mold/moldMaintenanceMain/moldMaintenanceMain.data.ts +++ b/src/views/eam/mold/moldMaintenanceMain/moldMaintenanceMain.data.ts @@ -70,7 +70,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, { diff --git a/src/views/eam/mold/moldRepair/moldRepair.data.ts b/src/views/eam/mold/moldRepair/moldRepair.data.ts index c4dcf34..211beda 100644 --- a/src/views/eam/mold/moldRepair/moldRepair.data.ts +++ b/src/views/eam/mold/moldRepair/moldRepair.data.ts @@ -55,7 +55,7 @@ export const MoldRepair = useCrudSchemas(reactive([ field: 'faultType', sort: 'custom', form: { - component: 'SelectV2' + component: 'Select' }, }, { @@ -64,7 +64,7 @@ export const MoldRepair = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, form: { - component: 'SelectV2' + component: 'Select' }, }, {