|
|
|
|
@ -6,7 +6,7 @@
|
|
|
|
|
<XCard class="content-nav">
|
|
|
|
|
<div class="table-page-search-wrapper">
|
|
|
|
|
<a-row :gutter="48" class="booking-from-box">
|
|
|
|
|
<a-col :span="19">
|
|
|
|
|
<a-col :xl="19" :lg="24" :md="24" :sm="24" :class="advanced ? '' : 'advanced'">
|
|
|
|
|
<BasicForm @register="registerForm" />
|
|
|
|
|
</a-col>
|
|
|
|
|
|
|
|
|
|
@ -40,7 +40,7 @@
|
|
|
|
|
</a-form> -->
|
|
|
|
|
<a-col
|
|
|
|
|
style="padding: 0px"
|
|
|
|
|
:xl="!advanced ? 5 : 8"
|
|
|
|
|
:xl="5"
|
|
|
|
|
:lg="24"
|
|
|
|
|
:md="24"
|
|
|
|
|
:sm="24"
|
|
|
|
|
@ -59,7 +59,11 @@
|
|
|
|
|
<span class="tab-btn" @click="formSetting">
|
|
|
|
|
<a-icon type="setting" :style="{ marginLeft: '0px' }" />
|
|
|
|
|
</span>
|
|
|
|
|
<a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
|
|
|
|
|
<a
|
|
|
|
|
class="senior-search"
|
|
|
|
|
@click="toggleAdvanced"
|
|
|
|
|
v-if="searchFormSchema.length > 4"
|
|
|
|
|
>
|
|
|
|
|
{{ advanced ? '收起查询' : '更多查询' }}
|
|
|
|
|
<i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
|
|
|
|
|
</a>
|
|
|
|
|
@ -74,7 +78,11 @@
|
|
|
|
|
<span class="tab-btn" @click="formSetting">
|
|
|
|
|
<a-icon type="setting" :style="{ marginLeft: '0px' }" />
|
|
|
|
|
</span>
|
|
|
|
|
<a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
|
|
|
|
|
<a
|
|
|
|
|
class="senior-search"
|
|
|
|
|
@click="toggleAdvanced"
|
|
|
|
|
v-if="searchFormSchema.length > 4"
|
|
|
|
|
>
|
|
|
|
|
{{ advanced ? '收起' : '更多' }}
|
|
|
|
|
<i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
|
|
|
|
|
</a>
|
|
|
|
|
@ -1294,7 +1302,7 @@
|
|
|
|
|
@cancel="moreNumCancel"
|
|
|
|
|
>
|
|
|
|
|
<div>
|
|
|
|
|
<a-textarea v-model="moreNumVal" style="height: 200px" />
|
|
|
|
|
<a-textarea v-model:value="moreNumVal" style="height: 200px" />
|
|
|
|
|
</div>
|
|
|
|
|
</a-modal>
|
|
|
|
|
<a-modal
|
|
|
|
|
@ -1529,7 +1537,6 @@
|
|
|
|
|
BookingOrderBachUpdate,
|
|
|
|
|
GetCarrierlist,
|
|
|
|
|
DjyCustomerSuggest,
|
|
|
|
|
GetYardlist,
|
|
|
|
|
GetSysUserPage,
|
|
|
|
|
DjyCustomerpage,
|
|
|
|
|
GetCtn,
|
|
|
|
|
@ -1609,114 +1616,7 @@
|
|
|
|
|
}
|
|
|
|
|
// 查询列表数据
|
|
|
|
|
async function getList(queryParam = {}, isInit = false, isAdd = 'normal', isAdv = false) {
|
|
|
|
|
// const FnsourceId: API.DataResult = await GetClientSourceSelectList()
|
|
|
|
|
// console.log(FnsourceId)
|
|
|
|
|
// if (FnsourceId.succeeded) {
|
|
|
|
|
// ListData.sourceId = []
|
|
|
|
|
// FnsourceId.data.forEach((e) => {
|
|
|
|
|
// ListData.sourceId.push({ label: e.sourceName, value: e.id })
|
|
|
|
|
// })
|
|
|
|
|
// }
|
|
|
|
|
// gridOptions.loading = true
|
|
|
|
|
// const { currentPage, pageSize } = gridOptions.pagerConfig
|
|
|
|
|
// let query = {
|
|
|
|
|
// pageCondition: {
|
|
|
|
|
// pageIndex: currentPage,
|
|
|
|
|
// pageSize: pageSize,
|
|
|
|
|
// sortConditions: [],
|
|
|
|
|
// },
|
|
|
|
|
// queryCondition: [],
|
|
|
|
|
// }
|
|
|
|
|
// Object.keys(formRes.value).forEach((item) => {
|
|
|
|
|
// console.log({
|
|
|
|
|
// FieldName: item,
|
|
|
|
|
// FieldValue: formRes.value[item],
|
|
|
|
|
// ConditionalType: 1,
|
|
|
|
|
// })
|
|
|
|
|
// query.queryCondition.push({
|
|
|
|
|
// FieldName: item,
|
|
|
|
|
// FieldValue: formRes.value[item],
|
|
|
|
|
// ConditionalType: 1,
|
|
|
|
|
// })
|
|
|
|
|
// })
|
|
|
|
|
// if (isAdv) {
|
|
|
|
|
// query.queryCondition.push(ConditionalList.value)
|
|
|
|
|
// }
|
|
|
|
|
// PageDataByBooking({
|
|
|
|
|
// pageCondition: query.pageCondition,
|
|
|
|
|
// queryCondition: JSON.stringify(query.queryCondition),
|
|
|
|
|
// })
|
|
|
|
|
// .then((res) => {
|
|
|
|
|
// if (res.succeeded) {
|
|
|
|
|
// let newBookingList = {}
|
|
|
|
|
// if (query.queryCondition.PageNo !== 1) {
|
|
|
|
|
// newBookingList = appStore.getbookingList
|
|
|
|
|
// }
|
|
|
|
|
// const _data = res.data.map((item, index) => {
|
|
|
|
|
// item.index = (currentPage - 1) * pageSize + index
|
|
|
|
|
// const bookstatus = [
|
|
|
|
|
// { staCode: 'sta_cangdan', isChecked: false },
|
|
|
|
|
// { staCode: 'sta_haifang', isChecked: false },
|
|
|
|
|
// { staCode: 'sta_zhuangzai', isChecked: false },
|
|
|
|
|
// { staCode: 'sta_mafang', isChecked: false },
|
|
|
|
|
// { staCode: 'sta_zhuangchuan', isChecked: false },
|
|
|
|
|
// { staCode: 'sta_atd', isChecked: false },
|
|
|
|
|
// ]
|
|
|
|
|
// if (item.bsstatusname) {
|
|
|
|
|
// if (appStore.getstatusDIct) {
|
|
|
|
|
// appStore.getstatusDIct.forEach((ite) => {
|
|
|
|
|
// if (ite.name == item.bsstatusname) {
|
|
|
|
|
// item.bsstatusnameColor = ite.remark
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// item.bookstatus = bookstatus
|
|
|
|
|
// item.refshYzitemLoad = false
|
|
|
|
|
// item.webDataLoad = false
|
|
|
|
|
// item.atdLoading = false
|
|
|
|
|
// item.serviceLoad = false
|
|
|
|
|
// item.rowDzMark = false
|
|
|
|
|
// item.rowCzMark = false
|
|
|
|
|
// item.rowCustno = false
|
|
|
|
|
// item.rowSqxs = false
|
|
|
|
|
// item.rowPono = false
|
|
|
|
|
// item.czmarkLoading = false
|
|
|
|
|
// item.custnoLoading = false
|
|
|
|
|
// item.dzmarkLoading = false
|
|
|
|
|
// item.sqxsLoading = false
|
|
|
|
|
// item.ponoLoading = false
|
|
|
|
|
// if (!item.shenQingXiangShi) {
|
|
|
|
|
// item.shenQingXiangShi = ''
|
|
|
|
|
// }
|
|
|
|
|
// let hasGoods = 0
|
|
|
|
|
// if (item.goodsStatusList) {
|
|
|
|
|
// item.goodsStatusList.map((gitem, gindex) => {
|
|
|
|
|
// if (gitem.finishTime || gitem.remark) {
|
|
|
|
|
// hasGoods++
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// }
|
|
|
|
|
// item.hasGoods = hasGoods
|
|
|
|
|
// newBookingList[item.id] = item
|
|
|
|
|
// return item
|
|
|
|
|
// })
|
|
|
|
|
// gridOptions.pagerConfig.columns = JSON.parse(JSON.stringify(initData.columns))
|
|
|
|
|
// gridOptions.data = [..._data]
|
|
|
|
|
// gridOptions.pagerConfig.total = res.data.totalCount
|
|
|
|
|
// appStore.setbookingList(newBookingList)
|
|
|
|
|
// } else {
|
|
|
|
|
// gridOptions.data = [...[]]
|
|
|
|
|
// gridOptions.loading = false
|
|
|
|
|
// // that.$forceUpdate()
|
|
|
|
|
// }
|
|
|
|
|
// ResetType.value = true
|
|
|
|
|
// appStore.setfirstFlag(false)
|
|
|
|
|
// console.log(gridOptions.loading)
|
|
|
|
|
// })
|
|
|
|
|
// .catch((err) => {
|
|
|
|
|
// console.log(err)
|
|
|
|
|
// })
|
|
|
|
|
console.log('getList')
|
|
|
|
|
}
|
|
|
|
|
// 创建搜索列表
|
|
|
|
|
const [registerForm, { getFieldsValue, resetFields, validateFields, setFieldsValue, validate }] =
|
|
|
|
|
@ -1750,36 +1650,54 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let condition: API.ConditionItem[] = []
|
|
|
|
|
|
|
|
|
|
Object.keys(getFieldsValue()).forEach((e) => {
|
|
|
|
|
condition.push({
|
|
|
|
|
FieldName: capitalizeFirstLetter(e),
|
|
|
|
|
FieldValue: getFieldsValue()[e],
|
|
|
|
|
ConditionalType: 1,
|
|
|
|
|
})
|
|
|
|
|
if (getFieldsValue()[e]) {
|
|
|
|
|
if (e == 'etd') {
|
|
|
|
|
getFieldsValue()[e].forEach((t, i) => {
|
|
|
|
|
condition.push({
|
|
|
|
|
FieldName: capitalizeFirstLetter(e),
|
|
|
|
|
FieldValue: t,
|
|
|
|
|
ConditionalType: i == 0 ? 3 : 5,
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
condition.push({
|
|
|
|
|
FieldName: capitalizeFirstLetter(e),
|
|
|
|
|
FieldValue: getFieldsValue()[e],
|
|
|
|
|
ConditionalType: 1,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
if (isAdvancedQuery.value) {
|
|
|
|
|
condition.push(ConditionalList.value)
|
|
|
|
|
}
|
|
|
|
|
if (moreNumVal.value) {
|
|
|
|
|
let ManyQueryData: any = { ConditionalList: [] }
|
|
|
|
|
moreNumVal.value
|
|
|
|
|
.replace(/\n|\r/g, ',')
|
|
|
|
|
.split(',')
|
|
|
|
|
.forEach((item) => {
|
|
|
|
|
ManyQueryData.ConditionalList.push({
|
|
|
|
|
Key: 0,
|
|
|
|
|
Value: { FieldName: 'mblno', FieldValue: item, ConditionalType: 1 },
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
condition.push(ManyQueryData)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
postParam.queryCondition = JSON.stringify(condition)
|
|
|
|
|
return postParam
|
|
|
|
|
},
|
|
|
|
|
afterFetch: () => {
|
|
|
|
|
isAdvancedQuery.value = false
|
|
|
|
|
|
|
|
|
|
moreNumVisible.value = false
|
|
|
|
|
moreNumVal.value = ''
|
|
|
|
|
},
|
|
|
|
|
columns,
|
|
|
|
|
// formConfig: {
|
|
|
|
|
// labelWidth: 120,
|
|
|
|
|
// schemas: searchFormSchema,
|
|
|
|
|
// },
|
|
|
|
|
// sortFn: (sorter) => {
|
|
|
|
|
// // console.log('排序:' + sorter);
|
|
|
|
|
// sortInfo = sorter
|
|
|
|
|
// },
|
|
|
|
|
// filterFn: (filters) => {
|
|
|
|
|
// // console.log('筛选:' + filters);
|
|
|
|
|
// filterInfo = filters
|
|
|
|
|
// },
|
|
|
|
|
pagination: true,
|
|
|
|
|
bordered: true,
|
|
|
|
|
useSearchForm: true,
|
|
|
|
|
@ -1956,12 +1874,6 @@
|
|
|
|
|
function tableRefresh() {
|
|
|
|
|
isAdvancedQuery.value = false
|
|
|
|
|
reload()
|
|
|
|
|
// const data = { ...formRes.value }
|
|
|
|
|
// nowFirst.value = false
|
|
|
|
|
// data.multisort = searchData.value.multisort
|
|
|
|
|
// searchData.value = JSON.parse(JSON.stringify(data))
|
|
|
|
|
// init(searchData.value)
|
|
|
|
|
// formRes.value = data
|
|
|
|
|
}
|
|
|
|
|
// 重置
|
|
|
|
|
function tableReset() {
|
|
|
|
|
@ -1970,7 +1882,21 @@
|
|
|
|
|
reload()
|
|
|
|
|
}, 100)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const moreNumVal = ref('') // 多提单号绑定值
|
|
|
|
|
const moreNumVisible = ref(false) //多提单号弹窗
|
|
|
|
|
// 打开多提单号查询
|
|
|
|
|
function tableMoreRefresh() {
|
|
|
|
|
moreNumVal.value = ''
|
|
|
|
|
moreNumVisible.value = !moreNumVisible.value
|
|
|
|
|
}
|
|
|
|
|
// 多提单号 确定
|
|
|
|
|
function moreNumSubmit() {
|
|
|
|
|
reload()
|
|
|
|
|
}
|
|
|
|
|
// 多提单号 取消
|
|
|
|
|
function moreNumCancel() {
|
|
|
|
|
moreNumVisible.value = false
|
|
|
|
|
}
|
|
|
|
|
// -----------------------------------
|
|
|
|
|
const formInitData = [
|
|
|
|
|
{ title: '主提单号', align: 'center', width: '90', label: 'MBLNO', type: 'input' },
|
|
|
|
|
@ -2003,9 +1929,9 @@
|
|
|
|
|
]
|
|
|
|
|
const formMoreTableData = ref('')
|
|
|
|
|
const formTableData = ref(JSON.parse(JSON.stringify(initData.columns)))
|
|
|
|
|
const moreNumVal = ref('')
|
|
|
|
|
|
|
|
|
|
const formatFlag = ref(false)
|
|
|
|
|
const moreNumVisible = ref(false)
|
|
|
|
|
|
|
|
|
|
const AdvancedQueryVisible = ref(false)
|
|
|
|
|
const advanced = ref(false)
|
|
|
|
|
const goodStatusShow = ref(false)
|
|
|
|
|
@ -2510,64 +2436,32 @@
|
|
|
|
|
document.execCommand('copy')
|
|
|
|
|
document.body.removeChild(cInput)
|
|
|
|
|
}
|
|
|
|
|
function moreNumSubmit() {
|
|
|
|
|
let data = ''
|
|
|
|
|
moreNumVal.value
|
|
|
|
|
.replace(/\n|\r/g, ',')
|
|
|
|
|
.split(',')
|
|
|
|
|
.forEach((item) => {
|
|
|
|
|
if (item.replace(/\s*/g, '')) {
|
|
|
|
|
if (data) {
|
|
|
|
|
data = `${data},${item}`
|
|
|
|
|
} else {
|
|
|
|
|
data = item
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
formRes.value.MBLNO = data
|
|
|
|
|
that.$refs['fromlabel-MBLNO'][0].$data.value = formRes.value.MBLNO
|
|
|
|
|
// that.$forceUpdate()
|
|
|
|
|
moreNumCancel()
|
|
|
|
|
}
|
|
|
|
|
function moreNumCancel() {
|
|
|
|
|
moreNumVisible.value = false
|
|
|
|
|
}
|
|
|
|
|
function TaskShippingOrderCompareHandleCancel() {
|
|
|
|
|
TaskShippingOrderCompareVisible.value = false
|
|
|
|
|
}
|
|
|
|
|
function toggleAdvanced() {
|
|
|
|
|
advanced.value = !advanced.value
|
|
|
|
|
// that.$forceUpdate()
|
|
|
|
|
const start = new Date().getTime()
|
|
|
|
|
console.log('== 点击展开 ==', start)
|
|
|
|
|
if (!advanced.value) {
|
|
|
|
|
const len = formData.value.length % 4
|
|
|
|
|
if (formData.value.length === 4 || formData.value.length > 4) {
|
|
|
|
|
formBtnCol.value = 8
|
|
|
|
|
} else {
|
|
|
|
|
formBtnCol.value = 24 - len * 4
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
const len = formData.value.length % 6
|
|
|
|
|
// formBtnCol.value = 24 - len * 4
|
|
|
|
|
formBtnCol.value = 24 - len * 4 === 4 ? 24 : 24 - len * 4
|
|
|
|
|
}
|
|
|
|
|
console.log('== 展开结束 ==', new Date().getTime() - start)
|
|
|
|
|
// // that.$forceUpdate()
|
|
|
|
|
// const start = new Date().getTime()
|
|
|
|
|
// console.log('== 点击展开 ==', start, formBtnCol)
|
|
|
|
|
// if (!advanced.value) {
|
|
|
|
|
// const len = searchFormSchema.length % 4
|
|
|
|
|
// if (searchFormSchema.length === 4 || searchFormSchema.length > 4) {
|
|
|
|
|
// formBtnCol.value = 8
|
|
|
|
|
// } else {
|
|
|
|
|
// formBtnCol.value = 24 - len * 4
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// const len = searchFormSchema.length % 6
|
|
|
|
|
// // formBtnCol.value = 24 - len * 4
|
|
|
|
|
// formBtnCol.value = 24 - len * 4 === 4 ? 24 : 24 - len * 4
|
|
|
|
|
// }
|
|
|
|
|
// console.log('== 展开结束 ==', new Date().getTime() - start, formBtnCol)
|
|
|
|
|
}
|
|
|
|
|
function formSetting() {
|
|
|
|
|
setForm.value.open()
|
|
|
|
|
}
|
|
|
|
|
function tableMoreRefresh() {
|
|
|
|
|
const arr = formRes.value.MBLNO.split(/，|,/)
|
|
|
|
|
let val = ``
|
|
|
|
|
arr.map((item) => {
|
|
|
|
|
val += `${item}
|
|
|
|
|
` // 这里不要格式化
|
|
|
|
|
})
|
|
|
|
|
moreNumVal.value = val
|
|
|
|
|
moreNumVisible.value = !moreNumVisible.value
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function pageClick() {
|
|
|
|
|
goodStatusShow.value = false
|
|
|
|
|
@ -2758,8 +2652,8 @@
|
|
|
|
|
switch (type) {
|
|
|
|
|
case 'CARRIER':
|
|
|
|
|
return GetCarrierlist
|
|
|
|
|
case 'YARDID':
|
|
|
|
|
return GetYardlist
|
|
|
|
|
// case 'YARDID':
|
|
|
|
|
// return GetYardlist
|
|
|
|
|
case 'CNTRTOTAL':
|
|
|
|
|
return GetCtn
|
|
|
|
|
case 'KINDPKGS':
|
|
|
|
|
@ -3683,6 +3577,9 @@
|
|
|
|
|
}
|
|
|
|
|
</script>
|
|
|
|
|
<style lang="less" scoped>
|
|
|
|
|
.advanced {
|
|
|
|
|
height: 65px;
|
|
|
|
|
}
|
|
|
|
|
.CsConditionFilter {
|
|
|
|
|
padding: 16px;
|
|
|
|
|
}
|
|
|
|
|
|
