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

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-05-20 00:31:17 +08:00
commit 26e4b04880
8 changed files with 182 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/views/emis/emisTmsScanRecord/coPackageScanning.vue
View File

@ -1,9 +1,28 @@
<template>
<div class="app-container">
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0">
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<span slot="label">
<span style="color: red">{{$t('下一站')}}</span>
</span>
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合包号" prop="bagNo" label-width="80px">
<span slot="label">
<span style="color: red">{{$t('合包号')}}</span>
</span>
<el-input v-model="form.bagNo" placeholder="请输入" >
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="80px">
<span slot="label">
<span style="color: red">扫描单号</span>
</span>
@ -12,20 +31,8 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合包号" prop="bagNo" label-width="60px">
<el-input v-model="form.bagNo" placeholder="请输入" >
</el-input>
</el-form-item>
</el-col>
</el-form>
</el-row>
</el-form>
<div slot="toolbar">

37
src/views/emis/emisTmsScanRecord/loadingScan.vue
View File

@ -1,31 +1,38 @@
<template>
<div class="app-container">
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-col :span="7">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0">
<el-col :span="8">
<el-form-item label="车牌号" prop="carNo" label-width="80px">
<span slot="label">
<span style="color: red">扫描单号</span>
<span style="color: red">{{$t('车牌号')}}</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="车牌号" prop="carNo" label-width="60px">
<el-input v-model="form.carNo" placeholder="请输入" >
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<el-form-item :label="$t('下一站')" prop="preOrNextStation" label-width="80px">
<span slot="label">
<span style="color: red">{{$t('下一站')}}</span>
</span>
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="80px">
<span slot="label">
<span style="color: red">扫描单号</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="toolbar">

16
src/views/emis/emisTmsScanRecord/positionScanning.vue
View File

@ -3,7 +3,7 @@
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<el-form-item label="扫描单号" prop="billCode" label-width="80px">
<span slot="label">
<span style="color: red">扫描单号</span>
</span>
@ -13,7 +13,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('留仓类型')" prop="keepWarehouse">
<el-form-item :label="$t('留仓类型')" prop="keepWarehouse" label-width="80px">
<span slot="label">
<span style="color: red">{{$t('留仓类型')}}</span>
</span>
<el-select
style="width:100%"
filterable
@ -24,10 +27,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="16">
<el-form-item label="留仓原因" prop="remark" label-width="80px">
<el-input v-model="form.remark" placeholder="请输入" >
</el-input>
<span slot="label">
<span style="color: red">{{$t('留仓原因')}}</span>
</span>
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入" />
</el-form-item>
</el-col>
@ -124,7 +129,6 @@
</template>
<script>
import { listEmisWaybill, getWaybillDetail,getEmisWaybill } from "@/api/emis/emisWaybill";
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';

141
src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
View File

@ -1,9 +1,10 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form ref="queryForm" size="mini" :model="queryParams" :rules="rules" label-width="100px">
<!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
<el-row :gutter="0">
<el-col :span="8">
<el-form-item prop="applySeq">
<!-- <el-form-item prop="applySeq">
<el-col :span="8">
<el-select v-model="queryParams.queryType" >
<el-option :label="$t('运单号')" value="1"></el-option>
@ -20,53 +21,70 @@
@keyup.enter.native="handleQuery"
/>
</el-col>
</el-form-item> -->
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.queryType">
<el-radio label="1">运单号</el-radio>
<el-radio label="0">订单号</el-radio>
</el-radio-group>
</div>
<el-input
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
type="textarea"
rows="2"
/>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<el-form-item :label="$t('扫描类型')" prop="scanType">
<el-select
style="width:100%"
filterable
clearable
v-model="queryParams.scanType"
>
<el-option v-for="item in dict.type.emis_scan_type" :key="item.value" :label="item.label" :value="item.label" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('扫描网点')" prop="scanSiteCode" label-width="70px">
<EmisSiteSimplePicker v-model="queryParams.scanSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('单号类型')" prop="isSubBill">
<el-select v-model="queryParams.isSubBill" :placeholder="$t('请选择')" >
<el-option :label="$t('主单')" value="0"></el-option>
<el-option :label="$t('子单')" value="1"></el-option>
<el-col :span="8">
<el-form-item :label="$t('扫描类型')" prop="scanType" label-width="100px">
<el-select
style="width:100%"
filterable
clearable
v-model="queryParams.scanType"
>
<el-option v-for="item in dict.type.emis_scan_type" :key="item.value" :label="item.label" :value="item.label" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item :label="$t('上/下一网点')" prop="preOrNextStation" label-width="90px">
<EmisSiteSimplePicker v-model="queryParams.preOrNextStation" @onChange="onPreOrNextSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('目的地')" prop="destCode" label-width="70px">
<DestinationPicker v-model="queryParams.destCode" @onChange="onDestinationSelect" ></DestinationPicker>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="扫描时间" prop="dateTimeRange">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
</search-form>
</el-row >
<el-col :span="8">
<el-form-item :label="$t('扫描网点')" prop="scanSiteCode" label-width="100px">
<EmisSiteSimplePicker v-model="queryParams.scanSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
</el-row >
<el-row :gutter="0">
<el-col :span="8">
<el-form-item :label="$t('单号类型')" prop="isSubBill" label-width="100px">
<el-select v-model="queryParams.isSubBill" :placeholder="$t('请选择')" >
<el-option :label="$t('主单')" value="0"></el-option>
<el-option :label="$t('子单')" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('上/下一网点')" prop="preOrNextStation" label-width="100px">
<EmisSiteSimplePicker v-model="queryParams.preOrNextStation" @onChange="onPreOrNextSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('目的地')" prop="destCode" label-width="100px">
<DestinationPicker v-model="queryParams.destCode" @onChange="onDestinationSelect" ></DestinationPicker>
</el-form-item>
</el-col>
</el-row >
<el-row :gutter="0">
<el-col :span="16" label-width="100px">
<el-form-item label="扫描时间" prop="dateTimeRange">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
</el-col>
</el-row >
<!-- </search-form> -->
</el-form>
<xd-table v-loading="loading"
border stripe
@ -82,6 +100,22 @@
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleQuery"
>查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleClearCode"
>清除单号</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@ -277,7 +311,7 @@ export default {
params:{},//扩展参数
// scanSite:null,
queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：0
// scanType:"",
isSubBill:"",
},
@ -333,7 +367,7 @@ export default {
let queryType = this.queryParams.queryType;
if(queryType == "1"){
this.queryParams.orderSN=null;
}else if(queryType == "2"){
}else if(queryType == "0"){
this.queryParams.orderSN=this.queryParams.billCode;
this.queryParams.billCode=null;
}
@ -481,6 +515,9 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
handleClearCode(){
this.queryParams.billCode=null;
},
handleTypeSelect(selection){
this.sctype = selection.value;
},
@ -715,4 +752,12 @@ export default {
color: #0955ee;
cursor: pointer;
}
.query-label {
.el-radio{
display: block;
line-height: 23px;
white-space: normal;
margin-right: 0;
}
}
</style>

2
src/views/emis/emisTmsScanRecord/signAndRecord.vue
View File

@ -35,7 +35,7 @@
<ImageUpload v-model="form.picUrl" @input="handleInput" ></ImageUpload>
</el-form-item>
</el-col>
</el-form>
</el-form>
</el-row>
<el-row>
<el-col class="line" :span="24">

5
src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
View File

@ -29,7 +29,7 @@
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="清单编号" prop="listNo" label-width="100px">
<el-input v-model="form.listNo" placeholder="请输入" >
</el-input>
@ -70,7 +70,7 @@
<el-input v-model="form.sendManNo" placeholder="请输入" >
</el-input>
</el-form-item>
</el-col>
</el-col> -->
</el-form>
</el-row>
@ -170,7 +170,6 @@
</template>
<script>
import { listEmisWaybill, getWaybillDetail,getEmisWaybill } from "@/api/emis/emisWaybill";
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';

39
src/views/emis/emisTmsScanRecord/unloadingScan.vue
View File

@ -1,24 +1,34 @@
<template>
<div class="app-container">
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-col :span="7">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0">
<el-col :span="8">
<el-form-item label="车牌号" prop="carNo" label-width="80px">
<span slot="label">
<span style="color: red">扫描单号</span>
<span style="color: red">{{$t('车牌号')}}</span>
</span>
<el-input v-model="form.carNo" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="80px">
<span slot="label">
<span style="color: red">{{$t('扫描单号')}}</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="车牌号" prop="carNo" label-width="60px">
<el-input v-model="form.carNo" placeholder="请输入" />
</el-form-item>
</el-col>
</el-form>
</el-row>
<el-row :gutter="0">
<el-col :span="8">
<el-form-item :label="$t('卸车图片')" prop="picUrl">
<ImageUpload v-model="form.picUrl" @input="handleInput" ></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
@ -97,9 +107,7 @@
</template>
<script>
import { listEmisWaybill, getWaybillDetail,getEmisWaybill } from "@/api/emis/emisWaybill";
import { doScan } from "@/api/emis/emisTmsScanRecord";
// import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
export default {
@ -227,7 +235,7 @@ export default {
}
return {
billCode:code,
carNo: carNo
carNo: carNo,
}
})
@ -349,7 +357,8 @@ export default {
carNo:item.carNo,
preOrNextStationCode:item.preOrNextStationCode,
scanDate:item.scanDate,
bagNo:item.bagNo
bagNo:item.bagNo,
picUrl: item.picUrl
}
);
});

15
src/views/emis/emisTmsScanRecord/unpackScan.vue
View File

@ -1,11 +1,11 @@
<template>
<div class="app-container">
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0">
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<el-form-item label="扫描包号" prop="billCode" label-width="70px">
<span slot="label">
<span style="color: red">扫描单号</span>
<span style="color: red">{{$t('扫描包号')}}</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
@ -13,13 +13,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('到家上一站')" prop="preOrNextStation" label-width="100px">
<el-form-item :label="$t('上一站')" prop="preOrNextStation" label-width="100px">
<EmisGetPreSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetPreSitePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>
</el-form>
<div slot="toolbar">
@ -59,7 +58,7 @@
<el-table ref="multipleTable" border stripe v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('扫描单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('扫描包号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('合包号')" align="center" prop="bagNo" min-width="150" />
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope">