Merge pull request 'master-dev' (#4) from master-dev into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-oms-frontend/pulls/4
This commit is contained in:
wuteng
commit
22394bfa98
@ -50,3 +50,14 @@ export function delEmisWarehouseIn(id) {
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
//根据进仓单编号查询进仓单详情
|
||||
export function getWarehouseInDetail(query) {
|
||||
return request({
|
||||
url: '/oms2c/emisWarehouseIn/getWarehouseInDetail',
|
||||
method: 'get',
|
||||
params: {
|
||||
inNo: query.inNo
|
||||
}
|
||||
})
|
||||
}
|
||||
392
src/views/oms/emisWaybill/WsInBatchList.vue
Normal file
392
src/views/oms/emisWaybill/WsInBatchList.vue
Normal file
@ -0,0 +1,392 @@
|
||||
<template>
|
||||
<div >
|
||||
|
||||
<div style="display:inline-flex;width: 100%;border-bottom: 1px solid #d9d9d9;margin-bottom: 20px;">
|
||||
<div class="form-group-title"><span class="title">{{ $t('进仓记录') }}</span></div>
|
||||
</div>
|
||||
<!-- <el-scrollbar style="height: 100%"> -->
|
||||
<!-- 如果显示子单勾选则循环显示子单 -->
|
||||
<div v-for="(item,index) in emisWarehouseInBatchList" :key="resetRefreshId+'.'+index">
|
||||
<CardWithHeader :header="'入仓时间:'+item.entryDate + ' 操作员:' + (item.createByName==null?'':item.createByName)+' 进仓子单号:'+item.inNo+'-'+(item.inBatchNo==null?'':item.inBatchNo)" >
|
||||
<template v-slot:body>
|
||||
<div>
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
|
||||
<el-col :span="3">
|
||||
件数:{{ item.parcelQty }}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
重量：{{ item.billWeight }}(kg)
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
体积：{{ item.totalVolume }}(m³)
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<div style="margin-top:10px">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
|
||||
<el-col :span="5">
|
||||
快递公司: <dict-tag :options="dict.type.emis_express_code" :value="item.prepareInExpress"/>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
快递单号:{{ item.prepareInBillCode }}
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
是否代垫运费:
|
||||
<span v-if="item.blPrepareInFreight==1">是</span>
|
||||
<span v-else>否</span>
|
||||
|
||||
</el-col>
|
||||
<el-col :span="5" v-if="item.blPrepareInFreight==1">
|
||||
代垫运费:{{ item.prepareInEstFee }} 元
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
自定义标识:{{item.prepareInRemark }}
|
||||
|
||||
</el-col>
|
||||
|
||||
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<div >
|
||||
|
||||
<el-table
|
||||
:cell-style="{
|
||||
'padding': '0px!important',
|
||||
'padding-left': '0px!important',
|
||||
'padding-right': '0px!important',
|
||||
'font-size':'11px'
|
||||
}"
|
||||
:header-cell-style="{
|
||||
'font-size':'11px'
|
||||
}"
|
||||
border
|
||||
stripe
|
||||
:data="item.cargoList"
|
||||
size="mini"
|
||||
style="width: 100%"
|
||||
|
||||
>
|
||||
<el-table-column :label="$t('序号')" align="center" width="60">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.$index+1}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="goodsName" label="品名" align="center" min-width="120" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.goodsName}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.cargoQty}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="length" :label="$t('长(cm)')" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.length}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="width" :label="$t('宽(cm)')" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.width}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="height" :label="$t('高(cm)')" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.height}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.goodsModel" size="mini" ></el-input>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column prop="goodsName" label="品牌" align="center" width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.brand}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--
|
||||
<el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
||||
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.material}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.purpose}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.ingredients}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplier" label="供应商" align="center" min-width="80" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span > {{scope.row.supplier}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
|
||||
</div>
|
||||
|
||||
<div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
|
||||
<!-- <div>进仓图片：</div> -->
|
||||
<div v-if="item.picUrl" style="display:inline-flex">
|
||||
<div >
|
||||
<ImagePreview height="40px" v-for="(pic,index2) in (item.picUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</CardWithHeader>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
||||
import CardWithHeader from '@/components/CardWithHeader/index.vue';
|
||||
import { getWarehouseInDetail} from "@/api/oms/emisWarehouseIn";
|
||||
|
||||
export default {
|
||||
name: "emisWarehouseInBatch",
|
||||
components: { elDateSimplePicker,CardWithHeader },
|
||||
props:{
|
||||
inNo:{
|
||||
type:String
|
||||
},
|
||||
stockInBatchList:{
|
||||
type:Array,
|
||||
default:()=>[]
|
||||
}
|
||||
},
|
||||
dicts: [
|
||||
],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
resetRefreshId:null,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 创建时间搜索
|
||||
dateTimeRange:[],
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 进仓单批次表格数据
|
||||
emisWarehouseInBatchList: this.stockInBatchList,
|
||||
|
||||
currentId:null,
|
||||
openForm: false,
|
||||
titleForm: "",
|
||||
|
||||
// 弹出展示层
|
||||
id:null,
|
||||
titleView:"",
|
||||
openView: false,
|
||||
// 更新站点时间范围
|
||||
daterangeEntryDate: [],
|
||||
// 更新站点时间范围
|
||||
daterangeConfirmDate: [],
|
||||
// 更新站点时间范围
|
||||
daterangeCreateTime: [],
|
||||
// 更新站点时间范围
|
||||
daterangeUpdateTime: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
serialNo: null,
|
||||
inNo: null,
|
||||
inBatchNo: null,
|
||||
customerCode: null,
|
||||
customerName: null,
|
||||
orderSn: null,
|
||||
billCode: null,
|
||||
transCarNo: null,
|
||||
entryDate: null,
|
||||
confirmStatus: null,
|
||||
confirmDate: null,
|
||||
status: null,
|
||||
totalParcelQty: null,
|
||||
totalVolume: null,
|
||||
totalWeight: null,
|
||||
remark: null,
|
||||
delFlag: null,
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.queryParams.inNo=this.inNo;
|
||||
// this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询进仓单批次列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
// listEmisWarehouseInBatch(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
|
||||
|
||||
// this.emisWarehouseInBatchList = response.rows;
|
||||
// this.resetRefreshId="wsbatch-"+Math.random().toString(36).substring(3,10);
|
||||
|
||||
// this.total = response.total;
|
||||
// this.loading = false;
|
||||
// });
|
||||
getWarehouseInDetail(this.inNo).then(response => {
|
||||
// this.emisWarehouseInBatchList = response.data;
|
||||
// this.resetRefreshId="wsbatch-"+Math.random().toString(36).substring(3,10);
|
||||
|
||||
// this.total = response.total;
|
||||
// this.loading = false;
|
||||
});
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.id)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
// 排序 查询字段是表格中字段名字 动态取值排序顺序
|
||||
handleSortChange(column) {
|
||||
this.queryParams.orderByColumn = column.prop;
|
||||
this.queryParams.isAsc = column.order;
|
||||
this.getList();
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd(row) {
|
||||
this.currentId=null;
|
||||
this.openForm= true;
|
||||
this.titleForm = "新增";
|
||||
},
|
||||
handleShowMoreInput(){
|
||||
this.moreInputVisible = !this.moreInputVisible;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.currentId= row.id;
|
||||
this.openForm = true;
|
||||
this.titleForm = "修改";
|
||||
},
|
||||
handleView(row) {
|
||||
this.id=row.id;
|
||||
this.titleView="查看";
|
||||
this.openView=true;
|
||||
// this.router.push({ path: '/emis/emisWarehouseInBatch/viewDetail', query: { id: row.id }})
|
||||
},
|
||||
handleFormChanged(){
|
||||
this.openForm = false;
|
||||
this.getList();
|
||||
},
|
||||
cancelForm(){
|
||||
this.openForm = false;
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认删除').then(function() {
|
||||
return delEmisWarehouseInBatch(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// this.download('emis/emisWarehouseInBatch/export', {
|
||||
// ...this.queryParams
|
||||
// }, `emisWarehouseInBatch_${new Date().getTime()}.xlsx`)
|
||||
const loadingInstance = this.$loading({
|
||||
text: '正在导出...'
|
||||
})
|
||||
var qParam = {...this.queryParams};
|
||||
qParam.pageNum=1;
|
||||
qParam.pageSize=5000;
|
||||
|
||||
listEmisWarehouseInBatch(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
|
||||
this.downloadLoading = false
|
||||
if (response.code === 200) {
|
||||
const curList = response.rows
|
||||
import('@/vendor/Export2Excel').then(excel => {
|
||||
const tHeader = ['id','进仓序列号','进仓单号','进仓子批次单号in_no+001','客户编号','客户名称','订单号','运单号','运输工具编号','进仓日期','客户确认状态','确认时间','状态','总件数','总体积','总重量','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
|
||||
const filterVal = ['id','serialNo','inNo','inBatchNo','customerCode','customerName','orderSn','billCode','transCarNo','entryDate','confirmStatus','confirmDate','status','totalParcelQty','totalVolume','totalWeight','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
|
||||
const data = this.formatJson(filterVal, curList, response.rows)
|
||||
excel.export_json_to_excel({
|
||||
header: tHeader,
|
||||
data,
|
||||
filename: '进仓单批次',
|
||||
autoWidth: true
|
||||
})
|
||||
loadingInstance.close()
|
||||
})
|
||||
}
|
||||
});
|
||||
},
|
||||
formatJson(filterVal, jsonData, resData) {
|
||||
let index = 0
|
||||
return jsonData.map(v => filterVal.map(j => {
|
||||
if (j === 'index') {
|
||||
return ++index
|
||||
}
|
||||
if (j === 'status') {
|
||||
var statusStr='xxx'
|
||||
if(v[j] == 10){
|
||||
statusStr='xxx'
|
||||
}
|
||||
return statusStr;
|
||||
}
|
||||
return v[j]
|
||||
}))
|
||||
},
|
||||
/** 列索引函数 */
|
||||
getIndex($index) {
|
||||
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
|
||||
},
|
||||
/** 时间搜索响应函数 */
|
||||
dateTimeChange(value){
|
||||
this.dateTimeRange=value;
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-divider{
|
||||
margin-top: 0px;
|
||||
background: 0 0;
|
||||
border-top: 1px solid #E6EBF5;
|
||||
}
|
||||
.el-divider__text {
|
||||
color: #0955ee;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
@ -4,10 +4,10 @@
|
||||
<div class="tab-container">
|
||||
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
|
||||
<el-tab-pane label="进仓单" name="billList" >
|
||||
<WarehouseInPanel @onSelect="onSelectBill"> </WarehouseInPanel>
|
||||
<WarehouseInPanel @onSelect="onSelectBill" @onStockIn="onStockIn" > </WarehouseInPanel>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.inNo" :label="'进仓单:'+item.inNo" closable >
|
||||
<WarehouseInBatchPanel :settleBillNo="item.inNo"></WarehouseInBatchPanel>
|
||||
<el-tab-pane :key="selectInNo" name="wsInView" :label="'进仓单:'+selectInNo" v-if="openViewForm" closable >
|
||||
<WarehouseInBatchPanel :settleBillNo="selectInNo" :key="'batchView_'+selectInNo" ></WarehouseInBatchPanel>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
@ -30,6 +30,8 @@ export default {
|
||||
return {
|
||||
activeTab:'billList',
|
||||
billTabs:[],
|
||||
selectInNo:null,
|
||||
openViewForm:false,
|
||||
};
|
||||
},
|
||||
created() {
|
||||
@ -39,27 +41,36 @@ export default {
|
||||
|
||||
},
|
||||
onSelectBill(item) {
|
||||
let old=this.billTabs.find(mItem=>mItem.settleBillNo==item.settleBillNo);
|
||||
if(old){
|
||||
this.activeTab=item.settleBillNo;
|
||||
}else{
|
||||
this.billTabs.push(item);
|
||||
this.activeTab=item.settleBillNo;
|
||||
}
|
||||
this.selectInNo=item.inNo;
|
||||
this.openViewForm=true;
|
||||
this.activeTab='wsInView';
|
||||
},
|
||||
removeTab(targetName) {
|
||||
|
||||
var self=this;
|
||||
removeTab(targetName) {
|
||||
if (targetName == 'wsInPanel') {
|
||||
this.showWsInPanel = false;
|
||||
this.activeTab = "billList";
|
||||
}
|
||||
else if (targetName == 'wsInView') {
|
||||
this.openViewForm = false;
|
||||
this.activeTab = "billList";
|
||||
}
|
||||
else {
|
||||
var self = this;
|
||||
let tabs = self.billTabs;
|
||||
self.billTabs = tabs.filter(tab => tab.settleBillNo !== targetName);
|
||||
if(self.billTabs.length>0){
|
||||
this.activeTab=self.billTabs[self.billTabs.length-1].settleBillNo;
|
||||
}else{
|
||||
this.activeTab="billList";
|
||||
self.billTabs = tabs.filter(tab => tab.inNo !== targetName);
|
||||
if (self.billTabs.length > 0) {
|
||||
this.activeTab = self.billTabs[self.billTabs.length - 1].inNo;
|
||||
} else {
|
||||
this.activeTab = "billList";
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
onStockIn(inNo) {
|
||||
this.selectInNo = inNo;
|
||||
this.showWsInPanel = true;
|
||||
this.activeTab = 'wsInPanel';
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -1,311 +1,88 @@
|
||||
<template>
|
||||
<div >
|
||||
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
|
||||
<div style="font-size: 12px;" v-if="whsInInfo">
|
||||
<div style="margin-bottom:20px" >
|
||||
<el-descriptions title="" size="mini" :column="4">
|
||||
<el-descriptions-item label="进仓单号">{{ whsInInfo.inNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="运单号">
|
||||
<span @click="handleShowOrderInfo" style="cursor: pointer;"> {{ whsInInfo.billCode }}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="订单号">
|
||||
<span @click="handleShowOrderInfo" style="cursor: pointer;">{{ whsInInfo.orderSn }}</span>
|
||||
|
||||
<el-form-item label="" prop="serialNo">
|
||||
<el-input
|
||||
v-model="queryParams.serialNo"
|
||||
:placeholder="$t('进仓序列号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="inNo">
|
||||
<el-input
|
||||
v-model="queryParams.inNo"
|
||||
:placeholder="$t('进仓单号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="inBatchNo">
|
||||
<el-input
|
||||
v-model="queryParams.inBatchNo"
|
||||
:placeholder="$t('进仓子批次单号in_no+001')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="customerCode">
|
||||
<el-input
|
||||
v-model="queryParams.customerCode"
|
||||
:placeholder="$t('客户编号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="customerName">
|
||||
<el-input
|
||||
v-model="queryParams.customerName"
|
||||
:placeholder="$t('客户名称')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="orderSn">
|
||||
<el-input
|
||||
v-model="queryParams.orderSn"
|
||||
:placeholder="$t('订单号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="billCode">
|
||||
<el-input
|
||||
v-model="queryParams.billCode"
|
||||
:placeholder="$t('运单号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="transCarNo">
|
||||
<el-input
|
||||
v-model="queryParams.transCarNo"
|
||||
:placeholder="$t('运输工具编号')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="entryDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.entryDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
:placeholder="$t('进仓日期')">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="confirmStatus">
|
||||
<el-input
|
||||
v-model="queryParams.confirmStatus"
|
||||
:placeholder="$t('客户确认状态')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="confirmDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.confirmDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
:placeholder="$t('确认时间')">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="status">
|
||||
<el-input
|
||||
v-model="queryParams.status"
|
||||
:placeholder="$t('状态')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="totalParcelQty">
|
||||
<el-input
|
||||
v-model="queryParams.totalParcelQty"
|
||||
:placeholder="$t('总件数')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="totalVolume">
|
||||
<el-input
|
||||
v-model="queryParams.totalVolume"
|
||||
:placeholder="$t('总体积')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="totalWeight">
|
||||
<el-input
|
||||
v-model="queryParams.totalWeight"
|
||||
:placeholder="$t('总重量')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="remark">
|
||||
<el-input
|
||||
v-model="queryParams.remark"
|
||||
:placeholder="$t('备注')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="delFlag">
|
||||
<el-input
|
||||
v-model="queryParams.delFlag"
|
||||
:placeholder="$t('删除标志（0代表存在')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
</SearchForm>
|
||||
<!-- -->
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="客户名称">{{ whsInInfo.customerName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="预约进仓日期" :span="4"><span style="font-weight: bold;color: red;">{{ whsInInfo.waybillDetail.pickStartDate }}</span></el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="仓库信息" :span="4">
|
||||
<div>
|
||||
仓库名：<span>{{ whsInInfo.waybillDetail.intoWarehouseName }}</span>
|
||||
</div>
|
||||
<div>
|
||||
联系人: <span>{{ whsInInfo.waybillDetail.intoWarehouseContact }} {{ whsInInfo.waybillDetail.intoWarehousePhone }} </span>
|
||||
</div>
|
||||
<div>
|
||||
地址:{{ whsInInfo.waybillDetail.intoWarehouseAddress }}
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="进仓状态">
|
||||
<el-tag v-if="whsInInfo.stockInFlag=='0'" type="info">未入仓</el-tag>
|
||||
<el-tag v-if="whsInInfo.stockInFlag=='1'" type="success">已入仓</el-tag>
|
||||
<el-tag v-if="whsInInfo.stockInFlag=='2'" type="warning">部分入仓</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="入仓总件数">{{ whsInInfo.totalParcelQty }}</el-descriptions-item>
|
||||
<el-descriptions-item label="入仓总重量">{{ whsInInfo.totalWeight }}kg</el-descriptions-item>
|
||||
<el-descriptions-item label="入仓总体积">{{ whsInInfo.totalVolume }}m³</el-descriptions-item>
|
||||
|
||||
<XdTable v-loading="loading"
|
||||
border
|
||||
size="small"
|
||||
:data="emisWarehouseInBatchList"
|
||||
:showSearch.sync="showSearch"
|
||||
:queryParams="queryParams"
|
||||
:total="total"
|
||||
@queryTable="getList"
|
||||
@selection-change="handleSelectionChange"
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
<el-descriptions-item label="确认状态">
|
||||
<el-tag v-if="whsInInfo.confirmStatus=='0'" type="info">未确认</el-tag>
|
||||
<el-tag v-if="whsInInfo.confirmStatus=='1'" type="success">已确认</el-tag>
|
||||
<el-tag v-if="whsInInfo.confirmStatus=='2'" type="warning">部分确认</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="确认时间">{{ whsInInfo.confirmDate }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisWarehouseInBatch:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<!--
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['emis:emisWarehouseInBatch:edit']"
|
||||
>修改</el-button>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['emis:emisWarehouseInBatch:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['emis:emisWarehouseInBatch:export']"
|
||||
>导出</el-button>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
@click="handleShowOrderInfo"
|
||||
>查看订单详情</el-button>
|
||||
|
||||
</div>
|
||||
|
||||
<div style="margin-bottom:20px">
|
||||
<div>
|
||||
<WsInBatchList :inNo="settleBillNo" :stockInBatchList="whsInInfo.stockInBatchList"> </WsInBatchList>
|
||||
</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-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="serialNo" min-width="100" />
|
||||
<el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
|
||||
<el-table-column :label="$t('进仓子批次单号in_no+001')" align="center" prop="inBatchNo" min-width="100" />
|
||||
<el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
|
||||
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
|
||||
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
|
||||
<el-table-column :label="$t('运输工具编号')" align="center" prop="transCarNo" min-width="100" />
|
||||
<el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
|
||||
<el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
|
||||
<el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
|
||||
<el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
|
||||
<el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
|
||||
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
|
||||
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
|
||||
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
|
||||
|
||||
|
||||
<el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
|
||||
<el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改时间" align="center" prop="updateTime" 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"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['emis:emisWarehouseInBatch:edit']"
|
||||
>修改</el-button>
|
||||
<!--
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['emis:emisWarehouseInBatch:remove']"
|
||||
>删除</el-button> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</XdTable>
|
||||
|
||||
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<emisWarehouseInBatchForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInBatchForm>
|
||||
</el-dialog> -->
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<el-dialog title="订单详情" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
<OrderDetailReadOnly :key="currentTraceBillCode" :billCode="currentTraceBillCode"></OrderDetailReadOnly>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listEmisWarehouseInBatch } from "@/api/oms/emisWarehouseInBatch";
|
||||
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
||||
import { getWarehouseInDetail} from "@/api/oms/emisWarehouseIn";
|
||||
import OrderDetailReadOnly from '@/views/oms/emisWaybill/OrderDetailReadOnly.vue';
|
||||
import WsInBatchList from '@/views/oms/emisWaybill/WsInBatchList.vue';
|
||||
|
||||
export default {
|
||||
name: "emisWarehouseInBatch",
|
||||
components: { elDateSimplePicker },
|
||||
name: "WarehouseInBatchPanel",
|
||||
components: {
|
||||
OrderDetailReadOnly,
|
||||
WsInBatchList
|
||||
},
|
||||
dicts: [
|
||||
],
|
||||
props: {
|
||||
settleBillNo: {
|
||||
type: String,
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
@ -322,6 +99,8 @@ export default {
|
||||
dateTimeRange:[],
|
||||
// 总条数
|
||||
total: 0,
|
||||
|
||||
whsInInfo:null,
|
||||
// 进仓单批次表格数据
|
||||
emisWarehouseInBatchList: [],
|
||||
|
||||
@ -329,6 +108,9 @@ export default {
|
||||
openForm: false,
|
||||
titleForm: "",
|
||||
|
||||
openTraceInfo:false,
|
||||
currentTraceBillCode:null,
|
||||
|
||||
// 弹出展示层
|
||||
id:null,
|
||||
titleView:"",
|
||||
@ -389,9 +171,8 @@ export default {
|
||||
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
|
||||
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
|
||||
}
|
||||
listEmisWarehouseInBatch(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
|
||||
this.emisWarehouseInBatchList = response.rows;
|
||||
this.total = response.total;
|
||||
getWarehouseInDetail({'inNo':this.settleBillNo}).then(response => {
|
||||
this.whsInInfo=response.data;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
@ -468,7 +249,7 @@ export default {
|
||||
qParam.pageNum=1;
|
||||
qParam.pageSize=5000;
|
||||
|
||||
listEmisWarehouseInBatch(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
|
||||
getWarehouseInDetail({inNo:this.settleBillNo}).then(response => {
|
||||
this.downloadLoading = false
|
||||
if (response.code === 200) {
|
||||
const curList = response.rows
|
||||
@ -511,6 +292,10 @@ export default {
|
||||
dateTimeChange(value){
|
||||
this.dateTimeRange=value;
|
||||
},
|
||||
handleShowOrderInfo(){
|
||||
this.currentTraceBillCode=this.whsInInfo.billCode;
|
||||
this.openTraceInfo=true;
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -176,20 +176,7 @@
|
||||
<el-tag v-if="scope.row.stockInFlag=='2'" type="warning">部分入仓</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" /> -->
|
||||
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
|
||||
|
||||
<!-- <el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
-->
|
||||
|
||||
<!-- <el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
-->
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
|
||||
<!-- <el-table-column label="修改时间" align="center" prop="updateTime" width="170"/> -->
|
||||
|
||||
</XdTable>
|
||||
<!--
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
@ -249,6 +236,7 @@ export default {
|
||||
daterangeCreateTime: [],
|
||||
// 更新站点时间范围
|
||||
daterangeUpdateTime: [],
|
||||
currentSelectOrder:null,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@ -329,7 +317,7 @@ export default {
|
||||
|
||||
this.selectionList=selection;
|
||||
if(this.selectionList&&this.selectionList.length>0){
|
||||
// this.currentSelectOrder=this.selectionList[0];
|
||||
this.currentSelectOrder=this.selectionList[0];
|
||||
}
|
||||
|
||||
},
|
||||
@ -358,7 +346,7 @@ export default {
|
||||
// this.id=row.id;
|
||||
// this.titleView="查看";
|
||||
// this.openView=true;
|
||||
this.$emit("onSelect",row);
|
||||
this.$emit("onSelect",this.currentSelectOrder);
|
||||
// this.router.push({ path: '/oms2c/emisWarehouseIn/viewDetail', query: { id: row.id }})
|
||||
},
|
||||
handleFormChanged(){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user