aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-12-23 07:58:54 +08:00
parent cf67862dba
commit 8e10b33d96
2 changed files with 77 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/views/emis/emisWaybill/UserOrderList.vue
View File

@ -14,7 +14,7 @@
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="8" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="运单号" prop="billCode">
<!-- <el-form-item label="运单号" prop="billCode">
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
@ -22,7 +22,23 @@
:rows="1"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="" prop="queryKey">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<el-radio :key="2" label="2">订单号</el-radio>
<el-radio :key="3" label="3">进仓单</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.queryKey"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="4"
/>
<!-- -->
</el-form-item>
<el-form-item label="下单日期" prop="dateTimeRange">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
@ -424,6 +440,12 @@
<div v-else>不发送</div>
</template>
</el-table-column>
<el-table-column :label="$t('仓库名称')" align="center" prop="intoWarehouseName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('仓库联系人')" align="center" prop="intoWarehouseContact" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('仓库联系电话')" align="center" prop="intoWarehousePhone" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('仓库地址')" align="center" prop="intoWarehouseAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预计入仓时间')" align="center" prop="pickStartDate" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
@ -586,10 +608,15 @@ export default {
titleView:"",
openView: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
queryOrderType:'1',
queryKey:null,
orderSn: null,
billCode: null,
billCodeSub: null,
@ -752,9 +779,9 @@ export default {
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[timeFormat(start), timeFormat(end)]
// this.dateTimeRange=[timeFormat(start), timeFormat(end)]
//this.queryParams.orderStatus='0';
this.queryParams.orderStatus='0';
this.getList();
},
methods: {
@ -776,6 +803,22 @@ export default {
/** 查询运单列表列表 */
getList() {
this.loading = true;
if(this.queryParams.queryOrderType==1){
this.queryParams.billCode= this.queryParams.queryKey;
this.queryParams.orderSn= null;
this.queryParams.intoWarehouseBillCode= null;
}
else if(this.queryParams.queryOrderType==2){
this.queryParams.billCode= null;
this.queryParams.orderSn= this.queryParams.queryKey;
this.queryParams.intoWarehouseBillCode= null;
}
else if(this.queryParams.queryOrderType==3){
this.queryParams.billCode= null;
this.queryParams.orderSn= null;
this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey;
}
listEmisOrder(this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate")).then(response => {
this.emisWaybillList = response.rows;
this.total = response.total;

32
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -1037,9 +1037,21 @@ computed: {
this.action="add";
this.addFrom="userOrder";
this.billCode=this.$route.query.billCode;
this.$route.meta.title = "接单";
// this.$route.meta.title = "接单";
const title = '接单';
const route = Object.assign({}, this.$route, { title: `${title}` })
this.$store.dispatch('tagsView/updateVisitedView', route)
this.initData();
}
}else{
if(this.$route.query.action='add'){
const title = '运单录入';
const route = Object.assign({}, this.$route, { title: `${title}` })
this.$store.dispatch('tagsView/updateVisitedView', route)
}
}
}
},
// beforeRouteEnter(to,from,next){
@ -1052,11 +1064,27 @@ created() {
this.action=this.$route.query.action;
if(!this.action){
this.action="add";
}
if(this.$route.query.addFrom=="userOrder"){
this.billCode=this.$route.query.billCode;
this.addFrom="userOrder";
const title = '接单';
const route = Object.assign({}, this.$route, { title: `${title}` })
this.$store.dispatch('tagsView/updateVisitedView', route)
}
else if(this.action=='add'){
const title = '运单录入';
const route = Object.assign({}, this.$route, { title: `${title}` })
this.$store.dispatch('tagsView/updateVisitedView', route)
}
else if(this.action=='modify'){
const title = '运单修改';
const route = Object.assign({}, this.$route, { title: `${title}` })
this.$store.dispatch('tagsView/updateVisitedView', route)
}
this.initData();