diff --git a/src/api/modular/main/DjyApiAuth.js b/src/api/modular/main/DjyApiAuth.js new file mode 100644 index 0000000..e69de29 diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index ce53fc0..f167174 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -30,6 +30,7 @@ :type="type" :details="bookingDetails" :rules="basicRules" + :inPageLoading="inPageLoading" @changeDetail="changeDetailFun" > diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index dcb6a0a..037d846 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -3,7 +3,7 @@
- + - + + @@ -105,7 +106,8 @@ :wrapperCol="wrapperCol2" has-feedback prop="pono"> - + + @@ -117,7 +119,8 @@ has-feedback prop="hblno" > - + + @@ -129,7 +132,8 @@ has-feedback prop="bookingno" > - + + @@ -176,7 +181,8 @@ @@ -225,7 +231,8 @@ has-feedback prop="lanecode" > - + + @@ -239,7 +246,9 @@ has-feedback prop="voynoinner" > - + + @@ -262,7 +271,8 @@ has-feedback prop="voyno" > - + + @@ -278,7 +288,7 @@ - W{{ etdWeek || '--' }} + W{{ etdWeek || '--' }}
@@ -308,7 +318,9 @@ :wrapperCol="wrapperCol" has-feedback prop="lanename"> - + + @@ -352,7 +364,8 @@ has-feedback prop="contractno" > - + + @@ -478,67 +491,6 @@ - - import { XCard } from '@/components' import { AutoComplete } from 'ant-design-vue' +import inputView from './inputView' import { DjyCustomerpage, DjyCustomerSuggest, @@ -580,7 +533,8 @@ export default { name: 'BookingDetail', components: { XCard, - AutoComplete + AutoComplete, + inputView, }, props: { details: { @@ -598,6 +552,10 @@ export default { default: () => { return {} } + }, + inPageLoading: { + type: Boolean, + default: false } }, data() { @@ -898,6 +856,12 @@ export default { detail: nval, type: 'baseInfo' }) + console.log('== 数据更新 ==', nval.etd) + if (nval.etd) { + this.etdWeek = this.getWeek(nval.etd) + } else { + this.etdWeek = '' + } }, deep: true }, @@ -921,6 +885,7 @@ export default { resolve(true); } else { console.log('验证失败!'); + // eslint-disable-next-line prefer-promise-reject-errors reject(false); } }); @@ -1022,6 +987,8 @@ export default { this.getUserList('custservice') if (this.details.etd) { this.etdWeek = this.getWeek(this.details.etd) + } else { + this.etdWeek = '' } this.ContactType = this.$options.filters['dictData']('booking_contact_type') }, @@ -1046,6 +1013,7 @@ export default { }) }, customerSelect(value) { + console.log('客户 - 这里点击更新了数据', value) this.customerData.forEach(item => { if (item.shortName == value) { this.details.op = item.op @@ -1365,7 +1333,11 @@ export default { }, // 关系人弹窗 - end changeEtd(date, dateString) { - this.details.etd = dateString + if (!dateString) { + this.details.etd = null + } else { + this.details.etd = dateString + } this.etdWeek = this.getWeek(dateString) }, getWeek(dateTime) { @@ -1417,8 +1389,13 @@ export default { this.details.vessel = this.details.vessel ? this.details.vessel : '' } this.getContractno(value) - } + }, // 约号 - end + inputChange ({ type, value }) { + this.details[type] = value + console.log(this.details[type]) + this.$forceUpdate() + } } } diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue index 0e5092f..5b7cf7f 100644 --- a/src/views/main/BookingLedger/detail/modules/billInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue @@ -59,9 +59,9 @@ has-feedback prop="issueplace" > +
- + +
- +
+ + + diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue index 1d3ad6c..e550b92 100644 --- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue @@ -35,14 +35,15 @@
- +
- +
- +
- + @@ -352,7 +355,8 @@ has-feedback prop="placereceipt" > - + + @@ -386,7 +390,8 @@ has-feedback prop="portload" > - + + @@ -420,7 +425,8 @@ has-feedback prop="transport" > - + + @@ -454,7 +460,8 @@ has-feedback prop="portdischarge" > - + + @@ -488,7 +495,8 @@ has-feedback prop="destination" > - + + @@ -522,7 +530,8 @@ has-feedback prop="placedelivery" > - + + @@ -534,7 +543,8 @@ has-feedback prop="pkgs" > - + + @@ -569,7 +579,9 @@ prop="kgs" >
- KGS + + + KGS
@@ -583,7 +595,9 @@ prop="cbm" >
- CBM + + + CBM
@@ -669,7 +683,8 @@ diff --git a/src/views/main/DjyApiAuth/index.vue b/src/views/main/DjyApiAuth/index.vue new file mode 100644 index 0000000..a1df171 --- /dev/null +++ b/src/views/main/DjyApiAuth/index.vue @@ -0,0 +1,313 @@ + + + \ No newline at end of file diff --git a/src/views/main/DjyApiAuth/modules/addFrom.vue b/src/views/main/DjyApiAuth/modules/addFrom.vue new file mode 100644 index 0000000..9995c30 --- /dev/null +++ b/src/views/main/DjyApiAuth/modules/addFrom.vue @@ -0,0 +1,170 @@ + + + diff --git a/src/views/main/DjyApiAuth/modules/initData.js b/src/views/main/DjyApiAuth/modules/initData.js new file mode 100644 index 0000000..905ed79 --- /dev/null +++ b/src/views/main/DjyApiAuth/modules/initData.js @@ -0,0 +1,11 @@ +export default { + columns: [ + { type: 'seq', width: 60, noDraggable: true }, + { field: 'goodsCategory', title: '品名分类', showHeaderOverflow: true, sortable: true }, + { field: 'goodsCategoryName', title: '品名分类名称', showHeaderOverflow: true, sortable: true }, + { field: 'createUserName', title: '创建者名称', showHeaderOverflow: true, sortable: true }, + { field: 'createTime', title: '创建时间', showHeaderOverflow: true, sortable: true }, + { field: 'updateTime', title: '更新时间', showHeaderOverflow: true, sortable: true }, + { field: 'operate', title: '操作', width: 150, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false } + ] +}