From 1cf6ff214d2fee494458bae94ef89b8692dce471 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 8 May 2024 15:11:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 12 +- .env.development | 12 +- src/components/tableSort/index.vue | 4 +- src/mixin/index.js | 2 +- src/utils/axios.js | 1 + src/views/main/BookingLedger/detail/index.vue | 2 +- src/views/main/CabinInventory/index.vue | 132 +++-- src/views/main/CabinManagement/index.vue | 547 ++++++++++++++---- src/views/main/Customer/index.vue | 2 +- src/views/main/Taskmanage/BCModify/index.vue | 2 +- .../main/Taskmanage/BcFileDetail/Editing.vue | 2 +- .../main/Taskmanage/notifications/index.vue | 12 + src/views/main/customerParam/addItemForm.vue | 2 +- src/views/main/customerParam/editItemForm.vue | 3 + src/views/main/mail/mailAnalysis.vue | 3 +- 15 files changed, 531 insertions(+), 207 deletions(-) diff --git a/.env b/.env index ce55dd7..33e92d4 100644 --- a/.env +++ b/.env @@ -2,8 +2,8 @@ NODE_ENV=production VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'hechuan' -VUE_APP_TYPE = 'yunyingduan' -# VUE_APP_TYPE = 'gangjie' +# VUE_APP_TYPE = 'yunyingduan' +VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 和川大简云正式 @@ -23,13 +23,13 @@ VUE_APP_TYPE = 'yunyingduan' # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # 港捷 -# 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:6001 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 # 运营端正式 -VUE_APP_API_BASE_URL=http://118.190.144.189:6002 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 \ No newline at end of file +# VUE_APP_API_BASE_URL=http://118.190.144.189:6002 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 \ No newline at end of file diff --git a/.env.development b/.env.development index 2afe06a..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 @@ -30,8 +30,8 @@ VUE_APP_TYPE = 'yunyingduan' # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 # 运营端正式 -VUE_APP_API_BASE_URL=http://118.190.144.189:6002 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 +# VUE_APP_API_BASE_URL=http://118.190.144.189:6002 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 # 客户端正式 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001 diff --git a/src/components/tableSort/index.vue b/src/components/tableSort/index.vue index 7d7b4f2..bc13a22 100644 --- a/src/components/tableSort/index.vue +++ b/src/components/tableSort/index.vue @@ -21,7 +21,7 @@ class="s-tool-column-item" v-for="item in columnsSetting" :key="`${item.title}tableColumnSetting`" - v-show="item.show && item.type!=='checkbox'"> + v-show="item.show && item.type!=='checkbox' && item.field!=='caozuo'">
@@ -121,7 +121,7 @@ handleSure() { const arr = [] this.columnsSetting.forEach(item => { - if (item.checked || item.type === 'checkbox') { + if (item.checked || item.type === 'checkbox' || item.field === 'caozuo') { arr.push(item) } }) diff --git a/src/mixin/index.js b/src/mixin/index.js index 6b6a180..f474391 100644 --- a/src/mixin/index.js +++ b/src/mixin/index.js @@ -126,7 +126,7 @@ export const sortMixin = { localStorage.setItem(this.sortMixinForm.setting, JSON.stringify(arr)) } if (Object.keys($data).includes(this.sortMixinForm.page)) { - this.queryParam.pageSize = $data[this.sortMixinForm.page].pageSize + this.queryParam.pageSize = JSON.parse($data[this.sortMixinForm.page].configJson).pageSize } else { arr.push({ type: this.sortMixinForm.page, diff --git a/src/utils/axios.js b/src/utils/axios.js index 3b91f6b..a45b067 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -33,3 +33,4 @@ const VueAxios = { export { VueAxios } + diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index c2fa6c2..03251d4 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -122,7 +122,7 @@ ref="iframe" @load="handleIframeLoad" style="width: 100%;height: 1400px;" - src="http://localhost:8080/#/index" + src="http://60.209.125.238:35103/#/index" frameborder="0">
diff --git a/src/views/main/CabinInventory/index.vue b/src/views/main/CabinInventory/index.vue index 3eebaef..840215c 100644 --- a/src/views/main/CabinInventory/index.vue +++ b/src/views/main/CabinInventory/index.vue @@ -70,52 +70,45 @@ 重置 - - - - - - - - - - - + + + + + + + + @@ -126,10 +119,13 @@ import { } from '@/api/modular/main/CompanySiteaccount' import { mapGetters } from 'vuex' import columnSetting from '@/components/tableColumnSetting' +import tableSort from '@/components/tableSort' +import { sortMixin } from '@/mixin/index'; export default { components: { - columnSetting + columnSetting, tableSort }, + mixins: [sortMixin], computed: { ...mapGetters([ 'ctnallList' @@ -146,101 +142,121 @@ export default { queryParam: { currentPage: 1, pageSize: 10, - totalResult: 1 + totalCount: 1 }, form: {}, + sortMixinForm: { + column: 'CabinInventory_list_column', + setting: 'CabinInventorySetting', + sort: 'CabinInventory_sort', + page: 'CabinInventory_page', + type: 'CabinInventory', + sortField: 'etd' + }, ColumnsQuery: [], columns: [ { title: '船名/航次', align: 'center', width: '160', - dataIndex: 'vessel', - fixed: 'left' + field: 'vessel', + fixed: 'left', + slots: { default: 'vessel' } }, { title: '订舱抬头', align: 'center', width: '160', - dataIndex: 'bookinG_PARTY', + field: 'bookinG_PARTY', fixed: 'left' }, { title: '合约号', align: 'center', width: '160', - dataIndex: 'contracT_NO', + field: 'contracT_NO', fixed: 'left' }, { title: '订舱方式', align: 'center', width: '160', - dataIndex: 'bookinG_SLOT_TYPE_NAME', + field: 'bookinG_SLOT_TYPE_NAME', fixed: 'left' }, { title: '总库存', align: 'center', width: '100', - dataIndex: 'totaL_ORDERS', + field: 'totaL_ORDERS', fixed: 'left' }, { title: '剩余库存', align: 'center', width: '100', - dataIndex: 'remaiN_CTNS_NUM', + field: 'remaiN_CTNS_NUM', + slots: { default: 'remaiN_CTNS_NUM' }, fixed: 'left' }, { title: '取消库存', align: 'center', width: '100', - dataIndex: 'portdischarge' + field: 'portdischarge' }, { title: 'WEEK', align: 'center', width: '150', - dataIndex: 'weeK_AT', + field: 'weeK_AT', fixed: 'left' }, { title: '航线', align: 'center', width: '100', - dataIndex: 'lanename' + field: 'lanename' }, { title: '箱型箱量', align: 'center', width: '100', - dataIndex: 'ctN_STAT' + field: 'ctN_STAT' }, { title: '剩余箱型箱量', align: 'center', width: '110', - dataIndex: 'remaiN_CTN_STAT' + field: 'remaiN_CTN_STAT' }, { title: 'ETD', align: 'center', width: '100', - dataIndex: 'etd' + field: 'etd', + slots: { default: 'etd' } }, { title: 'ETA', align: 'center', width: '100', - dataIndex: 'eta' + field: 'eta', + slots: { default: 'eta' } }, { title: '船公司', align: 'center', width: '150', - dataIndex: 'carrier' + field: 'carrier' + }, + { + title: '操作', + align: 'center', + field: 'caozuo', + slots: { default: 'caozuo' }, + width: 100, + fixed: 'right' } ], tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' }, @@ -285,7 +301,7 @@ export default { this.loadData = res.data.rows this.queryParam.currentPage = res.data.pageNo this.queryParam.pageSize = res.data.pageSize - this.queryParam.totalResult = res.data.totalRows + this.queryParam.totalCount = res.data.totalRows } else { this.$message.error(res.message) } diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue index a677901..0b94752 100644 --- a/src/views/main/CabinManagement/index.vue +++ b/src/views/main/CabinManagement/index.vue @@ -162,82 +162,77 @@
- 查询 + 查询 重置 +
- - - - - - - - - - - + + + + + + + + - 是否直接发送邮件给订舱联系人 + @@ -278,10 +273,10 @@ - - {{ item.name }} {{ item.email }} - - + + {{ item.name }} {{ item.email }} + + @@ -455,10 +450,13 @@ import { } from '@/api/modular/main/TaskmanageList' import { DjyCustomerSuggest, GetSysUserPage, DjyCustomerContacts } from '@/api/modular/main/BookingLedger' import columnSetting from '@/components/tableColumnSetting' +import tableSort from '@/components/tableSort' +import { sortMixin } from '@/mixin/index'; export default { components: { - columnSetting + columnSetting, tableSort }, + mixins: [sortMixin], computed: { ...mapGetters([ 'ctnallList' @@ -478,13 +476,13 @@ export default { customerByList: [], CustomerList: [], SlotVisible: false, - userInfoList:[], + userInfoList: [], setVisible1: false, fetching: false, queryParam: { - currentPage: 1, + PageNo: 1, pageSize: 10, - totalResult: 1 + totalCount: 1 }, bookingServiceItem: [], formItemLayout: { @@ -505,232 +503,519 @@ export default { slotEdit: {}, ColumnsQuery: [], columns: [ + { + type: 'checkbox', + width: 60, + noDraggable: true, + fixed: 'left' + }, { title: '订舱编号', align: 'center', width: '160', - dataIndex: 'sloT_BOOKING_NO', + field: 'sloT_BOOKING_NO', fixed: 'left' }, { title: '船名/航次', align: 'center', width: '100', - dataIndex: 'vessel', - fixed: 'left' + field: 'vessel', + fixed: 'left', + slots: { default: 'vessel' } }, { title: '船公司', align: 'center', width: '100', - dataIndex: 'carrier', + field: 'carrier', fixed: 'left' }, { title: '合约号', align: 'center', width: '100', - dataIndex: 'contracT_NO', + field: 'contracT_NO', fixed: 'left' }, { title: '承运模式', align: 'center', width: '100', - dataIndex: 'carriagE_TYPE_NAME', + field: 'carriagE_TYPE_NAME', fixed: 'left' }, { title: '订舱方式', align: 'center', width: '100', - dataIndex: 'bookinG_SLOT_TYPE_NAME', + field: 'bookinG_SLOT_TYPE_NAME', fixed: 'left' }, { title: 'ETD', align: 'center', width: '100', - dataIndex: 'etd', - fixed: 'left' + field: 'etd', + fixed: 'left', + sortable: true, + slots: { default: 'etd' } }, { title: 'ETA', align: 'center', width: '100', - dataIndex: 'eta', + field: 'eta', + sortable: true, + fixed: 'left', + slots: { default: 'eta' } + }, + { + title: 'CANCELLATION', + align: 'center', + width: '150', + field: 'iS_CANCELLATION', + slots: { default: 'iS_CANCELLATION' } + }, + { + title: '装货地', + align: 'center', + width: '180', + field: 'placereceipt' + }, + { + title: '收货地', + align: 'center', + width: '180', + field: 'placedelivery' + }, + { + title: '箱型箱量', + align: 'center', + width: '100', + field: 'ctN_STAT' + }, + { + title: 'WEEK', + align: 'center', + width: '100', + field: 'weeK_AT' + }, + { + title: '装货港名称', + align: 'center', + width: '100', + field: 'portload' + }, + { + title: '卸货港名称', + align: 'center', + width: '100', + field: 'portdischarge' + }, + { + title: '样单截止时间', + align: 'center', + width: '150', + sortable: true, + field: 'sI_CUT_DATE' + }, + { + title: 'VGM截止时间', + align: 'center', + width: '150', + sortable: true, + field: 'vgM_SUBMISSION_CUT_DATE' + }, + { + title: '截港时间', + align: 'center', + width: '150', + sortable: true, + field: 'cY_CUT_DATE' + }, + { + title: '入港清单截止', + align: 'center', + width: '150', + field: 'manifesT_CUT_DATE' + }, + { + title: 'MDGF截止', + align: 'center', + width: '150', + field: 'mdgF_CUT_DATE' + }, + { + title: '航线', + align: 'center', + width: '100', + field: 'lanename' + }, + { + title: '重量(KGS)', + align: 'center', + width: '100', + sortable: true, + field: 'WEIGHKGS' + }, + { + title: '创建日期', + align: 'center', + sortable: true, + width: '150', + field: 'createdTime' + }, + { + title: '创建人', + align: 'center', + width: '100', + field: 'createdUserName' + }, + { + title: '更新日期', + align: 'center', + width: '150', + sortable: true, + field: 'updatedTime' + }, + { + title: '更新人', + align: 'center', + width: '100', + field: 'updatedUserName' + }, + { + title: 'VGM回执', + align: 'center', + width: '100', + field: 'VGM_RLT_STAT' + }, + { + title: 'SI回执', + align: 'center', + width: '100', + field: 'SI_RLT_STAT' + }, + { + title: '提箱', + align: 'center', + width: '100', + field: 'TAKE_CTN_RLT_STAT' + }, + { + title: '还箱', + align: 'center', + width: '100', + field: 'RETURN_CTN_RLT_STAT' + }, + { + title: '预甩', + align: 'center', + width: '100', + field: 'NOMINATION_RLT_STAT' + }, + { + title: '舱位变更', + align: 'center', + width: '100', + field: 'AMENDMENT_RLT_STAT' + }, + { + title: '舱位取消', + align: 'center', + width: '100', + field: 'CANCELLATION_RLT_STAT' + }, + { + title: '卸船未提货', + align: 'center', + width: '100', + field: 'DISCHARGE_FULL_RLT_STAT' + }, + { + title: '提箱未还空箱', + align: 'center', + width: '150', + field: 'GATE_OUTFULL_RLT_STAT' + }, + { + title: '费用信息', + align: 'center', + width: '100', + field: 'typeCode' + }, + { + title: '操作', + align: 'center', + field: 'caozuo', + slots: { default: 'caozuo' }, + width: 100, + fixed: 'right' + } + + ], + columnsAll: [ + { + type: 'checkbox', + width: 60, + noDraggable: true, + fixed: 'left' + }, + { + title: '订舱编号', + align: 'center', + width: '160', + field: 'sloT_BOOKING_NO', + fixed: 'left' + }, + { + title: '船名/航次', + align: 'center', + width: '100', + field: 'vessel', + fixed: 'left', + slots: { default: 'vessel' } + }, + { + title: '船公司', + align: 'center', + width: '100', + field: 'carrier', + fixed: 'left' + }, + { + title: '合约号', + align: 'center', + width: '100', + field: 'contracT_NO', + fixed: 'left' + }, + { + title: '承运模式', + align: 'center', + width: '100', + field: 'carriagE_TYPE_NAME', + fixed: 'left' + }, + { + title: '订舱方式', + align: 'center', + width: '100', + field: 'bookinG_SLOT_TYPE_NAME', fixed: 'left' }, + { + title: 'ETD', + align: 'center', + width: '100', + field: 'etd', + fixed: 'left', + sortable: true, + slots: { default: 'etd' } + }, + { + title: 'ETA', + align: 'center', + width: '100', + field: 'eta', + sortable: true, + fixed: 'left', + slots: { default: 'eta' } + }, { title: 'CANCELLATION', align: 'center', width: '150', - dataIndex: 'iS_CANCELLATION' + field: 'iS_CANCELLATION', + slots: { default: 'iS_CANCELLATION' } }, { title: '装货地', align: 'center', width: '180', - dataIndex: 'placereceipt' + field: 'placereceipt' }, { title: '收货地', align: 'center', width: '180', - dataIndex: 'placedelivery' + field: 'placedelivery' }, { title: '箱型箱量', align: 'center', width: '100', - dataIndex: 'ctN_STAT' + field: 'ctN_STAT' }, { title: 'WEEK', align: 'center', width: '100', - dataIndex: 'weeK_AT' + field: 'weeK_AT' }, { title: '装货港名称', align: 'center', width: '100', - dataIndex: 'portload' + field: 'portload' }, { title: '卸货港名称', align: 'center', width: '100', - dataIndex: 'portdischarge' + field: 'portdischarge' }, { title: '样单截止时间', align: 'center', width: '150', - dataIndex: 'sI_CUT_DATE' + sortable: true, + field: 'sI_CUT_DATE' }, { title: 'VGM截止时间', align: 'center', width: '150', - dataIndex: 'vgM_SUBMISSION_CUT_DATE' + sortable: true, + field: 'vgM_SUBMISSION_CUT_DATE' }, { title: '截港时间', align: 'center', width: '150', - dataIndex: 'cY_CUT_DATE' + sortable: true, + field: 'cY_CUT_DATE' }, { title: '入港清单截止', align: 'center', width: '150', - dataIndex: 'manifesT_CUT_DATE' + field: 'manifesT_CUT_DATE' }, { title: 'MDGF截止', align: 'center', width: '150', - dataIndex: 'mdgF_CUT_DATE' + field: 'mdgF_CUT_DATE' }, { title: '航线', align: 'center', width: '100', - dataIndex: 'lanename' + field: 'lanename' }, { title: '重量(KGS)', align: 'center', width: '100', - dataIndex: 'WEIGHKGS' + sortable: true, + field: 'WEIGHKGS' }, { title: '创建日期', align: 'center', + sortable: true, width: '150', - dataIndex: 'createdTime' + field: 'createdTime' }, { title: '创建人', align: 'center', width: '100', - dataIndex: 'createdUserName' + field: 'createdUserName' }, { title: '更新日期', align: 'center', width: '150', - dataIndex: 'updatedTime' + sortable: true, + field: 'updatedTime' }, { title: '更新人', align: 'center', width: '100', - dataIndex: 'updatedUserName' + field: 'updatedUserName' }, { title: 'VGM回执', align: 'center', width: '100', - dataIndex: 'VGM_RLT_STAT' + field: 'VGM_RLT_STAT' }, { title: 'SI回执', align: 'center', width: '100', - dataIndex: 'SI_RLT_STAT' + field: 'SI_RLT_STAT' }, { title: '提箱', align: 'center', width: '100', - dataIndex: 'TAKE_CTN_RLT_STAT' + field: 'TAKE_CTN_RLT_STAT' }, { title: '还箱', align: 'center', width: '100', - dataIndex: 'RETURN_CTN_RLT_STAT' + field: 'RETURN_CTN_RLT_STAT' }, { title: '预甩', align: 'center', width: '100', - dataIndex: 'NOMINATION_RLT_STAT' + field: 'NOMINATION_RLT_STAT' }, { title: '舱位变更', align: 'center', width: '100', - dataIndex: 'AMENDMENT_RLT_STAT' + field: 'AMENDMENT_RLT_STAT' }, { title: '舱位取消', align: 'center', width: '100', - dataIndex: 'CANCELLATION_RLT_STAT' + field: 'CANCELLATION_RLT_STAT' }, { title: '卸船未提货', align: 'center', width: '100', - dataIndex: 'DISCHARGE_FULL_RLT_STAT' + field: 'DISCHARGE_FULL_RLT_STAT' }, { title: '提箱未还空箱', align: 'center', width: '150', - dataIndex: 'GATE_OUTFULL_RLT_STAT' + field: 'GATE_OUTFULL_RLT_STAT' }, { title: '费用信息', align: 'center', width: '100', - dataIndex: 'typeCode' + field: 'typeCode' + }, + { + title: '操作', + align: 'center', + field: 'caozuo', + slots: { default: 'caozuo' }, + width: 100, + fixed: 'right' } ], + sortMixinForm: { + column: 'Cabin_list_column', + setting: 'CabinSetting', + sort: 'Cabin_sort', + page: 'Cabin_page', + type: 'Cabin', + sortField: 'etd' + }, tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' }, // 加载数据方法 必须为 Promise 对象 loadData: [] @@ -738,7 +1023,7 @@ export default { }, created() { }, mounted() { - this.FnGetData() + this.getConfigStart() GetProjectList().then(res => { res.data.forEach(item => { item.isYield = false @@ -746,11 +1031,11 @@ export default { this.bookingServiceItem = res.data }) GetSysUserPage().then(res => { - this.UserList = res.data - }) - DjyCustomerSuggest({ keyword: '', type: 'consignor' }).then(res => { - this.CustomerList = res.data.rows - }) + this.UserList = res.data + }) + DjyCustomerSuggest({ keyword: '', type: 'consignor' }).then(res => { + this.CustomerList = res.data.rows + }) }, methods: { FnTurnD(data) { @@ -771,17 +1056,23 @@ export default { ImportSlotFromFile(formData, (percent) => this.setUploadProcess(percent)).then((res) => { if (res.data.succ) { this.$message.success('上传成功') - this.FnGetData() + this.getList() } else { this.$message.error('上传失败：' + res.data.msg) } }) }, + checkboxChangeEvent() { + console.log('== 选中，取消选中 ==', this.$refs.table.getCheckboxRecords()) + }, toggleAdvanced() { this.advanced = !this.advanced }, + handledbclick(row) { + this.handleEdit(row.row.id) + }, handleSendAll() { - const select = this.$refs.xTable.getCheckboxRecords() + const select = this.$refs.table.getCheckboxRecords() const pkIdArr = select.map((item, index) => { return item.id }) @@ -814,9 +1105,9 @@ export default { this.form = {} }, handlePageChange({ currentPage, pageSize }) { - this.queryParam.currentPage = currentPage + this.queryParam.PageNo = currentPage this.queryParam.pageSize = pageSize - this.FnGetData() + this.getList() }, SearchCustomer(e) { DjyCustomerSuggest({ keyword: e, type: 'consignor' }).then(res => { @@ -841,19 +1132,19 @@ export default { this.fetching = false }) }, - FnGetData() { + getList() { this.loading = true this.form.pageSize = this.queryParam.pageSize - this.form.PageNo = this.queryParam.currentPage + this.form.PageNo = this.queryParam.PageNo if (this.form.ctN_STAT) { this.form.ctN_STAT = this.form.ctN_STAT.join(',') } BookingSlotPage(this.form).then(res => { if (res.success) { this.loadData = res.data.rows - this.queryParam.currentPage = res.data.pageNo + this.queryParam.PageNo = res.data.pageNo this.queryParam.pageSize = res.data.pageSize - this.queryParam.totalResult = res.data.totalRows + this.queryParam.totalCount = res.data.totalRows } else { this.$message.error(res.message) } @@ -871,7 +1162,7 @@ export default { BookingSlotDelete(record).then(res => { if (res.success) { this.$message.success('删除成功') - this.FnGetData() + this.getList() } else { this.$message.error(`删除失败,${res.message}`) } @@ -924,7 +1215,7 @@ export default { }) }, handleOk() { - this.FnGetData() + this.getList() }, handleAdd() { this.$router.push({ @@ -959,6 +1250,7 @@ export default { diff --git a/src/views/main/Customer/index.vue b/src/views/main/Customer/index.vue index 83be83c..c8e80a1 100644 --- a/src/views/main/Customer/index.vue +++ b/src/views/main/Customer/index.vue @@ -115,7 +115,7 @@ > - + diff --git a/src/views/main/Taskmanage/BCModify/index.vue b/src/views/main/Taskmanage/BCModify/index.vue index fef054e..c5ddde2 100644 --- a/src/views/main/Taskmanage/BCModify/index.vue +++ b/src/views/main/Taskmanage/BCModify/index.vue @@ -354,7 +354,7 @@ 匹配已有订舱 - 是否直接发送邮件给订舱联系人 +

订舱录入

diff --git a/src/views/main/Taskmanage/BcFileDetail/Editing.vue b/src/views/main/Taskmanage/BcFileDetail/Editing.vue index 91cde60..45fe7a9 100644 --- a/src/views/main/Taskmanage/BcFileDetail/Editing.vue +++ b/src/views/main/Taskmanage/BcFileDetail/Editing.vue @@ -311,7 +311,7 @@ 匹配已有订舱 - 是否直接发送邮件给订舱联系人 +

订舱录入

diff --git a/src/views/main/Taskmanage/notifications/index.vue b/src/views/main/Taskmanage/notifications/index.vue index fa4b795..2d6a964 100644 --- a/src/views/main/Taskmanage/notifications/index.vue +++ b/src/views/main/Taskmanage/notifications/index.vue @@ -556,6 +556,18 @@ export default { shareGetinfo(ApiData).then(res => { if (res.data.succ) { this.form = res.data.ext + if (!this.form.from) { + this.form.from = {} + } + if (!this.form.to) { + this.form.to = {} + } + if (!this.form.rollingPlanList) { + this.form.rollingPlanList = [] + } + if (!this.form.loadDetailList) { + this.form.loadDetailList = [] + } this.$forceUpdate() } else { this.$message.error(res.data.msg) diff --git a/src/views/main/customerParam/addItemForm.vue b/src/views/main/customerParam/addItemForm.vue index da9c303..6776ff6 100644 --- a/src/views/main/customerParam/addItemForm.vue +++ b/src/views/main/customerParam/addItemForm.vue @@ -111,7 +111,7 @@ export default { form: this.$form.createForm(this), TenantData: [], ItemData: [], - ItemCodeDisabled: true, + ItemCodeDisabled: false, YWData: [] } }, diff --git a/src/views/main/customerParam/editItemForm.vue b/src/views/main/customerParam/editItemForm.vue index 4bc4c60..3d74b78 100644 --- a/src/views/main/customerParam/editItemForm.vue +++ b/src/views/main/customerParam/editItemForm.vue @@ -138,8 +138,10 @@ export default { }) if (e) { this.ItemCodeDisabled = false + this.ItemCodeLoad = true ParamItemList({ paraCode: e }).then(res => { this.ItemData = res.data + this.ItemCodeLoad = false }) } }, @@ -155,6 +157,7 @@ export default { console.log(record) this.data = record this.visible = true + this.FnChangeTypeCode(record.paraCode) DjyCustomerSuggest().then(res => { this.TenantData = res.data.rows }) diff --git a/src/views/main/mail/mailAnalysis.vue b/src/views/main/mail/mailAnalysis.vue index b4ad410..e4d8a09 100644 --- a/src/views/main/mail/mailAnalysis.vue +++ b/src/views/main/mail/mailAnalysis.vue @@ -186,7 +186,7 @@ 关闭 - +
检索: 搜索 @@ -197,7 +197,6 @@ onChange: onSelectChange, type: 'radio', }" - style="width: 100%;" :pagination="false" :loading="addLoading" :columns="addColumns"