From 55fb76c54df83b612e1145afa6d789d394a1b329 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Mon, 27 May 2024 10:17:58 +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 +- src/api/modular/main/TaskmanageList.js | 7 + src/router/generator-routers.js | 12 + .../main/BookingCustomerLedger/list/index.vue | 15 +- src/views/main/BookingDjy/detail/index.vue | 54 +- .../BookingLedger/list/modules/formLabel.vue | 4 +- src/views/main/Customer/editForm.vue | 1 + .../main/Taskmanage/TaskmanageList/index.vue | 43 +- .../main/Taskmanage/cautionNotice/index.vue | 644 ++++++++++++++++++ 9 files changed, 757 insertions(+), 35 deletions(-) create mode 100644 src/views/main/Taskmanage/cautionNotice/index.vue diff --git a/.env b/.env index 33e92d4..c84d1c6 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ NODE_ENV=production VUE_APP_PREVIEW=true # VUE_APP_TYPE = 'customer' -# VUE_APP_TYPE = 'hechuan' +VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'yunyingduan' -VUE_APP_TYPE = 'gangjie' +# VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 和川大简云正式 @@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie' # 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 @@ -23,8 +23,8 @@ VUE_APP_TYPE = 'gangjie' # 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 diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js index 3f244a1..66e1012 100644 --- a/src/api/modular/main/TaskmanageList.js +++ b/src/api/modular/main/TaskmanageList.js @@ -583,3 +583,10 @@ export function SendRollingNominationNotice(parameter) { }) } +export function GetInfoByTaskIdNotice(parameter) { + return axios({ + url: '/TaskCautionNotice/GetInfoByTaskId', + method: 'get', + params: parameter + }) +} \ No newline at end of file diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index 9da35e4..203af20 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -67,6 +67,7 @@ const constantRouterComponents = { BCModify: () => import('@/views/main/Taskmanage/BCModify/index'), vgmDetail: () => import('@/views/main/Taskmanage/vgmDetail/index'), cutTime: () => import('@/views/main/Taskmanage/cutTime/index'), + cautionNotice: () => import('@/views/main/Taskmanage/cautionNotice/index'), draft: () => import('@/views/main/Taskmanage/draft/index'), POD_GATEOUT_FULL: () => import('@/views/main/Taskmanage/POD_GATEOUT_FULL/index'), POD_DISCHARGE_FULL: () => import('@/views/main/Taskmanage/POD_DISCHARGE_FULL/index'), @@ -244,6 +245,17 @@ const userAccount = [ }, component: 'cutTime' }, + { + name: 'cautionNotice', + path: '/commontaskmanage/cautionNotice', + pid: 0, + id: 183110, + meta: { + title: '重要提醒', + show: false + }, + component: 'cautionNotice' + }, { name: 'draft', path: '/commontaskmanage/draft', diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue index 312cf1d..9d7d375 100644 --- a/src/views/main/BookingCustomerLedger/list/index.vue +++ b/src/views/main/BookingCustomerLedger/list/index.vue @@ -75,13 +75,22 @@
COSCO导入
 + + +
EMC导入
+ + @@ -955,10 +964,10 @@ export default { } console.log('== 展开结束 ==', new Date().getTime() - start) }, - customRequest(data) { + customRequest(data, type) { const formData = new FormData() formData.append('file', data.file) - formData.append('carrierId', 'COSCO') + formData.append('carrierId', type) this.importLoad = true ImportBookingCurst(formData, (percent) => this.setUploadProcess(percent)).then((res) => { if (res.success) { diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue index 14f5ee4..3b3a7ce 100644 --- a/src/views/main/BookingDjy/detail/index.vue +++ b/src/views/main/BookingDjy/detail/index.vue @@ -541,8 +541,7 @@ label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" - has-feedback - prop="reeferf"> + has-feedback> {{ details.extendData.Account }} @@ -552,11 +551,30 @@ label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" - has-feedback - prop="reeferf"> + has-feedback> {{ details.extendData.Password }} + + + {{ details.extendData.ContactName }} + + + + + {{ details.extendData.ContactTel }} + + @@ -565,11 +583,30 @@ label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" - has-feedback - prop="reeferf"> + has-feedback> {{ details.extendData.OpMail }} + + + {{ details.extendData.YSFS }} + + + + + {{ details.extendData.YSXT }} + + @@ -644,7 +681,7 @@ export default { textEntryModalVisible: false, textEntryModalTitle: '', historyData: {}, - sendLoading:false, + sendLoading: false, textEntryType: '', pkgstotalRes: 0, modelTitle: '', @@ -799,6 +836,9 @@ export default { } else { res.data.extendData = {} } + if (res.data.carrierid === 'EMC') { + res.data.contractno = res.data.extendData.ContractType + '-' + res.data.contractno + } this.details = res.data if (Object.keys(this.details.files).length > 0) { const arr = [] diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue index 4c58957..22b1963 100644 --- a/src/views/main/BookingLedger/list/modules/formLabel.vue +++ b/src/views/main/BookingLedger/list/modules/formLabel.vue @@ -13,7 +13,7 @@ @dateChange="dateChangeFun">