|
|
@@ -41,6 +41,14 @@
|
|
|
>报表设计
|
|
|
</el-button>
|
|
|
</template>
|
|
|
+ <template slot="iqNo" slot-scope="{ row, index }">
|
|
|
+ <span
|
|
|
+ style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
|
|
|
+ @click.stop="allClick('收据号', row)"
|
|
|
+ >
|
|
|
+ {{ row.iqNo }}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
<template slot="menu" slot-scope="{ row, index }">
|
|
|
<el-button v-if="row.changeOrderStatus == '申请'" size="small" type="text" @click="allClick('确认换单', row)">确认换单</el-button>
|
|
|
<el-button size="small" type="text" @click="allClick('上传附件', row)">上传附件</el-button>
|
|
|
@@ -81,8 +89,8 @@
|
|
|
温馨提示 第一次导入时请先下载模板
|
|
|
</p>
|
|
|
</el-dialog>
|
|
|
- <business-reports :id="id" ref="print" businessValue="YASJ" :printUpdate="false" :type="true"></business-reports>
|
|
|
- <reports :id="id" businessValue="YASJ" ref="report" :printUpdate="false"></reports>
|
|
|
+ <business-reports :id="id" ref="print" businessValue="YASJ" :printUpdate="false" :type="true"></business-reports>
|
|
|
+ <reports :id="id" businessValue="YASJ" ref="report" :printUpdate="false"></reports>
|
|
|
<file-update ref="file"></file-update>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -95,7 +103,9 @@ import {
|
|
|
confirmPaymentCollection,
|
|
|
confirmRefund,
|
|
|
changeOrderFile,
|
|
|
- changeOrderList
|
|
|
+ changeOrderList,
|
|
|
+ receiptDetail,
|
|
|
+ receiptSubmit
|
|
|
} from "@/api/iosBasicData/ImportExchange.js";
|
|
|
import dicSelect from "@/components/dicSelect/main";
|
|
|
import fileUpdate from "./components/fileUpdate.vue";
|
|
|
@@ -178,7 +188,7 @@ export default {
|
|
|
menuWidth: 160,
|
|
|
tip: false,
|
|
|
searchShow: true,
|
|
|
- searchMenuSpan: 24,
|
|
|
+ searchMenuSpan: 18,
|
|
|
border: true,
|
|
|
index: true,
|
|
|
addBtn: false,
|
|
|
@@ -212,12 +222,6 @@ export default {
|
|
|
overHidden: true
|
|
|
},
|
|
|
{
|
|
|
- label: "收据号",
|
|
|
- prop: "iqNo",
|
|
|
- width: "120",
|
|
|
- overHidden: true
|
|
|
- },
|
|
|
- {
|
|
|
label: "换单状态",
|
|
|
prop: "changeOrderStatus",
|
|
|
width: "80",
|
|
|
@@ -277,6 +281,13 @@ export default {
|
|
|
overHidden: true
|
|
|
},
|
|
|
{
|
|
|
+ label: "收据号",
|
|
|
+ prop: "iqNo",
|
|
|
+ width: "120",
|
|
|
+ search: true,
|
|
|
+ overHidden: true
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "HB/L NO",
|
|
|
prop: "hblno",
|
|
|
width: "100",
|
|
|
@@ -412,16 +423,16 @@ export default {
|
|
|
}
|
|
|
if (name == "收押箱款") {
|
|
|
let sum = 0;
|
|
|
- let ids=[]
|
|
|
+ let ids = [];
|
|
|
for (let item of this.selectionList) {
|
|
|
- ids.push(item.id)
|
|
|
+ ids.push(item.id);
|
|
|
sum += Number(item.boxPackingAmount ? item.boxPackingAmount : 0);
|
|
|
}
|
|
|
this.$DialogForm.show({
|
|
|
title: "收押箱款",
|
|
|
width: "30%",
|
|
|
menuPosition: "right",
|
|
|
- data: { amount: sum,corpName:this.selectionList[0].corpCnName },
|
|
|
+ data: { amount: sum, corpName: this.selectionList[0].corpCnName },
|
|
|
option: {
|
|
|
submitText: "确定",
|
|
|
emptyText: "取消",
|
|
|
@@ -467,7 +478,7 @@ export default {
|
|
|
callback: res => {
|
|
|
res.done();
|
|
|
let obj = {
|
|
|
- ids: ids.join(','),
|
|
|
+ ids: ids.join(","),
|
|
|
...res.data
|
|
|
};
|
|
|
confirmPaymentCollection(obj).then(res => {
|
|
|
@@ -549,6 +560,56 @@ export default {
|
|
|
if (name == "上传附件") {
|
|
|
this.$refs.file.openDialog(row);
|
|
|
}
|
|
|
+ if (name == "收据号") {
|
|
|
+ receiptDetail({ billNo: row.iqNo }).then(res => {
|
|
|
+ this.$DialogForm.show({
|
|
|
+ title: "收据信息",
|
|
|
+ width: "30%",
|
|
|
+ menuPosition: "right",
|
|
|
+ data: { ...res.data.data},
|
|
|
+ option: {
|
|
|
+ submitText: "确定",
|
|
|
+ emptyText: "取消",
|
|
|
+ column: [
|
|
|
+ {
|
|
|
+ label: "金额",
|
|
|
+ span: 24,
|
|
|
+ prop: "amount",
|
|
|
+ type: "number",
|
|
|
+ controls: false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "付款单位",
|
|
|
+ span: 24,
|
|
|
+ prop: "corpName"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "支票号",
|
|
|
+ span: 24,
|
|
|
+ prop: "chequeNumber"
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ beforeClose: done => {
|
|
|
+ done();
|
|
|
+ },
|
|
|
+ callback: res => {
|
|
|
+ res.done();
|
|
|
+ let obj={
|
|
|
+ ...res.data
|
|
|
+ }
|
|
|
+ receiptSubmit(obj).then(res => {
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "操作成功!"
|
|
|
+ });
|
|
|
+ this.refreshChange();
|
|
|
+ });
|
|
|
+ res.close();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
uploadBefore(file, done, loading) {
|
|
|
done();
|