diff --git a/.env b/.env index 33e92d4..ab44d3d 100644 --- a/.env +++ b/.env @@ -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/.env.development b/.env.development index ed1d2a1..7675bb5 100644 --- a/.env.development +++ b/.env.development @@ -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 @@ -26,8 +26,8 @@ VUE_APP_TYPE = 'gangjie' # 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/store/getters.js b/src/store/getters.js index 74a5f75..4b81c6b 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -18,7 +18,9 @@ const getters = { multiTab: state => state.app.multiTab, lang: state => state.i18n.lang, bookingList: state => state.user.bookingList, + desChinaFlag: state => state.user.desChinaFlag, slotShow: state => state.user.slotShow, + subTenant: state => state.user.subTenant, vesselFrom: state => state.user.vesselFrom, tenantParam: state => state.user.tenantParam, bctaskType: state => state.user.bctaskType, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 73d31e7..ea828b9 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -17,10 +17,12 @@ const user = { name: '', welcome: '', firstFlag: true, // 订舱台账首次加载 + desChinaFlag: false, // 货描是否可以输入中文 feeShow: false, // 订舱详情是否显示费用 slotShow: false, // 订舱详情是否显示舱位 vesselFrom: false, // 船名下拉框采用哪种方式 avatar: '', + subTenant: [], // 订舱子公司 messageNum: 0, buttons: [], // 按钮权限 admintype: '', // 是否是超管 @@ -113,6 +115,12 @@ const user = { SET_HASBOOKINGDETAIL: (state, obj) => { state.hasbookingDetail = obj }, + SET_DESCHINA: (state, buttons) => { + state.desChinaFlag = buttons + }, + SET_SUBTENANT: (state, obj) => { + state.subTenant = obj + }, SET_FIRSTFLAG: (state, flag) => { state.firstFlag = flag } @@ -174,6 +182,7 @@ const user = { } if (data.tenantParams) { data.tenantParams.forEach(item => { + // 是否显示占舱 if (item.paraCode === 'ENABLE_SLOT_ABILITY') { if (item.paraValue === 'YES') { commit('SET_SLOTSHOW', true) @@ -181,6 +190,7 @@ const user = { commit('SET_SLOTSHOW', false) } } + // 是否显示费用 if (item.paraCode === 'ENABLE_FEE_ABILITY') { if (item.paraValue === 'YES') { commit('SET_FEESHOW', true) @@ -188,6 +198,7 @@ const user = { commit('SET_FEESHOW', false) } } + // 船名选择数据源 if (item.paraCode === 'VESSEL_FROM_CONFIG_ONLY') { if (item.paraValue === 'YES') { commit('SET_VESSELFROM', true) @@ -195,13 +206,27 @@ const user = { commit('SET_VESSELFROM', false) } } + // 马士基订舱 if (item.paraCode === 'BOOKING_CHANNEL_SELECT_SHOW') { const arr = item.paraValue ? item.paraValue.split(',') : [] commit('SET_TENANTPARAM', arr) } + // 生成任务 if (item.paraCode === 'BC_TASK_CREATE_ORDER') { commit('SET_BCTASKTYPE', item.paraValue) } + // 订舱子公司 + if (item.paraCode === 'BOOKING_SUB_TENANT') { + let arr = [] + if (item.paraValue) { + arr = JSON.parse(item.paraValue) + } + commit('SET_SUBTENANT', arr) + } + // 货描是否允许中文 + if (item.paraCode === 'DESCRIP_CAN_CHINESE') { + commit('SET_DESCHINA', item.paraValue) + } }) if (data.tenantParams.length === 0) { commit('SET_SLOTSHOW', false) diff --git a/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue b/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue index e09ad7a..2de2648 100644 --- a/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingDjyLedger/detail/modules/basicInfo.vue @@ -260,7 +260,7 @@ - @@ -572,12 +563,12 @@ - + - + + + + + + + + + @@ -742,6 +758,7 @@ export default { data() { return { frompre: {}, + subTenantList: [], type: this.$route.query.type, basicDetails: JSON.parse(JSON.stringify(this.details)), BookingLockOrder: {}, @@ -974,10 +991,12 @@ export default { }, created() { this.init() + const arr = this.subTenant + this.subTenantList = arr }, computed: { ...mapGetters([ - 'projectDict', 'vesselFrom' + 'projectDict', 'vesselFrom', 'subTenant' ]) }, methods: { @@ -1252,14 +1271,14 @@ export default { } if (res.serviceItem) { const WserviceItem = [] - res.serviceItem.split(']').forEach((item) => { - if (item.split('[')[1]) { - WserviceItem.push(item.split('[')[1]) - } - }) - console.log(WserviceItem) - // this.details.saveServiceList = WserviceItem - // this.$emit('handleSaveService', WserviceItem) + res.serviceItem.split(']').forEach((item) => { + if (item.split('[')[1]) { + WserviceItem.push(item.split('[')[1]) + } + }) + console.log(WserviceItem) + // this.details.saveServiceList = WserviceItem + // this.$emit('handleSaveService', WserviceItem) } else { this.details.saveServiceList = [] this.$emit('handleSaveService', []) @@ -1302,6 +1321,9 @@ export default { } else if (type === 'thirdPay') { this.details.thirdPay = res.shortName || '' this.details.thirdPaytode = Number(res.id) || '' + } else if (type === 'subTenantId') { + this.details.subTenantId = res.id || '' + this.details.subTenantName = res.name || '' } }, dateChangeFun({ type, value }) { @@ -1338,14 +1360,16 @@ export default { .ant-col-xl-4-8 { width: 20%; } + .customer-btn { - display: inline-block; - font-size: 12px !important; - padding: 0px !important; - color: @primary-color; - cursor: pointer; - margin-top: -4px; - } + display: inline-block; + font-size: 12px !important; + padding: 0px !important; + color: @primary-color; + cursor: pointer; + margin-top: -4px; +} + /deep/ .ant-card-body { padding-left: 10px !important; } diff --git a/src/views/main/BookingGangjie/list/modules/formLabel.vue b/src/views/main/BookingGangjie/list/modules/formLabel.vue index f19b4b6..956f3ed 100644 --- a/src/views/main/BookingGangjie/list/modules/formLabel.vue +++ b/src/views/main/BookingGangjie/list/modules/formLabel.vue @@ -231,7 +231,8 @@ export default { 'lineList', 'bookingInitData', 'dpTreeList', - 'statusDIct' + 'statusDIct', + 'subTenant' ]) }, mounted() { }, @@ -399,6 +400,7 @@ export default { 'taskCategory', 'taskSource', 'taskType', + 'subTenantName', 'OP', 'VESSEL', 'bsStatusList' @@ -448,6 +450,8 @@ export default { return this.dpTreeList case 'OrgOp': return this.dpTreeList + case 'subTenantName': + return this.subTenant case 'VESSEL': return localStorage.getItem('vesselInfo') ? JSON.parse(localStorage.getItem('vesselInfo')) : [] case 'BSSTATUSNAME': diff --git a/src/views/main/BookingLedger/detail/childModules/sendMail.vue b/src/views/main/BookingLedger/detail/childModules/sendMail.vue index 4798395..a406b5e 100644 --- a/src/views/main/BookingLedger/detail/childModules/sendMail.vue +++ b/src/views/main/BookingLedger/detail/childModules/sendMail.vue @@ -263,6 +263,7 @@ export default { this.downloading = false }) }, + // 打开后获取各类人 必须要有邮箱才能显示出来 以及根据订舱内容赋值主题 getPeople(data) { const arr = data.contacts ? data.contacts : [] const arr1 = [] diff --git a/src/views/main/BookingLedger/detail/components/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue index e9e080c..99efe54 100644 --- a/src/views/main/BookingLedger/detail/components/selectView.vue +++ b/src/views/main/BookingLedger/detail/components/selectView.vue @@ -153,7 +153,8 @@ export default { 'sourceList', 'countryList', 'agentFilter', - 'yardFilter' + 'yardFilter', + 'subTenant' ]) }, watch: { @@ -396,6 +397,8 @@ export default { return this.countryList case 'shippercountry': return this.countryList + case 'subTenant': + return this.subTenant } }, filterOption(input, option) { @@ -446,7 +449,6 @@ export default { } }, getSelectFirst(e, canClick = true) { - console.log(e) if (canClick) { this.$refs.selectView.$refs.vcSelect.$refs.arrow.click() } else { @@ -461,6 +463,7 @@ export default { 'carrierid', 'carrier', 'yard', + 'subTenant', 'kindpkgs', 'issuetype', 'blfrt', diff --git a/src/views/main/BookingLedger/detail/components/textareaView.vue b/src/views/main/BookingLedger/detail/components/textareaView.vue index 8fb5dd5..030bcff 100644 --- a/src/views/main/BookingLedger/detail/components/textareaView.vue +++ b/src/views/main/BookingLedger/detail/components/textareaView.vue @@ -5,11 +5,11 @@ :disabled="disabled" :style="`width:${width}%;display:inline-block;height: ${height}px`" @input="debounce(textareaChange, 300, $event)" - @blur="textareaBlur" - > + @blur="textareaBlur">