md
This commit is contained in:
linfso
parent
d48397dbe4
commit
6b68a90d50
@ -263,10 +263,190 @@
|
|||||||
</XdTable>
|
</XdTable>
|
||||||
|
|
||||||
<div style="text-align: center;margin-bottom: 10px;" v-if="!disabled">
|
<div style="text-align: center;margin-bottom: 10px;" v-if="!disabled">
|
||||||
<el-button type="primary" @click="handleAddCoPack">保存批次</el-button>
|
<el-button type="primary" @click="submitAddCoPackForm">保存批次</el-button>
|
||||||
<el-button @click="handleCancelCo">取 消</el-button>
|
<el-button @click="handleCancelCo">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
|
||||||
|
<el-form ref="formBatch" size="mini" label-width="60px">
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item :label="$t('运单号')" prop="formBatchBillList">
|
||||||
|
<el-input v-model="formBatchBillList" type="textarea" :rows="8" placeholder="运单号" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer" style="text-align:center">
|
||||||
|
<el-button type="primary" @click="submitFormBatch">确定</el-button>
|
||||||
|
<el-button @click="cancelBatch">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-dialog :title="titleWayBill" :visible.sync="openWayBillForm" width="90%" @close="handleCloseWayBill" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||||
|
<el-form ref="formCo" size="mini" :model="wayBillData" label-width="100px" class="overflowhidden" >
|
||||||
|
<el-row :gutter="20">
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="" prop="billCode">
|
||||||
|
<div slot="label">
|
||||||
|
<el-radio-group class="query-label" v-model="wayBillData.params.queryOrderType">
|
||||||
|
<el-radio label="1">运单号</el-radio>
|
||||||
|
<el-radio label="0">订单号</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</div>
|
||||||
|
<!-- <el-input
|
||||||
|
v-model="wayBillData.billCode"
|
||||||
|
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||||
|
clearable
|
||||||
|
type="textarea"
|
||||||
|
rows="2"
|
||||||
|
/> -->
|
||||||
|
<XdTextareaInput
|
||||||
|
v-model="wayBillData.billCode"
|
||||||
|
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||||
|
clearable
|
||||||
|
:rows="2"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item :label="$t('目的国家')" prop="receiveCountry">
|
||||||
|
<CountryPicker :placeholder="$t('选择国家')" v-model="wayBillData.receiveCountry" ></CountryPicker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="线路" prop="lineCode">
|
||||||
|
<TransLinePicker v-model="wayBillData.lineCode" :countryCode="wayBillData.destCountry"></TransLinePicker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="产品" prop="productType">
|
||||||
|
<TransProductPicker placeholder="全部" v-model="wayBillData.productType" :transLineCode="wayBillData.lineCode" ></TransProductPicker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="" prop="billCode">
|
||||||
|
<div slot="label">
|
||||||
|
<el-radio-group class="query-label" v-model="wayBillData.params.dataTimeType">
|
||||||
|
<el-radio label="1">下单时间</el-radio>
|
||||||
|
<!-- <el-radio label="0">录单时间</el-radio> -->
|
||||||
|
</el-radio-group>
|
||||||
|
</div>
|
||||||
|
<elDateAdvPicker clearable v-model="wayBillData.dateTimeRange" @dateTimeChange="onWayBillDateSelect" ></elDateAdvPicker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<XdTable v-loading="loading2"
|
||||||
|
height="300px"
|
||||||
|
min-height="300px"
|
||||||
|
border
|
||||||
|
size="small"
|
||||||
|
id="emisWayBillList"
|
||||||
|
:data="emisWayBillList"
|
||||||
|
:showSearch.sync="showSearch"
|
||||||
|
:queryParams="wayBillData"
|
||||||
|
:total="wayBillotal"
|
||||||
|
:showRightButton="false"
|
||||||
|
@queryTable="handleQueryWayBill"
|
||||||
|
@sort-change="handleSortChange"
|
||||||
|
@selection-change="handleWayBillSelectionChange"
|
||||||
|
max-height="300px"
|
||||||
|
>
|
||||||
|
|
||||||
|
<div slot="toolbar">
|
||||||
|
<el-row :gutter="10" class="mb8">
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
size="mini"
|
||||||
|
@click="handleQueryWayBill"
|
||||||
|
>查询</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
icon="el-icon-plus"
|
||||||
|
size="mini"
|
||||||
|
@click="handleCoAdd"
|
||||||
|
:disabled="addWayBillDisabled"
|
||||||
|
>追加</el-button>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
<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="warehouseInNo" min-width="100" />
|
||||||
|
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<!-- <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="sendCountryName" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span class="ellipsis">{{ scope.row.sendCountryName }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
|
||||||
|
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
|
||||||
|
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ parseTime(scope.row.estimateDate || "") }}</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="150" />
|
||||||
|
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span class="ellipsis">{{ scope.row.receiveCompany }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
|
||||||
|
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
|
||||||
|
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
|
||||||
|
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span class="ellipsis">{{ scope.row.sendCompany }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<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-dialog>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -801,6 +981,15 @@ export default {
|
|||||||
console.log("date picker---->", value)
|
console.log("date picker---->", value)
|
||||||
this.wayBillData.dateTimeRange=value;
|
this.wayBillData.dateTimeRange=value;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
submitAddCoPackForm() {
|
||||||
|
this.$refs["formCo"].validate(valid => {
|
||||||
|
if (valid) {
|
||||||
|
this.handleAddCoPack();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
async handleAddCoPack(){
|
async handleAddCoPack(){
|
||||||
|
|
||||||
if(this.emisCoPackDetail.length == 0){
|
if(this.emisCoPackDetail.length == 0){
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user