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-06-14 13:44:28 +08:00
commit 7854621916
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,6 @@
<div class="app-container">
<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="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-col :span="8">
<el-form-item :label="$t('留仓类型')" prop="keepWarehouse" label-width="80px">
<span slot="label">
@ -21,9 +11,8 @@
style="width:100%"
filterable
clearable
v-model="keepWarehouseValue"
@change="onKeepWarehouseSelect">
<el-option v-for="item in dict.type.emis_keep_warehouse" :key="item.value" :label="item.label" :value="item.label" />
v-model="form.keepType">
<el-option v-for="item in dict.type.emis_keep_warehouse" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@ -35,7 +24,16 @@
<el-input v-model="form.remark" type="textarea" :rows="2" 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">扫描单号</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-form>
</el-row>
@ -100,6 +98,12 @@
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('留仓类型')" align="center" prop="keepType" min-width="150">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_keep_warehouse" :value="scope.row.keepType"/>
</template>
</el-table-column>
<el-table-column :label="$t('留仓原因')" align="center" prop="remark" min-width="150" />
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="150" />
<el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" />
</xd-table>
@ -220,6 +224,10 @@ export default {
this.form.ids= arr.map(item=>item.id)
},
handleBatchScan(){
if(this.form.keepType==null || this.form.remark==''){
this.$message.error("请先输入必填字段");
return;
}
this.formBatch = {
billCode: null,
}
@ -385,7 +393,8 @@ export default {
picUrl:item.picUrl,
scanDate:item.scanDate,
scanWeight:item.scanWeight,
remark:((item.keepWarehouseRemark?item.keepWarehouseRemark+" ":"") + (item.remark ? item.remark : "")).trim(),
keepType:item.keepType,
remark:item.remark,//((item.keepWarehouseRemark?item.keepWarehouseRemark+" ":"") + (item.remark ? item.remark : "")).trim(),
dispatchOrSendManCode:item.dispatchOrSendManCode
}
);
@ -425,6 +434,10 @@ export default {
this.$message.error("输入单号后回车");
return;
}
if(this.form.keepType==null || this.form.remark==''){
this.$message.error("请输入必填字段");
return;
}
if(this.dataMap[this.form.billCode]){
this.$message.error("重复扫描");