Browse Source

Revert "BUG修改"

This reverts commit e7ee5ce90d.
master
parent
commit
1dc5f27023
  1. 10
      src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
  2. 10
      src/views/eam/basic/inspection/inspection.data.ts
  3. 11
      src/views/eam/basic/item/item.data.ts
  4. 11
      src/views/eam/basic/location/location.data.ts
  5. 10
      src/views/eam/basic/locationArea/locationArea.data.ts
  6. 10
      src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
  7. 11
      src/views/eam/basic/supplier/supplier.data.ts
  8. 24
      src/views/eam/item/adjustRecord/adjustRecord.data.ts
  9. 16
      src/views/eam/item/applicationRecord/applicationRecordMain.data.ts
  10. 24
      src/views/eam/item/countRecord/countRecord.data.ts
  11. 12
      src/views/eam/item/countadjustWork/countadjustWork.data.ts
  12. 40
      src/views/eam/item/itemAccounts/index.vue
  13. 6
      src/views/eam/item/itemApplyMain/index.vue
  14. 20
      src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

10
src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts

@ -174,16 +174,6 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '操作',
field: 'action',

10
src/views/eam/basic/inspection/inspection.data.ts

@ -144,16 +144,6 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '操作',
field: 'action',

11
src/views/eam/basic/item/item.data.ts

@ -1,5 +1,4 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const ItemRules = reactive({
@ -244,16 +243,6 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '描述',
field: 'describes',

11
src/views/eam/basic/location/location.data.ts

@ -1,5 +1,4 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as LocationAreaApi from '@/api/eam/basic/locationArea'
import { LocationArea } from '../locationArea/locationArea.data'
@ -122,16 +121,6 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '描述',
field: 'description',

10
src/views/eam/basic/locationArea/locationArea.data.ts

@ -68,16 +68,6 @@ export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '描述',

10
src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts

@ -147,16 +147,6 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '操作',
field: 'action',

11
src/views/eam/basic/supplier/supplier.data.ts

@ -1,5 +1,4 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator'
// 表单校验
@ -78,16 +77,6 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 170
},
},
{
label: '备注',
field: 'remark',

24
src/views/eam/item/adjustRecord/adjustRecord.data.ts

@ -107,18 +107,6 @@ export const AdjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180,
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
}
},
{
label: '盘点数量',
@ -129,18 +117,6 @@ export const AdjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180,
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
}
},
{
label: '操作',

16
src/views/eam/item/applicationRecord/applicationRecordMain.data.ts

@ -188,14 +188,14 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
min: 1,
precision: 6
}
},
{
@ -208,14 +208,14 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
min: 1,
precision: 6
}
},

24
src/views/eam/item/countRecord/countRecord.data.ts

@ -147,18 +147,6 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180,
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
}
},
{
label: '盘点数量',
@ -169,18 +157,6 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180,
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
}
},
{
label: '操作',

12
src/views/eam/item/countadjustWork/countadjustWork.data.ts

@ -118,18 +118,6 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180,
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
}
},
{
label: '操作',

40
src/views/eam/item/itemAccounts/index.vue

@ -5,15 +5,28 @@
</ContentWrap>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="ItemAccounts.allSchemas" />
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ItemAccounts.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort">
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
@ -26,9 +39,16 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm ref="basicFormRef" @success="formsSuccess" :rules="ItemAccountsRules"
:formAllSchemas="ItemAccounts.allSchemas" :apiUpdate="ItemAccountsApi.updateItemAccounts"
:apiCreate="ItemAccountsApi.createItemAccounts" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="ItemAccountsRules"
:formAllSchemas="ItemAccounts.allSchemas"
:apiUpdate="ItemAccountsApi.updateItemAccounts"
:apiCreate="ItemAccountsApi.createItemAccounts"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
@ -36,8 +56,7 @@
<Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData"
@success="importSuccess" />
<ImportForm ref="importFormRef" url="/eam/item-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
@ -304,4 +323,5 @@
getList()
importTemplateData.templateUrl = await ItemAccountsApi.importTemplate()
})
</script>

6
src/views/eam/item/itemApplyMain/index.vue

@ -261,12 +261,6 @@
const submitForm = async (formType, data) => {
data.subList = tableData.value //
try {
for (let item of tableData.value) {
if (item.qty > item.currentQty) {
message.error('要货计划数量不得大于订单数量-已计划数量')
return false;
}
}
if (formType === 'create') {
await ItemApplyMainApi.createItemApplyMain(data)
message.success(t('common.createSuccess'))

20
src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

@ -111,14 +111,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true,
searchListPlaceholder: '请选择备件编号',
searchField: 'number',
searchTitle: '备件信息',
searchTitle: '库区信息',
searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},
}
]
},
},
@ -174,14 +174,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
min: 1,
precision: 6
}
},
{
@ -194,14 +194,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 2
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 2
min: 1,
precision: 6
}
},

Loading…
Cancel
Save