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

修复问题

Browse Source
This commit is contained in:
liuyp 2024-06-24 10:38:02 +08:00
parent ca19fe01bb
commit 3a095c88e1
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,6 +510,7 @@ export default {
remark:item.remark, remark:item.remark,
scanWeight:item.scanWeight, scanWeight:item.scanWeight,
dispatchManCode:item.dispatchManCode, dispatchManCode:item.dispatchManCode,
dataFrom: 'pc',
// customerCode:item.customerCode, // customerCode:item.customerCode,
// customerName:item.customerName, // customerName:item.customerName,
// dispatchOrSendManCode:item.dispatchOrSendManCode, // dispatchOrSendManCode:item.dispatchOrSendManCode,

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

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery"> --> <!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery"> -->
<el-form ref="queryForm" size="mini" :model="queryParams" :rules="rules" label-width="100px"> <el-form ref="queryForm" size="mini" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="" prop="billCode"> <el-form-item label="" prop="billCode">
@ -48,11 +48,10 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('删除备注')" prop="delRemark" label-width="100px"> <el-form-item :label="$t('删除备注')" prop="delRemark" label-width="100px">
<span slot="label">
<span style="color: red">{{ $t('删除备注') }}</span>
</span>
<el-checkbox v-model="form.delChecked">删除后清空备注</el-checkbox> <el-checkbox v-model="form.delChecked">删除后清空备注</el-checkbox>
<!-- <span>{{$t('删除备注')}}</span>
<div slot="label">
<el-checkbox v-model="form.delChecked">删除后清空备注</el-checkbox>
</div> -->
<el-input <el-input
v-model="form.delRemark" v-model="form.delRemark"
:placeholder="$t('请输入删除备注')" :placeholder="$t('请输入删除备注')"
@ -313,8 +312,8 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
id: [ delRemark: [
{ required: true, message: "id不能为空", trigger: "blur" } { required: true, message: "删除备注不能为空", trigger: "blur" }
], ],
} }
}; };
@ -369,7 +368,7 @@ export default {
record.queryType = this.queryParams.queryType; record.queryType = this.queryParams.queryType;
record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName; record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation; record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
record.remark = this.queryParams.delRemark; // record.remark = this.form.delRemark;
this.tmsScanList.push(record); this.tmsScanList.push(record);
} }
}); });
@ -542,11 +541,14 @@ export default {
const ids = this.ids; const ids = this.ids;
let that = this; let that = this;
// let newList = []; // let newList = [];
if(this.form.delRemark==null || this.form.delRemark==''){
this.$message.error("请输入删除备注");
return;
}
this.$modal.confirm('是否确认删除').then(async function(isPass) { this.$modal.confirm('是否确认删除').then(async function(isPass) {
console.log(that.form) console.log(that.form)
if(isPass){ if(isPass){
for(let i=0; i < ids.length; i++){ for(let i=0; i < ids.length; i++){
// TODO 等待新的接口
let res = await deleteSignedAndRemark(ids[i], that.form.delRemark); let res = await deleteSignedAndRemark(ids[i], that.form.delRemark);
if(!res || res.code != 200){ if(!res || res.code != 200){
that.$message.error("删除异常") that.$message.error("删除异常")