szh_zidingyibiaoti
lilu 2 years ago
commit 81e8a02572

@ -297,6 +297,7 @@ export function GetYardData(parameter) {
return axios({
url: '/BookingOrder/GetYardData',
method: 'get',
timeout: 30 * 1000,
params: parameter
})
}

@ -12,6 +12,18 @@ export function BookingTruckGetPage(parameter) {
data: parameter
})
}
/**
* 保存派车
*
* @author Myshipping
*/
export function BookingTruckSave(parameter) {
return axios({
url: '/BookingTruck/Save',
method: 'post',
data: parameter
})
}
/**
* 检索往来单位包含车队
*
@ -24,6 +36,149 @@ export function DjyCustomerQuerytDjyCustomerInfo(parameter) {
params: parameter
})
}
/**
* 通过职位获取用户信息
*
* @author Myshipping
*/
export function sysUserQueryUserByPos(parameter) {
return axios({
url: '/sysUser/QueryUserByPos',
method: 'get',
params: parameter
})
}
/**
* 获取派车详情
*
* @author Myshipping
*/
export function BookingTruckGetInfo(parameter) {
return axios({
url: '/BookingTruck/GetInfo',
method: 'get',
params: parameter
})
}
/**
* 撤销派车
*
* @author Myshipping
*/
export function BookingTruckCancel(parameter) {
return axios({
url: '/BookingTruck/Cancel',
method: 'get',
params: parameter
})
}
/**
* 提交派车
*
* @author Myshipping
*/
export function BookingTruckSubmit(parameter) {
return axios({
url: '/BookingTruck/Submit',
method: 'post',
data: parameter
})
}
/**
* 删除派车
*
* @author Myshipping
*/
export function apibookingtruck(parameter) {
return axios({
url: `/api/bookingtruck/${parameter}`,
method: 'DELETE'
})
}
/**
* 打印派车
*
* @author Myshipping
*/
export function BookingTruckPrint(parameter) {
return axios({
url: '/BookingTruck/Print',
method: 'get',
params: parameter
})
}
/**
* 订舱主键获取相关派车列表
*
* @author Myshipping
*/
export function BookingTruckGetTruckListByBooking(parameter) {
return axios({
url: '/BookingTruck/GetTruckListByBooking',
method: 'get',
params: parameter
})
}
/**
* 引入订舱集装箱详情生成派车信息
*/
export function BookingTruckPullInBookingOrderConta(parameter) {
return axios({
url: '/BookingTruck/PullInBookingOrderConta',
method: 'get',
params: parameter
})
}
/**
* 通过任务主键获取派车详情
*/
export function TaskManageTruckGetInfoByTaskId(parameter) {
return axios({
url: '/TaskManageTruck/GetInfoByTaskId',
method: 'get',
params: parameter
})
}
/**
* 保存派车
*/
export function TaskManageTruckSave(parameter) {
return axios({
url: '/TaskManageTruck/Save',
method: 'post',
data: parameter
})
}
/**
* 打印派车
*/
export function TaskManageTruckPrint(parameter) {
return axios({
url: '/TaskManageTruck/Print',
method: 'get',
params: parameter
})
}
/**
* 取消派车
*/
export function TaskManageTruckCancelDispatch(parameter) {
return axios({
url: '/TaskManageTruck/CancelDispatch',
method: 'get',
params: parameter
})
}
/**
* 批量派车
*/
export function TaskManageTruckSendDispatchBatch(parameter) {
return axios({
url: '/TaskManageTruck/SendDispatchBatch',
method: 'post',
data: parameter
})
}
/**
* 添加订舱模板
*

@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
/**
* 查询台账
*/
export function GetTaskManagePage (parameter) {
export function GetTaskManagePage(parameter) {
return axios({
url: '/TaskManage/GetPage',
method: 'post',
@ -14,263 +14,263 @@ export function GetTaskManagePage (parameter) {
/**
* 获取登录人员相关任务统计信息
*/
export function GetCurrentTotalStat (parameter) {
return axios({
url: '/TaskManage/GetCurrentTotalStat',
method: 'get',
params: parameter
})
export function GetCurrentTotalStat(parameter) {
return axios({
url: '/TaskManage/GetCurrentTotalStat',
method: 'get',
params: parameter
})
}
/**
* 获取查询参数
* ParaType STATUS-任务状态;TASK_TYPE-任务类型;SOURCE-任务来源
*/
export function GetParaInfo (parameter) {
return axios({
url: '/TaskManage/GetParaInfo',
method: 'get',
params: parameter
})
export function GetParaInfo(parameter) {
return axios({
url: '/TaskManage/GetParaInfo',
method: 'get',
params: parameter
})
}
/**
* 取消任务
*/
export function CancelTask (parameter) {
return axios({
url: '/TaskManage/CancelTask',
method: 'post',
export function CancelTask(parameter) {
return axios({
url: '/TaskManage/CancelTask',
method: 'post',
data: parameter
})
})
}
/**
* 完成任务
*/
export function CompleteTask (parameter) {
return axios({
url: '/TaskManage/CompleteTask',
method: 'post',
export function CompleteTask(parameter) {
return axios({
url: '/TaskManage/CompleteTask',
method: 'post',
data: parameter
})
})
}
/**
* 下载
*/
export function DownloadTaskAttach (parameter) {
return axios({
url: '/TaskManage/DownloadTaskAttach',
method: 'get',
params: parameter
})
export function DownloadTaskAttach(parameter) {
return axios({
url: '/TaskManage/DownloadTaskAttach',
method: 'get',
params: parameter
})
}
/**
* 转发电子邮件
*/
export function SendTelexEmail (parameter) {
return axios({
url: '/TaskManage/SendTelexEmail',
method: 'get',
params: parameter
})
export function SendTelexEmail(parameter) {
return axios({
url: '/TaskManage/SendTelexEmail',
method: 'get',
params: parameter
})
}
/**
* 页数计算
*/
export function LaraPaperCalc (parameter) {
return axios({
url: '/TaskManage/LaraPaperCalc?' + parameter,
method: 'post'
})
export function LaraPaperCalc(parameter) {
return axios({
url: '/TaskManage/LaraPaperCalc?' + parameter,
method: 'post'
})
}
/**
* LARA提单纸登记
*/
export function LaraPaperRegist (parameter) {
return axios({
url: '/TaskManage/LaraPaperRegist?' + parameter,
method: 'post'
})
export function LaraPaperRegist(parameter) {
return axios({
url: '/TaskManage/LaraPaperRegist?' + parameter,
method: 'post'
})
}
/**
* 下载正本提单(可批量)
*/
export function DownloadOriginalTask (parameter) {
return axios({
url: '/TaskManage/DownloadOriginalTask',
method: 'post',
export function DownloadOriginalTask(parameter) {
return axios({
url: '/TaskManage/DownloadOriginalTask',
method: 'post',
data: parameter
})
})
}
/**
* copy 打印
*/
export function PrintBatch (parameter) {
return axios({
url: '/TaskManage/PrintBatch',
method: 'post',
export function PrintBatch(parameter) {
return axios({
url: '/TaskManage/PrintBatch',
method: 'post',
data: parameter
})
})
}
/**
* copy 下载
*/
export function DownloadAttach (parameter) {
return axios({
url: '/TaskManage/DownloadAttach',
method: 'post',
data: parameter
})
export function DownloadAttach(parameter) {
return axios({
url: '/TaskManage/DownloadAttach',
method: 'post',
data: parameter
})
}
/**
* 获取详情
*/
export function GetBookingOrderInfo (parameter) {
return axios({
url: '/TaskManage/GetBookingOrderInfo',
method: 'get',
params: parameter
})
export function GetBookingOrderInfo(parameter) {
return axios({
url: '/TaskManage/GetBookingOrderInfo',
method: 'get',
params: parameter
})
}
/**
* lara 记录
*/
export function LaraPaperRegistPost (parameter) {
return axios({
url: '/TaskManage/LaraPaperRegistPost',
method: 'post',
data: parameter
})
export function LaraPaperRegistPost(parameter) {
return axios({
url: '/TaskManage/LaraPaperRegistPost',
method: 'post',
data: parameter
})
}
/**
* 发送SI
*/
export function SendShippingOrder (parameter) {
return axios({
url: '/TaskManage/SendShippingOrder',
method: 'get',
params: parameter
})
export function SendShippingOrder(parameter) {
return axios({
url: '/TaskManage/SendShippingOrder',
method: 'get',
params: parameter
})
}
export function GetSIFeedBackInfo (parameter) {
return axios({
url: '/TaskManage/GetSIFeedBackInfo',
method: 'get',
params: parameter
})
export function GetSIFeedBackInfo(parameter) {
return axios({
url: '/TaskManage/GetSIFeedBackInfo',
method: 'get',
params: parameter
})
}
export function SaveBookingSI (parameter) {
return axios({
url: '/TaskManage/SaveBookingSI',
method: 'post',
export function SaveBookingSI(parameter) {
return axios({
url: '/TaskManage/SaveBookingSI',
method: 'post',
data: parameter
})
})
}
export function LaraPaperRecordExport (parameter) {
return axios({
url: '/TaskManage/LaraPaperRecordExport',
method: 'get',
params: parameter
})
export function LaraPaperRecordExport(parameter) {
return axios({
url: '/TaskManage/LaraPaperRecordExport',
method: 'get',
params: parameter
})
}
export function GetVGMCompareResult (parameter) {
return axios({
url: '/TaskManage/GetVGMCompareResult',
method: 'get',
params: parameter
})
export function GetVGMCompareResult(parameter) {
return axios({
url: '/TaskManage/GetVGMCompareResult',
method: 'get',
params: parameter
})
}
export function SaveBookingVGM (id) {
return axios({
url: '/TaskManage/SaveBookingVGM?taskPKId=' + id,
method: 'post'
})
export function SaveBookingVGM(id) {
return axios({
url: '/TaskManage/SaveBookingVGM?taskPKId=' + id,
method: 'post'
})
}
export function AcceptChangeShip (parameter) {
return axios({
url: '/TaskManage/AcceptChangeShip',
method: 'get',
params: parameter
})
export function AcceptChangeShip(parameter) {
return axios({
url: '/TaskManage/AcceptChangeShip',
method: 'get',
params: parameter
})
}
export function AcceptCancelChangeShip (parameter) {
return axios({
url: '/TaskManage/AcceptCancelChangeShip',
method: 'get',
params: parameter
})
export function AcceptCancelChangeShip(parameter) {
return axios({
url: '/TaskManage/AcceptCancelChangeShip',
method: 'get',
params: parameter
})
}
export function GetChangeShipInfo (parameter) {
return axios({
url: '/TaskManage/GetChangeShipInfo',
method: 'get',
params: parameter
})
export function GetChangeShipInfo(parameter) {
return axios({
url: '/TaskManage/GetChangeShipInfo',
method: 'get',
params: parameter
})
}
export function GetAbortChangeShipInfo (parameter) {
return axios({
url: '/TaskManage/GetAbortChangeShipInfo',
method: 'get',
params: parameter
})
export function GetAbortChangeShipInfo(parameter) {
return axios({
url: '/TaskManage/GetAbortChangeShipInfo',
method: 'get',
params: parameter
})
}
// 重新比对
export function ManualReCompareBC (parameter) {
return axios({
url: '/TaskManage/ManualReCompareBC?' + parameter,
method: 'post'
})
export function ManualReCompareBC(parameter) {
return axios({
url: '/TaskManage/ManualReCompareBC?' + parameter,
method: 'post'
})
}
export function DownloadClosingEDI (parameter) {
return axios({
url: '/TaskManage/DownloadClosingEDI',
method: 'get',
params: parameter
})
export function DownloadClosingEDI(parameter) {
return axios({
url: '/TaskManage/DownloadClosingEDI',
method: 'get',
params: parameter
})
}
export function SendClosingEDI (parameter) {
return axios({
url: '/TaskManage/SendClosingEDI',
method: 'get',
params: parameter
})
export function SendClosingEDI(parameter) {
return axios({
url: '/TaskManage/SendClosingEDI',
method: 'get',
params: parameter
})
}
export function CalcLaraPageNumbers (parameter) {
return axios({
url: '/TaskManage/CalcLaraPageNumbers',
method: 'post',
export function CalcLaraPageNumbers(parameter) {
return axios({
url: '/TaskManage/CalcLaraPageNumbers',
method: 'post',
data: parameter
})
})
}
export function GetLaraPaperRecordPage (parameter) {
return axios({
url: '/TaskManage/GetLaraPaperRecordPage',
method: 'post',
export function GetLaraPaperRecordPage(parameter) {
return axios({
url: '/TaskManage/GetLaraPaperRecordPage',
method: 'post',
data: parameter
})
})
}

@ -36,9 +36,6 @@
<button @click="openModel('trace')">
<span class="iconfont icon-yunshu1" style="font-size:18px;"></span>运踪订阅
</button>
<button @click="openPreOrderFun">
<span class="iconfont icon-yunshu1" style="font-size:18px;"></span>预配舱单
</button>
</div>
<div class="btn-list more-view-2">
<button @click="openModel('initCabin')">
@ -63,10 +60,7 @@
<span class="iconfont icon-xia" :style="{ fontSize: '17px' }"></span>下一票
</button>
</div>
<div
class="btn-list single-view-1"
:style="{ width: '110px' }"
>
<div class="btn-list single-view-1" :style="{ width: '110px' }">
<a-popconfirm
title="确定删除当前订舱?"
ok-text="是"
@ -76,7 +70,12 @@
>
<button><span class="iconfont icon-shanchu1"></span>删除</button>
</a-popconfirm>
<button @click="addChild()" v-if="!details.hbList || details.hbList.length === 0"><span class="iconfont icon-zhizhishu"></span></button>
<button @click="addChild()" v-if="!details.hbList || details.hbList.length === 0">
<span class="iconfont icon-zhizhishu"></span>添加分单
</button>
</div>
<div class="btn-list single-view-4">
<button @click="FnGoSendCar"><span class="iconfont icon-yunshu1"></span>派车</button>
</div>
</a-card>
@ -170,7 +169,7 @@
</a-button> -->
</template>
</div>
<a-form class="initCabin-box">
<a-form>
<a-row :gutter="16">
<div class="item-box to-box" :style="{ paddingTop: '0px' }">
<!-- to -->
@ -711,15 +710,6 @@
</template>
</a-modal>
<!-- 运踪弹窗 end -->
<!-- 预配舱单列表 start -->
<!-- <a-modal width="90vw" :maskClosable="false" v-model="openPreOrderShow" title="预配舱单"> -->
<pre-order ref="preOrder" :details="details"/>
<!-- <template slot="footer">
<a-button type="primary" @click="closeOpenPreOrder"></a-button>
</template> -->
<!-- </a-modal> -->
<!-- 预配舱单列表 end -->
</div>
</template>
<script>
@ -729,6 +719,7 @@ import {
VgmSend,
LetterYard,
SampleBill,
VgmLink,
SendLetterYard,
SaveBookingLetteryard,
SaveBookingSampleBill,
@ -736,17 +727,19 @@ import {
TxxpLink,
ExcuteRulesOceanBooking,
BookingOrderPrintOrder,
BookingOrderDownloadPrint,
BookingOrderViewPrintPdf,
BookingOrderOcrUpFile,
BookingOrderOcrGetImg,
BookingOrderOcrGetText,
BookingOrderPrintTemplateWithHistoryList,
DownloadBookingOrClosingEDI,
DeleteLetterYard,
LetterYardPdf,
SendTrace,
GetYardlist
} from '@/api/modular/main/BookingLedger'
import preOrder from './preOrder'
import { BookingTruckGetTruckListByBooking } from '@/api/modular/main/SendCar'
export default {
props: {
details: {
@ -760,9 +753,6 @@ export default {
default: false
}
},
components: {
preOrder
},
data() {
return {
id: this.$route.query.id,
@ -851,7 +841,6 @@ export default {
cateCode: '',
spinning: false,
yardSelectData: null
// openPreOrderShow: false
}
},
mounted() {
@ -881,6 +870,18 @@ export default {
}
},
methods: {
FnGoSendCar() {
BookingTruckGetTruckListByBooking({ bookingId: this.id }).then(res => {
console.log(res)
this.$router.push({
name: 'SendCarAdd',
query: {
type: 'Edit',
BookingId: this.id
}
})
})
},
// ========== OCR ==========
FnClickCvBox(data) {
let Arr = ['pkgs', 'cbm', 'kgs', 'portdischarge', 'destination', 'kindpkgs']
@ -1036,7 +1037,10 @@ export default {
if (this.PrintType == 1) {
window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank')
} else {
window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`, '_blank')
window.open(
` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
'_blank'
)
}
}
})
@ -1251,8 +1255,7 @@ export default {
_this.sendXHZ()
}
},
onCancel() {
},
onCancel() {},
class: 'test'
})
},
@ -1626,21 +1629,11 @@ export default {
closedocdateChange(date, dateString) {
this.initCabinFrom.closeDocTime = dateString
},
removeOrder () {
removeOrder() {
this.$emit('removeOrder')
},
cancelRemove () {
cancelRemove() {
console.log('== 取消删除 ==')
},
openPreOrderFun () {
if (!this.id) {
this.$message.error('请先保存主单')
return false
}
this.$refs.preOrder.init()
},
closeOpenPreOrder () {
this.$refs.preOrder.close()
}
}
}

@ -79,7 +79,7 @@
<div class="nav" @click="batchEditing"><i class="iconfont icon-bianjiwenjian"></i>批量编辑</div>
<div class="nav"><i class="iconfont icon-shujushangchuan-shixin"></i>批量VGM</div>
<!-- <div class="nav" @click="excuteShippingOrderCompareBatch"><i class="iconfont icon-weibiaoti--"></i>下货纸比对</div> -->
<a-popconfirm
<!-- <a-popconfirm
title="确定进行下货纸比对?"
ok-text="是"
cancel-text="否"
@ -87,7 +87,7 @@
@cancel="cancelRemove"
>
<div class="nav"><i class="iconfont icon-duibi"></i>下货纸比对</div>
</a-popconfirm>
</a-popconfirm> -->
<a-popconfirm
title="确定删除当前选中订舱?"
ok-text="是"
@ -233,7 +233,7 @@
</template>
<div v-if="row.lstShipOrderCompareRlt">
<div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
<a-icon type="close-circle" :style="{ color: '#ff9200' }" />
<a-icon type="close-circle" :style="{ color: 'red' }" />
</div>
<div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
<a-icon type="check-circle" :style="{ color: '#54bc25' }" />
@ -300,7 +300,7 @@
</a-col>
</a-row>
<a-modal
title="下货纸比对(有差异)"
:title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对(有差异)' : '下货纸比对(正常)'"
@cancel="TaskShippingOrderCompareHandleCancel"
:visible="TaskShippingOrderCompareVisible"
width="40%"
@ -311,8 +311,12 @@
</a-button>
</template>
<p class="TaskShippingOrderCompareP">
{{ TaskShippingOrderCompareData.compareTime }} 比对异常 合计
<span class="TaskShippingOrderCompareSpan">{{ TaskShippingOrderCompareData.showDetailList.length }}</span>
{{ TaskShippingOrderCompareData.compareTime }}
<span v-if="TaskShippingOrderCompareData.isExistsDiff">
比对异常 合计
<span class="TaskShippingOrderCompareSpan">{{ TaskShippingOrderCompareData.total }}</span>
</span>
</p>
<div class="TaskShippingOrderCompareMainBox">
<div class="TaskShippingOrderCompareMain">
@ -1960,6 +1964,7 @@ export default {
} else {
if (res.data.extra) {
this.TaskShippingOrderCompareData = res.data.extra
this.TaskShippingOrderCompareData.total = res.data.total
this.TaskShippingOrderCompareVisible = true
} else {
this.$message.success(res.data.msg)

File diff suppressed because it is too large Load Diff

@ -7,11 +7,65 @@
<div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="18">
<a-col :md="20">
<a-row :gutter="48">
<a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`" v-show="item.checked">
<a-form-item :label="item.title">
<a-input v-model="queryParam[item.dataIndex]" allow-clear />
<!-- <a-col :md="8" :sm="24" v-for="item in HColumnsQuery" :key="`${item.dataIndex}1`" v-show="item.checked"> -->
<a-col :md="6" :sm="24">
<a-form-item label="派车单号">
<a-input v-model="queryParam.truckFlowNo" allow-clear />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="创建日期">
<a-range-picker @change="OnChangeCreate" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="派车状态">
<a-select v-model="queryParam.status" allowClear>
<a-select-option v-for="item in statusData" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="箱号">
<a-input v-model="queryParam.contaNo" allow-clear />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="支付方式">
<a-select v-model="queryParam.payMethod" allowClear>
<a-select-option v-for="item in payMethodData" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="派车日期">
<a-range-picker @change="OnChangetruckTime" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="车队">
<a-select
:showSearch="true"
:filterOption="filterOption"
v-model="queryParam.truckId"
@focus="gettruckIdData"
allowClear
>
<a-select-option v-for="item in truckIdData" :key="item.id" :value="item.id">
{{ item.shortName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="工厂">
<a-input v-model="queryParam.factoryName" allow-clear />
</a-form-item>
</a-col>
</a-row>
@ -35,14 +89,14 @@
</a>
</span>
</a-col>
<a-col :md="2" :sm="24" class="SetFlex">
<!-- <a-col :md="2" :sm="24" class="SetFlex">
<a-popover placement="bottom" v-model="setVisible" trigger="click">
<template #content>
<columnSetting :columns="ColumnsQuery" @columnChange="columnChange"></columnSetting>
<columnSetting :columns="HColumnsQuery" @columnChange="columnChange"></columnSetting>
</template>
<span class="tab-btn"> <a-icon type="setting" :style="{ fontSize: '16px' }" /> 设置 </span>
</a-popover>
</a-col>
</a-col> -->
</a-row>
</a-form>
</div>
@ -51,8 +105,8 @@
<vxe-toolbar>
<template #buttons>
<div class="nav-box">
<div class="nav" @click="TabsAdd"><i class="iconfont icon-jiahao2fill"></i>提交派车</div>
<div class="nav" @click="TabsAdd"><i class="iconfont icon-jiahao2fill"></i>撤销派车</div>
<div class="nav" @click="TabsAdd"><i class="iconfont icon-jiahao2fill"></i>新增派车</div>
<!-- <div class="nav" @click="TabsAdd"><i class="iconfont icon-jiahao2fill"></i>撤销派车</div> -->
</div>
</template>
<template #tools>
@ -74,6 +128,7 @@
resizable
round
:loading="loading"
height="600"
empty-text="没有更多数据了!"
v-if="!TableType"
>
@ -87,8 +142,13 @@
:align="item.align"
v-if="item.checked"
>
<template #default="{ row }" v-if="item.dataIndex == 'truckName'">
<span> {{ row.truckCode }}-{{ row.truckName }} </span>
<!-- <template #default="{ row }" v-if="item.dataIndex == 'status'">
<span> {{ row.status }}123</span>
</template> -->
<template #default="{ row }">
<span v-if="item.dataIndex == 'truckName'"> {{ row.truckCode }}-{{ row.truckName }} </span>
<span v-else-if="item.dataIndex == 'status'"> {{ FnRstatus(row.status) }} </span>
<span v-else>{{ row[item.dataIndex] }}</span>
</template>
</vxe-column>
<vxe-column title="操作" fixed="right" width="120" align="center">
@ -132,24 +192,27 @@
</div>
</template>
<script>
import { BookingTruckGetPage, DjyCustomerGet, DjyCustomerDelete, DjyUserConfigAdd } from '@/api/modular/main/SendCar'
// import addForm from './addForm.vue'
// import editForm from './editForm.vue'
const addForm = () => import('./addForm.vue')
const editForm = () => import('./editForm.vue')
import {
BookingTruckGetPage,
BookingTruckCancel,
DjyCustomerGet,
DjyUserConfigAdd,
apibookingtruck,
DjyCustomerQuerytDjyCustomerInfo
} from '@/api/modular/main/SendCar'
import columnSetting from '@/components/tableColumnSetting'
const columns = [
{
title: '派车单号',
align: 'center',
width: '90',
width: '100',
dataIndex: 'id'
},
{
title: '任务流水号',
align: 'center',
width: '120',
dataIndex: 'shortName'
dataIndex: 'TaskNo'
},
{
title: '状态',
@ -179,7 +242,7 @@ const columns = [
title: '指定到厂时间',
align: 'center',
width: '180',
dataIndex: 'closingTime'
dataIndex: 'needArriveTime'
},
{
title: '提箱日期',
@ -190,8 +253,6 @@ const columns = [
]
export default {
components: {
addForm,
editForm,
columnSetting
},
data() {
@ -200,6 +261,19 @@ export default {
// { title: 'Tab 2', content: 'Content of Tab 2', key: '2' }
]
return {
truckIdData: [],
payMethodData: [
{ id: 'NO_INVOICE', name: '不开票' },
{ id: 'OWN_COMPANY', name: '本公司发票' },
{ id: 'LAND_TRANS_INVOICE', name: '陆运发票' }
],
statusData: [
{ id: 'TEMP', name: '暂存' },
{ id: 'SUBMITED', name: '已提交' },
{ id: 'CANCELED', name: '已撤销' },
{ id: 'SEND_DISPATCH', name: '已派车' },
{ id: 'CANCEL_DISPATCH', name: '已撤销派车' }
],
activeKey: 0,
panes,
// /
@ -232,7 +306,33 @@ export default {
mounted() {
this.init()
},
computed: {},
methods: {
filterOption(value, option) {
return option.componentOptions.children[0].text.indexOf(value) >= 0
},
gettruckIdData(name = '', type) {
DjyCustomerQuerytDjyCustomerInfo({ queryType: 'fleet', queryItem: name }).then(res => {
this.truckIdData = res.data
})
},
OnChangeCreate(date, dateString) {
this.queryParam.createBegin = dateString[0]
this.queryParam.createEnd = dateString[1]
},
OnChangetruckTime(date, dateString) {
this.queryParam.truckTimeBegin = dateString[0]
this.queryParam.truckTimeEnd = dateString[1]
},
FnRstatus(data) {
let RData = ''
this.statusData.forEach(item => {
if (item.id == data) {
RData = item.name
}
})
return RData
},
init() {
Object.assign(this.$data, this.$options.data())
columns.forEach(item => {
@ -353,19 +453,21 @@ export default {
},
TabsEdit(row) {
this.$router.push({ name: 'CustomerInformationManagementEdit', query: { id: row.id } })
// this.$refs.editForm[0].edit(row)
// let activeKey = this.panes.length + 1
// this.panes.push({
// title: '',
// key: activeKey,
// row: row
// })
// this.activeKey = activeKey
this.$router.push({
name: 'SendCarAdd',
query: {
type: 'Edit',
id: row.id
}
})
},
TabsAdd() {
this.$router.push({ name: 'SendCarAdd' })
localStorage.setItem('SendCarAdd', 'new')
this.$router.push({
name: 'SendCarAdd',
query: {
type: 'Add'
}
})
},
columnChange(data) {
this.ColumnsQuery = [...data]
@ -418,7 +520,7 @@ export default {
this.loading = false
this.queryParam.currentPage = res.data.pageIndex
this.queryParam.pageSize = res.data.pageSize
this.queryParam.totalResult = res.data.totalPages
this.queryParam.totalResult = res.data.totalCount
})
},
/**
@ -432,7 +534,8 @@ export default {
this.DjyCustomerDelete(data)
},
DjyCustomerDelete(record) {
DjyCustomerDelete(record).then(res => {
console.log(record)
apibookingtruck(record.id).then(res => {
if (res.success) {
this.$message.success('删除成功')
this.FnGetData()

@ -10,7 +10,9 @@
<div class="nav-title" v-if="levelTop.length > 0">
<a-radio-group v-model="activeTopKey" style="margin-bottom: 16px" @change="changeTopLevel">
<a-radio-button v-for="(item, index) in levelTop" :value="item.key" :key="index">
<span class="nav-top">{{ item.name }}<span class="nav-top-tip">({{ item.total }})</span></span>
<span class="nav-top"
>{{ item.name }}<span class="nav-top-tip">({{ item.total }})</span></span
>
</a-radio-button>
</a-radio-group>
</div>
@ -37,7 +39,8 @@
class="icon"
:icon="levelreLoading ? 'loading' : 'reload'"
size="small"
@click="getCurrentTotalStat">
@click="getCurrentTotalStat"
>
点击重新加载
</a-button>
</div>
@ -71,11 +74,7 @@
:dropdownMatchSelectWidth="false"
v-decorator="['taskType', { rules: [{ required: false, message: '请输入任务类型' }] }]"
>
<a-select-option
v-for="(taskItem, tindex) in taskTypeList"
:key="tindex"
:value="taskItem.code"
>
<a-select-option v-for="(taskItem, tindex) in taskTypeList" :key="tindex" :value="taskItem.code">
{{ taskItem.name }}
</a-select-option>
</a-select>
@ -272,7 +271,9 @@
>
<a-button class="list-btn"><i class="iconfont icon-dengjizongshu"></i>LARA登记</a-button>
</a-popconfirm>
<a-button class="list-btn" @click="laraRecordFun"><i class="iconfont icon-touzijilu"></i>LARA记录</a-button>
<a-button class="list-btn" @click="laraRecordFun"
><i class="iconfont icon-touzijilu"></i>LARA记录</a-button
>
</template>
</template>
<template #tools>
@ -284,9 +285,7 @@
@confirm="tableRefresh"
@cancel="cancelFun"
>
<span class="tab-btn">
<a-icon type="redo" :style="{ fontSize: '16px' }" /> 刷新
</span>
<span class="tab-btn"> <a-icon type="redo" :style="{ fontSize: '16px' }" /> 刷新 </span>
</a-popconfirm>
</div>
</template>
@ -352,7 +351,9 @@
<template slot="title">
预览附件
</template>
<span class="operate-btn iconfont icon-a-wendangcaozuoxiazaishangchuanshanchuxinzengfujianyasuochakan-01"></span>
<span
class="operate-btn iconfont icon-a-wendangcaozuoxiazaishangchuanshanchuxinzengfujianyasuochakan-01"
></span>
</a-tooltip>
</a-popconfirm>
</template>
@ -538,7 +539,7 @@ export default {
align: 'center'
}
],
paperCalcExtras: '',
paperCalcExtras: ''
// downLoadErrTip: '',
// showdownLoadErr: false
}
@ -729,32 +730,34 @@ export default {
this.activeTreeKey = ['0-0-0']
GetCurrentTotalStat({
isReCalc: false
}).then(res => {
this.levelLoading = false
this.levelreLoading = false
if (res.success) {
this.levelTop = res.data.levelTop
this.levelNextAll = res.data.levelNext
this.levelTreeAll = res.data.levelTree
if (this.levelTop.length > 0) {
this.activeTopKey = this.levelTop[0].key
this.levelNext = this.selectNextLevel(this.levelNextAll, this.activeTopKey)
if (this.levelNext.length > 0) {
this.activeNextKey = this.levelNext[0].key
this.levelTree = this.selectTreeLevel(this.levelTreeAll, this.activeNextKey, this.activeTopKey)
})
.then(res => {
this.levelLoading = false
this.levelreLoading = false
if (res.success) {
this.levelTop = res.data.levelTop
this.levelNextAll = res.data.levelNext
this.levelTreeAll = res.data.levelTree
if (this.levelTop.length > 0) {
this.activeTopKey = this.levelTop[0].key
this.levelNext = this.selectNextLevel(this.levelNextAll, this.activeTopKey)
if (this.levelNext.length > 0) {
this.activeNextKey = this.levelNext[0].key
this.levelTree = this.selectTreeLevel(this.levelTreeAll, this.activeNextKey, this.activeTopKey)
}
}
this.activeTreeKey = []
this.form.resetFields()
this.taskType = ''
this.init()
} else {
this.init()
this.$message.error(res.message)
}
this.activeTreeKey = []
this.form.resetFields()
this.taskType = ''
this.init()
} else {
this.$message.error(res.message)
}
})
.catch(err => {
console.log(err)
})
})
.catch(err => {
console.log(err)
})
},
selectNextLevel(list, key) {
const arr = []
@ -832,6 +835,7 @@ export default {
this.$set(this.gridOptions, 'loading', false)
this.$forceUpdate()
} else {
this.$set(this.gridOptions, 'loading', false)
this.$message.error(res.message)
}
})
@ -872,23 +876,49 @@ export default {
this.advanced = !this.advanced
},
changePage(data) {
if (data.taskType === 'VGM_COMPARE') { // VGM
this.$router.push({ path: '/commontaskmanage/TaskVgmContrast', query: { taskPKId: data.pkId, type: data.status } })
} else if (data.taskType === 'INVOICE_BILL_MAIL') { //
console.log(data)
if (data.taskType === 'VGM_COMPARE') {
// VGM
this.$router.push({
path: '/commontaskmanage/TaskVgmContrast',
query: { taskPKId: data.pkId, type: data.status }
})
} else if (data.taskType === 'INVOICE_BILL_MAIL') {
//
this.$router.push({ path: '/commontaskmanage/VoyageBill', query: { taskPKId: data.pkId } })
} else if (data.taskType === 'PER_BILL') { //
} else if (data.taskType === 'PER_BILL') {
//
this.$router.push({ path: '/commontaskmanage/singleTicket', query: { taskPKId: data.pkId } })
} else if (data.taskType === 'CHANGE_SHIP') { //
} else if (data.taskType === 'CHANGE_SHIP') {
//
this.$router.push({ path: '/commontaskmanage/TaskChangeShip', query: { taskPKId: data.pkId, type: 'change' } })
} else if (data.taskType === 'ABORT_CHANGE_SHIP') { //
this.$router.push({ path: '/commontaskmanage/TaskChangeShip', query: { taskPKId: data.pkId, type: 'abortChange' } })
} else if (data.taskType === 'ORIGINAL_LOST') { //
} else if (data.taskType === 'ABORT_CHANGE_SHIP') {
//
this.$router.push({
path: '/commontaskmanage/TaskChangeShip',
query: { taskPKId: data.pkId, type: 'abortChange' }
})
} else if (data.taskType === 'ORIGINAL_LOST') {
//
this.$router.push({ path: '/commontaskmanage/TaskOriginalLost', query: { taskPKId: data.pkId } })
} else if (data.taskType === 'SHIPPING_ORDER') { //
} else if (data.taskType === 'SHIPPING_ORDER') {
//
this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
} else if (data.taskType === 'SI_FEEDBACK') { //
} else if (data.taskType === 'SI_FEEDBACK') {
//
this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pkId } })
} else { //
} else if (data.taskType === 'TRUCK_DISPATCH') {
//
// this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pkId } })
this.$router.push({
name: 'SendCarAdd',
query: {
type: 'Edit',
taskPKId: data.pkId
}
})
} else {
//
this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
}
},
@ -969,27 +999,27 @@ export default {
DownloadTaskAttach({
taskPKId: id
})
.then(res => {
if (res.message) {
// this.showdownLoadErr = true
this.downLoadErrTip = `${name}下载失败:${res.message}`
.then(res => {
if (res.message) {
// this.showdownLoadErr = true
this.downLoadErrTip = `${name}下载失败:${res.message}`
message.error(`${name}下载失败:${res.message}`, 0)
return false
}
const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
const link = document.createElement('a')
link.style.display = 'none'
link.href = URL.createObjectURL(blob)
link.download = name
document.body.appendChild(link)
link.click()
URL.revokeObjectURL(link.href) // URL
document.body.removeChild(link)
})
.catch(err => {
console.log(err)
})
message.error(`${name}下载失败:${res.message}`, 0)
return false
}
const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
const link = document.createElement('a')
link.style.display = 'none'
link.href = URL.createObjectURL(blob)
link.download = name
document.body.appendChild(link)
link.click()
URL.revokeObjectURL(link.href) // URL
document.body.removeChild(link)
})
.catch(err => {
console.log(err)
})
},
//
reComparisonFun() {
@ -1003,16 +1033,17 @@ export default {
return false
}
const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
ManualReCompareBC(query).then(res => {
if (res.success) {
this.$message.success('重新比对完成')
} else {
this.$message.error(res.message)
}
})
.catch(err => {
console.log(err)
})
ManualReCompareBC(query)
.then(res => {
if (res.success) {
this.$message.success('重新比对完成')
} else {
this.$message.error(res.message)
}
})
.catch(err => {
console.log(err)
})
},
//
SendEmailFun() {
@ -1105,7 +1136,7 @@ export default {
PKIds: pkIdArr
})
.then(res => {
//
//
if (res.message) {
const downLoadErrTip = `COPY打印失败${res.message}`
this.$message.error(downLoadErrTip)
@ -1220,7 +1251,7 @@ export default {
taskDownloadFun(data) {
// DRAFT
this.DownloadTaskAttach(data.pkId, data.taskTitle)
},
}
// onDownloadErrClose() {
// console.log('')
// this.showdownLoadErr = false
@ -1285,21 +1316,21 @@ export default {
color: @primary-color;
}
}
.icon-tip{
.icon-tip {
font-size: 12px;
color: @primary-color;
}
.nav-title{
.ant-radio-button-wrapper{
.nav-title {
.ant-radio-button-wrapper {
padding: 0 10px;
text-align: center;
}
}
.nav-top{
width:100%;
.nav-top {
width: 100%;
height: 100%;
// position: relative;
.nav-top-tip{
.nav-top-tip {
// position: absolute;
// top: 0;right: 10px;
// width: 20px;
@ -1314,29 +1345,29 @@ export default {
// border-radius: 50%;
}
}
.nav-box{
padding:20px 14px;
.nav-box {
padding: 20px 14px;
background: #fff;
border-radius: 2px;
}
.nav-no-data{
.nav-no-data {
height: 84px;
line-height: 84px;
text-align: center;
margin-top: 20px;
i{
i {
display: block;
line-height: 60px;
font-size: 32px;
color: #aaa;
}
span{
span {
display: block;
line-height: 24px;
color: #999;
}
}
.tab-btn{
.tab-btn {
cursor: pointer;
}
// .downLoad-err-alert{

Loading…
Cancel
Save