Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
liuchen864 5 months ago
parent
commit
21d4668f71
  1. 19
      src/api/eam/sparePartsInLocationMain/index.ts
  2. 6
      src/components/Form/src/Form.vue
  3. 15
      src/components/Search/src/Search.vue
  4. 1
      src/locales/en-US.ts
  5. 1
      src/locales/zh-CN.ts
  6. 1
      src/utils/dict.ts
  7. 2
      src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
  8. 1
      src/views/eam/equipmentRepairJobMain/index.vue
  9. 157
      src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
  10. 29
      src/views/eam/equipmentRepairRecordMain/index.vue
  11. 10
      src/views/eam/sparepartsinlocation/index.vue
  12. 88
      src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts
  13. 2
      src/views/login/forgetPassword.vue
  14. 13
      src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
  15. 21
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  16. 17
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
  17. 90
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  18. 1
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
  19. 1
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
  20. 24
      src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
  21. 60
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  22. 20
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
  23. 6
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  24. 1
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  25. 15
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
  26. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  27. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  28. 8
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  29. 8
      src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

19
src/api/eam/sparePartsInLocationMain/index.ts

@ -23,7 +23,7 @@ export interface SparePartsInLocationMainVO {
concurrencyStamp: number
}
// 查询备件领用出库记录主列表
// 查询备件库记录主列表
export const getSparePartsInLocationMainPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
@ -34,29 +34,34 @@ export const getSparePartsInLocationMainPage = async (params) => {
}
}
// 查询备件领用出库记录主详情
// 查询备件库记录主详情
export const getSparePartsInLocationMain = async (id: number) => {
return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id })
}
// 新增备件领用出库记录主
// 新增备件库记录主
export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data })
}
// 修改备件领用出库记录主
// 修改备件库记录主
export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data })
}
// 删除备件领用出库记录主
// 删除备件库记录主
export const deleteSparePartsInLocationMain = async (id: number) => {
return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id })
}
// 导出备件领用出库记录主 Excel
// 导出备件库记录主 Excel
export const exportSparePartsInLocationMain = async (params) => {
return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params })
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/eam/spare-parts-in-location-main/export-excel-senior`, data })
}else{
return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params })
}
}
// 下载用户导入模板

6
src/components/Form/src/Form.vue

@ -55,7 +55,7 @@ export default defineComponent({
vLoading: propTypes.bool.def(false),
labelPosition: propTypes.string.def('left'),
},
emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth'],
emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth','onInput'],
setup(props, { slots, expose, emit }) {
// element form
const elFormRef = ref<ComponentRef<typeof ElForm>>()
@ -204,6 +204,9 @@ export default defineComponent({
const onBlur = (field, e) => {
emit('onBlur', field, e)
}
const onInput = (field,value) => {
emit('onInput', field,value)
}
// formItem
const renderFormItem = (item: FormSchema) => {
// options
@ -382,6 +385,7 @@ export default defineComponent({
style={item.componentProps?.style}
onChange={(e)=>{onChange(item.field, e)}}
onBlur={(e)=>{onBlur(item.field, e)}}
onInput={(value)=>{onInput(item.field,value)}}
{...(notRenderOptions.includes(item?.component as string) &&
item?.componentProps?.options
? { options: item?.componentProps?.options || [] }

15
src/components/Search/src/Search.vue

@ -43,7 +43,7 @@ const props = defineProps({
}
})
const emit = defineEmits(['search', 'reset'])
const emit = defineEmits(['search', 'reset','onInput'])
const visible = ref(true)
@ -88,6 +88,14 @@ const { register, elFormRef, methods } = useForm({
model: props.model || {}
})
const onInput = (field,value) => {
emit('onInput', field,value)
}
const formRef = ref()
const setFormValues = (formData)=>{
formRef.value.setValues(formData)
}
const search = async () => {
await unref(elFormRef)?.validate(async (isValid) => {
if (isValid) {
@ -118,12 +126,14 @@ const setVisible = () => {
}
const Search = ref()
onMounted(() => {})
defineExpose({setFormValues}) // open
</script>
<template>
<!-- update by 芋艿class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离避免空隙过大 -->
<div ref="Search">
<Form
<Form ref="formRef"
:inline="inline"
:is-col="isCol"
:is-custom="false"
@ -132,6 +142,7 @@ onMounted(() => {})
class="-mb-15px search"
hide-required-asterisk
@register="register"
@onInput="onInput"
>
<template #action>
<div v-if="layout === 'inline'">

1
src/locales/en-US.ts

@ -44,6 +44,7 @@ export default {
importMessage: 'Whether to confirm import data item?',
createSuccess: 'Create Success',
updateSuccess: 'Update Success',
emailSentSuccess: 'Email sent successfully',
delMessage: 'Delete the selected data?',
delDataMessage: 'Delete the data?',
delNoData: 'Please select the data to delete',

1
src/locales/zh-CN.ts

@ -44,6 +44,7 @@ export default {
importMessage: '是否确认导入数据项?',
createSuccess: '新增成功',
updateSuccess: '修改成功',
emailSentSuccess: '邮件发送成功',
delMessage: '是否删除所选中数据?',
delDataMessage: '是否删除数据?',
delNoData: '请选择需要删除的数据',

1
src/utils/dict.ts

@ -363,6 +363,7 @@ export enum DICT_TYPE {
EAM_MAINTENANCE_URGENCY = 'eam_maintenance_urgency', // 维保紧急程度
EAM_MAINTENANCE_LEVEL = 'eam_maintenance_level', // 维保维修级别
EAM_REPAIR_STATUS = 'eam_repair_status', // 维修状态
EAM_COMPLETE_RESULT = 'eam_complete_result', // 维修状态
OFF_BACK_STATUS = 'off_back_status',
SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum',// 流程状态
IS_LINE_ITEM = 'is_line_item', // 是否是线边

2
src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts

@ -249,6 +249,8 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '结果',
field: 'completeResult',
sort: 'custom',
dictType: DICT_TYPE.EAM_COMPLETE_RESULT,
dictClass: 'string',
isSearch: true,
},
{

1
src/views/eam/equipmentRepairJobMain/index.vue

@ -88,7 +88,6 @@ import Detail from '@/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.
import FinishForm1 from '@/views/eam/equipmentRepairJobMain/finishForm1.vue'
import FinishForm2 from '@/views/eam/equipmentRepairJobMain/finishForm2.vue'
import FinishForm3 from '@/views/eam/equipmentRepairJobMain/finishForm3.vue'
import {createEquipmentRepairNewOrder} from "@/api/eam/equipmentRepairJobMain";
defineOptions({ name: 'EquipmentRepairJobMain' })

157
src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts

@ -1,5 +1,7 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
// 表单校验
export const EquipmentRepairRecordMainRules = reactive({
@ -11,7 +13,6 @@ export const EquipmentRepairRecordMainRules = reactive({
equipmentCode: [required],
totalMinutes: [required],
faultType: [required],
concurrencyStamp: [required]
})
export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
@ -28,12 +29,9 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.DEVICE_TYPE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true,
form: {
component: 'SelectV2'
}
},
{
label: '报修工单申请号',
label: '报修工单号',
field: 'repairNumber',
sort: 'custom',
isSearch: true
@ -42,43 +40,56 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '来源字典',
field: 'sources',
sort: 'custom',
dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true
dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: false
},
{
label: '维修描述',
field: 'maintenanceDesc',
sort: 'custom',
isSearch: true
isSearch: false
},
{
label: '紧急程度',
field: 'urgency',
sort: 'custom',
dictType: DICT_TYPE.REPAIR_DEGREE,
dictType: DICT_TYPE.EAM_MAINTENANCE_URGENCY,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true,
form: {
component: 'SelectV2'
}
},
{
label: '维修级别',
field: 'level',
sort: 'custom',
dictType: DICT_TYPE.REPAIR_LEVEL,
dictType: DICT_TYPE.EAM_MAINTENANCE_LEVEL,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true,
form: {
component: 'SelectV2'
}
},
{
label: '设备编号',
field: 'equipmentCode',
sort: 'custom',
isSearch: true
isSearch: true,
isForm: true,
form: {
componentProps: {
isSearchList: true, // 开启查询弹窗
searchTitle: '设备信息', // 查询弹窗标题
searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
searchField: 'code', // 查询弹窗赋值字段
searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
multiple:true,
searchCondition: [{
key: 'status',
value: 'NORMAL',
action: '==',
isSearch: true,
isMainValue: false
}]
}
}
},
{
label: '是否停机',
@ -96,7 +107,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'startTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
@ -118,7 +129,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'endTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
@ -139,23 +150,25 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '维修时间',
field: 'totalMinutes',
sort: 'custom',
isSearch: true
isSearch: false
},
{
label: '验证人',
field: 'verifyer',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
}
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '验证内容',
field: 'verifyContent',
sort: 'custom',
isSearch: true,
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
form: {
component: 'Editor',
componentProps: {
@ -169,7 +182,10 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'verifyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
search: {
component: 'DatePicker',
componentProps: {
@ -190,35 +206,31 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '执行人',
field: 'maintenancer',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
}
isSearch: false,
},
{
label: '维修人联系电话',
field: 'maintenancePhone',
sort: 'custom',
isSearch: true
isSearch: false
},
{
label: '结果枚举',
field: 'completeResult',
sort: 'custom',
dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
dictType: DICT_TYPE.EAM_COMPLETE_RESULT,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true,
form: {
component: 'SelectV2'
}
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '完成时间',
field: 'completionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
@ -240,7 +252,10 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'maintenanceTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
search: {
component: 'DatePicker',
componentProps: {
@ -262,7 +277,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'repairTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
@ -283,11 +298,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '报修人',
field: 'repairer',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
}
isSearch: false,
},
{
label: '故障类型',
@ -296,75 +307,86 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.FAILURE_REASON,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true,
form: {
component: 'SelectV2'
}
},
{
label: '流程状态',
field: 'status',
sort: 'custom',
dictType: DICT_TYPE.EAM_REPAIR_STATUS,
dictClass: 'string',
isSearch: true,
form: {
component: 'Radio'
}
},
{
label: '自动接单',
field: 'autoOrder',
sort: 'custom',
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '自动执行',
field: 'autoPerform',
sort: 'custom',
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '自动验证',
field: 'autoVerify',
sort: 'custom',
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '直接生成记录',
field: 'directCreateRecord',
sort: 'custom',
isSearch: true
isSearch: false
},
{
label: '班组类型',
field: 'classType',
sort: 'custom',
isSearch: true,
form: {
component: 'SelectV2'
}
isSearch: false,
},
{
label: '所属厂区编号',
field: 'factoryAreaCode',
sort: 'custom',
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '车间编号',
field: 'workshopCode',
sort: 'custom',
isSearch: true
isSearch: false
},
{
label: '工段编号',
field: 'workshopSectionCode',
sort: 'custom',
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '是否可用',
@ -372,7 +394,10 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '操作',

29
src/views/eam/equipmentRepairRecordMain/index.vue

@ -27,9 +27,9 @@
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>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
@ -51,7 +51,16 @@
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="EquipmentRepairRecordMain.allSchemas" />
<Detail ref="detailRef"
:isBasic="false"
:allSchemas="EquipmentRepairRecordMain.allSchemas"
:detailAllSchemas="EquipmentRepairRecordDetail.allSchemas"
:detailAllSchemasRules="EquipmentRepairRecordDetailRules"
:apiPage="EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage"
:detailButtonIsShowAdd=false
:detailButtonIsShowEdit=false
:detailButtonIsShowDelete=false
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/equipment-repair-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@ -60,7 +69,9 @@
<script setup lang="ts">
import download from '@/utils/download'
import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from './equipmentRepairRecordMain.data'
import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@ -99,9 +110,9 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentRepairRecordMain:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentRepairRecordMain:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentRepairRecordMain:export'}), //
// defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentRepairRecordMain:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentRepairRecordMain:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentRepairRecordMain:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
@ -133,8 +144,8 @@ const buttonBaseClick = (val, item) => {
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentRepairRecordMain:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentRepairRecordMain:delete'}), //
// defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentRepairRecordMain:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentRepairRecordMain:delete'}), //
]
// -

10
src/views/eam/sparepartsinlocation/index.vue

@ -168,9 +168,9 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), //
// defaultButtons.defaultImportBtn(null), //
// defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultAddBtn({hasPermi:'eam:spare-parts-in-location-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'eam:spare-parts-in-location-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'eam:spare-parts-in-location-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null) //
@ -218,7 +218,7 @@ const isShowMainButton = (row, val) => {
// -
const butttondata = (row) => {
return [
defaultButtons.mainListEditBtn({ hasPermi: 'wms:sparePartsInLocationMain:update' }) //
defaultButtons.mainListEditBtn({ hasPermi: 'eam:spare-parts-in-location-main:update' }) //
// defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:sparePartsInLocationMain:delete' }) //
]
}
@ -358,7 +358,7 @@ const handleImport = () => {
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '采购订单主导入模版.xlsx'
templateTitle: '备件入库记录导入模版.xlsx'
})
//

88
src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts

@ -30,14 +30,14 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '编号',
field: 'number',
sort: 'custom',
isSearch: false,
isSearch: true,
isForm: false,
},
{
label: '入库主题',
field: 'theme',
sort: 'custom',
isSearch: false,
isSearch: true,
},
{
label: '流程状态',
@ -120,25 +120,7 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isForm: false,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
},
{
label: '操作',
field: 'action',
@ -162,40 +144,6 @@ export const SparePartsInLocationDetailRules = reactive({
})
export const SparePartsInLocationDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: 'id',
field: 'id',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
isTableForm:false
},
{
label: '单号',
field: 'number',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isTableForm:false
},
{
label: '主表ID',
field: 'masterId',
sort: 'custom',
form: {
component: 'InputNumber',
value: 0
},
isSearch: false,
isTable: false,
isForm: false,
isTableForm:false
},
{
label: '库位编号',
field: 'locationCode',
@ -219,19 +167,19 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive<CrudSchema[]>(
}
},
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择备件编号', // 输入框占位文本
searchField: 'itemNumber', // 查询弹窗赋值字段
searchTitle: '备件信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
// isInpuFocusShow: true,
// searchListPlaceholder: '请选择备件编号', // 输入框占位文本
// searchField: 'itemNumber', // 查询弹窗赋值字段
// searchTitle: '备件信息', // 查询弹窗标题
// searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
// searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
// searchCondition: [
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }
// ]
}
},
{
@ -245,7 +193,7 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive<CrudSchema[]>(
}
},
tableForm:{
disabled: true
// disabled: true
}
},
{
@ -261,7 +209,7 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive<CrudSchema[]>(
}
},
tableForm:{
disabled: true
// disabled: true
}
},
{

2
src/views/login/forgetPassword.vue

@ -50,7 +50,7 @@
try {
const data = loginData as unknown as UserApi.UserVO
await UserApi.forgetPassword(data)
message.success(t('common.updateSuccess'))
message.success(t('common.emailSentSuccess'))
//
router.go(-1)
} finally {

13
src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="SupplierUser.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search ref="seachRef" :schema="SupplierUser.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" @onInput="onInput"/>
</ContentWrap>
<!-- 列表头部 -->
@ -89,6 +89,17 @@ const tableColumns = ref(SupplierUser.allSchemas.tableColumns)
const updataTableColumns = (val) => {
tableColumns.value = val
}
const seachRef = ref()
const onInput = (field,value) => {
if('userId'==field){
value = value.replace(/[^\d]/g,'')
seachRef.value.setFormValues({
userId:value
})
}
}
//
const searchTableParams = ref([

21
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -117,13 +117,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['uom'] = val[0]['uom']
}else if(formField=='packUnit'){
//1
row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){
//2
row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){
//
row['balancePackUnit'] = val[0]['packUnit']
}
} else {
const setV = {}
setV[formField] = val[0][searchField]
//setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV)
@ -134,6 +140,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
if(formField=='itemCode'){
//
setV['uom'] = val[0]['uom']
}else if(formField=='packUnit'){
//1
setV['packUnit'] = val[0]['packUnit']
setV['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){
//2
setV['secondPackUnit'] = val[0]['packUnit']
setV['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){
//
setV['balancePackUnit'] = val[0]['packUnit']
}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})

17
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@ -489,7 +489,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
},
tableForm: {
type: 'InputNumber',
min: 1,
min: 0.000001,
default:1,
precision: 6
}
},
@ -750,14 +751,12 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x',
}
},
{
label: '包装规格1',
field: 'packUnit',
isTable: true,
sort: 'custom',
table: {
width: 150,
form: {
componentProps: {
disabled: true,
isSearchList: true,
@ -786,7 +785,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'itemCode',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
@ -824,8 +823,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
field: 'secondPackUnit',
isTable: true,
sort: 'custom',
table: {
width: 150,
form: {
componentProps: {
disabled: true,
isSearchList: true,
@ -892,7 +890,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
label: '入库存包装规格',
field: 'balancePackUnit',
sort: 'custom',
table: {
form: {
width: 150,
componentProps: {
disabled: true,
@ -922,7 +920,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'itemCode',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
@ -947,7 +945,6 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
dictType: DICT_TYPE.IS_LINE_ITEM,
dictClass: 'string',
isSearch: false,
isForm: false,
isTable: true,
sort: 'custom',
table: {

90
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@ -406,26 +406,26 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'right'
},
},
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
isForm:false,
table: {
width: 150
},
sortTableDefault:7,
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
isForm:false,
table: {
width: 150
},
sortTableDefault:8,
},
// {
// label: '包装规格',
// field: 'packUnit',
// sort: 'custom',
// isForm:false,
// table: {
// width: 150
// },
// sortTableDefault:7,
// },
// {
// label: '包装数量',
// field: 'packQty',
// sort: 'custom',
// isForm:false,
// table: {
// width: 150
// },
// sortTableDefault:8,
// },
]))
//表单校验
@ -510,29 +510,29 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}]
},
},
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
sortTableDefault:6,
sortSearchDefault:4,
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
sortTableDefault:5,
sortSearchDefault:3,
},
// {
// label: '包装号',
// field: 'packingNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// isTableForm: false,
// isForm: false,
// sortTableDefault:6,
// sortSearchDefault:4,
// },
// {
// label: '批次',
// field: 'batch',
// sort: 'custom',
// table: {
// width: 150
// },
// isTableForm: false,
// sortTableDefault:5,
// sortSearchDefault:3,
// },
{
label: '库存状态',
field: 'inventoryStatus',
@ -561,8 +561,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '库位代码',
field: 'fromLocationCode',
label: '库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150

1
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts

@ -731,6 +731,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
tableForm:{
disabled:true,
type: 'Select'
}
},

1
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts

@ -732,6 +732,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
tableForm:{
disabled:true,
type: 'Select'
}
},

24
src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts

@ -911,18 +911,18 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '操作',
hiddenInMain:true,
field: 'action',
isDetail: false,
isForm: false ,
table: {
width: 150,
fixed: 'right'
},
isTableForm:false,
}
// {
// label: '操作',
// hiddenInMain:true,
// field: 'action',
// isDetail: false,
// isForm: false ,
// table: {
// width: 150,
// fixed: 'right'
// },
// isTableForm:false,
// }
]))
//表单校验

60
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@ -62,16 +62,37 @@
@tableFormButton="tableFormButton"
/>
<!-- bom列表 -->
<!-- Mes列表 -->
<Dialog
:title="DialogTitle"
v-model="bomModelVisible"
v-model="mesModelVisible"
width="80%"
:scroll="true"
max-height="450px"
>
<Table
:columns="ProductreceiptDetailb.allSchemas.tableColumns"
:data="detatableDataMes.tableList"
:loading="detatableDataMes.loading"
:pagination="{
total: detatableDataMes.total
}"
v-model:pageSize="detatableDataMes.pageSize"
v-model:currentPage="detatableDataMes.currentPage"
v-model:sort="detatableDataMes.sort"
/>
</Dialog>
<!-- bom列表 -->
<Dialog
:title="BomDialogTitle"
v-model="bomModelVisible"
width="80%"
:scroll="true"
max-height="450px"
>
<Table
:columns="BackflushRecordDetailb.allSchemas.tableColumns"
:data="detatableDataBom.tableList"
:loading="detatableDataBom.loading"
:pagination="{
@ -86,11 +107,12 @@
<script setup lang="ts">
import download from '@/utils/download'
import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, ProductreceiptDetailb } from './productreceiptAssembleRecordMain.data'
import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, ProductreceiptDetailb,BackflushRecordDetailb } from './productreceiptAssembleRecordMain.data'
import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as ProductreceiptDetailbApi from '@/api/wms/productreceiptDetailb'
import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
//
@ -105,6 +127,15 @@ routeName.value = route.name
const tableColumns = ref([...ProductreceiptRecordMain.allSchemas.tableColumns,...ProductreceiptRecordDetail.allSchemas.tableMainColumns])
// table
const buttondataTable = ref([{
label: 'Mes',
name: 'mes',
hide: false,
type: 'primary',
icon: '',
color: '',
hasPermi: '',
link: true, //
},{
label: 'Bom',
name: 'bom',
hide: false,
@ -115,11 +146,20 @@ const buttondataTable = ref([{
link: true, //
}])
// Mes
const DialogTitle = ref('Mes信息')
const mesModelVisible = ref(false)
const { tableObject: detatableDataMes, tableMethods: detatableMethodsMes } =useTable({
getListApi: ProductreceiptDetailbApi.getProductreceiptDetailbPage
})
const { getList:getDetailListMes } = detatableMethodsMes
// Bom
const DialogTitle = ref('Bom信息')
const BomDialogTitle = ref('Bom信息')
const bomModelVisible = ref(false)
const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
getListApi: ProductreceiptDetailbApi.getProductreceiptDetailbPage
getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
})
const { getList:getDetailListBom } = detatableMethodsBom
@ -220,9 +260,17 @@ const searchFormClick = (searchData) => {
// Bom
const tableFormButton = async (val , row) => {
if (val == 'mes') { // bom
mesModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Mes信息'
detatableDataMes.params = {
masterId: row.masterId
}
await getDetailListMes()
}
if (val == 'bom') { // bom
bomModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
BomDialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
detatableDataBom.params = {
masterId: row.masterId
}

20
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@ -1015,7 +1015,7 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
label: '主表ID',
field: 'masterId',
sort: 'custom',
isSearch: true,
isTable:false,
form: {
component: 'InputNumber',
value: 0
@ -1095,13 +1095,13 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
// {
// label: '操作',
// field: 'action',
// isForm: false,
// table: {
// width: 150,
// fixed: 'right'
// }
// }
]))

6
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -2282,7 +2282,8 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
isTableRowValue: true, //查询当前searchTable表中行数据的值
isMainValue: false
},
{
key: 'available',
@ -2306,7 +2307,8 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
isTableRowValue: true, //查询当前searchTable表中行数据的值
isMainValue: false
},
{
key: 'available',

1
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -586,6 +586,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
purchaseReceiptRecordNumberRef.value = row.purchaseReceiptRecordNumber;
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
PurchasereturnRequestDetail.allSchemas.tableColumns = PurchasereturnRequestDetail.allSchemas.tableColumns.filter(item=>item.field!='inventoryBalance')
detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereturnMain')
}

15
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@ -853,8 +853,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
}
},
{
label: '货数量',
field: 'receiptQty',
label: '退货数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
@ -908,6 +908,11 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
form: {
componentProps:{
disabled:true
}
},
tableForm:{
// labelMessage: '信息提示说明!!!',
isInpuFocusShow: true, // 开启查询弹窗
@ -921,6 +926,11 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
value: 'PurchaseReturn',
message: '请填写业务类型',
isMainValue: false
},{
key: 'isIn',
value: 'out',
message: '',
isMainValue: false
}]
},
hiddenInMain: true,
@ -988,6 +998,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
},
isForm:false,
tableForm:{
hidden:false,//控制列是否展示
type:'InputNumber',
min:0,
precision: 6

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -574,7 +574,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
},
{
label: '物流收货单号',
label: '待开票单据号',
field: 'recvBillNum',
table: {
width: 150

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -148,7 +148,7 @@
:apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
:apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail"
:Echo="Echo"
:detailButtonIsShowEdit="false"
:detailButtonIsShowEdit="true"
:detailButtonIsShowDelete="false"
:detailButtonIsShowAdd="false"
@buttonBaseClick="detailButtonBaseClick"

8
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -65,7 +65,7 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
field: 'billType'
},
{
label: '物流收货单号',
label: '待开票单据号',
field: 'recvBillNum',
table: {
width: 180,
@ -511,7 +511,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}
},
},
{
label: '采购价格审批人',
field: 'procurementCreator',
@ -548,7 +548,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// }
}
},
{
label: '采购审批时间',
field: 'procurementCreateTime',
@ -885,7 +885,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}
},
{
label: '物流收货单号',
label: '待开票单据号',
field: 'recvBillNum',
table: {
width: 150

8
src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@ -28,7 +28,7 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '物流单据号',
label: '待开票单据号',
field: 'recvBillNum',
sort: 'custom',
isSearch: true,
@ -120,7 +120,7 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '状态',
field: 'status',
@ -140,8 +140,8 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '订单行',
field: 'poLine',

Loading…
Cancel
Save