This commit is contained in:
linfso 2024-06-22 18:27:42 +08:00
parent e63b9d8bb0
commit ce50947ceb
2 changed files with 7 additions and 4 deletions

View File

@ -103,9 +103,12 @@
"vue-virtual-scroller": "^1.1.2", "vue-virtual-scroller": "^1.1.2",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3",
"vuex": "3.6.0", "vuex": "3.6.0",
"vxe-table": "^2.11.0",
"watermark-dom": "2.3.0", "watermark-dom": "2.3.0",
"xd-pdf": "./libs/XdPdf", "xd-pdf": "./libs/XdPdf",
"xd-vue-pdf": "file:libs/XdVuePdf", "xd-vue-pdf": "file:libs/XdVuePdf",
"xe-clipboard": "^1.10.2",
"xe-utils": "^3.5.27",
"xlsx": "^0.17.5" "xlsx": "^0.17.5"
}, },
"devDependencies": { "devDependencies": {

View File

@ -3,9 +3,9 @@
<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-row :gutter="0">
<el-col :span="8"> <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 slot="label">
<span style="color: red">{{$t('扫描包号')}}</span> <span style="color: red">{{$t('扫描单号')}}</span>
</span> </span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" > <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i> <i slot="suffix" class="iconfont">&#xe656;</i>
@ -68,7 +68,7 @@
> >
<!-- <el-table ref="multipleTable" border stripe v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange"> --> <!-- <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 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="bagNo" min-width="150" />
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" > <el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -230,7 +230,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 haveCode = null; let haveCode = null;