diff --git a/src/api/factory/site.js b/src/api/factory/site.js index d7cddae..b87df84 100644 --- a/src/api/factory/site.js +++ b/src/api/factory/site.js @@ -16,7 +16,7 @@ export const addUserBu = data => createAPI(`/site/addUserBu`,'post',data) export const delUserBu = data => createAPI(`/site/delUserBu`,'post',data) export const getBu = data => createAPI(`/site/getBu`,'post',data) - +export const getAllBuList = data => createAPI(`/site/getAllBuList`,'post',data) export const getDeptList = data => createAPI(`/site/getDeptList`,'post',data) export const addUserDept = data => createAPI(`/site/addUserDept`,'post',data) diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 46ad944..a2f46d7 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -278,6 +278,9 @@ 备件图片 + + 核心配件 + diff --git a/src/views/modules/partspare/inventorystock.vue b/src/views/modules/partspare/inventorystock.vue index 01bc4bf..b7e77c5 100644 --- a/src/views/modules/partspare/inventorystock.vue +++ b/src/views/modules/partspare/inventorystock.vue @@ -86,6 +86,17 @@ + + + + + + + @@ -142,10 +153,11 @@ import { getWareHouseList, } from '@/api/partspare/wareHouseEntity.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' - +import {getAllBuList}from '@/api/factory/site.js' export default { data() { return { + buList: [], // 是否收藏 favorite: false, // 导出 start @@ -171,7 +183,8 @@ export default { endQtyOnHand: '', groupType: '0', active: 'Y', - safetyStock: '' + safetyStock: '', + buNo: '', }, dataList: [], wareHouseList: [], @@ -186,6 +199,19 @@ export default { columnList: [], // 料号汇总 arrayPart: [ + { + columnProp: 'buDesc', + headerAlign: "center", + align: "left", + columnLabel: 'BU', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { columnProp: 'partNo', headerAlign: "center", @@ -311,6 +337,19 @@ export default { }], // 料号_序号 arrayColumns: [ + { + columnProp: 'buDesc', + headerAlign: "center", + align: "left", + columnLabel: 'BU', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { columnProp: 'partNo', headerAlign: "center", @@ -532,7 +571,7 @@ export default { }, mounted() { this.favoriteIsOk() - + this. getBu () this.$nextTick(() => { this.height = window.innerHeight - 210 this.columnList = this.arrayColumns @@ -673,6 +712,16 @@ export default { return s }, // 导出 end + getBu () { + let tempData = { + username: this.$store.state.user.name, + } + getAllBuList(tempData).then(({data}) => { + if (data.code === 0) { + this.buList = data.rows + } + }) + }, } } diff --git a/src/views/modules/partspare/partSpareLocation.vue b/src/views/modules/partspare/partSpareLocation.vue index 26c3c5f..0077ae8 100644 --- a/src/views/modules/partspare/partSpareLocation.vue +++ b/src/views/modules/partspare/partSpareLocation.vue @@ -32,6 +32,17 @@ + + + + + + + 查询 新增 @@ -167,11 +178,12 @@ import { saveUserFavorite, removeUserFavorite } from '@/api/userFavorite.js' - +import {getAllBuList}from '@/api/factory/site.js' import Chooselist from '@/views/modules/common/Chooselist_eam' export default { data() { return { + buList: [], favorite: false, exportData: [], exportName: "货位管理信息" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -183,6 +195,7 @@ export default { partNo: '', partDescription: '', spec: '', + buNo:'', active: '', warehouseId: '', limit: 1, @@ -196,6 +209,24 @@ export default { totalPage: 0, height: 200, columnList: [ + { + userId: this.$store.state.user.name, + functionId: 200101105, + serialNumber: '200101105TableBuNo', + tableId: "200101105Table", + tableName: "货位管理表", + columnProp: 'buDesc', + headerAlign: "center", + align: "center", + columnLabel: 'BU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { userId: this.$store.state.user.name, functionId: 200101105, @@ -379,7 +410,8 @@ export default { ], modalData:{ flag: '', - site: this.$store.state.user.site, + site: '', + buNo:'', locationId: '', locationName: '', warehouseId: '', @@ -440,10 +472,12 @@ export default { }, created() { + this. getBu () this.getDataList() this.getWareHouseList() // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) + }, components: { @@ -451,6 +485,16 @@ export default { }, methods: { + getBu () { + let tempData = { + username: this.$store.state.user.name, + } + getAllBuList(tempData).then(({data}) => { + if (data.code === 0) { + this.buList = data.rows + } + }) + }, // 批量打印 printList(){ partSpareLocationTemp(this.dataListSelections) @@ -508,12 +552,13 @@ export default { addModal () { this.modalData = { flag: '1', - site: this.$store.state.user.site, + site: '', locationId: '', locationName: '', warehouseId: '', warehouseName: '', maxCapacity: '', + buNo:'', active: 'Y', createBy: this.$store.state.user.name } @@ -532,6 +577,7 @@ export default { warehouseName: row.warehouseName, maxCapacity: row.maxCapacity, active: row.active, + buNo:row.buNo, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true @@ -639,6 +685,8 @@ export default { if (this.tagNo === 502) { this.modalData.warehouseId = val.warehouse_id this.modalData.warehouseName = val.warehouse_name + this.modalData.site = val.Site + this.modalData.buNo = val.Citem_code } }, diff --git a/src/views/modules/partspare/partspare-add-or-update.vue b/src/views/modules/partspare/partspare-add-or-update.vue index 0494610..6a4faa4 100644 --- a/src/views/modules/partspare/partspare-add-or-update.vue +++ b/src/views/modules/partspare/partspare-add-or-update.vue @@ -59,6 +59,16 @@ 货位编码 + + + + + + 确定 @@ -73,11 +83,12 @@ import Chooselist from '@/views/modules/common/Chooselist_eam' import {getPartSpareInfo, savePartSpare, updatePartSpare} from '@/api/partspare/partspare.js' - +import {getAllBuList}from '@/api/factory/site.js' export default { //校验averagePrice是否为数字 data() { return { + buList: [], visible: false, dataForm: { active: "Y", @@ -98,6 +109,7 @@ export default { umid: '', warehouseId: '', groupId:'', + buNo:'', }, addOrUpdate: false, tagNo: 0, @@ -106,6 +118,9 @@ export default { components: { Chooselist }, + created () { + this.getBu (); + }, methods: { // 获取基础数据列表S getBaseList(val, type) { @@ -167,7 +182,7 @@ export default { this.dataForm.site = data.partSpare.site this.dataForm.spec = data.partSpare.spec this.dataForm.groupId = data.partSpare.groupId - + this.dataForm.buNo = data.partSpare.buNo } }) } @@ -227,6 +242,10 @@ export default { this.$message.warning("货位编码不能为空") return; } + if (!this.dataForm.buNo) { + this.$message.warning("BU不能为空") + return; + } if (this.addOrUpdate) { updatePartSpare(this.dataForm).then(({data}) => { if (data && data.code == 0) { @@ -253,6 +272,17 @@ export default { Object.assign(this.$data, this.$options.data.call(this)); }) }, + + getBu () { + let tempData = { + username: this.$store.state.user.name, + } + getAllBuList(tempData).then(({data}) => { + if (data.code === 0) { + this.buList = data.rows + } + }) + }, } } diff --git a/src/views/modules/partspare/partspare.vue b/src/views/modules/partspare/partspare.vue index 1fbc254..464cca2 100644 --- a/src/views/modules/partspare/partspare.vue +++ b/src/views/modules/partspare/partspare.vue @@ -31,7 +31,17 @@ :key="item.warehouseId" :value="item.warehouseId" :label="item.warehouseName"> - + + + + + + + 查询 新增 @@ -140,10 +150,11 @@ import { getWareHouseList, } from '@/api/partspare/wareHouseEntity.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' - +import {getAllBuList}from '@/api/factory/site.js' export default { data() { return { + buList: [], // 是否收藏 favorite: false, // 导出 start @@ -160,6 +171,7 @@ export default { spec: '', active: '', warehouseId: '', + buNo: '', limit: 1, page: '', }, @@ -199,6 +211,24 @@ export default { fixed: 'left', columnWidth: 140, }, + { + userId: this.$store.state.user.name, + functionId:200101101, + serialNumber: '200101101TableBuNo', + tableId: "200101101Table", + tableName: "备品备件信息表", + columnProp: 'buDesc', + headerAlign: "center", + align: "left", + columnLabel: 'BU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: 'left', + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId:200101101, @@ -555,6 +585,7 @@ export default { created() { // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) + this. getBu () }, activated() { this.getDataList() @@ -780,6 +811,16 @@ export default { } }) }, + getBu () { + let tempData = { + username: this.$store.state.user.name, + } + getAllBuList(tempData).then(({data}) => { + if (data.code === 0) { + this.buList = data.rows + } + }) + }, closeDialog() { } diff --git a/src/views/modules/partspare/repairtransdetail.vue b/src/views/modules/partspare/repairtransdetail.vue index 48e3264..4047cfc 100644 --- a/src/views/modules/partspare/repairtransdetail.vue +++ b/src/views/modules/partspare/repairtransdetail.vue @@ -79,7 +79,17 @@ - + + + + + + + @@ -128,10 +138,11 @@ import { } from '@/api/partspare/wareHouseEntity.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' - +import {getAllBuList}from '@/api/factory/site.js' export default { data() { return { + buList: [], // 是否收藏 favorite: false, // 导出 start @@ -143,6 +154,7 @@ export default { // 导出 end queryForm: { site: this.$store.state.user.site, + buNo: '', limit: 1, page: '', direction: '', @@ -167,6 +179,24 @@ export default { addOrUpdateVisible: false, // 展示列集 columnList:[ + { + userId: this.$store.state.user.name, + functionId:200101104, + serialNumber: '200101104TableBuNo', + tableId: "200101104Table", + tableName: "出入库明细表", + columnProp: 'buDesc', + headerAlign: "center", + align: "left", + columnLabel: 'BU', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { userId: this.$store.state.user.name, functionId:200101104, @@ -423,8 +453,19 @@ export default { created() { // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) + this. getBu () }, methods: { + getBu () { + let tempData = { + username: this.$store.state.user.name, + } + getAllBuList(tempData).then(({data}) => { + if (data.code === 0) { + this.buList = data.rows + } + }) + }, // 校验用户是否收藏 favoriteIsOk() { let userFavorite = { diff --git a/src/views/modules/partspare/resourcespare-add-or-update.vue b/src/views/modules/partspare/resourcespare-add-or-update.vue index aa60c7d..407e78f 100644 --- a/src/views/modules/partspare/resourcespare-add-or-update.vue +++ b/src/views/modules/partspare/resourcespare-add-or-update.vue @@ -11,13 +11,13 @@ label-width="120px"> 设备编码 - + - 备品备件编码 + 备品备件编码 @@ -50,13 +50,15 @@ export default { resourceId: '', resourceIdOld: '', resourceName: '', + buNo: '', partNo: '', partNoOld: '', partDesc: '', qtyUsable: '', delflag: '', createdBy: '', - site: this.$store.state.user.site + site: this.$store.state.user.site, + partBuNo:'', }, addOrUpdate: false, } @@ -72,9 +74,12 @@ export default { let strVal = '' let conSql = '' if (val === 113) { + if(this.addOrUpdate){ + return + } strVal = this.dataForm.resourceId } - if (val === 504) { + if (val === 404) { strVal = this.dataForm.partNo } this.$refs.baseList.init(val, strVal, conSql) @@ -85,10 +90,12 @@ export default { if (this.tagNo === 113) { this.dataForm.resourceId = val.ObjectID this.dataForm.resourceName = val.ObjectDesc + this.dataForm.buNo = val.Bu_No } - if (this.tagNo === 504) { + if (this.tagNo === 404) { this.dataForm.partNo = val.part_no this.dataForm.partDesc = val.part_description + this.dataForm.partBuNo = val.Bu_no } }, init(row) { @@ -116,6 +123,10 @@ export default { }, // 表单提交 dataFormSubmit() { + if(this.dataForm.partBuNo!==this.dataForm.buNo){ + this.$message.error("设备和备件的BuNo不一致！") + return + } if (this.addOrUpdate) { updateResourceSpare(this.dataForm).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/partspare/resourcespare.vue b/src/views/modules/partspare/resourcespare.vue index af47dc8..36e8290 100644 --- a/src/views/modules/partspare/resourcespare.vue +++ b/src/views/modules/partspare/resourcespare.vue @@ -20,6 +20,17 @@ + + + + + + + 查询 新增 @@ -99,7 +110,7 @@ import { getResourceSpareList,deleteResourceSpare } from '@/api/partspare/resourcespare.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' - +import {getAllBuList}from '@/api/factory/site.js' export default { data() { return { @@ -119,8 +130,10 @@ export default { resourceId : '', resourceDesc : '', limit: 1, + buNo: '', page: '', }, + buList: [], dataList: [], pageIndex: 1, pageSize: 20, @@ -131,6 +144,24 @@ export default { addOrUpdateVisible: false, // 展示列集 columnList: [ + { + userId: this.$store.state.user.name, + functionId: 200101102, + serialNumber: '200101102TableBuNo', + tableId: "200101102Table", + tableName: "设备备品配件信息表", + columnProp: 'buNo', + headerAlign: "center", + align: "left", + columnLabel: 'BU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { userId: this.$store.state.user.name, functionId: 200101102, @@ -257,6 +288,7 @@ export default { created() { // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) + this. getBu () }, methods: { // 校验用户是否收藏 @@ -445,6 +477,16 @@ export default { } }) }, + getBu () { + let tempData = { + username: this.$store.state.user.name, + } + getAllBuList(tempData).then(({data}) => { + if (data.code === 0) { + this.buList = data.rows + } + }) + }, } }