|
|
@@ -2,27 +2,30 @@
|
|
|
<div class="app-container">
|
|
|
<el-form
|
|
|
:model="queryParams_s"
|
|
|
- ref="TWareHouseFees"
|
|
|
+ ref="queryParams_s"
|
|
|
:inline="true"
|
|
|
v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
>
|
|
|
- <el-form-item label="货权方" prop="fCorpid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams_s.fCorpid"
|
|
|
+ <el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams_s.fCtrlcorpid"
|
|
|
placeholder="请输入客户名称"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ style="width:200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
- >
|
|
|
- <el-option
|
|
|
+ />
|
|
|
+
|
|
|
+ <!-- <el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
></el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="结算单位" prop="fCorpid">
|
|
|
@@ -48,9 +51,10 @@
|
|
|
<el-form-item label="录入人" prop="createBy">
|
|
|
<el-input
|
|
|
v-model="queryParams_s.createBy"
|
|
|
- placeholder="请输入录入人"
|
|
|
- clearable
|
|
|
+
|
|
|
+
|
|
|
size="small"
|
|
|
+ disabled
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -201,23 +205,23 @@
|
|
|
:data="contrastList"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
- <el-table-column width="55" align="center" type="selection" />
|
|
|
+ <el-table-column width="50" align="center" type="selection" />
|
|
|
<!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
|
|
|
- <el-table-column label="行号" align="center" type="index" width="55" />
|
|
|
- <el-table-column label="系统编号" align="center" prop="fBillno" />
|
|
|
- <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" />
|
|
|
- <el-table-column label="结算单位" align="center" prop="fCorpid" />
|
|
|
- <el-table-column label="账单日期" align="center" prop="fAccbilldate">
|
|
|
+ <el-table-column label="行号" align="center" type="index"/>
|
|
|
+ <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>
|
|
|
+ <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" width="120"/>
|
|
|
+ <el-table-column label="结算单位" align="center" prop="fCorpidName" show-overflow-tooltip width="120"/>
|
|
|
+ <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="120">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="提单号" align="center" prop="tMblno" />
|
|
|
- <el-table-column label="应收金额" align="center" prop="fAmtdr" />
|
|
|
- <el-table-column label="应付金额" align="center" prop="fAmtcr" />
|
|
|
+ <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
|
|
|
+ <el-table-column label="应收金额" align="center" prop="fAmtdr" width="120"/>
|
|
|
+ <el-table-column label="应付金额" align="center" prop="fAmtcr" width="120"/>
|
|
|
<!-- <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
|
|
|
- <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" />
|
|
|
- <el-table-column label="状态" align="center" prop="fBillstatus">
|
|
|
+ <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" width="120"/>
|
|
|
+ <el-table-column label="状态" align="center" prop="fBillstatus" width="120">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.fBillstatus == '1'">新建</span>
|
|
|
<span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
|
|
|
@@ -233,6 +237,7 @@
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
class-name="small-padding fixed-width"
|
|
|
+ width="140"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -357,9 +362,9 @@
|
|
|
<el-button type="warning" size="small" @click="reconciliation"
|
|
|
>对账</el-button
|
|
|
>
|
|
|
- <el-button type="primary" size="small" :disabled="statrGo" @click="confirmReconciliation">确认对账</el-button>
|
|
|
+ <el-button type="primary" size="small" @click="confirmReconciliation">确认对账</el-button>
|
|
|
<el-button type="success" size="small">导出</el-button>
|
|
|
- <el-button type="info" size="small">打印</el-button>
|
|
|
+ <el-button type="info" size="small" @click="openPrint=true">打印</el-button>
|
|
|
<el-button type="danger" size="small">删除</el-button>
|
|
|
</div>
|
|
|
|
|
|
@@ -371,9 +376,9 @@
|
|
|
:data="DzfeeList"
|
|
|
@selection-change="handleSelectionChanGe"
|
|
|
>
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
+ <!-- <el-table-column type="selection" width="55" align="center" /> -->
|
|
|
<!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
|
|
|
- <el-table-column label="行1号" align="center" type="index" />
|
|
|
+ <el-table-column label="行号" align="center" type="index" />
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
<el-table-column label="业务日期" align="center" prop="fBsdate">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -389,7 +394,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="金额" align="center" prop="fAmtdr" />
|
|
|
<el-table-column label="本次金额" align="center" prop="fAmt" />
|
|
|
- <el-table-column label="业务1类型" align="center" prop="fBilltype">
|
|
|
+ <el-table-column label="业务类型" align="center" prop="fBilltype">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
|
|
|
<span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
|
|
|
@@ -667,6 +672,49 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <!-- 打印页面 -->
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="openPrint"
|
|
|
+ width="70%"
|
|
|
+ append-to-body
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ title="对账单"
|
|
|
+ >
|
|
|
+ <el-table
|
|
|
+ border="true"
|
|
|
+ v-loading="loading"
|
|
|
+ :data="DzfeeList"
|
|
|
+ @selection-change="handleSelectionChanGe">
|
|
|
+
|
|
|
+ <el-table-column label="行号" align="center" type="index" />
|
|
|
+ <el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
+ <el-table-column label="业务日期" align="center" prop="fBsdate">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{scope.row.fBsdate.slice(0,10)}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeName" />
|
|
|
+ <el-table-column label="收/付" align="center" prop="fSrcdc">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fSrcdc == 'D'">收</span>
|
|
|
+ <span v-else-if="scope.row.fSrcdc == 'C'">付</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="金额" align="center" prop="fAmtdr" />
|
|
|
+ <el-table-column label="本次金额" align="center" prop="fAmt" />
|
|
|
+ <el-table-column label="业务类型" align="center" prop="fBilltype">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
|
|
|
+ <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
|
|
|
+ <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
|
|
|
+ <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
|
|
|
+ <span v-else>{{scope.row.fBilltype}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-button style="marginTop:10px">打印</el-button>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -682,6 +730,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ openPrint:false,
|
|
|
statrGo:true,
|
|
|
state_s: true,
|
|
|
browseStatus:false,
|
|
|
@@ -733,7 +782,8 @@ export default {
|
|
|
fAmtcr:'', //应付合计
|
|
|
fMblno:'', //提单号
|
|
|
fName:'', //货权方
|
|
|
- fFeesName:'' //结算单位
|
|
|
+ fFeesName:'', //结算单位
|
|
|
+ fCorpid:'' //结算单位ID
|
|
|
},
|
|
|
// 传值对象
|
|
|
TWareHouseFees:{
|
|
|
@@ -828,15 +878,23 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- this.getList();
|
|
|
+ this.getList()
|
|
|
this.register()
|
|
|
},
|
|
|
methods: {
|
|
|
// 确认对账按钮功能
|
|
|
confirmReconciliation(){
|
|
|
- Cfee().then(response=>{
|
|
|
+ this.queryParams.fBillstatus = '4'
|
|
|
+ let formDate = new window.FormData()
|
|
|
+ formDate.append('tFee',JSON.stringify(this.queryParams))
|
|
|
+ formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
|
|
|
+
|
|
|
+ Cfee(formDate).then(response=>{
|
|
|
console.log(response)
|
|
|
+ this.msgSuccess("操作成功")
|
|
|
+
|
|
|
})
|
|
|
+ this.open = false
|
|
|
},
|
|
|
// 对账按钮功能
|
|
|
reconciliation(){
|
|
|
@@ -847,7 +905,9 @@ export default {
|
|
|
// 默认录入人
|
|
|
register() {
|
|
|
queryUserVal().then((response)=>{
|
|
|
- this.contrastList.createBy = response.user.userName
|
|
|
+ this.queryParams_s.createBy = response.user.userName
|
|
|
+ this.queryParams.createBy = response.user.userName
|
|
|
+ console.log(this.DzfeeList.createBy)
|
|
|
console.log(response.user.userName)
|
|
|
})
|
|
|
},
|
|
|
@@ -869,8 +929,8 @@ export default {
|
|
|
sums[0] = '合计';
|
|
|
} else {
|
|
|
sums[4] = '';
|
|
|
- this.pass.fAmtdr = sums[9]
|
|
|
- this.pass.fAmtcr = sums[10]
|
|
|
+ // this.pass.fAmtdr = sums[9]
|
|
|
+ // this.pass.fAmtcr = sums[10]
|
|
|
}
|
|
|
})
|
|
|
return sums;
|
|
|
@@ -958,6 +1018,7 @@ export default {
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
+ console.log(this.queryParams_s)
|
|
|
this.queryParams.pageNum = 1;
|
|
|
this.getList();
|
|
|
console.log(this.contrastList)
|
|
|
@@ -1008,6 +1069,14 @@ export default {
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
this.DzfeeList = []
|
|
|
+ this.pass={
|
|
|
+ fAmtdr:'', //应收合计
|
|
|
+ fAmtcr:'', //应付合计
|
|
|
+ fMblno:'', //提单号
|
|
|
+ fName:'', //货权方
|
|
|
+ fFeesName:'', //结算单位
|
|
|
+ fCorpid:'' //结算单位ID
|
|
|
+ },
|
|
|
this.open = true;
|
|
|
this.title = "添加财务数据主";
|
|
|
this.queryParams = {
|
|
|
@@ -1054,6 +1123,14 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
+ this.pass={
|
|
|
+ fAmtdr:'', //应收合计
|
|
|
+ fAmtcr:'', //应付合计
|
|
|
+ fMblno:'', //提单号
|
|
|
+ fName:'', //货权方
|
|
|
+ fFeesName:'', //结算单位
|
|
|
+ fCorpid:'' //结算单位ID
|
|
|
+ }
|
|
|
const fId = row.fId || this.ids
|
|
|
console.log(fId)
|
|
|
getFee(fId).then(response => {
|
|
|
@@ -1084,6 +1161,7 @@ export default {
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
console.log(this.queryParams)
|
|
|
+ console.log(this.DzfeeList)
|
|
|
// console.log(this.feeList)
|
|
|
this.$refs["ruless"].validate(valid => {
|
|
|
if (valid) {
|
|
|
@@ -1131,10 +1209,16 @@ export default {
|
|
|
/* 添加财务数据主 导入*/
|
|
|
confirmImport(){
|
|
|
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].fAmtdr)
|
|
|
+ // console.log(Number(this.pass.fAmtcr))
|
|
|
+ // console.log(this.pass)
|
|
|
+ // console.log(this.pass.fAmtcr)
|
|
|
+ // console.log(this.pass.fAmtdr)
|
|
|
}
|
|
|
-
|
|
|
+ console.log(this.pass)
|
|
|
if(this.state_s == true) {
|
|
|
if (this.selection.length == '0') {
|
|
|
console.log('未选择')//写入提示
|
|
|
@@ -1162,25 +1246,28 @@ export default {
|
|
|
this.pass.fMblno = this.empty[0] + "..."
|
|
|
console.log(this.pass.fMblno)
|
|
|
}
|
|
|
- // if (this.nothing.length <= 1){
|
|
|
- // this.pass.fName = this.nothing[0]
|
|
|
- // console.log(this.nothing)
|
|
|
- // }else {
|
|
|
- // this.pass.fName = this.nothing[0] + "..."
|
|
|
- // console.log(this.nothing)
|
|
|
- // }
|
|
|
if (this.nothing.length <= 1){
|
|
|
- this.pass.fFeesName = this.nothing[0]
|
|
|
+ this.pass.fName = this.nothing[0]
|
|
|
console.log(this.nothing)
|
|
|
}else {
|
|
|
- this.pass.fFeesName = this.nothing[0] + "..."
|
|
|
+ this.pass.fName = this.nothing[0] + "..."
|
|
|
console.log(this.nothing)
|
|
|
}
|
|
|
-
|
|
|
+ // if (this.nothing.length <= 1){
|
|
|
+ // this.pass.fCorpid = this.nothing[0]
|
|
|
+ // console.log(this.nothing)
|
|
|
+ // }else {
|
|
|
+ // this.pass.fCorpid = this.nothing[0] + "..."
|
|
|
+ // console.log(this.nothing)
|
|
|
+ // }
|
|
|
this.DzfeeList = this.selection
|
|
|
this.queryParams.tMblno = this.pass.fMblno //提单号
|
|
|
- this.queryParams.fCorpid = this.pass.fFeesName
|
|
|
- // this.queryParams.fCtrlcorpid = this.pass.fName
|
|
|
+ // this.queryParams.fCorpid = this.pass.fFeesName
|
|
|
+
|
|
|
+ this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
|
|
|
+ this.queryParams.fCtrlcorpid = this.pass.fName
|
|
|
+ console.log(this.queryParams.fCorpid)
|
|
|
+ console.log(this.pass)
|
|
|
this.queryParams.fAmtcr = this.pass.fAmtcr
|
|
|
this.queryParams.fAmtdr = this.pass.fAmtdr
|
|
|
console.log(this.pass)
|
|
|
@@ -1251,7 +1338,14 @@ export default {
|
|
|
},
|
|
|
//清空一行
|
|
|
deleteRow(index, rows) {
|
|
|
- rows.splice(index, 1);
|
|
|
+ this.queryParams.fAmtdr = 0
|
|
|
+ this.queryParams.fAmtcr = 0
|
|
|
+ rows.splice(index, 1)
|
|
|
+ for(let item in this.DzfeeList) {
|
|
|
+ console.log(this.DzfeeList[item])
|
|
|
+ this.queryParams.fAmtcr = this.DzfeeList[item].fAmt
|
|
|
+ this.queryParams.fAmtdr = this.DzfeeList[item].fAmtdr
|
|
|
+ }
|
|
|
},
|
|
|
},
|
|
|
};
|
caojunjie