|
|
@@ -557,7 +557,6 @@
|
|
|
<el-form-item
|
|
|
label="对账日期"
|
|
|
prop="fAccbilldate"
|
|
|
- v-if="typevalue != 2"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
v-model="queryParams.fAccbilldate"
|
|
|
@@ -1656,7 +1655,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fAmt"
|
|
|
v-input-limit="2"
|
|
|
- @change="changeAmt(scope.row.fAmt,scope.$index)"
|
|
|
+ @change="changeAmt(scope.row.fAmt, scope.$index)"
|
|
|
/>
|
|
|
</span>
|
|
|
<span v-else>{{ scope.row[item.label] }}</span>
|
|
|
@@ -1665,7 +1664,15 @@
|
|
|
</el-table>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="confirmImport">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="confirmImport" v-if="typevalue != 2"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ @click="confirmImport2"
|
|
|
+ v-if="typevalue == 2"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
<el-button @click="signOut">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -3215,9 +3222,13 @@ export default {
|
|
|
this.handleAdd();
|
|
|
} else if (Cookies.get("sysType") == 2) {
|
|
|
confirmFleet(formDate).then((response) => {
|
|
|
- this.open = false;
|
|
|
- this.msgSuccess("操作成功");
|
|
|
- this.getList();
|
|
|
+ if (response.code == 200) {
|
|
|
+ this.open = false;
|
|
|
+ this.notChange = true;
|
|
|
+ this.$set(this.queryParams, "fBillstatus", 6);
|
|
|
+ this.msgSuccess("操作成功");
|
|
|
+ this.getList();
|
|
|
+ }
|
|
|
});
|
|
|
} else if (Cookies.get("sysType") == 3) {
|
|
|
formDate.append("billsType", "KHDZ");
|
|
|
@@ -3288,10 +3299,10 @@ export default {
|
|
|
this.doNot = true;
|
|
|
}
|
|
|
},
|
|
|
- changeAmt(row,index){
|
|
|
- if(row>this.feeList[index].fAmount){
|
|
|
+ changeAmt(row, index) {
|
|
|
+ if (row > this.feeList[index].fAmount) {
|
|
|
this.$message.error("本次金额不能大于原定金额");
|
|
|
- this.feeList[index].fAmt=this.feeList[index].fAmount;
|
|
|
+ this.feeList[index].fAmt = this.feeList[index].fAmount;
|
|
|
}
|
|
|
},
|
|
|
// 默认录入人
|
|
|
@@ -3308,7 +3319,11 @@ export default {
|
|
|
if (this.selection.length == 0) {
|
|
|
if (index === 0) {
|
|
|
sums[index] = "合计";
|
|
|
- } else if (column.label == "金额" || column.label == "本次金额"||column.label == "费用金额") {
|
|
|
+ } else if (
|
|
|
+ column.label == "金额" ||
|
|
|
+ column.label == "本次金额" ||
|
|
|
+ column.label == "费用金额"
|
|
|
+ ) {
|
|
|
const values = data.map((item) => Number(item[column.property]));
|
|
|
if (!values.every((value) => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
@@ -3532,6 +3547,146 @@ export default {
|
|
|
this.$message.error("本次金额不能大于原定金额");
|
|
|
}
|
|
|
},
|
|
|
+ /* 添加财务数据主 导入*/
|
|
|
+ confirmImport2() {
|
|
|
+ this.doNot = true;
|
|
|
+ this.hide = true;
|
|
|
+ this.pass.fAmtdr = 0;
|
|
|
+ this.pass.fAmtcr = 0;
|
|
|
+ for (let item in this.selection) {
|
|
|
+ this.pass.fAmtcr = Number(this.pass.fAmtcr);
|
|
|
+ this.pass.fAmtdr = Number(this.pass.fAmtdr);
|
|
|
+ this.pass.fAmtcr += Number(this.selection[item].fAmt);
|
|
|
+ this.pass.fAmtdr += Number(this.selection[item].fAmount);
|
|
|
+ }
|
|
|
+ // this.pass.fAmtcr.toFixed(2);
|
|
|
+ if (this.state_s == true) {
|
|
|
+ if (this.selection.length == "0") {
|
|
|
+ this.$message.error("未选择导入行");
|
|
|
+ } else {
|
|
|
+ let Num = [];
|
|
|
+ for (let item in this.selection) {
|
|
|
+ this.empty.push(this.selection[item].fMblno);
|
|
|
+ this.nothing.push(this.selection[item].fName);
|
|
|
+ if (this.DzfeeList.length === 0) {
|
|
|
+ this.DzfeeList = this.DzfeeList.concat(this.selection);
|
|
|
+
|
|
|
+ //去重提单号
|
|
|
+ this.empty = new Set(this.empty);
|
|
|
+ this.empty = Array.from(this.empty);
|
|
|
+ //去重货权方
|
|
|
+ this.nothing = new Set(this.nothing);
|
|
|
+ this.nothing = Array.from(this.nothing);
|
|
|
+ if (this.empty.length <= 1) {
|
|
|
+ this.pass.fMblno = this.empty[0];
|
|
|
+ } else {
|
|
|
+ this.pass.fMblno = this.empty[0] + "...";
|
|
|
+ }
|
|
|
+ if (this.nothing.length <= 1) {
|
|
|
+ this.pass.fName = this.nothing[0];
|
|
|
+ } else {
|
|
|
+ this.pass.fName = this.nothing[0] + "...";
|
|
|
+ }
|
|
|
+ // this.DzfeeList = this.DzfeeList.concat(this.Fee)
|
|
|
+ this.queryParams.tMblno = this.pass.fMblno; //提单号
|
|
|
+ this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid;
|
|
|
+ this.queryParams.fCtrlcorpid = this.pass.fName;
|
|
|
+ this.queryParams.fAmtcr = this.pass.fAmtcr;
|
|
|
+ this.queryParams.fAmtdr = this.pass.fAmtdr;
|
|
|
+ this.innerVisible = false;
|
|
|
+ this.feeList = [];
|
|
|
+ // this.feeList = this.DzfeeList
|
|
|
+ this.TWareHouseFees = {
|
|
|
+ fCorpid: "",
|
|
|
+ fToCorpid: "",
|
|
|
+ fMblno: "",
|
|
|
+ fStatementNo: "",
|
|
|
+ fFeeid: "",
|
|
|
+ timeExamine: "",
|
|
|
+ timeInterval: "",
|
|
|
+ fSrcdc: "",
|
|
|
+ fReconciliation: "0",
|
|
|
+ timeReconci: "",
|
|
|
+ fDc: "D",
|
|
|
+ };
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (let li in this.DzfeeList) {
|
|
|
+ for (let item in this.selection) {
|
|
|
+ if (this.selection[item].fSrcid !== this.DzfeeList[li].fSrcid) {
|
|
|
+ this.Fee = this.DzfeeList.concat(this.selection);
|
|
|
+ let result = [];
|
|
|
+ let obj = {};
|
|
|
+ for (let lis in this.Fee) {
|
|
|
+ if (!obj[this.Fee[lis].fSrcid]) {
|
|
|
+ result.push(this.Fee[lis]);
|
|
|
+ obj[this.Fee[lis].fSrcid] = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //去重提单号
|
|
|
+ this.empty = new Set(this.empty);
|
|
|
+ this.empty = Array.from(this.empty);
|
|
|
+ //去重货权方
|
|
|
+ this.nothing = new Set(this.nothing);
|
|
|
+ this.nothing = Array.from(this.nothing);
|
|
|
+ if (this.empty.length <= 1) {
|
|
|
+ this.pass.fMblno = this.empty[0];
|
|
|
+ } else {
|
|
|
+ this.pass.fMblno = this.empty[0] + "...";
|
|
|
+ }
|
|
|
+ if (this.nothing.length <= 1) {
|
|
|
+ this.pass.fName = this.nothing[0];
|
|
|
+ } else {
|
|
|
+ this.pass.fName = this.nothing[0] + "...";
|
|
|
+ }
|
|
|
+ // this.DzfeeList = this.DzfeeList.concat(this.Fee)
|
|
|
+ this.queryParams.tMblno = this.pass.fMblno; //提单号
|
|
|
+ this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid;
|
|
|
+ this.queryParams.fCtrlcorpid = this.pass.fName;
|
|
|
+ this.queryParams.fAmtcr = this.pass.fAmtcr;
|
|
|
+ this.queryParams.fAmtdr = this.pass.fAmtdr;
|
|
|
+ this.innerVisible = false;
|
|
|
+ this.feeList = [];
|
|
|
+ // this.feeList = this.DzfeeList
|
|
|
+ this.TWareHouseFees = {
|
|
|
+ fCorpid: "",
|
|
|
+ fToCorpid: this.queryParams.fCorpid,
|
|
|
+ fMblno: "",
|
|
|
+ fStatementNo: "",
|
|
|
+ fFeeid: "",
|
|
|
+ timeExamine: "",
|
|
|
+ timeInterval: "",
|
|
|
+ fSrcdc: "",
|
|
|
+ fReconciliation: "0",
|
|
|
+ timeReconci: "",
|
|
|
+ fDc: "D",
|
|
|
+ };
|
|
|
+ this.DzfeeList = result;
|
|
|
+ } else {
|
|
|
+ let i = Number(li) + 1;
|
|
|
+ Num += i + "、";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (Num.length != 0) {
|
|
|
+ MessageBox.confirm(
|
|
|
+ "从表的第" +
|
|
|
+ Num.slice(0, Num.length - 1) +
|
|
|
+ "行重复，如本次金额变更，请删除后重新选择",
|
|
|
+ "提示",
|
|
|
+ {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (this.state_s == false) {
|
|
|
+ this.$message.error("本次金额不能大于原定金额");
|
|
|
+ }
|
|
|
+ },
|
|
|
// imgChangeI(fAmtdr,fAmt){
|
|
|
// if (fAmt <= fAmtdr){
|
|
|
// this.state_s = true
|
qukaidi