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-07-09 14:17:18 +08:00
parent 13cde325a1
commit 477f077935
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
View File

@ -248,7 +248,7 @@
size="mini"
:disabled="multiple"
@click="handleMergeBill"
v-hasPermi="['emis:emisSettleSubBill:mergeBillByCenter']"
v-hasPermi="['emis:emisSettleBill:add']"
>合账</el-button>
</el-col>
@ -405,7 +405,7 @@
</XdTable>
<el-dialog :title="titleMergeForm" :visible.sync="openMergeForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
<MergeBillForm :selectBillList="selectBillList" @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
<MergeBillForm :settleBillNo="currentSettleBillNo" @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
</el-dialog>
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -525,8 +525,11 @@ export default {
billMonth:null,
titleMergeForm:null,
openMergeForm:false,
currentSettleBillNo:null,
selectBillList:[],
@ -969,18 +972,20 @@ export default {
closeOnClickModal: false
}).then(() => {
this.form.tplCode=genJsSeqNo();
this.currentSettleBillNo="B"+genJsSeqNo();
let settleBillForm={
settleBillNo: null,
settleBillName: null,
billMonth: null,
settleBillNo: this.currentSettleBillNo,
settleBillName: this.billName,
billMonth: this.billMonth,
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="合并账单";
this.openMergeForm=true;
});

10
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -404,7 +404,7 @@
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('2')||applyTypeArr.includes('38'))" >
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('2'))" >
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>件数调整</span>
@ -420,7 +420,7 @@
</el-row>
</el-col>
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('3')||applyTypeArr.includes('38'))" >
<el-col :span="24" v-if="applyType&&(applyTypeArr.includes('3'))" >
<el-row :gutter="0" class="md-row">
<el-col :span="3" class="md-title">
<span>体积调整</span>
@ -539,7 +539,7 @@
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
<!-- @keyup.enter.native="(val)=>handleCargoQtyChange(scope.row)" -->
<template slot-scope="scope">
<el-input v-model="scope.row.cargoQty" @input="(val)=>handleCargoQtyChangeDebounce(scope.row)" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.cargoQty" @input="(val)=>handleCargoQtyChangeDebounce(scope.row)" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column>
<el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
@ -549,7 +549,7 @@
</el-table-column>
<el-table-column :label="$t('操作')" align="left" min-width="50">
<!-- <el-table-column :label="$t('操作')" align="left" min-width="50">
<template slot-scope="scope">
<span class="icon iconfont"
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@ -558,7 +558,7 @@
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@click="()=>copyGoodsItem(scope.row,scope.$index)">&#xe620;</span>
</template>
</el-table-column>
</el-table-column> -->
</el-table>