From b2652f3a044219a09c0ad5bf258a0cf9cc824fd5 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Thu, 8 Feb 2024 16:25:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 122 +- package.json | 2 +- src/api/modular/main/TaskmanageList.js | 55 + src/api/modular/system/logManage.js | 20 +- src/assets/icons/u1041.svg | 6 + src/assets/icons/u1043.svg | 6 + src/assets/icons/u1044.svg | 6 + src/assets/icons/u1046.svg | 6 + src/assets/icons/u1133.svg | 6 + src/assets/icons/u1224.svg | 6 + src/assets/icons/u991.svg | 6 + src/assets/icons/u993.svg | 6 + src/assets/icons/u995.svg | 6 + src/components/Table/index.js | 2 +- src/main.js | 2 +- src/router/generator-routers.js | 12 + src/views/main/BookingLedger/detail/index.vue | 69 +- .../detail/modules/rightContent.vue | 10 +- .../detail/style/rightContent.less | 1 - .../main/Taskmanage/TaskmanageList/index.vue | 3 + .../Taskmanage/rollingNomination/index.vue | 1153 +++++++++++++++++ src/views/main/fee/feeExchange.vue | 7 +- src/views/main/fee/feeUnits.vue | 38 +- src/views/system/log/oplog/details.vue | 59 +- src/views/system/log/oplog/index.vue | 15 +- 25 files changed, 1473 insertions(+), 151 deletions(-) create mode 100644 src/assets/icons/u1041.svg create mode 100644 src/assets/icons/u1043.svg create mode 100644 src/assets/icons/u1044.svg create mode 100644 src/assets/icons/u1046.svg create mode 100644 src/assets/icons/u1133.svg create mode 100644 src/assets/icons/u1224.svg create mode 100644 src/assets/icons/u991.svg create mode 100644 src/assets/icons/u993.svg create mode 100644 src/assets/icons/u995.svg create mode 100644 src/views/main/Taskmanage/rollingNomination/index.vue diff --git a/package-lock.json b/package-lock.json index 5a0e142..2866da7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2698,6 +2698,17 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz", @@ -2749,6 +2760,18 @@ "supports-color": "^7.0.0" } }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz", @@ -2806,6 +2829,18 @@ "webpack-sources": "^1.4.3" } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz", @@ -17441,9 +17476,9 @@ } }, "vue-json-viewer": { - "version": "2.2.21", - "resolved": "https://registry.npmmirror.com/vue-json-viewer/download/vue-json-viewer-2.2.21.tgz", - "integrity": "sha512-FZL5pZM63nJjAWqOIkiA9KtAesIhUwmFkAaBZ4eCIPb0jDczL59bHgbdJOkvP7rsFVuQox5SHAxj7O7SrJrTvw==", + "version": "2.2.22", + "resolved": "https://registry.npmmirror.com/vue-json-viewer/-/vue-json-viewer-2.2.22.tgz", + "integrity": "sha512-3oPH5BxoUWva/qp7wNJj+15FBXyi9Yu5VDW4mCWivjHR1pUpMv34fjqqxML7jh2uOqm1S/3Xks5nQ5JjC5+OWw==", "requires": { "clipboard": "^2.0.4" } @@ -17469,87 +17504,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-ls": { "version": "3.2.2", "resolved": "https://registry.npm.taobao.org/vue-ls/download/vue-ls-3.2.2.tgz", diff --git a/package.json b/package.json index c8d2f1c..d1cc17b 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "vue-contextmenu": "^1.5.9", "vue-cropper": "0.4.9", "vue-easytable": "^2.27.1", - "vue-json-viewer": "^2.2.1", + "vue-json-viewer": "^2.2.22", "vue-ls": "^3.2.1", "vue-quill-editor": "^3.0.6", "vue-router": "^3.1.2", diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js index 24f3eae..d4fa880 100644 --- a/src/api/modular/main/TaskmanageList.js +++ b/src/api/modular/main/TaskmanageList.js @@ -342,3 +342,58 @@ export function TaskManageBCGetCompareResult(parameter) { params: parameter }) } +export function TaskManageRollingNominationGetInfoByTaskId(parameter) { + return axios({ + url: '/TaskManageRollingNomination/GetInfoByTaskId', + method: 'get', + params: parameter + }) +} + +export function GetLoadStatusDetailList(parameter) { + return axios({ + url: '/TaskManageRollingNomination/GetLoadStatusDetailList', + method: 'get', + params: parameter + }) +} + +export function RefreshBookingorder(parameter) { + return axios({ + url: '/TaskManageRollingNomination/RefreshBookingorder', + method: 'post', + data: parameter + }) +} + +export function TaskManageRolingWominationGetUrl(parameter) { + return axios({ + url: '/TaskManageRollingNomination/GetUrl', + method: 'get', + params: parameter + }) +} + +export function TaskManageRolingWominationCancelsharelink(parameter) { + return axios({ + url: '/TaskManageRollingNomination/Cancelsharelink', + method: 'post', + data: parameter + }) +} + +export function DispatchRollingNomination(parameter) { + return axios({ + url: '/TaskManageRollingNomination/DispatchRollingNomination', + method: 'post', + data: parameter + }) +} + +export function CreateShareLink(parameter) { + return axios({ + url: '/TaskManageRollingNomination/CreateShareLink', + method: 'post', + data: parameter + }) +} diff --git a/src/api/modular/system/logManage.js b/src/api/modular/system/logManage.js index b1f2d52..eeabdf1 100644 --- a/src/api/modular/system/logManage.js +++ b/src/api/modular/system/logManage.js @@ -14,7 +14,7 @@ import { axios } from '@/utils/request' * @author yubaoshan * @date 2020/5/19 11:57 */ -export function sysVisLogPage (parameter) { +export function sysVisLogPage(parameter) { return axios({ url: '/sysVisLog/page', method: 'get', @@ -28,7 +28,7 @@ export function sysVisLogPage (parameter) { * @author yubaoshan * @date 2020/5/19 11:57 */ -export function sysOpLogPage (parameter) { +export function sysOpLogPage(parameter) { return axios({ url: '/sysOpLog/page', method: 'get', @@ -42,7 +42,7 @@ export function sysOpLogPage (parameter) { * @author yubaoshan * @date 2020/5/19 11:57 */ -export function sysExLogPage (parameter) { +export function sysExLogPage(parameter) { return axios({ url: '/sysExLog/page', method: 'get', @@ -56,7 +56,7 @@ export function sysExLogPage (parameter) { * @author yubaoshan * @date 2020/6/23 23:09 */ -export function sysVisLogDelete (parameter) { +export function sysVisLogDelete(parameter) { return axios({ url: '/sysVisLog/delete', method: 'post', @@ -70,7 +70,7 @@ export function sysVisLogDelete (parameter) { * @author yubaoshan * @date 2020/6/23 23:09 */ -export function sysOpLogDelete (parameter) { +export function sysOpLogDelete(parameter) { return axios({ url: '/sysOpLog/delete', method: 'post', @@ -84,10 +84,18 @@ export function sysOpLogDelete (parameter) { * @author yubaoshan * @date 2020/6/23 23:09 */ - export function sysExLogDelete (parameter) { +export function sysExLogDelete(parameter) { return axios({ url: '/sysExLog/delete', method: 'post', data: parameter }) } + +export function sysOpLogdetail(parameter) { + return axios({ + url: '/sysOpLog/detail', + method: 'get', + params: parameter + }) +} diff --git a/src/assets/icons/u1041.svg b/src/assets/icons/u1041.svg new file mode 100644 index 0000000..0d865c8 --- /dev/null +++ b/src/assets/icons/u1041.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u1043.svg b/src/assets/icons/u1043.svg new file mode 100644 index 0000000..83704cd --- /dev/null +++ b/src/assets/icons/u1043.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u1044.svg b/src/assets/icons/u1044.svg new file mode 100644 index 0000000..a7c6d23 --- /dev/null +++ b/src/assets/icons/u1044.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u1046.svg b/src/assets/icons/u1046.svg new file mode 100644 index 0000000..c3a77f1 --- /dev/null +++ b/src/assets/icons/u1046.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u1133.svg b/src/assets/icons/u1133.svg new file mode 100644 index 0000000..0a691b9 --- /dev/null +++ b/src/assets/icons/u1133.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u1224.svg b/src/assets/icons/u1224.svg new file mode 100644 index 0000000..f9a1fe8 --- /dev/null +++ b/src/assets/icons/u1224.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u991.svg b/src/assets/icons/u991.svg new file mode 100644 index 0000000..3d2fe98 --- /dev/null +++ b/src/assets/icons/u991.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u993.svg b/src/assets/icons/u993.svg new file mode 100644 index 0000000..5e6bbf6 --- /dev/null +++ b/src/assets/icons/u993.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/icons/u995.svg b/src/assets/icons/u995.svg new file mode 100644 index 0000000..43ed06a --- /dev/null +++ b/src/assets/icons/u995.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Table/index.js b/src/components/Table/index.js index b91d15f..8cbaf3b 100644 --- a/src/components/Table/index.js +++ b/src/components/Table/index.js @@ -187,6 +187,7 @@ export default { * @param {Object} sorter 排序条件 */ loadData(pagination, filters, sorter) { + console.log(pagination, filters, sorter) this.localLoading = true if (sorter) { this.sortObj = sorter @@ -219,7 +220,6 @@ export default { } } } - console.log(parameter) const result = this.data(parameter) // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data // eslint-disable-next-line diff --git a/src/main.js b/src/main.js index 693e534..a887420 100644 --- a/src/main.js +++ b/src/main.js @@ -32,8 +32,8 @@ import VueEasytable from 'vue-easytable' import qs from 'qs' import '@/utils/drag' import VueClipBoard from 'vue-clipboard2' -Vue.use(VueClipBoard) +Vue.use(VueClipBoard) Vue.use(VXETable) Vue.use(VueContextMenu) Vue.use(vcolorpicker) diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index a7e50e6..e93d957 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -41,6 +41,7 @@ const constantRouterComponents = { BcFileDetail: () => import('@/views/main/Taskmanage/BcFileDetail'), BCModify: () => import('@/views/main/Taskmanage/BCModify/index'), cancellation: () => import('@/views/main/Taskmanage/cancellation/index'), + rollingNomination: () => import('@/views/main/Taskmanage/rollingNomination/index'), BcEditing: () => import('@/views/main/Taskmanage/BcFileDetail/Editing'), BookingDetailTest: () => import('@/views/main/BookingLedger/detail/BookingDetailTest'), BookingCustomerDetail: () => import('@/views/main/BookingCustomerLedger/detail') @@ -201,6 +202,17 @@ const userAccount = [ }, component: 'cancellation' }, + { + name: 'rollingNomination', + path: '/commontaskmanage/rollingNomination', + pid: 0, + id: 183191, + meta: { + title: 'rollingNomination', + show: false + }, + component: 'rollingNomination' + }, { name: 'TaskmanageDetail', path: '/commontaskmanage/TaskmanageDetail', diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 1fd8718..002d2b8 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -110,11 +110,16 @@ isParent="parent" @changeDetail="changeDetailFun"> -
+
@@ -630,6 +635,51 @@ export default { // this.$refs.basicInfo.refresh() // this.$refs.goodsTable.tableData = data.data2 }, + handleIframeLoad() { + if (this.bookingDetails.id !== 0) { + const mapFrame = this.$refs['iframe'] + const data = { + custno: this.bookingDetails.custno, + mblno: this.bookingDetails.mblno, + cntrtotal: this.bookingDetails.cntrtotal, + cbm: this.bookingDetails.cbm, + kgs: this.bookingDetails.kgs, + pkgs: this.bookingDetails.pkgs, + customername: this.bookingDetails.customername, + customerid: this.bookingDetails.customerid, + portdischarge: this.bookingDetails.portdischarge, + vessel: this.bookingDetails.vessel, + voyno: this.bookingDetails.voyno, + sale: this.bookingDetails.sale, + etd: this.bookingDetails.etd, + blfrt: this.bookingDetails.blfrt, + destination: this.bookingDetails.destination, + portload: this.bookingDetails.portload, + truckerid: this.bookingDetails.truckerid, + trucker: this.bookingDetails.trucker, + customser: this.bookingDetails.customser, + customserid: this.bookingDetails.customserid, + forwarder: this.bookingDetails.forwarder, + forwarderid: this.bookingDetails.forwarderid, + agentname: this.bookingDetails.agentname, + agentnameid: this.bookingDetails.agentnameid, + yard: this.bookingDetails.yard, + yardid: this.bookingDetails.yardid, + shipagency: this.bookingDetails.shipagency, + shipagencyid: this.bookingDetails.shipagencyid, + id: this.bookingDetails.id + } + if (this.feeShow) { + const iframeWin = mapFrame.contentWindow + iframeWin.postMessage( + { + token: localStorage.getItem('pro__Access-Token'), + data: data, + customerTypeList: this.$options.filters['dictData']('djy_cust_prop') + }, '*') + } + } + }, sendMessageFY() { const mapFrame = this.$refs['iframe'] const data = { @@ -666,11 +716,11 @@ export default { if (this.feeShow) { const iframeWin = mapFrame.contentWindow iframeWin.postMessage( - { - token: localStorage.getItem('pro__Access-Token'), - data: data, - customerTypeList: this.$options.filters['dictData']('djy_cust_prop') - }, '*') + { + token: localStorage.getItem('pro__Access-Token'), + data: data, + customerTypeList: this.$options.filters['dictData']('djy_cust_prop') + }, '*') } }, ...mapActions(['setNeedSavePages', 'setBookingList', 'setBookingGridOptions', 'setInBookingDetailsSave', 'setSET_SAVEFLAG']), @@ -844,7 +894,7 @@ export default { }, 200) setTimeout(() => { const key = this.$route.fullPath - this.sendMessageFY() + // this.sendMessageFY() setTimeout(() => { const detailsChange = Object.keys(this.needSavePages).includes(key) ? !!this.needSavePages[key].details @@ -1183,6 +1233,9 @@ export default { this.$store.commit('SET_SAVETOPDOWN', false) }) }, + handleIframeunLoad() { + console.log(22222) + }, setDeatilsFun(res, overSet = false) { if (!res.data.bookingEDIExt) { res.data.bookingEDIExt = bookingEDIExt diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index e500647..d664218 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -256,22 +256,22 @@
- 修改人 - 修改时间 + 修改人 + 修改时间 + 功能模块
{{ log.createdUserName }} - + {{ log.createdTime }} - - + {{ log.fromFunc }}
diff --git a/src/views/main/BookingLedger/detail/style/rightContent.less b/src/views/main/BookingLedger/detail/style/rightContent.less index 71a23ac..f1b0e27 100644 --- a/src/views/main/BookingLedger/detail/style/rightContent.less +++ b/src/views/main/BookingLedger/detail/style/rightContent.less @@ -475,7 +475,6 @@ span { display: inline-block; border: 1px solid #eee; - flex: 1; &:nth-of-type(1) { border-right: none; } diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue index 5b8f4ce..88b74ba 100644 --- a/src/views/main/Taskmanage/TaskmanageList/index.vue +++ b/src/views/main/Taskmanage/TaskmanageList/index.vue @@ -1482,6 +1482,9 @@ export default { } else if (data.taskType === 'CANCELLATION') { // Cancellation this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pkId } }) + } else if (data.taskType === 'ROLLING_NOMINATION') { + // ROLLING_NOMINATION + this.$router.push({ path: '/commontaskmanage/rollingNomination', query: { taskPKId: data.pkId } }) } else { // 订舱详情查看 this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } }) diff --git a/src/views/main/Taskmanage/rollingNomination/index.vue b/src/views/main/Taskmanage/rollingNomination/index.vue new file mode 100644 index 0000000..29127a4 --- /dev/null +++ b/src/views/main/Taskmanage/rollingNomination/index.vue @@ -0,0 +1,1153 @@ + + + diff --git a/src/views/main/fee/feeExchange.vue b/src/views/main/fee/feeExchange.vue index 7430803..6689b3b 100644 --- a/src/views/main/fee/feeExchange.vue +++ b/src/views/main/fee/feeExchange.vue @@ -135,7 +135,12 @@ - + + {{ item.codeName }} + diff --git a/src/views/main/fee/feeUnits.vue b/src/views/main/fee/feeUnits.vue index d915401..bb89125 100644 --- a/src/views/main/fee/feeUnits.vue +++ b/src/views/main/fee/feeUnits.vue @@ -104,14 +104,21 @@ - + + {{ item.name }} + - + + {{ item.codeName }} + @@ -187,7 +194,9 @@ import { FeeCustTemplatePage, FeeCustTemplateSave, FeeCustTemplateDelete, - GetFeeCustomerList + GetFeeCustomerList, + FeeCurrencyList, + GetFeeUnitList } from '@/api/modular/main/mailSetting' import columnSetting from '@/components/tableColumnSetting' export default { @@ -202,7 +211,7 @@ export default { visible: false, loading: false, selectedRowKeys: [], - title:'', + title: '', againVisible: false, fileList: [], setVisible: false, @@ -307,18 +316,37 @@ export default { receiveServer: [{ required: true, message: '请输入收件服务器', trigger: 'change' }] }, tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' }, - loadData: [] + loadData: [], + unitList: [], + currencyList: [] } }, created() { }, mounted() { this.FnGetData() this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop') + this.getCurrency() + this.GetFeeUnit() }, methods: { toggleAdvanced() { this.advanced = !this.advanced }, + getCurrency() { + FeeCurrencyList().then(res => { + this.currencyList = res.data + }) + }, + GetFeeUnit() { + GetFeeUnitList().then(res => { + res.data.forEach((item, index) => { + if (!item.name) { + res.data.splice(index, 1) + } + }) + this.unitList = res.data + }) + }, onSelectChange(selectedRowKeys) { this.selectedRowKeys = selectedRowKeys; }, diff --git a/src/views/system/log/oplog/details.vue b/src/views/system/log/oplog/details.vue index 4c0bede..d343e7e 100644 --- a/src/views/system/log/oplog/details.vue +++ b/src/views/system/log/oplog/details.vue @@ -1,52 +1,49 @@