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-07-31 17:42:55 +08:00
commit 502bf54568
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue
View File

@ -665,7 +665,7 @@
</el-dialog>
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
<el-form ref="formBatch" size="mini" label-width="60px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('运单号')" prop="formBatchBillList">
@ -1535,8 +1535,11 @@ export default {
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode});
if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){
this.$modal.msgError((response && response.msg || '无此运单数据') + ": " + billcode)
if(!billRes || billRes.code != 200){
this.$modal.msgError(billRes && billRes.msg)
return;
}else if(!billRes.rows || billRes.rows.length < 1){
this.$modal.msgError(('无此运单数据') + ": " + billcode)
return;
}
let item = billRes.rows[0];

10
src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
View File

@ -494,7 +494,7 @@
</el-dialog>
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
<el-form ref="formBatch" size="mini" label-width="60px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('运单号')" prop="formBatchBillList">
@ -1361,11 +1361,13 @@ export default {
bcList.forEach(async (billcode) => {
billcode = billcode.trim();
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode});
if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){
this.$modal.msgError((response && response.msg || '无此运单数据') + ": " + billcode)
if(!billRes || billRes.code != 200){
this.$modal.msgError(billRes && billRes.msg)
return;
}else if(!billRes.rows || billRes.rows.length < 1){
this.$modal.msgError(('无此运单数据') + ": " + billcode)
return;
}
let item = billRes.rows[0];

10
src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
View File

@ -440,7 +440,7 @@
</el-dialog>
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
<el-form ref="formBatch" size="mini" label-width="60px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('运单号')" prop="formBatchBillList">
@ -1307,11 +1307,13 @@ export default {
bcList.forEach(async (billcode) => {
billcode = billcode.trim();
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode});
if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){
this.$modal.msgError((response && response.msg || '无此运单数据') + ": " + billcode)
if(!billRes || billRes.code != 200){
this.$modal.msgError(billRes && billRes.msg)
return;
}else if(!billRes.rows || billRes.rows.length < 1){
this.$modal.msgError(('无此运单数据') + ": " + billcode)
return;
}
let item = billRes.rows[0];