diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 3476872..3944f78 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -38,7 +38,6 @@
-
-
-
-
-
-
{
const defaultData = JSON.parse(res.data.configJson)
this.defaultData = defaultData
- console.log('==== 获取默认值设置 ====', defaultData)
defaultData.map((item, index) => {
const field = item.field.split('.')
let label = field[1].toLowerCase()
@@ -777,7 +741,6 @@ export default {
if (['EPCODE', 'DZREMARK', 'CZREMARK', 'Warehouse'].includes(field[1])) {
label = this.emnuDefaultLabel(field[1])
}
- console.log('initData ----', label)
if (Object.keys(initDetail).includes(label)) {
initDetail[label] = item.code
this.bookingDetails[label] = this.bookingDetails[label] && this.bookingDetails[label] !== '' ? this.bookingDetails[label] : item.code
@@ -801,7 +764,6 @@ export default {
} else if (typeArr2.includes(field[1]) || typeArr4.includes(field[1])) {
label = this.emnuDefaultLabel(field[1])
}
- console.log('edi --- ', label)
initDetail.bookingEDIExt[label] = item.code
bookingEDIExt[label] = item.code
this.bookingDetails.bookingEDIExt[label] = this.bookingDetails.bookingEDIExt[label] && this.bookingDetails.bookingEDIExt[label] !== '' ? this.bookingDetails.bookingEDIExt[label] : item.code
@@ -923,7 +885,6 @@ export default {
},
getDetail() {
- // this.inPageLoading = false
if (this.inPageLoading) {
return false
}
@@ -993,7 +954,6 @@ export default {
this.inPageLoading = false
this.getDefaultVal()
setTimeout(() => {
- // console.log('== 5. 设置主单保存数据 - false ==')
this.checkSaveFun({ type: 'details', hasChange: false })
this.detailsLoadOver = true
this.inChildLoading = false
@@ -1037,7 +997,6 @@ export default {
changeDetailFun(data) {
const { detail, type } = data
if (this.ifCompare(this.bookingDetails, detail) && !this.inChildLoading) {
- // console.log('== 6. 设置主单有保存数据 - true ==')
this.checkSaveFun({ type: 'details', hasChange: true })
}
this.bookingDetails = detail
@@ -1094,7 +1053,6 @@ export default {
return false
}
} else {
- // edi 初始数据验证
Object.keys(this.ediRules).map((item, index) => {
if (this.checkFrom.includes(item) && !this.bookingDetails[item.split('.')[0]][item.split('.')[1]]) {
this.hasEdiRules = true
@@ -1107,7 +1065,6 @@ export default {
}
}
- // 箱信息验证
if (this.hasTableRules && this.bookingDetails.shippingMethod !== '拼箱') {
if (this.bookingDetails.ctnInputs.length === 0) {
this.$message.error('保存失败，箱信息未填写')
@@ -1293,7 +1250,6 @@ export default {
} else {
FnOk()
}
- // 自定义必填项验证 - end
},
spliceMorefun(str) {
@@ -1304,7 +1260,6 @@ export default {
this.mainOrderActiveKey = e
},
- // 操作按钮
refreshPage() {
this.init()
this.$refs.rightContent.init()
@@ -1355,7 +1310,6 @@ export default {
name: 'BookingDetail',
query: { id: prevId, type: prevType, mblno: this.bookingList[prevId].mblno, noOpenTab: true }
})
- // this.$route.query.id = 1123
} else {
if (index === arr.length - 1) {
this.$message.error('当前已经是最后一票')
@@ -1381,8 +1335,6 @@ export default {
query: { id: this.id, isCopy: true, type: this.bookingDetails.carrierid }
})
},
- // 分单部分
- // 切换
changeTab(e) {
console.log('== 切换顶部标签 ==', this.detailsLoadOver, this.inChildLoading)
const _this = this
@@ -1391,13 +1343,11 @@ export default {
_this.$refs.sedOrder.init(_this.bookingDetails.hbList)
}, 100)
},
- // 新增
addSedList() {
if (this.isAdd) {
this.$message.error('请先保存主单')
return false
}
- // this.$message.loading('加载中...')
const data = JSON.parse(JSON.stringify(this.bookingDetails))
data.isNoSave = true
data.hblno = ''
@@ -1417,7 +1367,6 @@ export default {
this.$refs.sedOrder.init(this.bookingDetails.hbList)
}, 200)
},
- // 修改
changeHBFun(data) {
const arr = []
data.map((item, index) => {
@@ -1426,16 +1375,11 @@ export default {
if (arr.includes(true)) {
this.$set(this.bookingDetails, 'hbList', data)
this.checkSaveFun({ type: 'hbList', hasChange: true })
- // console.log('== 分单有修改 ==')
} else {
this.checkSaveFun({ type: 'hbList', hasChange: false })
- // console.log('== 分单无修改 ==')
}
},
checkSaveFun(data) {
- // if (this.inPageLoading) {
- // return false
- // }
if (this.inGoodsSave) { return false }
const key = this.$route.fullPath
const lastPages = this.needSavePages
@@ -1448,7 +1392,6 @@ export default {
} else if (data.type === 'hbList') {
this.$set($data, 'hbList', data.hasChange)
}
- // console.log('== 设置主单保存数据 ==', this.detailsLoadOver, this.inPageLoading, this.inChildLoading)
this.$set(lastPages, key, $data)
this.setNeedSavePages(lastPages)
},
@@ -1456,7 +1399,6 @@ export default {
this.inGoodsSave = data
},
- // 箱信息计算
calc(num1, num2, calcStr) {
var str1 // 转换为字符串的数字
var str2
@@ -1566,16 +1508,13 @@ export default {
}
},
sedOrderRemoveFun(sedData) {
- // console.log('== 父组件收到子单删除数据 ==', sedData, this.bookingDetails.hbList)
this.$set(this.bookingDetails, 'hbList', sedData)
if (sedData.length === 0) {
- // console.log('== 子单删除完毕 ==')
this.Showtabs = false
this.tabActiveKey = '1'
}
},
changeCtnInfoFun ({ type, val }) {
- console.log('获取数据')
if (type === 'kindpkgs') {
this.bookingDetails.kindpkgs = val
}
diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index e87a325..ddf488b 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -166,16 +166,6 @@
:showLabel="['contractNo']"
@select="getAutoViewRes"
>
-
@@ -240,6 +230,19 @@
+
+
+
+
+
+
W{{ etdWeek || '--' }}
-
+
-
+ -->
-
+
-
-
+
-
+
{
- // console.log('编辑', row, column)
}
},
checkboxOption: {
hideSelectAll: false,
- // 行选择改变事件
selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
this.selectArr = selectedRowKeys
},
- // 全选改变事件
selectedAllChange: ({ isSelected, selectedRowKeys }) => {
if (isSelected) {
this.selectArr = selectedRowKeys
@@ -767,7 +755,6 @@ export default {
}
}
},
- // 单元格复制
clipboardOption: {
copy: true,
paste: true,
@@ -877,7 +864,6 @@ export default {
etdWeek: '',
selectArr: [],
customerContacts: [],
- // 选择委托单位 / 关系人弹窗 - end
customerContactsData: [],
ContactType: [],
customerContactsDataList: []
@@ -887,7 +873,6 @@ export default {
details: {
handler(nval, oval) {
if (!this.inSave) {
- // console.log('基础数据改变，回传数据', this.inSave, nval)
this.$emit('changeDetail', {
detail: nval,
type: 'baseInfo'
@@ -965,10 +950,6 @@ export default {
// ---------- 新增 ----------
async insertEvent(row) {
- // const $table = this.$refs.xTable
- // const record = {}
- // const { row: newRow } = await $table.insertAt(record, row)
- // await $table.setActiveCell(newRow, 'name')
const data = {
email: '',
name: '',
@@ -1001,10 +982,8 @@ export default {
})
const data = JSON.parse(JSON.stringify(fullData))
data.forEach(item => {
- // if (item.WroleCode) {
item.roleCode = item.WroleCode
delete item.rowKey
- // }
})
BookingOrderContactSavebatch(this.$route.query.id, data).then(res => {
if (res.success) {
@@ -1148,7 +1127,6 @@ export default {
this.$forceUpdate()
},
getSelectViewRes({ type, res }) {
- console.log('=== 获取到选择数据 ===', type, res)
if (type === 'customername') {
this.details.customername = res.shortName || ''
this.details.customerid = Number(res.id) || ''
@@ -1189,13 +1167,6 @@ export default {
} else {
this.details.item = []
}
- // if (res.id) {
- // DjyCustomerdetail({ id: res.id }).then(res => {
- // console.log(res.id)
- // this.details.sale = res.data.sale || ''
- // this.details.saleid = res.data.saleid || ''
- // })
- // }
} else if (type === 'carrierid') {
this.details.carrier = res.enName || ''
this.details.carrierid = res.code || ''
@@ -1237,7 +1208,6 @@ export default {
this.$refs.vesselView.handleSearch('')
}, 600)
}
- console.log('== 日期修改 ==', type, value, this.details[type])
},
getAutoViewRes ({ type, res }) {
console.log(type, res)
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 2da967c..6c7c7c9 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -67,6 +67,26 @@
+
@@ -1121,6 +1141,8 @@ export default {
toggleAdvanced() {
this.advanced = !this.advanced
+ let start = new Date().getTime()
+ console.log('== 点击展开 ==')
if (!this.advanced) {
const len = this.formData.length % 4
if (this.formData.length === 4 || this.formData.length > 4) {
@@ -1133,6 +1155,7 @@ export default {
// this.formBtnCol = 24 - len * 4
this.formBtnCol = 24 - len * 4 === 4 ? 24 : 24 - len * 4
}
+ console.log('== 展开结束 ==', new Date().getTime() - start)
},
tableRefresh() {
const data = { ...this.formRes }
@@ -1629,7 +1652,7 @@ export default {
KeyWord: value,
type: 'booking_agent'
}
- } else if (['SALE', 'CUSTSERVICE', 'DOC', 'ROUTE'].includes(form.label)) {
+ } else if (['SALE', 'CUSTSERVICE', 'DOC', 'ROUTE', 'OP'].includes(form.label)) {
// 销售 、 揽货人, 航线操作
query = {
name: value
@@ -2161,7 +2184,7 @@ export default {
.active {
cursor: pointer;
// color: @primary-color;
- color: #15a4a4;
+ color: #004d11;
}
}
}
@@ -2199,7 +2222,7 @@ export default {
.active {
cursor: pointer;
// color: @primary-color;
- color: #15a4a4;
+ color: #004d11;
}
&:nth-of-type(3) {
i {