Browse Source

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

master_hella_20240701
songguoqiang 6 months ago
parent
commit
accc784b40
  1. 2
      README.md
  2. 25
      src/api/eam/equipmentMaintenanceMain/index.ts
  3. 7
      src/components/BasicForm/src/BasicForm.vue
  4. 175
      src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
  5. 232
      src/views/eam/equipmentMaintenanceMain/finishForm.vue
  6. 91
      src/views/eam/equipmentMaintenanceMain/index.vue
  7. 4
      src/views/home/components/material.vue
  8. 4
      src/views/home/components/produce.vue
  9. 4
      src/views/home/components/product.vue
  10. 4
      src/views/home/components/supplierIndex.vue
  11. 10
      src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
  12. 6
      src/views/wms/basicDataManage/orderManage/shift/index.vue
  13. 12
      src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
  14. 1
      src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
  15. 3
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  16. 20
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  17. 14
      src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
  18. 2
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  19. 40
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  20. 140
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
  21. 4
      src/views/wms/reportList/index.vue
  22. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

2
README.md

@ -1,4 +1,4 @@
## dev发布2024-05-23-002 ## dev发布2024-06-01-001
**xxxx.data.ts 文件配置说明** **xxxx.data.ts 文件配置说明**
**form表单查询弹窗配置** **form表单查询弹窗配置**
form: { form: {

25
src/api/eam/equipmentMaintenanceMain/index.ts

@ -3,27 +3,32 @@ import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
export interface EquipmentMaintenanceMainVO { export interface EquipmentMaintenanceMainVO {
id: number id: number
number: string
describing: string describing: string
number: string
sources: string
equipmentCode: string equipmentCode: string
type: string type: string
classes: string
planNumber: string
faultType: string faultType: string
cycle: string planNumber: string
times: string planStartTime: Date
planEndTime: Date
startTime: Date
endTime: Date
classType: string
verifyer: number verifyer: number
verifyContent: string verifyContent: string
verifyTime: Date verifyTime: Date
maintenancer: number maintenancer: number
maintenancePhone: string maintenancePhone: string
completeResult: string
completionTime: Date completionTime: Date
maintenanceTime: Date maintenanceTime: Date
status: string status: string
autoOrder: string
autoPerform: string
autoVerify: string
directCreateRecord: string
factoryAreaCode: string factoryAreaCode: string
workshopCode: string workshopCode: string
workshopSectionCode: string
departmentCode: string departmentCode: string
remark: string remark: string
siteId: string siteId: string
@ -49,6 +54,12 @@ export const getEquipmentMaintenanceMain = async (id: number) => {
return await request.get({ url: `/eam/equipment-maintenance-main/get?id=` + id }) return await request.get({ url: `/eam/equipment-maintenance-main/get?id=` + id })
} }
export const getMaintenanceOrderConfig = async () => {
return await request.get({ url: `/eam/equipment-maintenance-main/get-order-config`})
}
// 新增设备保养工单主 // 新增设备保养工单主
export const createEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => { export const createEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
return await request.post({ url: `/eam/equipment-maintenance-main/create`, data }) return await request.post({ url: `/eam/equipment-maintenance-main/create`, data })

7
src/components/BasicForm/src/BasicForm.vue

@ -390,6 +390,13 @@ const opensearchTable = (
return return
} }
}else if(searchCondition[i].isTableRowValue){ }else if(searchCondition[i].isTableRowValue){
if(searchCondition[i].required){
if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择!')
return
}
}
row[searchCondition[i].value]
//table //table
_searchCondition[searchCondition[i].key] = row[searchCondition[i].value] _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
} else { } else {

175
src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts

@ -7,15 +7,16 @@ import * as WorkshopApi from "@/api/wms/workshop";
import {RelationMaintenancePlanItem} from "@/views/eam/maintenance/maintenance.data"; import {RelationMaintenancePlanItem} from "@/views/eam/maintenance/maintenance.data";
import * as ItemApi from "@/api/eam/relationMaintenancePlanItem"; import * as ItemApi from "@/api/eam/relationMaintenancePlanItem";
import {validateroundNumber} from "@/utils/validator"; import {validateroundNumber} from "@/utils/validator";
import {getRelationMaintenancePlanItemPage} from "@/api/eam/relationMaintenancePlanItem";
// 表单校验 // 表单校验
export const EquipmentMaintenanceMainRules = reactive({ export const EquipmentMaintenanceMainRules = reactive({
number: [required], number: [required],
sources: [required],
equipmentCode: [required], equipmentCode: [required],
planNumber: [required], type: [required],
planStartTime: [required],
planEndTime: [required],
status: [required], status: [required],
factoryAreaCode: [required],
}) })
export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
@ -29,23 +30,23 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isDetail:false, isDetail:false,
}, },
{ {
label: '保养工单编号', label: '描述',
field: 'number', field: 'describing',
sort: 'custom', sort: 'custom',
isSearch: false,
isTable: false,
isForm: false, isForm: false,
isSearch: true, isDetail:false,
}, },
{ {
label: '描述', label: '保养工单编号',
field: 'describing', field: 'number',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
{ {
label: '设备类别', label: '来源字典',
field: 'type', field: 'sources',
dictType: DICT_TYPE.DEVICE_TYPE,
dictClass: 'string',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
@ -75,8 +76,16 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '班次枚举', label: '设备类别',
field: 'classes', field: 'type',
dictType: DICT_TYPE.DEVICE_TYPE,
dictClass: 'string',
sort: 'custom',
isSearch: true,
},
{
label: '故障类型枚举',
field: 'faultType',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
@ -87,26 +96,98 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true, isSearch: true,
}, },
{ {
label: '故障类型枚举', label: '计划开始时间',
field: 'faultType', field: 'planStartTime',
sort: 'custom', sort: 'custom',
formatter: dateFormatter,
isSearch: true, isSearch: true,
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')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
}, },
{ {
label: '保养周期', label: '计划结束时间',
field: 'cycle', field: 'planEndTime',
sort: 'custom', sort: 'custom',
formatter: dateFormatter,
isSearch: true, isSearch: true,
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')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
}, },
{ {
label: '保养次数', label: '保养开始时间',
field: 'times', field: 'startTime',
sort: 'custom', sort: 'custom',
formatter: dateFormatter,
isSearch: true, isSearch: true,
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')]
}
},
form: { form: {
component: 'InputNumber', component: 'DatePicker',
value: 0 componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '保养结束时间',
field: 'endTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
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')]
}
}, },
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '保养班组',
field: 'classType',
sort: 'custom',
isSearch: true,
}, },
{ {
label: '验证人', label: '验证人',
@ -119,6 +200,13 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'verifyContent', field: 'verifyContent',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
form: {
component: 'Editor',
componentProps: {
valueHtml: '',
height: 200
}
},
}, },
{ {
label: '验证时间', label: '验证时间',
@ -154,12 +242,6 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
{
label: '结果枚举临时措施、完成',
field: 'completeResult',
sort: 'custom',
isSearch: true,
},
{ {
label: '完成时间', label: '完成时间',
field: 'completionTime', field: 'completionTime',
@ -212,14 +294,35 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.EAM_ORDER_STATUS, dictType: DICT_TYPE.EAM_ORDER_STATUS,
dictClass: 'string', dictClass: 'string',
}, },
// {
// label: '自动接单',
// field: 'autoOrder',
// sort: 'custom',
// isSearch: true,
// },
// {
// label: '自动执行',
// field: 'autoPerform',
// sort: 'custom',
// isSearch: true,
// },
// {
// label: '自动验证',
// field: 'autoVerify',
// sort: 'custom',
// isSearch: true,
// },
{
label: '直接生成记录',
field: 'directCreateRecord',
sort: 'custom',
isSearch: true,
},
{ {
label: '所属厂区编号', label: '所属厂区编号',
field: 'factoryAreaCode', field: 'factoryAreaCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: true,
isTable: false,
isForm: false,
isDetail:false,
}, },
{ {
label: '车间编号', label: '车间编号',
@ -288,9 +391,10 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '是否可用默认TRUE', label: '是否可用默认TRUE',
field: 'available', field: 'available',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: false,
dictType: DICT_TYPE.TRUE_FALSE, isTable: false,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isForm: false,
isDetail:false,
}, },
{ {
label: '删除时间', label: '删除时间',
@ -351,6 +455,7 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
])) ]))
export const EquipmentMaintenanceDetailRules = reactive({ export const EquipmentMaintenanceDetailRules = reactive({
number: [required], number: [required],
masterId: [required], masterId: [required],

232
src/views/eam/equipmentMaintenanceMain/finishForm.vue

@ -0,0 +1,232 @@
<template>
<Dialog v-model="dialogVisible" :title="dialogTitle" :close-on-click-modal="false">
<el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="验证人" prop="verifyer">
<el-input v-model="formData.verifyer" placeholder="请输入验证人" :disabled="isDisabled"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="验证内容" prop="verifyContent">
<el-input v-model="formData.verifyContent" placeholder="请输入验证内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="验证时间" prop="verifyTime">
<el-date-picker
v-model="formData.verifyTime"
type="datetime"
placeholder="选择验证时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="保养人ID" prop="maintenancer">
<el-input v-model="formData.maintenancer" placeholder="请输入保养人" :disabled="isDisabled"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保养人电话" prop="maintenancePhone">
<el-input v-model="formData.maintenancePhone" placeholder="请输入保养人电话" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm('success')"> </el-button>
<el-button @click="handleClose('close')"> </el-button>
</template>
</Dialog>
<!--添加巡检项弹窗-->
<SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
</template>
<script lang="ts" setup>
import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
import request from "@/config/axios";
import { SearchTable } from '@/components/SearchTable'
import { InspectionItem} from "@/views/eam/inspectionItem/inspectionItem.data";
import * as inspectionItemApi from "@/api/eam/inspectionItem";
import {ElInput} from "element-plus";
import {updateEquipmentMaintenanceMain} from "@/api/eam/equipmentMaintenanceMain";
defineOptions({ name: 'TeamForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const tags=ref([])
const inputValue = ref('')
const inputVisible = ref(false)
const isDisabled = ref(false)
const InputRef = ref<InstanceType<typeof ElInput>>()
const formData = ref({
id:'',
number:'',
verifyer: '',
verifyContent: '',
verifyTime: '',
maintenancer: '',
maintenancePhone: '',
})
const formRules = reactive({
verifyer: [
{ required: true, message: '验证人不能为空', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
verifyContent: [
{ required: true, message: '验证内容不能为空', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
verifyTime: [
{ required: true, message: '验证时间不能为空', trigger: 'blur' },
],
maintenancer: [
{ required: true, message: '保养人ID不能为空', trigger: 'blur' },
],
maintenancePhone: [
{ required: true, message: '保养人电话不能为空', trigger: 'blur' },
],
})
const basicFormRef = ref() // Ref
// /** */
// const searchTableRef = ref();
// const _searchTableTitle = ref();
// const _searchTableAllSchemas = ref();
// const _searchTablePage = ref();
// const _formField = ref();
// const _searchField = ref();
// const _multiple = ref();
// const _type = ref();
// const _row = ref();
// const _searchCondition = ref({})
//
//
// const addItem = () =>{
// addItemCommon(true,'xunJianItem')
// }
//
// /** */
// const addItemCommon = (multiple,field) => {
// _searchCondition.value = {}
// const filters: any[] = []
// filters.push({
// action: "==",
// column: 'available',
// value: 'TRUE'
// })
// //
// _searchCondition.value.isSearch = true
// _searchCondition.value.filters = filters
// _searchTableTitle.value = ''
// _multiple.value = multiple
// _formField.value = field
// _searchField.value = field
// _searchTablePage.value = inspectionItemApi.getInspectionItemPage
// _searchTableAllSchemas.value = InspectionItem.allSchemas
// openCommon()
// }
//
// /** */
// const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
// nextTick?.(() => {
// if (formField === 'xunJianItem') {
// val.forEach(item => {
// const isExist = tags.value.some(tag => tag.content === item.content);
// if (!isExist){
// const newItem = {};
// newItem['content'] = item.content;
// newItem['id'] = item.id;
// tags.value.push(newItem);
// }
// });
// }
// })
// }
// /**/
// const openCommon = () => {
// searchTableRef.value.open(
// _searchTableTitle.value,
// _searchTableAllSchemas.value,
// _searchTablePage.value,
// _formField.value,
// _searchField.value,
// _multiple.value,
// _type.value,
// _row.value,
// _searchCondition.value
// )
// }
/** 初始化弹窗 */
const open = async (type: string, row?: object) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
//
formData.value.id = row.id
formData.value.number = row.planNumber
}
defineExpose({ open }) // open
/** 提交表单 */
const submitForm = async (val) => {
//success
emit('success',formData.value.id)
//
if (!basicFormRef) return
const valid = await basicFormRef.value.validate()
if (!valid) return
//
await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(formData.value)
dialogVisible.value = false
}
const handleClose=(val)=>{
dialogVisible.value = false
emit('close',val)
}
//
const emit = defineEmits(['close','success'])
</script>
<style scoped>
.tag-container {
margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
border: 1px solid #ccc; /* 添加边框样式 */
padding: 10px; /* 可根据需要调整容器内边距 */
width: 950px; /* 设置固定宽度为 950px */
overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
overflow-wrap: break-word; /* 兼容性更好的写法 */
flex-wrap: wrap;
}
.input-with-button {
display: flex;
align-items: center;
width: 100%;
}
.input-with-button > .el-input {
flex: 1;
/*margin-right: 10px;*/
}
</style>

91
src/views/eam/equipmentMaintenanceMain/index.vue

@ -51,6 +51,20 @@
@onChange="onChange" @onChange="onChange"
/> />
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="EquipmentMaintenanceMainRules"
:formAllSchemas="EquipmentMaintenanceMain.allSchemas"
:apiUpdate="EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain"
:apiCreate="EquipmentMaintenanceMainApi.createEquipmentMaintenanceMain"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
@onChange="onChange"
/>
<FinishForm ref="finishFormRef" @success="getData" @close="getClosed"/>
<!-- 详情 --> <!-- 详情 -->
<Detail ref="detailRef" <Detail ref="detailRef"
:isBasic="false" :isBasic="false"
@ -83,12 +97,13 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/views/eam/equipmentMaintenanceMain/MaintenanceOrderDetail.vue' import Detail from '@/views/eam/equipmentMaintenanceMain/MaintenanceOrderDetail.vue'
import FinishForm from '@/views/eam/equipmentMaintenanceMain/finishForm.vue'
import {Maintenance} from "@/views/eam/maintenance/maintenance.data"; import {Maintenance} from "@/views/eam/maintenance/maintenance.data";
import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data"; import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
import * as ToolItemApi from "@/api/eam/toolAccounts"; import * as ToolItemApi from "@/api/eam/toolAccounts";
import {updateMaintenanceOrder} from "@/api/eam/equipmentMaintenanceMain"; import {getMaintenanceOrderConfig} from "@/api/eam/equipmentMaintenanceMain";
defineOptions({ name: 'EquipmentMaintenanceMain' }) defineOptions({ name: 'EquipmentMaintenanceMain' })
@ -195,7 +210,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'execute') { // } else if (val == 'execute') { //
handleExecute(row.id) handleExecute(row.id)
} else if (val == 'finish') { // } else if (val == 'finish') { //
handleFinish(row.id) handleFinish(row)
} else if (val == 'validate') { // } else if (val == 'validate') { //
handleValidate(row.id) handleValidate(row.id)
} }
@ -330,22 +345,38 @@ const handleExecute = async (id: number) => {
} }
/** 完成按钮操作 */ /** 完成按钮操作 */
const handleFinish = async (id: number) => { const finishFormRef = ref()
try { const handleFinish = async (row) => {
// let res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig();
await message.delConfirm('是否完成所选中工单?'); //
const params = ref({ if(res.remark === 'TRUE'){
id: '', try {
status:'', //
}) await message.delConfirm('是否完成所选中工单?');
params.value.id = id const params = ref({
params.value.status = '5' id: '',
// status:'',
await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) })
message.success(t('工单已完成')) params.value.id = row.id
// params.value.status = '5'
await getList() //
} catch {} await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
message.success(t('工单已完成'))
//
await getList()
} catch {}
}
//
if(res.remark === 'FALSE'){
try {
//
await message.delConfirm('是否完成所选中工单?');
//
finishFormRef.value.open('update', row);
} catch {}
}
} }
/** 验证按钮操作 */ /** 验证按钮操作 */
@ -498,6 +529,30 @@ const searchFormClick = (searchData) => {
getList() // getList() //
} }
const getClosed=(val)=> {
//console.log('orderday-publishClosed-200',val)
nextTick?.(() => {
console.log(val)
getList()
})
}
const getData=(val)=> {
nextTick?.(async () => {
console.log(val)
const params = ref({
id: '',
status: '',
})
params.value.id = val
params.value.status = '5'
//
await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
message.success(t('工单已完成'))
//
await getList()})
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

4
src/views/home/components/material.vue

@ -250,8 +250,8 @@ const getJobCharts = async () => {
]) ])
lineIndex.value++ lineIndex.value++
} }
onMounted(async () => { onMounted(() => {
await getMaterialData() getMaterialData()
}) })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

4
src/views/home/components/produce.vue

@ -201,8 +201,8 @@ const getJobCharts = async () => {
]) ])
lineIndex.value++ lineIndex.value++
} }
onMounted(async () => { onMounted( () => {
await getProduceData() getProduceData()
}) })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

4
src/views/home/components/product.vue

@ -228,8 +228,8 @@ const getJobCharts = async () => {
]) ])
lineIndex.value++ lineIndex.value++
} }
onMounted(async () => { onMounted( () => {
await getProductData() getProductData()
}) })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

4
src/views/home/components/supplierIndex.vue

@ -354,8 +354,8 @@ const formatter = (type,dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
return str return str
} }
onMounted(async () => { onMounted( () => {
await getSupplierData() getSupplierData()
getList() getList()
}) })
</script> </script>

10
src/views/wms/basicDataManage/factoryModeling/productionline/index.vue

@ -67,7 +67,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
// 线 // 线
defineOptions({ name: 'Productionline' }) defineOptions({ name: 'Productionline' })
const message = useMessage() // const message = useMessage() //
@ -154,10 +154,10 @@ const openForm = (type: string, row?: any) => {
if (item.field == 'code') { if (item.field == 'code') {
item.componentProps.disabled = true item.componentProps.disabled = true
} }
if (item.field == 'workshopCode') { // if (item.field == 'workshopCode') {
item.componentProps.disabled = true // item.componentProps.disabled = true
item.componentProps.isSearchList = false // item.componentProps.isSearchList = false
} // }
}) })
}else { }else {

6
src/views/wms/basicDataManage/orderManage/shift/index.vue

@ -165,12 +165,14 @@ const openForm = (type: string, row?: any) => {
// form // form
const formsSuccess = async (formType,data) => { const formsSuccess = async (formType,data) => {
console.log('endAtNextDay',data)
var isHave =Shift.allSchemas.formSchema.some(function (item) { var isHave =Shift.allSchemas.formSchema.some(function (item) {
return item.field === 'beginTime' || item.field === 'entTime'; return item.field === 'beginTime' || item.field === 'entTime';
}); });
if(isHave){
if(data['endAtNextDay']=='FALSE'&&isHave){
if(data.beginTime && data.entTime && data.beginTime >=data.entTime){ if(data.beginTime && data.entTime && data.beginTime >=data.entTime){
message.error('开始时间大于结束时间') message.error('开始时间大于结束时间')
return; return;
} }
} }

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

@ -55,7 +55,15 @@
<Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierUser.allSchemas" /> <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierUser.allSchemas" />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/supplier-user/import" :importTemplateData="importTemplateData" @success="importSuccess" /> <ImportForm
ref="importFormRef"
url="/wms/supplier-user/import"
:importTemplateData="importTemplateData"
@success="importSuccess"
:updateIsDisable="true"
:coverIsDisable="true"
:mode="2"
/>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -66,7 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
//
defineOptions({ name: 'SupplierUser' }) defineOptions({ name: 'SupplierUser' })
const message = useMessage() // const message = useMessage() //

1
src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@ -87,6 +87,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
dialogWidth:'1025px',//搜索出来弹窗的宽度
isSearchList: true, isSearchList: true,
searchListPlaceholder: '请选用户信息', searchListPlaceholder: '请选用户信息',
searchField: 'id', searchField: 'id',

3
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -868,6 +868,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm:false,
isForm:false, isForm:false,
}, },
{ {
@ -878,6 +879,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm:false,
isForm:false, isForm:false,
}, },
{ {
@ -887,6 +889,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm:false,
isForm:false, isForm:false,
}, },
{ {

20
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -558,10 +558,24 @@ const importSuccess = () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params.isSearch = true
isSearch: true, let filters = [...searchData.filters]
filters: searchData.filters if(!filters.find(item=>item.column=='business_type')){
if ( routeName.value == 'DeliverRequestMain') {
filters = [...filters,{
action:'==',
column:'business_type',
value:'Deliver',
}]
} else if ( routeName.value == 'ZZBJDeliverRequestMain') {
filters = [...filters,{
action:'==',
column:'business_type',
value:'ZZBJDeliver',
}]
}
} }
tableObject.params.filters = filters
getList() // getList() //
} }

14
src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@ -673,12 +673,14 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },
key:'productionLineCode', // ,{
value:'productionLineCode', // key:'productionLineCode',
message: '请填写生产线代码!', // value:'productionLineCode',
isMainValue: true // message: '请填写生产线代码!',
},{ // isMainValue: true
// },
{
key: 'businessTypeCode', key: 'businessTypeCode',
value: 'Issue', value: 'Issue',
isMainValue: false isMainValue: false

2
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -590,7 +590,7 @@ const submitForm = async (formType, data) => {
const submitFormLabel = async (formType, data) => { const submitFormLabel = async (formType, data) => {
try { try {
detatableData.tableList.forEach(async (item) => { detatableData.tableList.forEach(async (item) => {
await PackageApi.createPackageLabel(item).then(res => { await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {
isCreateLabel.value = true isCreateLabel.value = true
message.success('创建标签成功') message.success('创建标签成功')
}).catch(err => { }).catch(err => {

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

@ -260,14 +260,16 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row
// row['fromLocationCode'] = val[0]['fromLocationCode'] // row['fromLocationCode'] = val[0]['fromLocationCode']
row['toLocationCode'] = val[0]['toLocationCode'] row['toLocationCode'] = val[0]['toLocationCode']
}else if(formField=='fromLocationCode'){ }else if(formField=='fromLocationCode'){
let params = { // let params = {
itemCode: row.itemCode, // itemCode: row.itemCode,
batch: row.batch, // batch: row.batch,
locationCode:val[0]['code'] // locationCode:val[0]['code']
} // }
let aa = await BalanceApi.getSumByConditions(params); // let aa = await BalanceApi.getSumByConditions(params);
console.log('23423423',aa); // console.log('23423423',aa);
row['inventoryBalance'] = aa// // row['inventoryBalance'] = aa//
}else if(formField=='packingNumber'){
row['inventoryBalance'] = val[0]['qty']//
} }
} else { } else {
const setV = {} const setV = {}
@ -491,17 +493,17 @@ const butttondata = (row,$index) => {
hide: isShowMainButton(row, ['1']), hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:purchasereceipt-request-main:update' hasPermi: 'wms:purchasereceipt-request-main:update'
}), // }), //
{ // {
label: '生成标签', // label: '',
name: 'ssbq', // name: 'ssbq',
hide: isShowMainButton(row, ['3']), // hide: isShowMainButton(row, ['3']),
type: 'primary', // type: 'primary',
icon: '', // icon: '',
color: '', // color: '',
hasPermi: '', // hasPermi: '',
link: true // // link: true //
}, // },
defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), //
] ]
} }

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

@ -10,6 +10,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
import * as ItemPackageApi from '@/api/wms/itempackage/index' import * as ItemPackageApi from '@/api/wms/itempackage/index'
import * as LocationApi from "@/api/wms/location"; import * as LocationApi from "@/api/wms/location";
import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
@ -744,6 +746,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm:false,
isTable:false,
hiddenInMain: true, hiddenInMain: true,
tableForm:{ tableForm:{
disabled:true disabled:true
@ -761,6 +765,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm:false,
isTable:false,
hiddenInMain: true, hiddenInMain: true,
tableForm:{ tableForm:{
disabled:true disabled:true
@ -771,7 +777,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
} }
}, },
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
tableForm:{
disabled:true
},
form: {
componentProps:{
disabled:true
}
}
},
{ {
label: '替代批次', label: '替代批次',
field: 'altBatch', field: 'altBatch',
@ -880,6 +901,77 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
// disabled:false // disabled:false
// } // }
// }, // },
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
// labelMessage: '信息提示说明!!!',
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
searchTitle: '库位代码信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
searchCondition: [{
key: 'businessType',
value: 'PurchaseReturn',
message: '请填写业务类型',
isMainValue: false
}]
},
hiddenInMain: true,
isTable: false,
},
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTable: false,
form: {
componentProps:{
disabled:true
}
},
tableForm:{
// labelMessage: '信息提示说明!!!',
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码、批次、从库位代码',
searchField: 'packingNumber',
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage,
searchCondition: [{
key: 'itemCode',
value: 'itemCode',
message: '请填写物料代码',
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:false
},{
key: 'batch',
value: 'batch',
message: '请填写批次',
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:false
},{
key: 'locationCode',
value: 'fromLocationCode',
message: '请选择从库位代码',
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:false
}]
},
},
{ {
label: '库存余额', label: '库存余额',
field: 'inventoryBalance', field: 'inventoryBalance',
@ -922,21 +1014,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
precision: 6 precision: 6
} }
}, },
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTable: false,
form: {
componentProps:{
disabled:true
}
}
},
{ {
label: '库存状态', label: '库存状态',
field: 'inventoryStatus', field: 'inventoryStatus',
@ -960,31 +1037,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
} }
}, },
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
// labelMessage: '信息提示说明!!!',
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
searchTitle: '库位代码信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
searchCondition: [{
key: 'businessType',
value: 'PurchaseReturn',
message: '请填写业务类型',
isMainValue: false
}]
},
hiddenInMain: true,
isTable: false,
},
{ {
label: '到库位代码', label: '到库位代码',
field: 'toLocationCode', field: 'toLocationCode',
@ -1292,9 +1344,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
//表单校验 //表单校验
export const PurchasereturnRequestDetailRules = reactive({ export const PurchasereturnRequestDetailRules = reactive({
// packingNumber: [ packingNumber: [
// { required: true, message: '请输入包装号', trigger: 'blur' } { required: true, message: '请输入包装号', trigger: 'blur' }
// ], ],
// batch: [ // batch: [
// { required: true, message: '请输入批次', trigger: 'blur' } // { required: true, message: '请输入批次', trigger: 'blur' }
// ], // ],

4
src/views/wms/reportList/index.vue

@ -6,9 +6,11 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getAccessToken } from '@/utils/auth'
// const url = ref('http://localhost:12080/jmreport/view/881686740529258496') // const url = ref('http://localhost:12080/jmreport/view/881686740529258496')
const route = useRoute() // const route = useRoute() //
debugger
const str = route.path.split('/')[3] const str = route.path.split('/')[3]
const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str) const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str+ '?token='+ getAccessToken())
console.log(url); console.log(url);
</script> </script>

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

@ -298,7 +298,7 @@
return [] return []
} }
return [ return [
defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), //
defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), //
{ {
label: t('ts.采购通过'), label: t('ts.采购通过'),

Loading…
Cancel
Save