From 5e604efdbec35284952553811118961a661f7603 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Thu, 11 Apr 2024 17:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 12 +- src/api/modular/main/DJYTenantParam.js | 12 +- src/layouts/BasicLayout.vue | 6 +- .../main/BookingGangjie/detail/index.vue | 26 +++- .../detail/modules/goodsTable.vue | 31 +++- src/views/main/CabinManagement/index.vue | 2 +- src/views/main/DJYTenantParam/addItemForm.vue | 4 +- .../main/DJYTenantParam/editItemForm.vue | 54 ++++--- src/views/main/DJYTenantParam/index.vue | 39 +++-- src/views/main/DJYTenantParam/indexItem.vue | 133 ++++++++---------- src/views/main/mskOrderList/index.vue | 17 ++- 11 files changed, 177 insertions(+), 159 deletions(-) diff --git a/.env.development b/.env.development index 7b0dc75..7caaa7b 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ NODE_ENV=development VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' -# VUE_APP_TYPE = 'hechuan' -VUE_APP_TYPE = 'yunyingduan' +VUE_APP_TYPE = 'hechuan' +# VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan @@ -11,8 +11,8 @@ VUE_APP_TYPE = 'yunyingduan' # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # 和川大简云测试 -# VUE_APP_API_BASE_URL=http://60.209.125.238:35100 -# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 +VUE_APP_API_BASE_URL=http://60.209.125.238:35100 +VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 # 客户端测试 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813 @@ -26,8 +26,8 @@ VUE_APP_TYPE = 'yunyingduan' # VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/ # 港捷 -VUE_APP_API_BASE_URL=http://118.190.144.189:5001 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 +# VUE_APP_API_BASE_URL=http://118.190.144.189:5001 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 # 运营端正式 # VUE_APP_API_BASE_URL=http://118.190.144.189:6002 diff --git a/src/api/modular/main/DJYTenantParam.js b/src/api/modular/main/DJYTenantParam.js index 8c1e32c..a928790 100644 --- a/src/api/modular/main/DJYTenantParam.js +++ b/src/api/modular/main/DJYTenantParam.js @@ -7,9 +7,9 @@ import { axios } from '@/utils/request' */ export function DJYTenantParamGet(parameter) { return axios({ - url: '/DJYTenantParam/list', - method: 'get', - params: parameter + url: '/DJYTenantParam/page', + method: 'post', + data: parameter }) } @@ -58,9 +58,9 @@ export function DJYTenantParamDelete(parameter) { */ export function DJYTenantParamGetParamValue(parameter) { return axios({ - url: '/DJYTenantParam/getParamValue', - method: 'get', - params: parameter + url: '/DJYTenantParam/PageParamValue', + method: 'post', + data: parameter }) } diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 2f8ae66..7cb0a00 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -185,14 +185,10 @@ export default { this.setdpTreeList() this.setStatusDict() this.setProjectDict() - if (!localStorage.getItem('booking_form_copy')) { - this.setCopySet() - } + this.setCopySet() if (process.env.VUE_APP_TYPE === 'gangjie') { - if (!localStorage.getItem('booking_form_yard')) { this.setYardSet() } - } } } } diff --git a/src/views/main/BookingGangjie/detail/index.vue b/src/views/main/BookingGangjie/detail/index.vue index 1dfe541..a9f0cac 100644 --- a/src/views/main/BookingGangjie/detail/index.vue +++ b/src/views/main/BookingGangjie/detail/index.vue @@ -191,7 +191,8 @@ import { CheckCtnCover, GetCtnListRefsh, SaveServiceStatus, - CancelServiceStatus + CancelServiceStatus, + GetBookingVGMResult } from '@/api/modular/main/BookingLedger' import { mapActions, mapGetters } from 'vuex' import rules from '../../BookingLedger/detail/rulesTest' @@ -1266,6 +1267,28 @@ export default { handleIframeunLoad() { console.log(22222) }, + getVGM() { + GetBookingVGMResult({ id: this.$route.query.id }).then(res => { + if (res.data && res.data.length > 0) { + if (this.bookingDetails.ctnInputs && this.bookingDetails.ctnInputs.length > 0) { + this.bookingDetails.ctnInputs.forEach(item => { + item.vgm = false + res.data.forEach(ite => { + if (ite.cntrNo === item.cntrno) { + item.vgm = true + item.vgmWeight = ite.vgmWeight + item.isMissing = ite.isMissing + item.submissionDeadLine = ite.submissionDeadLine + item.vgmWeightUnit = ite.vgmWeightUnit + item.vgmWeightMethod = ite.vgmWeightMethod + } + }) + }) + this.$refs.goodsTable.init() + } + } + }) + }, setDeatilsFun(res, overSet = false, refshFlag = false) { if (!res.data.bookingEDIExt) { res.data.bookingEDIExt = bookingEDIExt @@ -1339,6 +1362,7 @@ export default { } const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt } this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } }) + this.getVGM() this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails)) this.sendMessageFY() if (this.$route.query.isCopy && this.$route.query.copyId) { diff --git a/src/views/main/BookingGangjie/detail/modules/goodsTable.vue b/src/views/main/BookingGangjie/detail/modules/goodsTable.vue index 3d51799..83a2a2f 100644 --- a/src/views/main/BookingGangjie/detail/modules/goodsTable.vue +++ b/src/views/main/BookingGangjie/detail/modules/goodsTable.vue @@ -4,24 +4,24 @@
- 添加 - 删除 + 添加 + 删除 多品名 - 引入场站数据 + 引场站数据 - 引入场站箱封号 + 引箱封号 - 引入箱皮重 + 引箱皮重 展开箱量 - 刷新 + 刷新
) } + }, + { + field: 'vgm', + key: 'vgm', + title: 'VGM', + align: 'center', + width: 50, + edit: false, + renderBodyCell: ({ row, column, rowIndex }, h) => { + return ( +
+ + + - +
+ ) + } } ], modelColumns: [ @@ -1923,7 +1940,7 @@ export default { if (ite.code !== 'KINDPKGS') { _data[ite.intoName] = item[ite.code] } else { - _data.kindpkgs = kindpkgsOld + _data.kindpkgs = kindpkgsOld || item.KINDPKGS } }) addTable.push(_data) diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue index bd38721..032d3d6 100644 --- a/src/views/main/CabinManagement/index.vue +++ b/src/views/main/CabinManagement/index.vue @@ -159,7 +159,7 @@ 导入 作废 - 批量发送邮件 +
查询 diff --git a/src/views/main/DJYTenantParam/addItemForm.vue b/src/views/main/DJYTenantParam/addItemForm.vue index 8bac526..e6e4fcb 100644 --- a/src/views/main/DJYTenantParam/addItemForm.vue +++ b/src/views/main/DJYTenantParam/addItemForm.vue @@ -141,9 +141,9 @@ export default { methods: { FnDJYTenantParamGet() { DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => { - this.TypeData = res.data + this.TypeData = res.data.items let data = [] - res.data.forEach(item => { + res.data.items.forEach(item => { if (data.length) { let type2 = false data.forEach((item2, index2) => { diff --git a/src/views/main/DJYTenantParam/editItemForm.vue b/src/views/main/DJYTenantParam/editItemForm.vue index 7baffad..f59e6d9 100644 --- a/src/views/main/DJYTenantParam/editItemForm.vue +++ b/src/views/main/DJYTenantParam/editItemForm.vue @@ -31,15 +31,6 @@ - - - - - {{ item.itemName }} - - + + + + + {{ item.itemName }} + + + @@ -123,6 +116,7 @@ export default { }, typeData: [], visible: false, + ItemCodeLoad:false, confirmLoading: false, form: this.$form.createForm(this), data: {}, @@ -134,6 +128,7 @@ export default { }, mounted() { this.YWData = this.$options.filters['dictData']('tenant_param_group') + this.FnDJYTenantParamGet() SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => { this.TenantData = res.data.rows }) @@ -141,9 +136,9 @@ export default { methods: { FnDJYTenantParamGet() { DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => { - this.TypeData = res.data - let data = [] - res.data.forEach(item => { + this.TypeData = res.data.items + const data = [] + res.data.items.forEach(item => { if (data.length) { let type2 = false data.forEach((item2, index2) => { @@ -177,8 +172,10 @@ export default { }) if (e) { this.ItemCodeDisabled = false + this.ItemCodeLoad = true DJYTenantParamGetParamItem({ paraCode: e }).then(res => { this.ItemData = res.data + this.ItemCodeLoad = false }) } }, @@ -191,7 +188,6 @@ export default { }, // 初始化方法 edit(record) { - this.FnDJYTenantParamGet() console.log(record) this.FnChangeTypeCode(record.paraCode) this.data = record diff --git a/src/views/main/DJYTenantParam/index.vue b/src/views/main/DJYTenantParam/index.vue index bdab102..1f9225b 100644 --- a/src/views/main/DJYTenantParam/index.vue +++ b/src/views/main/DJYTenantParam/index.vue @@ -10,14 +10,9 @@ - - + @@ -35,10 +30,6 @@ 查询 重置 - @@ -92,15 +83,15 @@ - + @@ -129,9 +120,8 @@ export default { setVisible: false, setVisible1: false, queryParam: { - currentPage: 1, - pageSize: 10, - totalResult: 1 + pageNo: 1, + pageSize: 10 }, ColumnsQuery: [], columns: [ @@ -167,12 +157,17 @@ export default { }, created() {}, watch: { - $route() { - this.init() + '$route.query': { + immediate: true, + handler(nval, oval) { + if (this.$route.name === 'tenant_param') { + this.init() + } + } } }, mounted() { - this.init() + // this.init() }, methods: { FnTurnD(data) { @@ -201,11 +196,11 @@ export default { FnGetData() { this.loading = true DJYTenantParamGet(this.queryParam).then(res => { - this.loadData = res.data + this.loadData = res.data.items this.loading = false - this.queryParam.currentPage = res.data.pageNo + this.queryParam.currentPage = res.data.pageIndex this.queryParam.pageSize = res.data.pageSize - this.queryParam.totalResult = res.data.totalRows + this.queryParam.totalResult = res.data.totalCount }) }, /** diff --git a/src/views/main/DJYTenantParam/indexItem.vue b/src/views/main/DJYTenantParam/indexItem.vue index 9efe44f..963cc78 100644 --- a/src/views/main/DJYTenantParam/indexItem.vue +++ b/src/views/main/DJYTenantParam/indexItem.vue @@ -18,12 +18,6 @@ v-show="item.dataIndex != 'itemCode' && item.dataIndex != 'remark'" > - {{ item2.paraName }} @@ -72,10 +65,6 @@ 查询 重置 - @@ -99,13 +88,7 @@ :min-width="item.width" :title="item.title" :align="item.align" - v-if="item.title != '租户'" > - - + @@ -169,9 +151,8 @@ export default { setVisible: false, setVisible1: false, queryParam: { - currentPage: 1, - pageSize: 10, - totalResult: 1 + pageNo: 1, + pageSize: 10 }, ColumnsQuery: [], columns: [ @@ -179,13 +160,13 @@ export default { title: '租户', align: 'center', width: '80', - dataIndex: 'tenantId' + dataIndex: 'tenantName' }, { title: '租户参数类别', align: 'center', width: '100', - dataIndex: 'paraCode' + dataIndex: 'paraName' }, { title: '租户参数名称', @@ -193,7 +174,6 @@ export default { width: '80', dataIndex: 'itemCode' }, - // itemCode { title: '备注', align: 'center', @@ -209,32 +189,37 @@ export default { } }, watch: { - $route() { - this.init() + '$route.query': { + immediate: true, + handler(nval, oval) { + if (this.$route.name === 'tenant_param_item') { + this.init() + } + } } }, created() {}, mounted() { - this.init() + // this.init() }, methods: { FnRTypeCode(e) { - let RData = '' - this.TypeData.forEach(item => { - if (item.paraCode == e.paraCode) { - if (item.itemCodeData.length) { - item.itemCodeData.forEach(item2 => { - if (item2.itemCode == e.itemCode) { - console.log(item2, 'item2') - RData = item2.itemName - } - }) - } else { - RData = e.itemCode - } - } - }) - return RData + // let RData = '' + // this.TypeData.forEach(item => { + // if (item.paraCode == e.paraCode) { + // if (item.itemCodeData.length) { + // item.itemCodeData.forEach(item2 => { + // if (item2.itemCode == e.itemCode) { + // console.log(item2, 'item2') + // RData = item2.itemName + // } + // }) + // } else { + // RData = e.itemCode + // } + // } + // }) + // return RData }, tenantIdSearch(value) { if (value) { @@ -244,22 +229,22 @@ export default { } }, FnTurnD(data) { - let Rdata = '' - this.TypeData.forEach(item => { - if (item.paraCode == data) { - Rdata = item.paraName - } - }) - return Rdata + // let Rdata = '' + // this.TypeData.forEach(item => { + // if (item.paraCode == data) { + // Rdata = item.paraName + // } + // }) + // return Rdata }, FnTypeD(data) { - let Rdata = '' - this.YWData.forEach(item => { - if (item.code == data) { - Rdata = item.name - } - }) - return Rdata + // let Rdata = '' + // this.YWData.forEach(item => { + // if (item.code == data) { + // Rdata = item.name + // } + // }) + // return Rdata }, toggleAdvanced() { this.advanced = !this.advanced @@ -269,10 +254,13 @@ export default { this.ColumnsQuery = this.columns this.FnGetData() this.YWData = this.$options.filters['dictData']('tenant_param_group') + SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => { + this.TenantData = res.data.rows + }) DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => { - this.TypeData = res.data + this.TypeData = res.data.items let data = [] - res.data.forEach(item => { + res.data.items.forEach(item => { if (data.length) { let type2 = false data.forEach((item2, index2) => { @@ -289,14 +277,6 @@ export default { } }) this.WTypeData = data - this.TypeData.forEach(item => { - DJYTenantParamGetParamItem({ paraCode: item.paraCode }).then(res => { - item.itemCodeData = res.data - }) - }) - }) - SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => { - this.TenantData = res.data.rows }) }, handlePageChange({ currentPage, pageSize }) { @@ -307,15 +287,12 @@ export default { FnGetData() { this.loading = true let data = { ...this.queryParam } - if (!data.tenantId) { - data.tenantId = 0 - } DJYTenantParamGetParamValue(data).then(res => { - this.loadData = res.data + this.loadData = res.data.items this.loading = false - this.queryParam.currentPage = res.data.pageNo + this.queryParam.pageNo = res.data.pageIndex this.queryParam.pageSize = res.data.pageSize - this.queryParam.totalResult = res.data.totalRows + this.queryParam.totalResult = res.data.totalCount }) }, /** diff --git a/src/views/main/mskOrderList/index.vue b/src/views/main/mskOrderList/index.vue index 7c68784..0062af9 100644 --- a/src/views/main/mskOrderList/index.vue +++ b/src/views/main/mskOrderList/index.vue @@ -160,7 +160,7 @@ @sort-change="tableSortChange" @resizable-change="resizableChange" @checkbox-change="checkboxChangeEvent" - height="600px" + height="650px" empty-text="没有更多数据了！">