diff --git a/.env b/.env index c84d1c6..33e92d4 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 = 'hechuan' # 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_SOCKET_BASE_URL=http://60.209.125.238:35100 # 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 7caaa7b..cf7bf3e 100644 --- a/.env.development +++ b/.env.development @@ -7,12 +7,12 @@ VUE_APP_TYPE = 'hechuan' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 和川大简云正式 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 +VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +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 diff --git a/src/components/generation/index.vue b/src/components/generation/index.vue index 1a733dd..91035a5 100644 --- a/src/components/generation/index.vue +++ b/src/components/generation/index.vue @@ -2,14 +2,14 @@ - + {{ slotEdit.sloT_BOOKING_NO }} - + 更新订舱 @@ -26,7 +26,7 @@ 匹配已有订舱 - + 是否直接发送邮件给订舱联系人 @@ -185,9 +185,12 @@ - + - + @@ -197,8 +200,8 @@ - - + + @@ -283,13 +286,14 @@ - +
{{ item.ctnall }} - + +
@@ -424,7 +428,7 @@ export default { }, methods: { handleOk1() { - if (this.type == 'A') { + if (this.type == 'BCModify' || this.type == 'BC') { this.handleOkA() } else { const projectList = [] @@ -446,7 +450,7 @@ export default { } } else { this.$message.error('至少选择1个箱子') - return false + return false } const ApiData = { slotId: this.slotEdit.id, @@ -481,13 +485,13 @@ export default { this.CreateData.opName = item.name } }) - this.type = 'A' + this.type = 'BC' this.userInfoList = [] this.$forceUpdate() this.SlotVisible = true }, init(row) { - this.type = 'B' + this.type = 'cabin' this.userInfoList = [] this.$forceUpdate() this.CreateData = {} @@ -499,10 +503,10 @@ export default { this.slotEdit = row if (res.data.length > 0) { res.data.forEach(item => { - item.maxnum = item.ctnnum - }) - this.$set(this.CreateData, 'CtnList', res.data) - this.ctnListCopy = JSON.parse(JSON.stringify(res.data)) + item.maxnum = item.ctnnum + }) + this.$set(this.CreateData, 'CtnList', res.data) + this.ctnListCopy = JSON.parse(JSON.stringify(res.data)) } else { this.$message.error('可用箱子为空，请选择其它舱位生成订舱') this.$set(this.CreateData, 'CtnList', []) @@ -530,7 +534,7 @@ export default { this.spinning = true this.userInfoList = [] this.$forceUpdate() - this.type = 'A' + this.type = 'BCModify' GetBookingOrder({ taskPkId: this.$route.query.taskPKId }).then(res => { if (res.data.ext) { this.CreateData = { @@ -539,6 +543,33 @@ export default { isDirectSend: false, ...res.data.ext } + + if (this.CreateData.customerId) { + const arr = [] + this.CustomerList.forEach(item => { + if (item.id === this.CreateData.customerId) { + arr.push(1) + } + }) + if (arr.length === 0) { + this.CustomerList.push({ + id: this.CreateData.customerId, + shortName: this.CreateData.customerName + }) + } + setTimeout(() => { + this.fetching = true + DjyCustomerdetail({ id: this.CreateData.customerId }).then(res => { + if (res.success) { + this.customerByList = res.data.contacts + this.$forceUpdate() + } else { + this.$message.error(res.message) + } + this.fetching = false + }) + }, 100) + } } else { this.CreateData = { generateMethod: 'UPD_BOOKING', @@ -778,6 +809,7 @@ export default { /deep/ .ant-form-item { margin-bottom: 0px !important; } + .tear-list { display: flex; flex-wrap: wrap; diff --git a/src/components/mskBookingOrder/index.vue b/src/components/mskBookingOrder/index.vue index 147d677..fa8b385 100644 --- a/src/components/mskBookingOrder/index.vue +++ b/src/components/mskBookingOrder/index.vue @@ -249,7 +249,7 @@ - + 检索商品 @@ -540,7 +540,7 @@ export default { cargoType: [{ required: true, message: '请选择货物标志', trigger: 'blur' }], totalCargoWeight: [{ required: true, message: '请填写总重', trigger: 'blur' }], commodityCodeType: [{ required: true, message: '请选择商品编码类型', trigger: 'blur' }], - commodityName: [{ required: true, message: '请选择商品', trigger: 'blur' }], + commodityName: [{ required: true, message: '请选择商品', trigger: 'change' }], importServiceMode: [{ required: true, message: '请选择目的地运输条款', trigger: 'blur' }], exportServiceMode: [{ required: true, message: '请选择始发地服务模式', trigger: 'blur' }], sfcarrierGeoID: [{ required: true, message: '请选择始发地', trigger: 'blur' }], @@ -973,8 +973,9 @@ export default { }, handleSelectGoods(item) { this.goodsFlag = false - this.form.commodityCode = item.commodityCode - this.form.commodityName = item.commodityName + this.$set(this.form, 'commodityCode', item.commodityCode) + this.$set(this.form, 'commodityName', item.commodityName) + this.$refs.form.validateField('commodityName'); }, handleDeleteCtn(index) { this.form.ctns.splice(index, 1) diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index 7066161..fa59fce 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -921,7 +921,7 @@ export default { this.totalCbm = num + '0' } else { this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) - this.totalCbm = this.totalCbm.toFixed(2) + this.totalCbm = this.totalCbm.toFixed(3) } } if (column.field === 'kgs' || column.field === 'tareweight') { @@ -1207,7 +1207,7 @@ export default { this.totalCbm = num + '0' } else { this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) - this.totalCbm = this.totalCbm.toFixed(2) + this.totalCbm = this.totalCbm.toFixed(3) } } if (selectionRangeKeys.endColKey === 'kgs' || selectionRangeKeys.endColKey === 'tareweight') { @@ -1496,7 +1496,7 @@ export default { this.totalCbm = onum + '0' } else { this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) - this.totalCbm = this.totalCbm.toFixed(2) + this.totalCbm = this.totalCbm.toFixed(3) } } }) @@ -1561,7 +1561,7 @@ export default { this.totalCbm = onum + '0' } else { this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) - this.totalCbm = this.totalCbm.toFixed(2) + this.totalCbm = this.totalCbm.toFixed(3) } } }) @@ -2002,7 +2002,7 @@ export default { }) this.totalPkgs = totalPkgs this.totalKgs = totalKgs.toFixed(2) - this.totalCbm = totalCbm.toFixed(2) + this.totalCbm = totalCbm.toFixed(3) this.$emit('changeTotal', { type: 'totalKgs', val: this.totalKgs }) this.$emit('changeTotal', { type: 'totalPkgs', val: this.totalPkgs }) this.$emit('changeTotal', { type: 'totalCbm', val: this.totalCbm }) diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue index c0ad78d..f82c544 100644 --- a/src/views/main/Taskmanage/TaskmanageList/index.vue +++ b/src/views/main/Taskmanage/TaskmanageList/index.vue @@ -1224,6 +1224,7 @@ export default { this.activeTreeKey = selectedKeys if (selectedKeys.length === 0) { this.gridOptions.loading = true + this.formRes.taskType = '' this.init() return false } @@ -1281,6 +1282,7 @@ export default { this.activeTreeKey = [] }, init(queryParam = {}) { + console.log(queryParam) this.gridOptions.pagerConfig = { total: 0, currentPage: 1,