From 995b903d34445390f1649e802af0390e0474df1d Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 12 Jun 2024 18:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 12 +- .env.development | 12 +- src/components/generation/index.vue | 102 ++++++++++----- .../BookingCustomerLedger/detail/index.vue | 116 ++++++++++++++---- src/views/main/CabinManagement/details.vue | 57 +++++++++ src/views/main/CabinManagement/index.vue | 88 ++++++++----- .../main/CabinManagement/labelSetting.vue | 15 ++- src/views/main/Customer/addForm.vue | 14 ++- src/views/main/Customer/editForm.vue | 15 ++- src/views/main/Customer/index.vue | 56 ++++++++- 10 files changed, 380 insertions(+), 107 deletions(-) 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/.env.development b/.env.development index 78c2215..7caaa7b 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ NODE_ENV=development VUE_APP_PREVIEW=true -VUE_APP_TYPE = 'customer' -# VUE_APP_TYPE = 'hechuan' +# VUE_APP_TYPE = 'customer' +VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'gangjie' # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan @@ -11,8 +11,8 @@ VUE_APP_TYPE = 'customer' # 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 @@ -34,5 +34,5 @@ VUE_APP_TYPE = 'customer' # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 # 客户端正式 -VUE_APP_API_BASE_URL=http://118.190.144.189:6001 -VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 \ No newline at end of file +# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 +# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 \ No newline at end of file diff --git a/src/components/generation/index.vue b/src/components/generation/index.vue index 026dbf5..1a733dd 100644 --- a/src/components/generation/index.vue +++ b/src/components/generation/index.vue @@ -141,30 +141,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -187,6 +163,53 @@ + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + if (item.id == e) { + this.CreateData[Tname] = item.name + } + }) + } } else { if (type === 0) { this.UserList = JSON.parse(JSON.stringify(this.UserListAll)) @@ -672,6 +708,9 @@ export default { if (type === 5) { this.UserList5 = JSON.parse(JSON.stringify(this.UserListAll)) } + if (type === 6) { + this.UserList6 = JSON.parse(JSON.stringify(this.UserListAll)) + } } this.$forceUpdate() }, @@ -684,14 +723,6 @@ export default { } }) this.fetching = true - // DjyCustomerContacts({ customerId: e }).then(res => { - // if (res.success) { - // this.customerByList = res.data - // } else { - // this.$message.error(res.message) - // } - // this.fetching = false - // }) DjyCustomerdetail({ id: e }).then(res => { if (res.success) { this.customerByList = res.data.contacts @@ -723,6 +754,13 @@ export default { this.$set(this.CreateData, 'saleId', '') this.$set(this.CreateData, 'saleName', '') } + if (res.data.businessid) { + this.CreateData.businessid = Number(res.data.businessid) + this.CreateData.business = res.data.business + } else { + this.$set(this.CreateData, 'businessid', '') + this.$set(this.CreateData, 'business', '') + } this.$forceUpdate() } else { this.$message.error(res.message) diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue index 7a96f87..80047b6 100644 --- a/src/views/main/BookingCustomerLedger/detail/index.vue +++ b/src/views/main/BookingCustomerLedger/detail/index.vue @@ -212,7 +212,7 @@ :defaultVal="details.placereceipt" searchApi="GetPortloadlist" :searchQuery="{ KeyWord: '' }" - :showLabel="['ediCode', 'enName']" + :showLabel="['enName', 'ediCode']" :openSearch="true" :isCopy="true" @change="getSelectViewRes"> @@ -231,7 +231,7 @@ :defaultVal="details.portload" searchApi="GetPortloadlist" :searchQuery="{ KeyWord: '' }" - :showLabel="['ediCode', 'enName']" + :showLabel="['enName', 'ediCode']" :openSearch="true" :isCopy="true" @change="getSelectViewRes"> @@ -250,7 +250,7 @@ :defaultVal="details.portdischarge" searchApi="GetPortlist" :searchQuery="{ KeyWord: '' }" - :showLabel="['ediCode', 'enName']" + :showLabel="['enName', 'ediCode']" :openSearch="true" @change="getSelectViewRes"> @@ -268,7 +268,7 @@ :defaultVal="details.destination" searchApi="GetPortlist" :searchQuery="{ KeyWord: '' }" - :showLabel="['ediCode', 'enName']" + :showLabel="['enName', 'ediCode']" :openSearch="true" @change="getSelectViewRes"> @@ -419,16 +419,36 @@ - + prop="blfrt"> + + PP + CC + + + + + Shipper + Forwarder + Consignee + Notify + Party + + + + + + + + @@ -670,8 +701,8 @@
- MS - MR + MS + MR
- MS - MR + MS + MR { + if (item.kgs && item.ctnnum) { + kgsTotal += item.kgs * item.ctnnum + } + }) + this.details.kgs = kgsTotal.toFixed(2) + } + } + }, mounted() { this.id = this.$route.query.id this.getDictList() @@ -1536,9 +1582,11 @@ export default { lanecode: [{ required: true, message: '请选择航线', trigger: 'blur' }], voyno: [{ required: true, message: '请输入航次', trigger: 'blur' }], vessel: [{ required: true, message: '请输入船名', trigger: 'blur' }], + blfrt: [{ required: true, message: '请选择付款方式', trigger: 'blur' }], bookingAccount: [{ required: true, message: '请选择订舱账号', trigger: 'blur' }], billCount: [{ required: true, message: '请输入提单数量', trigger: 'blur' }], billSignLoc: [{ required: true, message: '请选择提单签发地', trigger: 'blur' }], + signType: [{ required: true, message: '请选择签约方', trigger: 'blur' }], bookingAddr: [{ required: true, message: '请选择订舱网点', trigger: 'blur' }], serviceMode: [{ required: true, message: '请选择运输形态', trigger: 'blur' }], serviceType: [{ required: true, message: '请选择运送方式', trigger: 'blur' }], @@ -1655,8 +1703,6 @@ export default { bookingName: $data.bookingDetails.bookingName, bookingSex: $data.bookingDetails.bookingSex, - - destinationid: $data.bookingDetails.destinationid, destination: $data.bookingDetails.destination, destinationcode: $data.bookingDetails.destinationcode, @@ -1998,16 +2044,24 @@ export default { const arr3 = [] res.data.items.forEach(item => { if (item.shipperName) { - arr.push(item.shipperName) + if (!arr.includes(item.shipperName)) { + arr.push(item.shipperName) + } } if (item.bookingName) { - arr1.push(item.bookingName) + if (!arr1.includes(item.bookingName)) { + arr1.push(item.bookingName) + } } if (item.notifypartName) { - arr2.push(item.notifypartName) + if (!arr2.includes(item.notifypartName)) { + arr2.push(item.notifypartName) + } } if (item.consigneeName) { - arr3.push(item.consigneeName) + if (!arr3.includes(item.consigneeName)) { + arr3.push(item.consigneeName) + } } }) this.shipperList = arr @@ -2028,7 +2082,9 @@ export default { const arr = [] res.data.items.forEach(item => { if (item.shipperName) { - arr.push(item.shipperName) + if (!arr.includes(item.shipperName)) { + arr.push(item.shipperName) + } } }) this.shipperList = arr @@ -2046,7 +2102,9 @@ export default { const arr = [] res.data.items.forEach(item => { if (item.bookingName) { - arr.push(item.bookingName) + if (!arr.includes(item.bookingName)) { + arr.push(item.bookingName) + } } }) this.bookingList = arr @@ -2063,7 +2121,9 @@ export default { const arr = [] res.data.items.forEach(item => { if (item.notifypartName) { - arr.push(item.notifypartName) + if (!arr.includes(item.notifypartName)) { + arr.push(item.notifypartName) + } } }) this.notifypartList = arr @@ -2080,7 +2140,9 @@ export default { const arr = [] res.data.items.forEach(item => { if (item.consigneeName) { - arr.push(item.consigneeName) + if (!arr.includes(item.consigneeName)) { + arr.push(item.consigneeName) + } } }) this.consigneeList = arr @@ -2119,13 +2181,15 @@ export default { this.$set(this.details, 'carrierid', this.$route.query.carrierid) this.$set(this.details, 'carrier', this.$route.query.carrierid) if (this.$route.query.carrierid === 'EMC') { - this.$set(this.details, 'shipperSex', 'Mr.') - this.$set(this.details, 'bookingSex', 'Mr.') + this.$set(this.details, 'shipperSex', 'MS') + this.$set(this.details, 'bookingSex', 'MR') + this.$set(this.details, 'signType', 'Forwarder') this.$set(this.details, 'blfrt', '') this.$set(this.details, 'service', '') this.$set(this.details, 'portload', '') this.$set(this.details, 'portloadid', '') this.$set(this.details, 'billCount', 1) + this.$refs.basicFrom.resetFields() } } } @@ -2545,7 +2609,7 @@ export default { this.$message.success('保存成功') setTimeout(() => { this.saveFlag = false - }, 5000); + }, 3000); this.loading = false this.id = res.data.id if (res.data.cargoid) { @@ -2832,6 +2896,10 @@ export default { this.details.destinationcode = res['code'] || '' this.$forceUpdate() } + if (type === 'destinationid') { + this.details.destinationcode = res['code'] + this.$forceUpdate() + } } else if (['shippername', 'consigneename', 'notifypartyname', 'notifypartY2name', 'foreignAgentname', 'descriptionname'].includes(type)) { this[type] = res['title'] || '' this.details[type.replace('name', '')] = res['content'] || '' diff --git a/src/views/main/CabinManagement/details.vue b/src/views/main/CabinManagement/details.vue index 03bf967..ac4413b 100644 --- a/src/views/main/CabinManagement/details.vue +++ b/src/views/main/CabinManagement/details.vue @@ -149,6 +149,28 @@ + + + + + {{ item.name }} + + + +
@@ -596,6 +618,7 @@ export default { UserList1: [], UserList: [], UserList2: [], + UserList4: [], UserListAll: [], UserList3: [], id: 0, @@ -796,6 +819,7 @@ export default { this.UserList1 = JSON.parse(JSON.stringify(res.data)) this.UserList2 = JSON.parse(JSON.stringify(res.data)) this.UserList3 = JSON.parse(JSON.stringify(res.data)) + this.UserList4 = JSON.parse(JSON.stringify(res.data)) this.UserListAll = JSON.parse(JSON.stringify(res.data)) }) if (this.type === 'Edit') { @@ -876,6 +900,9 @@ export default { if (type === 3) { this.UserList3 = res.data } + if (type === 4) { + this.UserList4 = res.data + } }) } }, @@ -898,6 +925,9 @@ export default { if (item.saleid) { item.saleid = Number(item.saleid) } + if (item.businessid) { + item.businessid = Number(item.businessid) + } }) this.oldBook = JSON.parse(JSON.stringify(this.form.bookingSlotSaleInfoList)) } @@ -968,6 +998,13 @@ export default { } }) } + if (type === 4) { + this.UserList3.forEach(item => { + if (item.id == e) { + this.form.bookingSlotSaleInfoList[index][Tname] = item.name + } + }) + } } else { if (type === 0) { this.UserList = JSON.parse(JSON.stringify(this.UserListAll)) @@ -981,6 +1018,9 @@ export default { if (type === 3) { this.UserList3 = JSON.parse(JSON.stringify(this.UserListAll)) } + if (type === 4) { + this.UserList4 = JSON.parse(JSON.stringify(this.UserListAll)) + } } this.$forceUpdate() }, @@ -1035,6 +1075,23 @@ export default { this.type = 'Edit' this.id = res.data.id this.form = res.data + this.form.bookingSlotSaleInfoList.forEach(item => { + if (item.custserviceid) { + item.custserviceid = Number(item.custserviceid) + } + if (item.docid) { + item.docid = Number(item.docid) + } + if (item.opid) { + item.opid = Number(item.opid) + } + if (item.saleid) { + item.saleid = Number(item.saleid) + } + if (item.businessid) { + item.businessid = Number(item.businessid) + } + }) this.loading = false // this.getDetail() } else { diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue index 8b71847..9a7395e 100644 --- a/src/views/main/CabinManagement/index.vue +++ b/src/views/main/CabinManagement/index.vue @@ -212,6 +212,7 @@ :loading="loading" @cell-dblclick="handledbclick" @sort-change="tableSortChange" + @cell-click="cellClickEvent" @resizable-change="resizableChange" @checkbox-change="checkboxChangeEvent" :height="tableHeight" @@ -271,7 +272,9 @@ {{ row.etd ? row.etd.substring(0, 10) : '' }}