From e195f5f8b22b062ee456b792b09913c91f6916c7 Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Thu, 13 Jun 2024 13:49:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/warehouse/location.vue | 56 ++++--- src/views/modules/warehouse/stagingCode.vue | 64 ++++---- src/views/modules/warehouse/warehouse.vue | 165 +++++++++----------- 3 files changed, 142 insertions(+), 143 deletions(-) diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue index 2f926a8..8a5d945 100644 --- a/src/views/modules/warehouse/location.vue +++ b/src/views/modules/warehouse/location.vue @@ -114,10 +114,10 @@ - + - + @@ -125,16 +125,14 @@ - - + + - - @@ -154,9 +152,9 @@ - - - + + + @@ -329,7 +327,7 @@ export default { columnWidth: 145, columnProp: 'active', headerAlign: 'center', - align: "left", + align: "center", columnLabel: '是否在用', columnHidden: false, columnImage: false, @@ -356,24 +354,24 @@ export default { status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 100001004, - serialNumber: '100001004TableRemarks', - tableId: "100001004Table", - tableName: "备注", - columnWidth: 150, - columnProp: 'remarks', - headerAlign: 'center', - align: "center", - columnLabel: '备注', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 100001004, + // serialNumber: '100001004TableRemarks', + // tableId: "100001004Table", + // tableName: "备注", + // columnWidth: 150, + // columnProp: 'remarks', + // headerAlign: 'center', + // align: "center", + // columnLabel: '备注', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 100001004, @@ -516,7 +514,7 @@ export default { addModal () { this.modalData = { flag: '1', - site: '', + site: this.$store.state.user.site, creator: this.$store.state.user.name, locationId: '', locationName: '', diff --git a/src/views/modules/warehouse/stagingCode.vue b/src/views/modules/warehouse/stagingCode.vue index 3e86236..ea6aafa 100644 --- a/src/views/modules/warehouse/stagingCode.vue +++ b/src/views/modules/warehouse/stagingCode.vue @@ -81,14 +81,14 @@ - - + + - + - - + + @@ -242,20 +242,20 @@ export default { }, ], rules: { - // warehouseId:[ - // { - // required: true, - // message: ' ', - // trigger: ['blur','change'] - // } - // ], - // locationId:[ - // { - // required: true, - // message: ' ', - // trigger: ['blur','change'] - // } - // ], + phaseCode:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], + identificationCode:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], // site:[ // { // required: true, @@ -294,6 +294,16 @@ export default { this.getDataList() }, + watch: { + modalData: { + deep: true, + handler: function (newV, oldV) { + this.modalData.phaseCode = this.modalData.phaseCode.toUpperCase() + this.modalData.identificationCode = this.modalData.identificationCode.toUpperCase() + } + } + }, + methods: { // 获取用户的bu getSiteAndBuByUserName () { @@ -388,14 +398,14 @@ export default { // 新增/修改方法 saveData () { - // if (this.modalData.site === '' || this.modalData.site == null) { - // this.$message.warning('请输入工厂编码！') - // return - // } - // if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) { - // this.$message.warning('请选择仓库编码！') - // return - // } + if (this.modalData.phaseCode === '' || this.modalData.phaseCode == null) { + this.$message.warning('请输入阶段代码！') + return + } + if (this.modalData.identificationCode === '' || this.modalData.identificationCode == null) { + this.$message.warning('请输入标识码！') + return + } // if(this.modalData.locationName === ''|| this.modalData.locationName == null){ // this.$message.warning('请输入库位名称！') // return diff --git a/src/views/modules/warehouse/warehouse.vue b/src/views/modules/warehouse/warehouse.vue index 5e15d36..11dc14f 100644 --- a/src/views/modules/warehouse/warehouse.vue +++ b/src/views/modules/warehouse/warehouse.vue @@ -10,25 +10,15 @@ - - - - - - - - - - - - - + + + @@ -102,12 +92,13 @@ - - + + - + + @@ -127,16 +118,16 @@ - - - + + + - - - - - - + + + + + + @@ -202,7 +193,7 @@ export default { modalFlag: false, modalDisableFlag: false, modalData: { - site: '', + site: this.$store.state.user.name, warehouseId: '', warehouseName: '', active: '', @@ -223,7 +214,7 @@ export default { serialNumber: '100001003TableSite', tableId: "100001003Table", tableName: "工厂编码", - columnWidth: 100, + columnWidth: 150, columnProp: 'site', headerAlign: 'center', align: "center", @@ -241,7 +232,7 @@ export default { serialNumber: '100001003TableWarehouseId', tableId: "100001003Table", tableName: "仓库编码", - columnWidth: 100, + columnWidth: 150, columnProp: 'warehouseId', headerAlign: 'center', align: "center", @@ -277,7 +268,7 @@ export default { serialNumber: '100001003TableActive', tableId: "100001003Table", tableName: "是否在使用", - columnWidth: 100, + columnWidth: 150, columnProp: 'active', headerAlign: 'center', align: "center", @@ -307,67 +298,67 @@ export default { status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 100001003, - serialNumber: '100001003TableWarehouseTypeDB', - tableId: "100001003Table", - tableName: "DB", - columnWidth: 150, - columnProp: 'warehouseTypeDB', - headerAlign: 'center', - align: "left", - columnLabel: 'DB', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, - { - userId: this.$store.state.user.name, - functionId: 100001003, - serialNumber: '100001003TableKeeper', - tableId: "100001003Table", - tableName: "管理员", - columnWidth: 100, - columnProp: 'keeper', - headerAlign: 'center', - align: "center", - columnLabel: '管理员', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, - { - userId: this.$store.state.user.name, - functionId: 100001003, - serialNumber: '100001003TableCompanyId', - tableId: "100001003Table", - tableName: "公司编码", - columnWidth: 100, - columnProp: 'companyId', - headerAlign: 'center', - align: "center", - columnLabel: '公司编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 100001003, + // serialNumber: '100001003TableWarehouseTypeDB', + // tableId: "100001003Table", + // tableName: "DB", + // columnWidth: 150, + // columnProp: 'warehouseTypeDB', + // headerAlign: 'center', + // align: "left", + // columnLabel: 'DB', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 100001003, + // serialNumber: '100001003TableKeeper', + // tableId: "100001003Table", + // tableName: "管理员", + // columnWidth: 100, + // columnProp: 'keeper', + // headerAlign: 'center', + // align: "center", + // columnLabel: '管理员', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 100001003, + // serialNumber: '100001003TableCompanyId', + // tableId: "100001003Table", + // tableName: "公司编码", + // columnWidth: 100, + // columnProp: 'companyId', + // headerAlign: 'center', + // align: "center", + // columnLabel: '公司编码', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, { userId: this.$store.state.user.name, functionId: 100001003, serialNumber: '100001003TableValidStock', tableId: "100001003Table", tableName: "检验方法维护表", - columnWidth: 100, + columnWidth: 150, columnProp: 'validStock', headerAlign: 'center', align: "center", @@ -403,7 +394,7 @@ export default { serialNumber: '100001003TableCreateTime', tableId: "100001003Table", tableName: "创建时间", - columnWidth: 100, + columnWidth: 150, columnProp: 'createTime', headerAlign: 'center', align: "center", @@ -421,7 +412,7 @@ export default { serialNumber: '100001003TableCreator', tableId: "100001003Table", tableName: "创建人", - columnWidth: 80, + columnWidth: 150, columnProp: 'creator', headerAlign: 'center', align: "center", @@ -523,7 +514,7 @@ export default { addModal () { this.modalData = { flag: '1', - site: '', + site: this.$store.state.user.site, creator: this.$store.state.user.name, warehouseId: '', warehouseName: '',