diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts index 97fa5bd..a42e068 100644 --- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts +++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts @@ -145,7 +145,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, table: { - width: 170, + width: 200, }, form: { component: 'InputNumber', diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts index f4cd403..586fd79 100644 --- a/src/views/eam/basic/item/item.data.ts +++ b/src/views/eam/basic/item/item.data.ts @@ -7,6 +7,10 @@ export const ItemRules = reactive({ { required: true, message: '请输入备件名称', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + uom: [ + { required: true, message: '请选择备件单位', trigger: 'blur' }, + { max: 50, message: '不得超过50个字符', trigger: 'blur' } + ], }) export const Item = useCrudSchemas(reactive([ @@ -127,11 +131,11 @@ export const Item = useCrudSchemas(reactive([ type: 'Select' } }, - { - label: '单价', - field: 'singlePrice', - sort: 'custom', - }, + // { + // label: '单价', + // field: 'singlePrice', + // sort: 'custom', + // }, { label: '重采购点', field: 'reprocurement', @@ -227,31 +231,31 @@ export const Item = useCrudSchemas(reactive([ } } }, - // { - // label: '是否可用', - // field: 'available', - // 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', + 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: 'createTime', diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts index 5b92e95..087478a 100644 --- a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts +++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts @@ -144,7 +144,7 @@ export const MoldMaintenance = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, table: { - width: 170, + width: 200, }, form: { component: 'InputNumber', diff --git a/src/views/eam/device/problemSolving/index.vue b/src/views/eam/device/problemSolving/index.vue index 6b6570a..dae632f 100644 --- a/src/views/eam/device/problemSolving/index.vue +++ b/src/views/eam/device/problemSolving/index.vue @@ -184,7 +184,7 @@ const formsSuccess = async (formType, data) => { await ProblemSolvingApi.createProblemSolving(data) message.success(t('common.createSuccess')) } else { - await ProblemSolvingApi.createProblemSolving(data) + await ProblemSolvingApi.updateProblemSolving(data) message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false diff --git a/src/views/eam/item/itemOrderMain/index.vue b/src/views/eam/item/itemOrderMain/index.vue index 3b914e6..f49e7b6 100644 --- a/src/views/eam/item/itemOrderMain/index.vue +++ b/src/views/eam/item/itemOrderMain/index.vue @@ -78,6 +78,8 @@ // 明细查询页赋值 row[formField] = val[0][searchField] row['itemNumber'] = val[0]['number'] + row['itemName'] = val[0]['name'] + row['uom'] = val[0]['uom'] row['isRadeIn'] = val[0]['isRadeIn'] row['available'] = val[0]['available'] } else { @@ -114,6 +116,7 @@ // 列表头部按钮 const HeadButttondata = [ + defaultButtons.defaultAddBtn(null), // 新增 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -167,7 +170,7 @@ if (val == 'edit') { // 编辑 openForm('update', row) } - else if (val == 'mainOrderCOMPLETE') { // 关闭 + else if (val == 'mainOrderCOMPLETE') { // 完成 handleCOMPLETE(row.id) } else if (val == 'delete') { // 删除 diff --git a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts index 53bbde7..e490aa3 100644 --- a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts +++ b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts @@ -173,7 +173,7 @@ export const ItemOrderDetail = useCrudSchemas(reactive([ isInpuFocusShow: true, searchListPlaceholder: '请选择备件编号', searchField: 'number', - searchTitle: '库区信息', + searchTitle: '备件信息', searchAllSchemas: Item.allSchemas, // 查询弹窗所需类 searchPage: ItemApi.getItemPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -185,8 +185,33 @@ export const ItemOrderDetail = useCrudSchemas(reactive([ }, }, { - label: '库存数量', - field: 'qty', + label: '备件名称', + field: 'itemName', + sort: 'custom', + isSearch: true, + table: { + width: 110, + }, + tableForm: { + disabled: true + } + }, + { + label: '单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '单价', + field: 'singlePrice', sort: 'custom', table: { width: 150 @@ -236,6 +261,26 @@ export const ItemOrderDetail = useCrudSchemas(reactive([ disabled: true } }, + { + label: '库存数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } + }, { label: '备注', field: 'remark', @@ -259,53 +304,7 @@ export const ItemOrderDetail = useCrudSchemas(reactive([ //表单校验 export const ItemOrderDetailRules = reactive({ - lineNumber: [ - { required: true, message: '请输入行号', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } - ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } - ], - convertRate: [ - { required: true, message: '请输入转换率', trigger: 'blur' } - ], - taxRate: [ - { required: true, message: '请输入税率', trigger: 'blur' } - ], - shippedQty: [ - { required: true, message: '请输入已发货数量', trigger: 'blur' } - ], - receivedQty: [ - { required: true, message: '请输入已收货数量', trigger: 'blur' } - ], - returnedQty: [ - { required: true, message: '请输入已退货数量', trigger: 'blur' } - ], - putawayQty: [ - { required: true, message: '请输入已上架数量', trigger: 'blur' } - ], - overReceivingPercent: [ - { required: true, message: '请输入超收百分比', trigger: 'blur' } - ], - orderQty: [ - { required: true, message: '请输入订单数量', trigger: 'blur' } - ], - uom: [ - { required: true, message: '请选择计量单位', trigger: 'change' } - ], - available: [ - { required: true, message: '请选择是否可用', trigger: 'change' } - ], - nuumber: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], - itemCode: [ - { required: true, message: '请选择物品代码', trigger: 'change' } - ], - remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + singlePrice: [ + { required: true, message: '请输入备件单价', trigger: 'blur' }, ], })