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-20 06:13:13 +08:00
commit 4190c9b85b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/emis/emisTmsScanRecord/deliveryScan.vue
View File

@ -14,6 +14,9 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode"> <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<span slot="label">
<span style="color: red">{{ $t('派件员') }}</span>
</span>
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker> <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -184,8 +187,8 @@ export default {
this.form.recordMan=this.$store.getters.empName; this.form.recordMan=this.$store.getters.empName;
this.form.recordManCode=this.$store.getters.empCode; this.form.recordManCode=this.$store.getters.empCode;
this.form.dispatchOrSendMan=this.$store.getters.empName; // this.form.dispatchOrSendMan=this.$store.getters.empName;
this.form.dispatchOrSendManCode=this.$store.getters.empCode; // this.form.dispatchOrSendManCode=this.$store.getters.empCode;
this.$nextTick(function() { this.$nextTick(function() {
let form = this.$refs.form.$el; let form = this.$refs.form.$el;
@ -212,6 +215,10 @@ export default {
this.form.ids= arr.map(item=>item.id) this.form.ids= arr.map(item=>item.id)
}, },
handleBatchScan(){ handleBatchScan(){
if(this.form.dispatchOrSendManCode==null || this.form.dispatchOrSendManCode==''){
this.$message.error("请输入派件员");
return;
}
this.formBatch = { this.formBatch = {
billCode: null, billCode: null,
} }
@ -234,7 +241,6 @@ export default {
this.openBatch=false; this.openBatch=false;
}, },
submitFormBatch(){ submitFormBatch(){
if(this.formBatch.billCode==null || this.formBatch.billCode==''){ if(this.formBatch.billCode==null || this.formBatch.billCode==''){
this.$message.error("输入单号后回车"); this.$message.error("输入单号后回车");
return; return;
@ -409,12 +415,16 @@ export default {
}, },
handleScanInput(){ handleScanInput(){
if(this.form.billCode==null || this.form.billCode==''){ if(this.form.billCode==null || this.form.billCode==''){
this.$message.error("输入单号后回车"); this.$message.error("输入单号后回车");
return; return;
} }
if(this.form.dispatchOrSendManCode==null || this.form.dispatchOrSendManCode==''){
this.$message.error("请输入派件员");
return;
}
if(this.dataMap[this.form.billCode]){ if(this.dataMap[this.form.billCode]){
this.$message.error("重复扫描"); this.$message.error("重复扫描");
this.playNoticeTone(1); this.playNoticeTone(1);

3
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -197,6 +197,7 @@ import { listEmisWaybill } from "@/api/emis/emisWaybill";
// import { getWaybillDetail } from "@/api/emis/emisWaybill"; // import { getWaybillDetail } from "@/api/emis/emisWaybill";
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'; import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import { parseTime } from "@/utils/custom";
export default { export default {
name: "ProblemEntry", name: "ProblemEntry",
@ -495,7 +496,7 @@ export default {
picUrl:item.picUrl, picUrl:item.picUrl,
remark:item.remark, remark:item.remark,
scanWeight:item.scanWeight, scanWeight:item.scanWeight,
scanDate:item.scanDate scanDate:parseTime(item.scanDate || new Date())
} }
) )
// problemInfoList.push({ // problemInfoList.push({