合包管理新逻辑
This commit is contained in:
liuyp
parent
248166b74a
commit
f7ce8bc310
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<XdPageContainer class="app-container">
|
||||
<!-- <SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
|
||||
<el-form ref="form" size="mini" :model="queryParams" label-width="100px">
|
||||
<el-form slot="pageHeader" ref="form" size="mini" :model="queryParams" label-width="100px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="" prop="queryType">
|
||||
@ -28,159 +28,208 @@
|
||||
<!-- </SearchForm> -->
|
||||
</el-form>
|
||||
|
||||
|
||||
<XdTable v-loading="loading"
|
||||
border stripe
|
||||
size="small"
|
||||
:data="emisTmsPackList"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryParams"
|
||||
:total="total"
|
||||
@queryTable="handleQuery"
|
||||
@selection-change="handleSelectionChange"
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
v-hasPermi="['emis:emisTmsPack:query']"
|
||||
@click="handleQuery"
|
||||
>查询</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisTmsPack:add']"
|
||||
>新增合包</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisTmsPack:edit']"
|
||||
>修改</el-button>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDeleteCoPack"
|
||||
v-hasPermi="['emis:emisTmsPack:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisTmsPack:export']"
|
||||
>打印合包</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div slot="pageContent"
|
||||
slot-scope="slotProps"
|
||||
:style="'height:'+(slotProps.contentHeight)+'px'"
|
||||
>
|
||||
<div>
|
||||
<el-button style="margin-right: 5px;"
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
v-hasPermi="['emis:emisTmsPack:query']"
|
||||
@click="getQuery"
|
||||
>查询</el-button>
|
||||
<el-button style="margin-right: 5px;"
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
:disabled="packDisabled"
|
||||
v-hasPermi="['emis:emisTmsPack:add']"
|
||||
>去组包</el-button>
|
||||
<el-button style="margin-right: 5px;"
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisTmsPack:add']"
|
||||
>新增合包</el-button>
|
||||
<el-button style="margin-right: 5px;"
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDeleteCoPack"
|
||||
v-hasPermi="['emis:emisTmsPack:remove']"
|
||||
>删除</el-button>
|
||||
<el-button style="margin-right: 5px;"
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisTmsPack:export']"
|
||||
>打印合包</el-button>
|
||||
</div>
|
||||
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!--
|
||||
<el-table-column label="序号" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
<span v-text="getIndex(scope.$index)"> </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-tabs v-model="activeName" style="margin-top: 10px;" @tab-click="getQuery">
|
||||
<el-tab-pane label="待合包" name="first">
|
||||
<XdTable v-loading="loadingWait"
|
||||
:height="(slotProps.contentHeight-200)+'px'"
|
||||
border stripe
|
||||
size="small"
|
||||
:data="emisTmsWaitPackList"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryWaitParams"
|
||||
:total="waitTotal"
|
||||
:showRightButton="false"
|
||||
@queryTable="handleQueryWait"
|
||||
@selection-change="handleWaitSelectionChange"
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
|
||||
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
|
||||
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
|
||||
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
|
||||
<el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
|
||||
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
|
||||
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
|
||||
<el-table-column :label="$t('国家')" align="center" prop="destinationCounty" min-width="100" />
|
||||
<el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
|
||||
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
|
||||
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
|
||||
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
|
||||
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
|
||||
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="100" />
|
||||
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100" />
|
||||
<el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="100" />
|
||||
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
|
||||
<el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
|
||||
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
|
||||
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="100" />
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" />
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span class="ellipsis">{{ scope.row.remark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</XdTable>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="已合包" name="second">
|
||||
<XdTable v-loading="loadingDone"
|
||||
:height="(slotProps.contentHeight-200)+'px'"
|
||||
border stripe
|
||||
size="small"
|
||||
:data="emisTmsDonePackList"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryDoneParams"
|
||||
:total="doneTotal"
|
||||
:showRightButton="false"
|
||||
@queryTable="handleQueryDone"
|
||||
@selection-change="handleDoneSelectionChange"
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
|
||||
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
|
||||
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
|
||||
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
|
||||
<el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
|
||||
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
|
||||
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
|
||||
<el-table-column :label="$t('国家')" align="center" prop="destinationCounty" min-width="100" />
|
||||
<el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
|
||||
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
|
||||
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
|
||||
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
|
||||
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
|
||||
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="100" />
|
||||
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100" />
|
||||
<el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="100" />
|
||||
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
|
||||
<el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
|
||||
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
|
||||
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="100" />
|
||||
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" />
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span class="ellipsis">{{ scope.row.remark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</XdTable>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="合包列表" name="third">
|
||||
<XdTable v-loading="loading"
|
||||
:height="(slotProps.contentHeight-200)+'px'"
|
||||
border stripe
|
||||
size="small"
|
||||
:data="emisTmsPackList"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryParams"
|
||||
:total="total"
|
||||
:showRightButton="false"
|
||||
@queryTable="handleQuery"
|
||||
@selection-change="handleSelectionChange"
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
|
||||
<el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
|
||||
<el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
|
||||
<el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="100" />
|
||||
<el-table-column :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
|
||||
<el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="totalWeight" min-width="100" />
|
||||
<el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
|
||||
<el-table-column :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
|
||||
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['emis:emisTmsPack:query']"
|
||||
>查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</XdTable>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
|
||||
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
|
||||
<template slot-scope="scope">
|
||||
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.settleStatus == 0" style="color:red;">
|
||||
<span class="el-tag el-tag--info">未结算</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 10" style="color:red;">
|
||||
<span class="el-tag">待确认</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 11" style="color:green;">
|
||||
<span class="el-tag el-tag--success el-tag--light">已确认</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 20" >
|
||||
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 21" style="color:green;">
|
||||
<span class="el-tag el-tag--success el-tag--light">已打款</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 40" style="color:red;">
|
||||
<span class="el-tag el-tag--danger">已拒绝</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
-->
|
||||
|
||||
<el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
|
||||
<el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
|
||||
<el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="100" />
|
||||
<el-table-column :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
|
||||
<el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="totalWeight" min-width="100" />
|
||||
<el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
|
||||
<el-table-column :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
|
||||
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['emis:emisTmsPack:query']"
|
||||
>查看</el-button>
|
||||
<!-- <el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['emis:emisTmsPack:edit']"
|
||||
>修改</el-button> -->
|
||||
<!--
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="CoPack(scope.row)"
|
||||
v-hasPermi="['emis:emisTmsPack:remove']"
|
||||
>删除</el-button> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</XdTable>
|
||||
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" @close="handleCancelCo" v-dialogDrag append-to-body>
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="80%" style="height: 80%" :destroy-on-close="true" @close="handleCancelCo" v-dialogDrag append-to-body>
|
||||
<el-form ref="formCo" size="mini" :model="coData" label-width="100px" class="overflowhidden" >
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="16">
|
||||
@ -276,17 +325,18 @@
|
||||
</el-form>
|
||||
|
||||
<XdTable v-loading="loading"
|
||||
height="300px"
|
||||
min-height="300px"
|
||||
border stripe
|
||||
size="small"
|
||||
id="emisCoPackDetail"
|
||||
:data="emisCoPackDetail"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryParams"
|
||||
:total="emisCoPackDetail.length"
|
||||
@queryTable="handleQuery"
|
||||
:showRightButton="false"
|
||||
@queryTable="donothing"
|
||||
@selection-change="handleCoPackSelectionChange"
|
||||
@sort-change="handleSortChange"
|
||||
max-height="400px"
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
@ -434,15 +484,16 @@
|
||||
</el-form>
|
||||
|
||||
<XdTable v-loading="loading2"
|
||||
height="300px"
|
||||
min-height="300px"
|
||||
border stripe
|
||||
size="small"
|
||||
id="emisWayBillList"
|
||||
:data="emisWayBillList"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryParams"
|
||||
:queryParams="wayBillData"
|
||||
:total="wayBillotal"
|
||||
:pageSizes="20"
|
||||
:page="1"
|
||||
:showRightButton="false"
|
||||
@queryTable="handleQueryWayBill"
|
||||
@sort-change="handleSortChange"
|
||||
@selection-change="handleWayBillSelectionChange"
|
||||
@ -482,7 +533,11 @@
|
||||
<el-table-column :label="$t('国家')" align="center" prop="destinationCounty" min-width="100" />
|
||||
<el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
|
||||
<el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
|
||||
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
|
||||
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
|
||||
@ -500,7 +555,7 @@
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
|
||||
</XdTable>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</XdPageContainer>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@ -524,8 +579,10 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
loading: false,
|
||||
loading2: false,
|
||||
loadingWait: false,
|
||||
loadingDone: false,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
@ -537,6 +594,8 @@ export default {
|
||||
coMultiple: true,
|
||||
|
||||
addWayBillDisabled: true,
|
||||
packDisabled: true,
|
||||
activeName:'first',
|
||||
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
@ -547,6 +606,14 @@ export default {
|
||||
// TMS合包表格数据
|
||||
emisTmsPackList: [],
|
||||
|
||||
// 待合包列表
|
||||
emisTmsWaitPackList:[],
|
||||
waitTotal:0,
|
||||
|
||||
// 已合包列表
|
||||
emisTmsDonePackList:[],
|
||||
doneTotal:0,
|
||||
waitPackList:[],//选择未组包的运单先保存起来，在后续新增合包的弹框中使用
|
||||
// 新增/修改弹窗数据
|
||||
coData: {
|
||||
blUnpack:"1"
|
||||
@ -556,6 +623,8 @@ export default {
|
||||
blUnpack:"1",
|
||||
// 追加的运单查询数据
|
||||
wayBillData: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
params:{}
|
||||
},
|
||||
// 追加的运单数据
|
||||
@ -605,9 +674,26 @@ export default {
|
||||
opMan: null,
|
||||
remark: null,
|
||||
delFlag: null,
|
||||
params:{}
|
||||
},
|
||||
queryCoParams: {
|
||||
|
||||
params:{}
|
||||
},
|
||||
// 查询参数
|
||||
queryWaitParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
packNo: null,
|
||||
beginCreateTime: null,
|
||||
endCreateTime: null,
|
||||
params:{}
|
||||
},
|
||||
// 查询参数
|
||||
queryDoneParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
packNo: null,
|
||||
params:{}
|
||||
},
|
||||
};
|
||||
},
|
||||
@ -621,23 +707,91 @@ export default {
|
||||
start.setHours(0,0,0,0)
|
||||
end.setHours(23,59,59,0)
|
||||
this.dateTimeRange=[start,end];
|
||||
this.getList();
|
||||
this.activeName="first";
|
||||
this.getQuery();
|
||||
},
|
||||
methods: {
|
||||
getQuery(){
|
||||
this.packDisabled = true;
|
||||
switch(this.activeName){
|
||||
case 'first':
|
||||
this.waitPackList=[];
|
||||
this.handleQueryWait();
|
||||
break;
|
||||
case 'second':
|
||||
this.waitPackList=[];
|
||||
this.handleQueryDone();
|
||||
break;
|
||||
case 'third':
|
||||
this.waitPackList=[];
|
||||
this.getList();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
},
|
||||
donothing(){
|
||||
|
||||
},
|
||||
/** 查询TMS合包列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
// this.queryParams.params = {};
|
||||
this.emisTmsPackList = [];
|
||||
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
|
||||
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
|
||||
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
|
||||
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
|
||||
this.queryParams.params["beginCreateTime"] = this.dateTimeRange[0];
|
||||
this.queryParams.params["endCreateTime"] = this.dateTimeRange[1];
|
||||
}
|
||||
listEmisTmsPack(this.queryParams).then(response => {
|
||||
this.emisTmsPackList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
handleQueryWait(){
|
||||
this.queryWaitParams.params.beginCreateTime = this.dateTimeRange[0];
|
||||
this.queryWaitParams.params.endCreateTime = this.dateTimeRange[1];
|
||||
this.queryWaitParams.packNo = this.queryParams.packNo;
|
||||
|
||||
this.loadingWait = true;
|
||||
this.queryWaitParams.params.isNeedPack = 1;
|
||||
listEmisWaybill(this.queryWaitParams).then(response => {
|
||||
this.loadingWait = false;
|
||||
if(response.code != 200){
|
||||
this.$message.error(response.msg);
|
||||
return;
|
||||
}
|
||||
this.emisTmsWaitPackList = response.rows;
|
||||
// this.emisCoPackDetail = response.rows;
|
||||
console.log(this)
|
||||
this.waitTotal = response.total;
|
||||
})
|
||||
},
|
||||
handleWaitSelectionChange(selection){
|
||||
// TODO
|
||||
selection.length > 0 ? this.packDisabled = false : this.packDisabled=true;
|
||||
this.waitPackList = selection;
|
||||
},
|
||||
async handleQueryDone(){
|
||||
this.loadingDone = true;
|
||||
this.queryDoneParams.packNo = this.queryParams.packNo;
|
||||
let resList = await listEmisTmsPackDtl(this.queryDoneParams);
|
||||
this.loadingDone = false;
|
||||
if(!resList || resList.code != 200){
|
||||
this.$message.error(resList && resList.msg || "未知错误");
|
||||
return;
|
||||
}
|
||||
//this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
|
||||
this.doneTotal = resList.total;
|
||||
this.emisTmsDonePackList = [];
|
||||
for(let p = 0; p < resList.rows.length;p++){
|
||||
let obj = {...resList.rows[p].waybillDetail};
|
||||
obj.packNo = resList.rows[p].packNo;
|
||||
this.emisTmsDonePackList.push(obj);
|
||||
}
|
||||
},
|
||||
handleDoneSelectionChange(){
|
||||
|
||||
},
|
||||
handleQueryWayBill(){
|
||||
this.loading2 = true;
|
||||
@ -700,30 +854,38 @@ export default {
|
||||
opMan: this.$store.getters.empCode
|
||||
}
|
||||
if(this.coPackType == "add"){// 新增
|
||||
let resPack = await getPackNo();
|
||||
if(!resPack || resPack.code != 200){
|
||||
this.$message.error(resPack && resPack.msg || "未知错误");
|
||||
return;
|
||||
}
|
||||
// this.coData.packNo = resPack.data;
|
||||
coPackItem.packNo = resPack.data;
|
||||
let response = await addEmisTmsPack(coPackItem);
|
||||
// addEmisTmsPack(coPackItem).then(response => {
|
||||
if(!response || response.code != 200){
|
||||
this.$modal.msgError(response && response.msg || '新增合包失败')
|
||||
return;
|
||||
}
|
||||
if(!response || response.code != 200){
|
||||
this.$modal.msgError(response && response.msg || '新增合包失败')
|
||||
return;
|
||||
}
|
||||
// })
|
||||
for(let i = 0; i< this.emisCoPackDetail.length;i++){
|
||||
let packDetail = {
|
||||
packNo:this.coData.packNo,
|
||||
packNo:resPack.data,
|
||||
billCode: this.emisCoPackDetail[i].billCode,
|
||||
scanDate: this.emisCoPackDetail[i].scanDate,
|
||||
scanStatus: this.emisCoPackDetail[i].scanStatus,
|
||||
packStatus: null,
|
||||
packStatus: "1",//已合包
|
||||
scanMan: this.emisCoPackDetail[i].scanMan,
|
||||
createBy: this.$store.getters.empCode,
|
||||
createTime: parseTime(new Date())
|
||||
};
|
||||
let response = await addEmisTmsPackDtl(packDetail);
|
||||
// addEmisTmsPackDtl(packDetail).then(response => {
|
||||
if(!response || response.code != 200){
|
||||
this.$modal.msgError(response && response.msg || '合包明细新增失败')
|
||||
return;
|
||||
}
|
||||
if(!response || response.code != 200){
|
||||
this.$modal.msgError(response && response.msg || '合包明细新增失败')
|
||||
return;
|
||||
}
|
||||
this.waitPackList=[];
|
||||
// })
|
||||
}
|
||||
}else if(this.coPackType == "edit"){// 修改
|
||||
@ -816,7 +978,7 @@ export default {
|
||||
this.openForm= false;
|
||||
this.titleForm = "";
|
||||
this.$modal.msgSuccess('操作成功！');
|
||||
this.getList();
|
||||
this.getQuery();
|
||||
},
|
||||
async handleDeleteCoPack(){
|
||||
let that =this;
|
||||
@ -851,6 +1013,8 @@ export default {
|
||||
this.titleWayBill="";
|
||||
this.openWayBillForm=false;
|
||||
this.wayBillData = {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
params:{}
|
||||
};
|
||||
this.emisWayBillList=[];
|
||||
@ -863,6 +1027,8 @@ export default {
|
||||
this.titleWayBill="";
|
||||
this.openWayBillForm=false;
|
||||
this.wayBillData = {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
params:{}
|
||||
};
|
||||
this.emisWayBillList=[];
|
||||
@ -883,6 +1049,7 @@ export default {
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
// this.queryParams.pageSize = 20;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
@ -931,14 +1098,20 @@ export default {
|
||||
async handleAdd() {
|
||||
this.coPackType="add";
|
||||
this.coData = {};
|
||||
this.tempExistCoPackWayBillList = [];//情况临时保存的已有运单号
|
||||
this.tempCoPackInfo={};
|
||||
let response = await getPackNo();
|
||||
if(!response || response.code != 200){
|
||||
this.$message.error(response && response.msg || "未知错误");
|
||||
return;
|
||||
if(this.activeName=="first"){
|
||||
// 将选中的“待合包”的运单 置为 追加的运单号
|
||||
for(let p = 0; p < this.waitPackList.length;p++){
|
||||
this.emisCoPackDetail.push(this.waitPackList[p]);
|
||||
}
|
||||
}
|
||||
this.coData.packNo = response.data;
|
||||
this.tempExistCoPackWayBillList = [];// 清空临时保存的已有运单号
|
||||
this.tempCoPackInfo={};
|
||||
// let response = await getPackNo();
|
||||
// if(!response || response.code != 200){
|
||||
// this.$message.error(response && response.msg || "未知错误");
|
||||
// return;
|
||||
// }
|
||||
// this.coData.packNo = response.data;
|
||||
this.coData.createTime = parseTime(new Date());
|
||||
this.coData.destCountry = null;
|
||||
this.coData.destCountryName = null;
|
||||
@ -950,6 +1123,8 @@ export default {
|
||||
this.coData.sendSiteCode = this.$store.getters.ownerSiteCode;
|
||||
this.coData.sendSiteName=this.$store.getters.ownerSiteName;
|
||||
|
||||
this.computeTotal();
|
||||
|
||||
this.currentId=null;
|
||||
this.openForm= true;
|
||||
this.titleForm = "新增合包";
|
||||
@ -1098,7 +1273,14 @@ export default {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
.overflowhidden{
|
||||
.overflowhidden{
|
||||
overflow: hidden;
|
||||
}
|
||||
.ellipsis {
|
||||
width: 100px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
vertical-align: top;
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user