diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index 6ea9c22..9e103f9 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -953,7 +953,7 @@ export default {
console.log('=== 获取到选择数据 ===', type, res)
if (type === 'customername') {
this.details.customername = res.shortName || ''
- this.details.customerid = res.codeName || ''
+ this.details.customerid = res.id || ''
if (res.op) {
this.details.op = res.op
this.details.opid = res.opid
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index d6695ab..e38e6ee 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -980,7 +980,7 @@ export default {
immediate: true,
handler(nD, oD) {
this.id = this.$route.query.id
- // this.init()
+ this.init()
}
},
totalKgs() {
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index d362477..2f75746 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -15,6 +15,7 @@
发货人
收货人
通知人
-
+
+
endValue.valueOf();
+ },
+ disabledEndDate(endValue) {
+ const startValue = this.startValue;
+ if (!endValue || !startValue) {
+ return false;
+ }
+ return startValue.valueOf() >= endValue.valueOf();
+ },
+ handleStartOpenChange(open) {
+ if (!open) {
+ this.endOpen = true;
+ }
+ // if (this.startValue) {
+ // this.getDateRangeRes()
+ // }
+ },
+ handleEndOpenChange(open) {
+ this.endOpen = open;
+ // if (this.endValue) {
+ // this.getDateRangeRes()
+ // }
+ },
+ getDateRangeRes () {
+ const start = this.startValue ? this.formatDate(this.startValue._d).substr(0, 10) : ''
+ const end = this.endValue ? this.formatDate(this.endValue._d).substr(0, 10) : ''
+ const date = [start, end]
+ console.log('== 更新时间 ==', date)
this.$emit('change', {
form: this.labelData,
- value: mode
+ value: date
})
},
- openChangeRangeDate (e) {
- // let arr = []
- // e.map((item, index) => {
- // if (item._d) {
- // const date = this.formatDate(item._d).substr(0, 10)
- // arr.push(date)
- // console.log(date)
- // }
- // })
- // this.$emit('change', {
- // form: this.labelData,
- // value: arr
- // })
- },
formatDate (now) {
var date = new Date(now)
var y = date.getFullYear() // 年份
@@ -182,6 +243,7 @@ export default {
// 返回值,根据自己需求调整,现在已经拿到了年月日时分秒了
return y + '-' + m + '-' + d + ' ' + h + ':' + min + ':' + s
},
+ // 时间区间 end
// == 下拉选择 ==
filterOption(input, option) {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0