|
@@ -49,7 +49,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="限定金额" prop="billDate">
|
|
|
- <el-input style="width: 100%;" v-model="form.checkNo"
|
|
|
+ <el-input style="width: 100%;" v-model="form.limitedAmount"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="editSave"
|
|
|
clearable placeholder="请输入对账单号" >
|
|
@@ -116,7 +116,7 @@
|
|
|
<el-input style="width: 100%;" v-model="form.corpAccRemarks"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="editSave"
|
|
|
- clearable placeholder="请输入账期备注" >
|
|
|
+ clearable placeholder="请输入协议签订人" >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -173,7 +173,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
- <el-form-item label="业务员" prop="srcType">
|
|
|
+ <el-form-item label="业务来源" prop="srcType">
|
|
|
<el-col :span="10">
|
|
|
<search-query :datalist="srcTypeData"
|
|
|
:selectValue="form.srcType"
|
|
@@ -272,7 +272,7 @@
|
|
|
size="small"
|
|
|
:disabled="editSave"
|
|
|
format="yyyy-MM-dd"
|
|
|
- value-format="yyyy-MM-dd HH:mm"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
placeholder="选择财务日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -280,7 +280,7 @@
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="审核期间" prop="etd">
|
|
|
<el-date-picker
|
|
|
- v-model="form.etd"
|
|
|
+ v-model="form.approvedDate"
|
|
|
type="datetimerange"
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
@@ -289,14 +289,14 @@
|
|
|
size="small"
|
|
|
:disabled="editSave"
|
|
|
format="yyyy-MM-dd"
|
|
|
- value-format="yyyy-MM-dd HH:mm"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
placeholder="选择对账日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="查询金额" prop="hblno">
|
|
|
- <el-input style="width: 100%;" v-model="form.hblno"
|
|
|
+ <el-form-item label="查询金额" prop="queryAmount">
|
|
|
+ <el-input style="width: 100%;" v-model="form.queryAmount"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="editSave"
|
|
|
clearable placeholder="请输入查询金额" >
|
|
@@ -329,16 +329,10 @@
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="船 名" prop="vesselCnName" >
|
|
|
- <search-query :datalist="vesselData"
|
|
|
- :selectValue="form.vesselCnName"
|
|
|
- :clearable="true"
|
|
|
- :disabled="editSave"
|
|
|
- :buttonIf="false"
|
|
|
- :forParameter="{ key:'id', label:'cnName', value:'cnName'}"
|
|
|
- @corpChange="corpChange($event,'vesselCnName')"
|
|
|
- @remoteMethod="vesselBvesselsListfun"
|
|
|
- @corpFocus="vesselBvesselsListfun" >
|
|
|
- </search-query>
|
|
|
+ <el-input style="width: 100%;" v-model="form.vesselCnName"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="editSave"
|
|
|
+ clearable placeholder="请选择船名" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
@@ -350,19 +344,19 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="三检单号" prop="voyageNo" >
|
|
|
- <el-input style="width: 100%;" v-model="form.voyageNo"
|
|
|
+ <el-form-item label="三检单号" prop="threeInspectionsNo" >
|
|
|
+ <el-input style="width: 100%;" v-model="form.threeInspectionsNo"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="editSave"
|
|
|
- clearable placeholder="请选择航次" ></el-input>
|
|
|
+ clearable placeholder="请输入三检单号" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="预收帐款" prop="voyageNo" >
|
|
|
- <el-input style="width: 100%;" v-model="form.voyageNo"
|
|
|
+ <el-form-item label="预收帐款" prop="receivableAdvance" >
|
|
|
+ <el-input style="width: 100%;" v-model="form.receivableAdvance"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="editSave"
|
|
|
- clearable placeholder="请选择航次" ></el-input>
|
|
|
+ clearable placeholder="请输入预收帐款" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
@@ -407,7 +401,7 @@
|
|
|
:loading="saveLoading" @click="ResetFilter">重置条件
|
|
|
</el-button>
|
|
|
<el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
- :loading="saveLoading" @click="finstlbillsListAccBillfun" >检 索
|
|
|
+ :loading="saveLoading" @click="finstlbillslistAccBillV1fun" >检 索
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</el-col>
|
|
@@ -495,11 +489,11 @@
|
|
|
<el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
:loading="saveLoading" @click="editHandle">计算合计值
|
|
|
</el-button>
|
|
|
- <el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
- :loading="saveLoading" @click="editHandle">签收信息
|
|
|
+ <el-button size="small" type="primary" style="margin-right: 8px" :disabled="!form.id"
|
|
|
+ :loading="saveLoading" @click="ConfirmReceiptfun">批量签收
|
|
|
</el-button>
|
|
|
- <el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
- :loading="saveLoading" @click="editHandle">批量签收
|
|
|
+ <el-button size="small" type="danger" style="margin-right: 8px" :disabled="!form.id"
|
|
|
+ :loading="saveLoading" @click="RevokeReceiptfun">撤销签收
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</el-col>
|
|
@@ -508,8 +502,8 @@
|
|
|
|
|
|
<el-card style="margin-top: 10px">
|
|
|
<div style="margin-bottom: 10px">
|
|
|
- <el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
- :loading="saveLoading" @click="editHandle">确认发票
|
|
|
+ <el-button size="small" type="primary" style="margin-right: 8px" :disabled="editSave"
|
|
|
+ :loading="saveLoading" @click="Confirminvoicefun">确认发票
|
|
|
</el-button>
|
|
|
<el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
:loading="saveLoading" @click="editHandle">批量确认发票
|
|
@@ -520,15 +514,16 @@
|
|
|
<el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
:loading="saveLoading" @click="editHandle">批量不开发票
|
|
|
</el-button>
|
|
|
- <el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
- :loading="saveLoading" @click="editHandle">确认选定行
|
|
|
- </el-button>
|
|
|
- <el-button size="small" type="primary" style="margin-right: 8px"
|
|
|
- :loading="saveLoading" @click="editHandle">选择操作行
|
|
|
+
|
|
|
+ <el-button size="small" type="info" style="margin-right: 8px" :disabled="editSave"
|
|
|
+ :loading="saveLoading" @click="SelectedRows">确认选定行
|
|
|
</el-button>
|
|
|
+ <!--<el-button size="small" type="primary" style="margin-right: 8px"-->
|
|
|
+ <!-- :loading="saveLoading" @click="editHandle">选择操作行-->
|
|
|
+ <!--</el-button>-->
|
|
|
</div>
|
|
|
|
|
|
- <finstlbillsitems :tableData="ListAccBill"></finstlbillsitems>
|
|
|
+ <finstlbillsitems :tableData="tableData" @handleSelectionChange="handleSelectionChange"></finstlbillsitems>
|
|
|
</el-card>
|
|
|
</div>
|
|
|
|
|
@@ -543,7 +538,12 @@
|
|
|
import {getBvesselsList} from "@/api/iosBasicData/bvessels";
|
|
|
import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
|
|
|
import {getDeptLazyTree} from "@/api/system/dept";
|
|
|
- import {finstlbillsDetail, finstlbillsListAccBill, finstlbillsSubmit} from '@/api/iosBasicData/finstlbills'
|
|
|
+ import {
|
|
|
+ finstlbillsConfirmSignFor,
|
|
|
+ finstlbillsDetail,
|
|
|
+ finstlbillslistAccBillV1, finstlbillsRevokeSignFor,
|
|
|
+ finstlbillsSubmit
|
|
|
+ } from '@/api/iosBasicData/finstlbills'
|
|
|
import expand from "@/components/basic-container/expand.vue";
|
|
|
import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
|
|
|
|
|
@@ -561,13 +561,11 @@
|
|
|
tableData:[],
|
|
|
pageLoading:false, // 全屏加载动画
|
|
|
saveLoading:false, // 按钮动画
|
|
|
+ // 绑定的数据
|
|
|
form:{
|
|
|
- isSignfor:'0',
|
|
|
- isApproved:'0',
|
|
|
- isCleared:'0',
|
|
|
- isChecked:'0',
|
|
|
- isInvoice:'0',
|
|
|
- }, // 绑定的数据
|
|
|
+
|
|
|
+ },
|
|
|
+ handleSelectionData:[], // 表格选择的数据
|
|
|
corpData:[], // 对账单位 数据
|
|
|
allyesnoData:[], // 全部是否字典数据
|
|
|
isInvoiceData:[],// 发票字典
|
|
@@ -609,8 +607,6 @@
|
|
|
value:'SI'
|
|
|
}
|
|
|
],
|
|
|
- vesselData:[], // 船名
|
|
|
- ListAccBill:[], // 检索出来的数据
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
@@ -639,6 +635,11 @@
|
|
|
}
|
|
|
// 业务来源
|
|
|
else if (name == 'srcType') {
|
|
|
+ if (!value) {
|
|
|
+ this.$set(this.form,'srcType','')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.$set(this.form,name,value)
|
|
|
if (value == 'OWN') {
|
|
|
this.srcforParameter = { key:'id', label:'title', value:'title'}
|
|
|
this.ownDeptLazyTreefun()
|
|
@@ -652,6 +653,12 @@
|
|
|
}
|
|
|
// 业务来源选择
|
|
|
else if (name == 'srcCnName') {
|
|
|
+ if (!value) {
|
|
|
+ this.$set(this.form,'srcId','')
|
|
|
+ this.$set(this.form,'srcCnName','')
|
|
|
+ this.$set(this.form,'srcEnName','')
|
|
|
+ return
|
|
|
+ }
|
|
|
for (let item of this.srcData) {
|
|
|
if (item[this.srcforParameter.value] == value) {
|
|
|
if (this.form.srcType == 'OWN') {
|
|
@@ -675,13 +682,25 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // 操作员
|
|
|
+ else if (name == 'updateUserName') {
|
|
|
+ for (let item of this.updateUserData) {
|
|
|
+ if (item.name == value) {
|
|
|
+ this.$set(this.form,'updateUser',item.id)
|
|
|
+ this.$set(this.form,'updateUserName',item.name)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
else {
|
|
|
this.$set(this.form,name,value)
|
|
|
}
|
|
|
},
|
|
|
+ // 编辑
|
|
|
+ editHandle(){
|
|
|
+ this.editSave = false
|
|
|
+ },
|
|
|
// 保存
|
|
|
editCustomer(){
|
|
|
- console.log(this.form)
|
|
|
// 对账单位
|
|
|
if (!this.form.corpId) {
|
|
|
this.$message.warning('请选择对账单位');
|
|
@@ -692,11 +711,30 @@
|
|
|
this.$message.warning('请选择业务类型');
|
|
|
return
|
|
|
}
|
|
|
+ // 是否选择从表数据
|
|
|
+ if (this.handleSelectionData.length == 0) {
|
|
|
+ this.$message.warning('请选择对账数据');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.saveLoading = true // 加载动画
|
|
|
this.form.billNoFormat = 'HYDZ'
|
|
|
this.form.businessTypeCode = 'HYDZ'
|
|
|
+
|
|
|
+ this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
+ item.lineNo = index
|
|
|
+ item.pType = item.businessType
|
|
|
+ item.accBillId = item.id
|
|
|
+ item.accBillNo = item.billNo
|
|
|
+ item.accDate = item.billDate
|
|
|
+ delete item.businessType
|
|
|
+ delete item.id
|
|
|
+ delete item.billNo
|
|
|
+ delete item.billDate
|
|
|
+ return item
|
|
|
+ })
|
|
|
finstlbillsSubmit(this.form).then(res=>{
|
|
|
+ this.saveLoading = false
|
|
|
this.$message.success('操作成功');
|
|
|
- console.log(res.data.data)
|
|
|
this.finstlbillsDetailfun(res.data.data.id)
|
|
|
})
|
|
|
},
|
|
@@ -705,6 +743,7 @@
|
|
|
this.pageLoading = true
|
|
|
finstlbillsDetail(id).then(res=>{
|
|
|
this.form = res.data.data
|
|
|
+ this.tableData = this.form.finStlBillsItemsList
|
|
|
this.form.isSignfor = this.form.isSignfor + ''
|
|
|
this.form.isApproved = this.form.isApproved + ''
|
|
|
this.form.isCleared = this.form.isCleared + ''
|
|
@@ -715,31 +754,156 @@
|
|
|
},
|
|
|
// 重置条件
|
|
|
ResetFilter(){
|
|
|
-
|
|
|
+ this.form = {}
|
|
|
},
|
|
|
// 检索接口
|
|
|
- finstlbillsListAccBillfun(){
|
|
|
- if (!this.form.curCode) {
|
|
|
- this.$message.warning('请选择币别筛选');
|
|
|
- return
|
|
|
+ finstlbillslistAccBillV1fun(){
|
|
|
+ delete this.form.id
|
|
|
+ for(let i in this.form) {
|
|
|
+ console.log(i,737)
|
|
|
+ }
|
|
|
+ // let obj = JSON.parse(JSON.stringify(this.form))
|
|
|
+ let obj = {}
|
|
|
+ obj.auditStatus = this.form.isApproved // 审核状态 0 新建费用 1 已请核 2 审核中 3 驳回 4 通过
|
|
|
+ obj.corpCnName = this.form.corpId // 对账单位
|
|
|
+ obj.isSignfor = this.form.isSignfor // 是否已签收(0 否 1是)
|
|
|
+ obj.dc = this.form.dc // 收付 D=收 C=付
|
|
|
+ obj.curCode = this.form.curCode // 币别
|
|
|
+ obj.srcType = this.form.srcType // 业务来源
|
|
|
+ obj.srcCnName = this.form.srcId // 业务员id
|
|
|
+ obj.isCleared = this.form.isCleared // 是否销账(0 未销账 3 部分销账 9 销账)
|
|
|
+ obj.accBillNo = this.form.accountNo // 账单编号 ACCT NO
|
|
|
+ obj.billNo = this.form.businessNo // 单据编号 JOB NO
|
|
|
+ obj.mblno = this.form.mblno // MB/L NO
|
|
|
+ obj.hblno = this.form.hblno // HB/L NO
|
|
|
+ obj.isChecked = this.form.isChecked // 是否对账(0 未对账 1 已对账)
|
|
|
+ obj.queryAmount = this.form.queryAmount // 查询金额
|
|
|
+ obj.businessType = this.form.businessType // 业务类型
|
|
|
+ obj.invoiceStatus = this.form.isInvoice // 发票状态 0 = 未开 9=已开 2 待开 3 不开
|
|
|
+ obj.vesselCnName = this.form.vesselCnName // 中文船名
|
|
|
+ obj.invoiceNo = this.form.invoiceNo // 发票号
|
|
|
+ obj.bookingNo = this.form.bookingNo // 订舱号 BKNO
|
|
|
+ obj.createUserName = this.form.updateUser // 操作员id
|
|
|
+ obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
|
|
|
+ obj.threeInspectionsNo = this.form.threeInspectionsNo // 三检单号
|
|
|
+ obj.voyageNo = this.form.voyageNo // 航次
|
|
|
+ // 审核期间
|
|
|
+ if (this.form.approvedDate) {
|
|
|
+ obj.approveTimeList = this.form.approvedDate
|
|
|
+ }
|
|
|
+ // 财务期间
|
|
|
+ if (this.form.accountDate) {
|
|
|
+ obj.billDateList = this.form.accountDate
|
|
|
}
|
|
|
- finstlbillsListAccBill(this.form).then(res=>{
|
|
|
- this.ListAccBill = res.data.data.map(item=>{
|
|
|
+ console.log(obj,754)
|
|
|
+ // return
|
|
|
+ finstlbillslistAccBillV1(obj).then(res=>{
|
|
|
+ this.tableData = res.data.data.map(item=>{
|
|
|
return item
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ // 确认发票
|
|
|
+ Confirminvoicefun(){
|
|
|
+
|
|
|
+ },
|
|
|
+ // 确认签收
|
|
|
+ ConfirmReceiptfun(){
|
|
|
+ if (this.handleSelectionData.length === 0) {
|
|
|
+ this.$message.warning("请选择至少一条数据");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (let item of this.handleSelectionData) {
|
|
|
+ if (item.isSignfor == 1) {
|
|
|
+ this.$message.warning('请选择未签收的数据');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.$confirm("确定将选择数据签收?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(()=>{
|
|
|
+ this.finstlbillsConfirmSignForfun()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 撤销签收
|
|
|
+ RevokeReceiptfun(){
|
|
|
+ if (this.handleSelectionData.length === 0) {
|
|
|
+ this.$message.warning("请选择至少一条数据");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.$confirm("确定将选择数据撤销签收?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(()=>{
|
|
|
+ this.finstlbillsRevokeSignForfun()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 确认选定行
|
|
|
+ SelectedRows(){
|
|
|
+ this.editCustomer()
|
|
|
+ },
|
|
|
+ // 下面表格多选
|
|
|
+ handleSelectionChange(arr){
|
|
|
+ this.handleSelectionData = arr
|
|
|
+ },
|
|
|
//返回列表
|
|
|
backToList() {
|
|
|
this.$emit('goBack')
|
|
|
},
|
|
|
// 请求的接口
|
|
|
+ // 确认签收接口
|
|
|
+ finstlbillsConfirmSignForfun(){
|
|
|
+ this.form.billNoFormat = 'HYDZ'
|
|
|
+ this.form.businessTypeCode = 'HYDZ'
|
|
|
+
|
|
|
+ this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
+ item.lineNo = index
|
|
|
+ item.pType = item.businessType
|
|
|
+ item.accBillId = item.id
|
|
|
+ item.accBillNo = item.billNo
|
|
|
+ item.accDate = item.billDate
|
|
|
+ delete item.businessType
|
|
|
+ delete item.billNo
|
|
|
+ delete item.billDate
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ finstlbillsConfirmSignFor(this.form).then(res=>{
|
|
|
+ this.$message.success('操作成功');
|
|
|
+ this.finstlbillsDetailfun(res.data.data.id)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 撤销签收接口
|
|
|
+ finstlbillsRevokeSignForfun(){
|
|
|
+ this.form.billNoFormat = 'HYDZ'
|
|
|
+ this.form.businessTypeCode = 'HYDZ'
|
|
|
+
|
|
|
+ this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
+ item.lineNo = index
|
|
|
+ item.pType = item.businessType
|
|
|
+ item.accBillId = item.id
|
|
|
+ item.accBillNo = item.billNo
|
|
|
+ item.accDate = item.billDate
|
|
|
+ delete item.businessType
|
|
|
+ delete item.billNo
|
|
|
+ delete item.billDate
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ finstlbillsRevokeSignFor(this.form).then(res=>{
|
|
|
+ this.$message.success('操作成功');
|
|
|
+ this.finstlbillsDetailfun(res.data.data.id)
|
|
|
+ })
|
|
|
+ },
|
|
|
// 获取 全部是否 接口
|
|
|
allyesnoWorkDictsfun(){
|
|
|
getWorkDicts('all_yes_no').then(res=>{
|
|
|
this.allyesnoData = res.data.data;
|
|
|
})
|
|
|
},
|
|
|
+ // 销账字段数据
|
|
|
+
|
|
|
// 获取发票的字典数据
|
|
|
invoiceWorkDictsfun(){
|
|
|
getWorkDicts('invoice_los').then(res=>{
|
|
@@ -777,12 +941,6 @@
|
|
|
this.srcData = res.data.data.records
|
|
|
})
|
|
|
},
|
|
|
- // 船名
|
|
|
- vesselBvesselsListfun(cnName){
|
|
|
- getBvesselsList(1,10,{cnName}).then(res=>{
|
|
|
- this.vesselData = res.data.data.records
|
|
|
- })
|
|
|
- },
|
|
|
// 获取对账单位数据
|
|
|
corpBcorpsListfun(cnName){
|
|
|
getBcorpslistByType(1,10,{cnName}).then(res=>{
|