|
@@ -1740,8 +1740,7 @@
|
|
|
<template slot="title">
|
|
|
<i class="el-icon-remove" style="font-size: 16px"></i>
|
|
|
<span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
|
|
|
- >付款信息</span
|
|
|
- >
|
|
|
+ >付款信息</span>
|
|
|
</template>
|
|
|
<div
|
|
|
class="dialogTableTitle flex a-center jlr"
|
|
@@ -1777,6 +1776,13 @@
|
|
|
</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
+ type="info"
|
|
|
+ size="small"
|
|
|
+ @click.prevent="printCr"
|
|
|
+ >请款单
|
|
|
+ </el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
v-if="browseStatus"
|
|
@@ -1794,6 +1800,7 @@
|
|
|
stripe
|
|
|
show-summary
|
|
|
:summary-method="warehouseDrSummaries"
|
|
|
+ @selection-change="SelectCr"
|
|
|
>
|
|
|
<el-table-column type="selection" width="50" align="center" fixed/>
|
|
|
<el-table-column
|
|
@@ -1816,7 +1823,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -1839,7 +1846,7 @@
|
|
|
v-model="scope.row.fFeeid"
|
|
|
clearable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fCNameOptions"
|
|
@@ -1886,7 +1893,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1909,7 +1916,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fQty"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
placeholder="数量"
|
|
|
show-word-limit
|
|
@@ -1927,7 +1934,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fUnitprice"
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
|
|
|
+ :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus === 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
placeholder="单价"
|
|
|
show-word-limit
|
|
@@ -1962,7 +1969,7 @@
|
|
|
<el-select
|
|
|
v-model="scope.row.fStltypeid"
|
|
|
placeholder="请选择结算表票结、月结"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fStltypeOptions"
|
|
@@ -1984,7 +1991,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2000,7 +2007,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2016,7 +2023,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2033,7 +2040,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2049,7 +2056,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2066,7 +2073,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2094,7 +2101,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.remarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2109,12 +2116,23 @@
|
|
|
<template slot-scope="scope">
|
|
|
<!-- <el-button size="small">审核费用</el-button> -->
|
|
|
<el-button
|
|
|
+ @click.native.prevent="checkRow(scope.$index, warehouseCrList)"
|
|
|
+ size="small"
|
|
|
+ v-if="scope.row.fBillstatus < 6"
|
|
|
+ >请核
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ @click.native.prevent="revokeRow(scope.$index, warehouseCrList)"
|
|
|
+ size="small"
|
|
|
+ v-if="scope.row.fBillstatus === 6"
|
|
|
+ >撤销
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
|
|
|
size="small"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>移除
|
|
|
- </el-button
|
|
|
- >
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -2337,6 +2355,114 @@
|
|
|
<el-button @click="whgenlegVisible = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+<!-- 付款信息作业单-->
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="print_Cr"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_Cr" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ font-size: 24px;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ {{ company }}请款单
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ font-size: 18px;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ ></div>
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ class="print_form"
|
|
|
+ >
|
|
|
+ <div style="display: flex; flex-direction: column;">
|
|
|
+<!-- <div>请款单号:</div>-->
|
|
|
+ <div>源业务编码:{{ form.fBillno }}</div>
|
|
|
+ <div>委托单位:{{ form.fCorpid | fMblnoFormat(fMblnoOptions) }}</div>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; flex-direction: column;margin-right: 15px;width: 150px">
|
|
|
+ <div style="">请款日期:</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="print_table" style="display: flex">
|
|
|
+ <table
|
|
|
+ border="0"
|
|
|
+ cellspacing="0"
|
|
|
+ cellpadding="0"
|
|
|
+ style="width: 100%; line-height: 30px"
|
|
|
+ >
|
|
|
+ <tr>
|
|
|
+ <td>结算单位</td>
|
|
|
+ <td>提单号</td>
|
|
|
+<!-- <td>源业务编码</td>-->
|
|
|
+ <td>业务日期</td>
|
|
|
+ <td>数量</td>
|
|
|
+ <td>单价</td>
|
|
|
+ <td>费用</td>
|
|
|
+ <td>人民币</td>
|
|
|
+ <td>美元</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in PrintingCrlist" :key="index">
|
|
|
+ <td>{{ item.fCorpid | fMblnoFormat(fMblnoOptions) }}</td>
|
|
|
+ <td>{{ form.fMblno }}</td>
|
|
|
+<!-- <td>{{ form.fBillno }}</td>-->
|
|
|
+ <td>{{ form.fBsdate | fBsdateFormat }}</td>
|
|
|
+ <td>{{ item.fQty }}</td>
|
|
|
+ <td>{{ item.fUnitprice }}</td>
|
|
|
+ <td>{{ item.fFeeid | fFeetFormat(fCNameOptions) }}</td>
|
|
|
+ <td>{{ item.fAmount }}</td>
|
|
|
+ <td></td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>合计</td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td>{{ allCrfAmount }}</td>
|
|
|
+ <td></td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
+ >
|
|
|
+ <div>领款人:</div>
|
|
|
+ <div>业务经理:</div>
|
|
|
+ <div>财务:</div>
|
|
|
+ <div style="width: 150px">经理:</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span lot="footer" class="dialog-footer">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="
|
|
|
+ print_Cr = false;
|
|
|
+ addprint('crzyd');
|
|
|
+ "
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_Cr = false" size="mini">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
<el-dialog
|
|
|
:visible.sync="print_zyd"
|
|
|
width="70%"
|
|
@@ -2356,13 +2482,15 @@
|
|
|
{{ company }}作业单
|
|
|
</div>
|
|
|
<div
|
|
|
- style="
|
|
|
+ style="
|
|
|
display: flex;
|
|
|
- justify-content: center;
|
|
|
- font-size: 18px;
|
|
|
+ justify-content: space-between;
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
- ></div>
|
|
|
+ >
|
|
|
+ <div></div>
|
|
|
+ <div>办单日期:{{ nowTime }}</div>
|
|
|
+ </div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
<table
|
|
|
border="0"
|
|
@@ -2372,13 +2500,14 @@
|
|
|
>
|
|
|
<tr>
|
|
|
<td>作业类型</td>
|
|
|
- <td colspan="2">
|
|
|
+ <td colspan="4">
|
|
|
{{ form.fBusinessType | fBusinessTypeFormat }}
|
|
|
</td>
|
|
|
<td>入库时间</td>
|
|
|
- <td colspan="3"></td>
|
|
|
+ <td colspan="4"></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
+ <td>序号</td>
|
|
|
<td>车号</td>
|
|
|
<td>物品名称</td>
|
|
|
<td>提单号</td>
|
|
@@ -2386,8 +2515,11 @@
|
|
|
<td>净重(KG)</td>
|
|
|
<td>件数/规格</td>
|
|
|
<td>箱号</td>
|
|
|
+ <td>库位</td>
|
|
|
+ <td>车型</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+ <td>{{ index + 1 }}</td>
|
|
|
<td>{{ item.fTruckno }}</td>
|
|
|
<td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
|
|
|
<td>{{ item.fMblno }}</td>
|
|
@@ -2396,37 +2528,39 @@
|
|
|
</td>
|
|
|
<td>{{ item.fNetweight }}</td>
|
|
|
<td>{{ item.fQty }}/{{ item.fPackagespecs }}</td>
|
|
|
- <td>{{ item.fCntrno }}</td>
|
|
|
+ <td>{{ item.fCntrno }}
|
|
|
+ <td>{{ item.fWarehouseInformation }}</td>
|
|
|
+ <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>备注</td>
|
|
|
- <td colspan="6">{{ form.remark }}</td>
|
|
|
+ <td colspan="9">{{ form.remark }}</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Collectionoptionss" :key="index">
|
|
|
<td>收费</td>
|
|
|
- <td colspan="2">{{ item.fFeeids }}</td>
|
|
|
- <td colspan="3">{{ item.fAmount }} 元</td>
|
|
|
+ <td colspan="4">{{ item.fFeeids }}</td>
|
|
|
+ <td colspan="4">{{ item.fAmount }} 元</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>司机签字</td>
|
|
|
- <td></td>
|
|
|
+ <td colspan="2"></td>
|
|
|
<td>电话</td>
|
|
|
- <td>{{ fDriverTel }}</td>
|
|
|
- <td colspan="3" rowspan="2">
|
|
|
+ <td colspan="2">{{ fDriverTel }}</td>
|
|
|
+ <td colspan="4" rowspan="2">
|
|
|
确认货物数量无误,包装于货物完好!<br/>出库盖好篷布,如有违背责任自负<br/>装卸工是否收小费
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>制表</td>
|
|
|
- <td>{{ form.createBy }}</td>
|
|
|
+ <td colspan="2">{{ form.createBy }}</td>
|
|
|
<td>机械/人工</td>
|
|
|
- <td></td>
|
|
|
+ <td colspan="2"></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>地址</td>
|
|
|
<td colspan="2">{{ stockaddr }}</td>
|
|
|
<td>电话</td>
|
|
|
- <td colspan="3">{{ form.fTel }}</td>
|
|
|
+ <td colspan="6">{{ form.fTel }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
@@ -3671,6 +3805,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ nowTime: null,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
dialogWhgenlegList: [],
|
|
@@ -3742,6 +3877,9 @@ export default {
|
|
|
print_xqckd: false,
|
|
|
company: "",
|
|
|
Printinglist: [],
|
|
|
+ // 收款信息明细
|
|
|
+ PrintingCrlist: [],
|
|
|
+ allCrfAmount: 0,
|
|
|
//库位
|
|
|
stockName: "",
|
|
|
//库位地址
|
|
@@ -4138,6 +4276,8 @@ export default {
|
|
|
entryPrinting: 1,
|
|
|
// 滚动加载显示
|
|
|
isFlag: false,
|
|
|
+ // Cr打印弹窗是否开启
|
|
|
+ print_Cr: false,
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
@@ -4281,6 +4421,24 @@ export default {
|
|
|
});
|
|
|
return goods;
|
|
|
},
|
|
|
+ fFeetFormat(row, fCNameOptions) {
|
|
|
+ let name;
|
|
|
+ fCNameOptions.map((e) => {
|
|
|
+ if (row == e.fId) {
|
|
|
+ name = e.fName;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return name;
|
|
|
+ },
|
|
|
+ fMblnoFormat(row, fMblnoOptions) {
|
|
|
+ let name;
|
|
|
+ fMblnoOptions.map((e) => {
|
|
|
+ if (row == e.fId) {
|
|
|
+ name = e.fName;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return name;
|
|
|
+ },
|
|
|
fCartypeFormat(row, fCartypeOptions) {
|
|
|
let name;
|
|
|
fCartypeOptions.map((e) => {
|
|
@@ -4299,6 +4457,15 @@ export default {
|
|
|
});
|
|
|
return fStorageType;
|
|
|
},
|
|
|
+ fCartypeIdFormat(row, fCartypeId) {
|
|
|
+ let fCartype;
|
|
|
+ fCartypeId.map((e) => {
|
|
|
+ if (row == e.dictValue) {
|
|
|
+ fCartype = e.dictLabel;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return fCartype;
|
|
|
+ },
|
|
|
},
|
|
|
methods: {
|
|
|
init() {
|
|
@@ -4604,9 +4771,122 @@ export default {
|
|
|
},
|
|
|
//撤销请核
|
|
|
revoke() {
|
|
|
- revoke(this.form.fId).then((data) => {
|
|
|
+ revoke(this.form.fId).then(async (data) => {
|
|
|
if (data.code === 200) {
|
|
|
this.browseStatus = false;
|
|
|
+ await getWarehousebills(this.form.fId).then((response) => {
|
|
|
+ this.form = response.data.warehousebills;
|
|
|
+ if (this.form.fBillstatus > 3) {
|
|
|
+ this.approvalStatus = false;
|
|
|
+ this.browseStatus = true;
|
|
|
+ } else {
|
|
|
+ this.approvalStatus = true;
|
|
|
+ this.browseStatus = false;
|
|
|
+ }
|
|
|
+ this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
+ this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
|
|
|
+ this.$set(this.form, "createTime", Date.parse(this.form.createTime));
|
|
|
+ this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
|
|
|
+ this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
|
|
|
+ this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
|
|
|
+ if (this.form.fCartype || this.form.fCartype == 0) {
|
|
|
+ this.$set(this.form, "fCartype", this.form.fCartype.toString());
|
|
|
+ }
|
|
|
+ if (this.form.fStltypeid || this.form.fStltypeid == 0) {
|
|
|
+ this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
|
|
|
+ }
|
|
|
+ if (this.form.fTrademodeid) {
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fTrademodeid",
|
|
|
+ this.form.fTrademodeid.toString()
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (!this.copyStatus) {
|
|
|
+ if (response.data.warehouseBillsItem) {
|
|
|
+ response.data.warehouseBillsItem.map((e) => {
|
|
|
+ e.fBsdate = Date.parse(e.fBsdate);
|
|
|
+ e.fBusinessType = e.fBusinessType.toString();
|
|
|
+ e.fLntype = e.fLntype ? e.fLntype.toString() : null;
|
|
|
+ });
|
|
|
+ this.detailList = response.data.warehouseBillsItem;
|
|
|
+ } else {
|
|
|
+ this.detailList = [];
|
|
|
+ }
|
|
|
+ response.data.warehousebillsfeesCr.map((e) => {
|
|
|
+ if (e.fFeeunitid) {
|
|
|
+ e.fFeeUnitid = e.fFeeunitid.toString();
|
|
|
+ }
|
|
|
+ if (e.fStltypeid || e.fStltypeid == 0) {
|
|
|
+ e.fStltypeid = e.fStltypeid.toString();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
+ response.data.warehousebillsfeesDr.map((e) => {
|
|
|
+ if (e.fFeeunitid) {
|
|
|
+ e.fFeeUnitid = e.fFeeunitid.toString();
|
|
|
+ }
|
|
|
+ if (e.fStltypeid || e.fStltypeid == 0) {
|
|
|
+ e.fStltypeid = e.fStltypeid.toString();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
+ this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
|
|
|
+ if (response.data.tCntrList) {
|
|
|
+ this.CntrTable = response.data.tCntrList;
|
|
|
+ } else {
|
|
|
+ this.CntrTable = [];
|
|
|
+ }
|
|
|
+ if (response.data.enclosures) {
|
|
|
+ this.relevantAttachments = response.data.enclosures;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$set(this.form, "fId", null);
|
|
|
+ this.$set(this.form, "fMblno", null);
|
|
|
+ this.$set(this.form, "fMarks", null);
|
|
|
+ this.$set(this.form, "fProductName",null);
|
|
|
+ this.$set(this.form, "fNetweight", 0);
|
|
|
+ this.$set(this.form, "fPlanvolumn", 0);
|
|
|
+ this.$set(this.form, "fGrossweight", 0);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.warehouseCrList.forEach((item, index) => {
|
|
|
+ if (item.fQty != 0 && item.fUnitprice !== 0 && item.fAmount !==0) {
|
|
|
+ item.fBillstatus = 6;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ this.detailList.forEach(item => {
|
|
|
+ if (item.srcId !== null) {
|
|
|
+ item.fStorageFeeDeadline = item.fBsdate
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 库存明细
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsitems",
|
|
|
+ JSON.stringify(this.detailList)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "tEnclosure",
|
|
|
+ JSON.stringify(this.relevantAttachments)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 收款
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
|
|
|
+ formData.append("tCntr", JSON.stringify(this.CntrTable));
|
|
|
+ addWarehousebills(formData).then(res => {
|
|
|
+ })
|
|
|
this.msgSuccess("撤销成功");
|
|
|
}
|
|
|
});
|
|
@@ -5313,11 +5593,11 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!this.warehouseDrList[item].fBillingway) {
|
|
|
+ if (!this.warehouseCrList[item].fFeeUnitid) {
|
|
|
if (item === "fBusinessType") {
|
|
|
} else {
|
|
|
this.$message.error(
|
|
|
- "请维护收款信息第" + (Number(item) + 1) + "行计价单位"
|
|
|
+ "请维护付款信息第" + (Number(item) + 1) + "行计价单位"
|
|
|
);
|
|
|
return false;
|
|
|
}
|
|
@@ -5709,6 +5989,82 @@ export default {
|
|
|
});
|
|
|
this.detailList = response.data.warehousebillsitems;
|
|
|
this.msgSuccess("保存成功");
|
|
|
+ getWarehousebills(this.form.fId).then((response) => {
|
|
|
+ this.form = response.data.warehousebills;
|
|
|
+ if (this.form.fBillstatus > 3) {
|
|
|
+ this.approvalStatus = false;
|
|
|
+ this.browseStatus = true;
|
|
|
+ } else {
|
|
|
+ this.approvalStatus = true;
|
|
|
+ this.browseStatus = false;
|
|
|
+ }
|
|
|
+ this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
+ this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
|
|
|
+ this.$set(this.form, "createTime", Date.parse(this.form.createTime));
|
|
|
+ this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
|
|
|
+ this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
|
|
|
+ this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
|
|
|
+ if (this.form.fCartype || this.form.fCartype == 0) {
|
|
|
+ this.$set(this.form, "fCartype", this.form.fCartype.toString());
|
|
|
+ }
|
|
|
+ if (this.form.fStltypeid || this.form.fStltypeid == 0) {
|
|
|
+ this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
|
|
|
+ }
|
|
|
+ if (this.form.fTrademodeid) {
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fTrademodeid",
|
|
|
+ this.form.fTrademodeid.toString()
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (!this.copyStatus) {
|
|
|
+ if (response.data.warehouseBillsItem) {
|
|
|
+ response.data.warehouseBillsItem.map((e) => {
|
|
|
+ e.fBsdate = Date.parse(e.fBsdate);
|
|
|
+ e.fBusinessType = e.fBusinessType.toString();
|
|
|
+ e.fLntype = e.fLntype ? e.fLntype.toString() : null;
|
|
|
+ });
|
|
|
+ this.detailList = response.data.warehouseBillsItem;
|
|
|
+ } else {
|
|
|
+ this.detailList = [];
|
|
|
+ }
|
|
|
+ response.data.warehousebillsfeesCr.map((e) => {
|
|
|
+ if (e.fFeeunitid) {
|
|
|
+ e.fFeeUnitid = e.fFeeunitid.toString();
|
|
|
+ }
|
|
|
+ if (e.fStltypeid || e.fStltypeid == 0) {
|
|
|
+ e.fStltypeid = e.fStltypeid.toString();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
+ response.data.warehousebillsfeesDr.map((e) => {
|
|
|
+ if (e.fFeeunitid) {
|
|
|
+ e.fFeeUnitid = e.fFeeunitid.toString();
|
|
|
+ }
|
|
|
+ if (e.fStltypeid || e.fStltypeid == 0) {
|
|
|
+ e.fStltypeid = e.fStltypeid.toString();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
+ this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
|
|
|
+ if (response.data.tCntrList) {
|
|
|
+ this.CntrTable = response.data.tCntrList;
|
|
|
+ } else {
|
|
|
+ this.CntrTable = [];
|
|
|
+ }
|
|
|
+ if (response.data.enclosures) {
|
|
|
+ this.relevantAttachments = response.data.enclosures;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$set(this.form, "fId", null);
|
|
|
+ this.$set(this.form, "fMblno", null);
|
|
|
+ this.$set(this.form, "fMarks", null);
|
|
|
+ this.$set(this.form, "fProductName",null);
|
|
|
+ this.$set(this.form, "fNetweight", 0);
|
|
|
+ this.$set(this.form, "fPlanvolumn", 0);
|
|
|
+ this.$set(this.form, "fGrossweight", 0);
|
|
|
+ }
|
|
|
+ });
|
|
|
if (status == "goBack") {
|
|
|
this.cancel();
|
|
|
}
|
|
@@ -5755,6 +6111,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ // 付款明细多选
|
|
|
+ SelectCr(selection) {
|
|
|
+ this.PrintingCrlist = selection;
|
|
|
+ },
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
const {columns, data} = param;
|
|
@@ -5944,6 +6304,7 @@ export default {
|
|
|
}, 2000)
|
|
|
},
|
|
|
printZyd() {
|
|
|
+ this.nowTime = new Date(+new Date() + 8 * 3600 * 1000 ).toJSON().substr(0, 19).replace("T"," ")
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
for (let item in this.Printinglist) {
|
|
|
if (!this.Printinglist[item].fId) {
|
|
@@ -5966,6 +6327,23 @@ export default {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
},
|
|
|
+ // 付款信息打印准备
|
|
|
+ printCr() {
|
|
|
+ if (this.PrintingCrlist.length > 0) {
|
|
|
+ for (let item in this.PrintingCrlist) {
|
|
|
+ if (!this.PrintingCrlist[item].fId) {
|
|
|
+ return this.$message.error("请先保存!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.allCrfAmount = 0
|
|
|
+ this.PrintingCrlist.forEach(item => {
|
|
|
+ this.allCrfAmount = this.allCrfAmount + item.fAmount
|
|
|
+ })
|
|
|
+ this.print_Cr = true;
|
|
|
+ } else {
|
|
|
+ this.$message.error("请选择需要打印的明细!");
|
|
|
+ }
|
|
|
+ },
|
|
|
detailedApproval(command) {
|
|
|
if (command === 'QH') {
|
|
|
deliveryDetails(this.form.fId).then(res => {
|
|
@@ -6541,6 +6919,14 @@ export default {
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
break;
|
|
|
+ case "crzyd":
|
|
|
+ print({
|
|
|
+ printable: "print_Cr",
|
|
|
+ type: "html",
|
|
|
+ style: style, // 亦可使用引入的外部css;
|
|
|
+ scanStyles: false,
|
|
|
+ });
|
|
|
+ break;
|
|
|
case "bzckd":
|
|
|
print({
|
|
|
printable: "print_area3",
|
|
@@ -6631,6 +7017,91 @@ export default {
|
|
|
query: { id: 1},
|
|
|
});
|
|
|
},
|
|
|
+ // 付款信息请核
|
|
|
+ checkRow(index, rows) {
|
|
|
+ if (!rows[index].fQty) {
|
|
|
+ this.$message.error("请维护数量")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!rows[index].fUnitprice) {
|
|
|
+ this.$message.error("请维护单价")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!rows[index].fAmount) {
|
|
|
+ this.$message.error("请维护金额")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ rows[index].fBillstatus = 6
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ this.detailList.forEach(item => {
|
|
|
+ if (item.srcId !== null) {
|
|
|
+ item.fStorageFeeDeadline = item.fBsdate
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 库存明细
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsitems",
|
|
|
+ JSON.stringify(this.detailList)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "tEnclosure",
|
|
|
+ JSON.stringify(this.relevantAttachments)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 收款
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
|
|
|
+ formData.append("tCntr", JSON.stringify(this.CntrTable));
|
|
|
+ addWarehousebills(formData).then(res => {
|
|
|
+ this.msgSuccess("请核成功");
|
|
|
+ })
|
|
|
+ },
|
|
|
+ revokeRow(index, rows) {
|
|
|
+ rows[index].fBillstatus = 2
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ this.detailList.forEach(item => {
|
|
|
+ if (item.srcId !== null) {
|
|
|
+ item.fStorageFeeDeadline = item.fBsdate
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 库存明细
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsitems",
|
|
|
+ JSON.stringify(this.detailList)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "tEnclosure",
|
|
|
+ JSON.stringify(this.relevantAttachments)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 收款
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
|
|
|
+ formData.append("tCntr", JSON.stringify(this.CntrTable));
|
|
|
+ addWarehousebills(formData).then(res => {
|
|
|
+ this.msgSuccess("撤销成功");
|
|
|
+ })
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
// 监听 addOrUpdateVisible 改变
|
|
@@ -6640,6 +7111,7 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
+
|
|
|
<style lang="scss" scoped>
|
|
|
.tag-hover:hover {
|
|
|
background-color: #d9ebfb;
|