|
|
@@ -758,6 +758,7 @@
|
|
|
:fixed="item.fixed"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
+ <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fReviewDate}}</span>
|
|
|
<span v-if="item.label == 'fSrcdc' && login == 3">{{ scope.row.fSrcdc == 'D' ? '收' : '付' }}</span>
|
|
|
<span v-else>{{ scope.row[item.label] }}</span>
|
|
|
</template>
|
|
|
@@ -1332,16 +1333,15 @@
|
|
|
<span v-if="item.label == 'boatName'">{{ scope.row.boatName }}</span>
|
|
|
<span v-if="item.label == 'voyageName'">{{ scope.row.voyageName }}</span>
|
|
|
<span v-if="item.label == 'fProductName'">{{ scope.row.fProductName }}</span>
|
|
|
- <span v-if="item.label == 'fBsdate'"
|
|
|
- >{{ scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fBsdate }}</span>
|
|
|
+ <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fReviewDate}}</span>
|
|
|
<span v-if="item.label == 'fBilltype'">
|
|
|
<template>
|
|
|
<span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
|
|
|
<span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
|
|
|
+ <span v-else-if="scope.row.fBilltype == 'KHDD'">凯合订单</span>
|
|
|
<span v-else>{{ scope.row.fBilltype }}</span>
|
|
|
</template>
|
|
|
</span>
|
|
|
- <span v-if="item.label == 'fBusinessType'">{{ scope.row.fBusinessType }}</span>
|
|
|
<span v-if="item.label == 'fReviewDate'">{{ scope.row.fReviewDate }}</span>
|
|
|
<span v-if="item.label == 'fFeeName'">{{ scope.row.fFeeName }}</span>
|
|
|
<span v-if="item.label == 'fAmtdr'">{{ scope.row.fAmtdr }}</span>
|
|
|
@@ -1756,41 +1756,34 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: '8',
|
|
|
- label: 'fBusinessType',
|
|
|
- name: '作业类型',
|
|
|
- checked: 0,
|
|
|
- width: 100
|
|
|
- },
|
|
|
- {
|
|
|
- surface: '9',
|
|
|
label: 'fReviewDate',
|
|
|
name: '审核日期',
|
|
|
checked: 0,
|
|
|
width: 100
|
|
|
},
|
|
|
{
|
|
|
- surface: '10',
|
|
|
+ surface: '9',
|
|
|
label: 'fFeeName',
|
|
|
name: '费用名称',
|
|
|
checked: 0,
|
|
|
width: 100
|
|
|
},
|
|
|
{
|
|
|
- surface: '11',
|
|
|
+ surface: '10',
|
|
|
label: 'fAmtdr',
|
|
|
name: '金额',
|
|
|
checked: 0,
|
|
|
width: 100
|
|
|
},
|
|
|
{
|
|
|
- surface: '12',
|
|
|
+ surface: '11',
|
|
|
label: 'fAmt',
|
|
|
name: '本次金额',
|
|
|
checked: 0,
|
|
|
width: 100
|
|
|
},
|
|
|
{
|
|
|
- surface: '13',
|
|
|
+ surface: '12',
|
|
|
label: 'fRemarks',
|
|
|
name: '备注',
|
|
|
checked: 0,
|
|
|
@@ -2256,7 +2249,6 @@ export default {
|
|
|
userId: Cookies.get('userName')
|
|
|
}
|
|
|
select(this.data).then((res) => {
|
|
|
- console.log(res)
|
|
|
if (res.data.length != 0) {
|
|
|
this.getRowList = res.data.filter((e) => e.checked == 0)
|
|
|
this.setRowList = res.data
|
|
|
@@ -2282,10 +2274,8 @@ export default {
|
|
|
userId: Cookies.get('userName'),
|
|
|
sysTableSetList: this.setRowList
|
|
|
}
|
|
|
- console.log(this.tableDate)
|
|
|
addSet(this.data).then((res) => {
|
|
|
this.getRowList = this.setRowList
|
|
|
- console.log(this.tableDate)
|
|
|
})
|
|
|
},
|
|
|
//重置列表
|
|
|
@@ -2352,7 +2342,6 @@ export default {
|
|
|
},
|
|
|
//重置列表
|
|
|
delRow2() {
|
|
|
- console.log('11')
|
|
|
this.data = {
|
|
|
tableName: '2发票列表',
|
|
|
userId: Cookies.get('userName')
|
|
|
@@ -2695,7 +2684,6 @@ export default {
|
|
|
this.addOrUpdateVisib = false
|
|
|
let id = '448'
|
|
|
let actId = '470'
|
|
|
- console.log(this.increase_s.fId)
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId)
|
|
|
})
|
|
|
@@ -2954,8 +2942,6 @@ export default {
|
|
|
this.tablefilter = true
|
|
|
if (res == 1) {
|
|
|
this.notChange = true
|
|
|
- console.log(this.Operator)
|
|
|
- console.log(this.Lander)
|
|
|
if (this.Operator == this.Lander) {
|
|
|
this.tablefilter = false
|
|
|
this.reset()
|
|
|
@@ -3104,13 +3090,12 @@ export default {
|
|
|
formDate.append('billsType', 'ApplyFP')
|
|
|
addcheck(formDate).then(response => {
|
|
|
this.queryParams.fId = response.data.tFee.fId
|
|
|
+ this.queryParams.fBillno = response.data.tFee.fBillno
|
|
|
this.msgSuccess('操作成功')
|
|
|
this.getList()
|
|
|
this.notChange = true
|
|
|
this.doNot = true
|
|
|
this.queryParams.fBillstatus = '4'
|
|
|
- console.log(this.Operator)
|
|
|
- console.log(this.Lander)
|
|
|
if (this.Operator == this.Lander) {
|
|
|
this.tablefilter = false
|
|
|
}
|
|
|
@@ -3252,7 +3237,6 @@ export default {
|
|
|
this.nothing.push(this.selection[item].fName)
|
|
|
if (this.increase_s.length === 0) {
|
|
|
this.increase_s = this.increase_s.concat(this.selection)
|
|
|
- console.log(this.increase_s)
|
|
|
//去重提单号
|
|
|
this.empty = new Set(this.empty)
|
|
|
this.empty = Array.from(this.empty)
|
|
|
@@ -3299,7 +3283,6 @@ export default {
|
|
|
for (let item in this.selection) {
|
|
|
if (this.selection[item].fSrcid !== this.increase_s[li].fSrcid) {
|
|
|
this.Fee = this.increase_s.concat(this.selection)
|
|
|
- console.log(this.Fee)
|
|
|
let result = []
|
|
|
let obj = {}
|
|
|
for (let lis in this.Fee) {
|
|
|
@@ -3376,7 +3359,6 @@ export default {
|
|
|
if (Cookies.get('sysType') == 1) {
|
|
|
//大木
|
|
|
listCharge(this.tableFilter).then((response) => {
|
|
|
- console.log(response)
|
|
|
this.chargeList = response.rows
|
|
|
this.total = response.total
|
|
|
this.loading = false
|
|
|
@@ -3384,7 +3366,6 @@ export default {
|
|
|
} else if (Cookies.get('sysType') == 2) {
|
|
|
//车队
|
|
|
listCharges(this.tableFilter).then((response) => {
|
|
|
- console.log(response)
|
|
|
response.rows.map((e) => {
|
|
|
if (e.createTime) {
|
|
|
e.createTime = e.createTime.substring(0, 10)
|
|
|
@@ -3409,7 +3390,6 @@ export default {
|
|
|
this.tableFilter.amount = []
|
|
|
}
|
|
|
listInvoice(this.tableFilter).then(response => {
|
|
|
- console.log(response)
|
|
|
response.rows.map((e) => {
|
|
|
if (e.createTime) {
|
|
|
e.createTime = e.createTime.substring(0, 10)
|
|
|
@@ -3475,7 +3455,6 @@ export default {
|
|
|
this.rules = {}
|
|
|
|
|
|
if (Cookies.get('sysType') == 1) {
|
|
|
- console
|
|
|
search(this.queryParameter).then((response) => {
|
|
|
this.chargeList_s = response.rows
|
|
|
this.$message.success('查询成功')
|
|
|
@@ -3539,8 +3518,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
} else if (Cookies.get('sysType') == 3) {
|
|
|
- console.log('222')
|
|
|
- console.log(this.queryParameter)
|
|
|
this.queryParameter.fSystemType = Cookies.get('sysType')
|
|
|
getcontrastList(this.queryParameter).then((response) => {
|
|
|
this.chargeList_s = response.rows
|
|
|
@@ -3617,7 +3594,6 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
- console.log(this.activeIndex)
|
|
|
this.notChange = false
|
|
|
this.doNot = false
|
|
|
this.hide = true
|
|
|
@@ -3746,7 +3722,6 @@ export default {
|
|
|
}
|
|
|
this.feeInfo = true
|
|
|
this.increase_s = response.data.feeDoList
|
|
|
- console.log(this.increase_s)
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
this.queryParams = response.data.tFee
|
|
|
this.invoiceList = response.data.tFeeInvoiceList
|
|
|
@@ -3757,7 +3732,6 @@ export default {
|
|
|
fId: this.queryParams.fCorpid,
|
|
|
fName: this.queryParams.fCorpidName
|
|
|
})
|
|
|
- // console.log(this.corpid)
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
// this.fMblnoOptions = response.data.corps;
|
|
|
this.mainTable = true
|
|
|
@@ -3772,7 +3746,6 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm(res) {
|
|
|
- console.log(this.increase_s)
|
|
|
this.$refs['ruless'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (!this.queryParams.fId) {
|
|
|
@@ -3998,7 +3971,6 @@ export default {
|
|
|
this.queryParams.fAmtdr += this.increase_s[item].fAmtdr
|
|
|
}
|
|
|
if (this.increase_s == 0) {
|
|
|
- console.log('111')
|
|
|
this.doNot = false
|
|
|
} else {
|
|
|
this.doNot = true
|
wengyuwen