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-06-22 15:29:00 +08:00
parent 0451b70da9
commit 5be4f1445b
6 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/index.html
View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="force-rendering" content="webkit"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
<!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" /> --> <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" /> -->
<link rel="icon" href="<%= BASE_URL %>shorticon.png"/> <link rel="icon" href="<%= BASE_URL %>shorticon.png"/>

8
src/utils/TanexPrinterSdk.js
View File

@ -546,14 +546,14 @@ class TanexPrinterSdk {
} }
} }
innerBatchGetPDF(msg){ async innerBatchGetPDF(msg){
// console.log("innerBatchGetPDF") // console.log("innerBatchGetPDF")
// 有出错，停止接收数据 // 有出错，停止接收数据
if(msg.Status!='2'){ if(msg.Status!='2'){
clearTimeout(this.recievePdfFileTimer); clearTimeout(this.recievePdfFileTimer);
if(this.onBatchGetPDFCallback){ if(this.onBatchGetPDFCallback){
this.onBatchGetPDFCallback(500,msg.Data) await this.onBatchGetPDFCallback(500,msg.Data)
} }
return; return;
@ -572,7 +572,7 @@ class TanexPrinterSdk {
this.pdfFileReceiveMap[ydSn]=1; this.pdfFileReceiveMap[ydSn]=1;
if(this.onBatchGetPDFCallback!=null){ if(this.onBatchGetPDFCallback!=null){
this.onBatchGetPDFCallback(200,"获取成功",msg.Data); await this.onBatchGetPDFCallback(200,"获取成功",msg.Data);
} }
} }
} }
@ -583,7 +583,7 @@ class TanexPrinterSdk {
if(this.onBatchGetPDFCallback!=null){ if(this.onBatchGetPDFCallback!=null){
// clearTimeout(this.recievePdfFileTimer); // clearTimeout(this.recievePdfFileTimer);
// 把PDF文件传给终端处理 // 把PDF文件传给终端处理
this.onBatchGetPDFCallback(800,"获取成功",this.recievePdfFileList); await this.onBatchGetPDFCallback(800,"获取成功",this.recievePdfFileList);
} }
// 发送完成后数据清空 // 发送完成后数据清空

20
src/views/emis/emisTmsScanRecord/customsClearScan.vue
View File

@ -2,6 +2,17 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="0"> <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-col :span="8">
<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="7"> <el-col :span="7">
<el-form-item label="扫描单号" prop="billCode" label-width="70px"> <el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label"> <span slot="label">
@ -13,15 +24,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<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="7"> <el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px"> <el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" > <el-input v-model="form.scanWeight" placeholder="扫描重量" >

19
src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
View File

@ -2,6 +2,16 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="0"> <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-col :span="8">
<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="7"> <el-col :span="7">
<el-form-item label="扫描单号" prop="billCode" label-width="70px"> <el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label"> <span slot="label">
@ -12,15 +22,6 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<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="7"> <el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px"> <el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" > <el-input v-model="form.scanWeight" placeholder="扫描重量" >

21
src/views/emis/emisTmsScanRecord/outgoingScan.vue
View File

@ -2,6 +2,14 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="0"> <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-col :span="8">
<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="7"> <el-col :span="7">
<el-form-item label="扫描单号" prop="billCode" label-width="70px"> <el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label"> <span slot="label">
@ -12,15 +20,8 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<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="7"> <el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px"> <el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" > <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@ -253,7 +254,7 @@ export default {
this.$message.error("输入单号后回车"); this.$message.error("输入单号后回车");
return; return;
} }
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[]; let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode; let dispatchOrSendManCode = this.form.dispatchOrSendManCode;

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

@ -2,17 +2,6 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="0"> <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-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<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-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode"> <el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker> <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
@ -23,6 +12,16 @@
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker> <EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<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-col :span="8"> <el-col :span="8">
<el-form-item label="重量" prop="scanWeight" label-width="100px"> <el-form-item label="重量" prop="scanWeight" label-width="100px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" > <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@ -318,7 +317,7 @@ export default {
this.openBatch=false; this.openBatch=false;
}, },
submitFormBatch(){ submitFormBatch(){
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[]; let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight let scanWeight = this.form.scanWeight
let dispatchOrSendMan = this.form.dispatchOrSendMan; let dispatchOrSendMan = this.form.dispatchOrSendMan;
let dispatchOrSendManCode = this.form.dispatchOrSendManCode; let dispatchOrSendManCode = this.form.dispatchOrSendManCode;