From 47e5d0693b4699cf02f71a0ea8780e69a12865b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 26 Mar 2024 15:55:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/basic/item/item.data.ts | 3 + .../deviceInternalAudit.data.ts | 18 ++--- .../item/itemAccounts/itemAccounts.data.ts | 77 ++++++++++++------- src/views/eam/item/itemApplyMain/index.vue | 1 - .../item/itemApplyMain/itemApplyMain.data.ts | 32 ++++---- 5 files changed, 76 insertions(+), 55 deletions(-) diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts index 586fd79..55ff286 100644 --- a/src/views/eam/basic/item/item.data.ts +++ b/src/views/eam/basic/item/item.data.ts @@ -11,6 +11,9 @@ export const ItemRules = reactive({ { required: true, message: '请选择备件单位', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + classification: [ + { required: true, message: '请选择备件分类', trigger: 'blur' }, + ], }) export const Item = useCrudSchemas(reactive([ diff --git a/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts b/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts index 93aacd2..2ad9a66 100644 --- a/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts +++ b/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts @@ -9,39 +9,39 @@ export const DeviceInternalAuditRules = reactive({ ], fitOut: [ { required: true, message: '请输入装配', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], coating: [ { required: true, message: '请输入涂装', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], injectionMolding: [ { required: true, message: '请输入注塑', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], business: [ { required: true, message: '请输入商务', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], laboratory: [ { required: true, message: '请输入实验室', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], it: [ { required: true, message: '请输入IT', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], qualityDepartment: [ { required: true, message: '请输入质量保障部', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], materialFlow: [ { required: true, message: '请输入物流', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], moldPre: [ { required: true, message: '请输入模具前期', trigger: 'blur' }, - { max: 200, message: '不得超过200', trigger: 'blur' } + // { max: 200, message: '不得超过200', trigger: 'blur' } ], }) diff --git a/src/views/eam/item/itemAccounts/itemAccounts.data.ts b/src/views/eam/item/itemAccounts/itemAccounts.data.ts index d0d85af..51c2cdd 100644 --- a/src/views/eam/item/itemAccounts/itemAccounts.data.ts +++ b/src/views/eam/item/itemAccounts/itemAccounts.data.ts @@ -78,6 +78,7 @@ export const ItemAccounts = useCrudSchemas(reactive([ } } }, + { label: '规格', field: 'itemDO.specifications', @@ -107,6 +108,30 @@ export const ItemAccounts = useCrudSchemas(reactive([ } } }, + { + label: '是否存储', + field: 'itemDO.isRadeIn', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 110 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } + }, { label: '科目', field: 'itemDO.subject', @@ -164,33 +189,31 @@ export const ItemAccounts = useCrudSchemas(reactive([ field: 'itemDO.financer', sort: 'custom', }, - { - label: '是否以旧换新', - field: 'itemDO.isRadeIn', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: false, - 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: 'itemDO.isRadeIn', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isSearch: false, + // 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', diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index aa43f08..7b8aed1 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -115,7 +115,6 @@ setV[formField] = val[0][searchField] if (formField == 'itemNumber') { setV['itemNumber'] = val[0]['itemNumber'] - setV['isInAccount'] = val[0]['isInAccount'] setV['currentQty'] = val[0]['qty'] setV['available'] = val[0]['available'] diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index aee226f..2a6685d 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -23,21 +23,21 @@ export const ItemApplyMain = useCrudSchemas(reactive([ }, { label: '申领人', - field: 'applyName', + field: 'applyId', sort: 'custom', isForm: false, isSearch: false, }, { label: '审批人', - field: 'approveName', + field: 'approveId', sort: 'custom', isForm: false, isSearch: false, }, { label: '出库人', - field: 'outName', + field: 'outId', sort: 'custom', isForm: false, isSearch: false, @@ -260,11 +260,9 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ precision: 2 } }, - - { - label: '是否可用', - field: 'available', + label: '是否账内库', + field: 'isInAccount', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', @@ -276,13 +274,16 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ tableForm: { type: 'Select', disabled: true - } + }, + form: { + componentProps: { + disabled: true, + } + }, }, - - { - label: '是否以旧换新', - field: 'isRadeIn', + label: '是否可用', + field: 'available', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', @@ -294,12 +295,7 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ tableForm: { type: 'Select', disabled: true - }, - form: { - componentProps: { - disabled: true, - } - }, + } }, { label: '备注', From 096552d3dd8b49b5c16d794e8865c0c085597b51 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 26 Mar 2024 16:50:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 9216753..7516b40 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -115,17 +115,17 @@
  • 设备停机率
  • 0.05%
    • -
  • 0
    • +
  • 0.06%
  • 平均故障回复时间
  • 20
    • -
  • 0
    • +
  • 10
  • 平均故障间隔时间
    • -
  • 20
    • -
  • 0
    • +
  • 120
    • +
  • 16
@@ -141,18 +141,18 @@
  • 设备停机率
    • -
  • 0.05%
    • -
  • 0
    • +
  • 89%
    • +
  • 76%
  • 平均故障回复时间
    • -
  • 20
    • -
  • 0
    • +
  • 88
    • +
  • 12
  • 平均故障间隔时间
    • -
  • 20
    • -
  • 0
    • +
  • 62
    • +
  • 90
@@ -168,18 +168,18 @@
  • 设备停机率
    • -
  • 0.05%
    • -
  • 0
    • +
  • 19%
    • +
  • 16%
  • 平均故障回复时间
    • -
  • 20
    • -
  • 0
    • +
  • 200
    • +
  • 160
  • 平均故障间隔时间
    • -
  • 20
    • -
  • 0
    • +
  • 140
    • +
  • 155
@@ -426,5 +426,10 @@ onMounted(async () => { font-size: 18px; font-weight: bold; } + .red{ + color: #ff0000; + font-size: 18px; + font-weight: bold; + } }