|
@@ -8,21 +8,22 @@
|
|
size="small"
|
|
size="small"
|
|
style="width: 200px;"
|
|
style="width: 200px;"
|
|
placeholder="请输入编号" />
|
|
placeholder="请输入编号" />
|
|
- <el-input
|
|
|
|
|
|
+ <el-select
|
|
v-model="listQuery.type.customer"
|
|
v-model="listQuery.type.customer"
|
|
|
|
+ placeholder="请选择客户"
|
|
|
|
+ style="margin:0 20px;"
|
|
clearable
|
|
clearable
|
|
- class="filter-item"
|
|
|
|
- size="small"
|
|
|
|
- style="width: 200px;"
|
|
|
|
- placeholder="请输入客户" />
|
|
|
|
- <el-select v-model="listQuery.type.status" size="small" clearable placeholder="请选择收款状态">
|
|
|
|
|
|
+ size="small">
|
|
|
|
+ <el-option v-for="item in khList" :label="item.customer" :value="item.customer" :key="item.customer"/>
|
|
|
|
+ </el-select>
|
|
|
|
+ <!-- <el-select v-model="listQuery.type.status" size="small" clearable placeholder="请选择收款状态">
|
|
<el-option
|
|
<el-option
|
|
v-for="item in skList"
|
|
v-for="item in skList"
|
|
:label="item.label"
|
|
:label="item.label"
|
|
:value="item.value"
|
|
:value="item.value"
|
|
:key="item.value"
|
|
:key="item.value"
|
|
/>
|
|
/>
|
|
- </el-select>
|
|
|
|
|
|
+ </el-select> -->
|
|
<el-select
|
|
<el-select
|
|
v-model="listQuery.type.businessType"
|
|
v-model="listQuery.type.businessType"
|
|
placeholder="请选择单据类型"
|
|
placeholder="请选择单据类型"
|
|
@@ -102,23 +103,23 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" label="装车日期" prop="closingDate" />
|
|
<el-table-column align="center" label="装车日期" prop="closingDate" />
|
|
<el-table-column align="center" label="应付金额" prop="amountIng" />
|
|
<el-table-column align="center" label="应付金额" prop="amountIng" />
|
|
- <el-table-column align="center" label="已付金额" prop="amountPaid" />
|
|
|
|
- <el-table-column align="center" label="未付金额" prop="unpaidAmount" />
|
|
|
|
|
|
+ <!-- <el-table-column align="center" label="已付金额" prop="amountPaid" /> -->
|
|
|
|
+ <!-- <el-table-column align="center" label="未付金额" prop="unpaidAmount" /> -->
|
|
<el-table-column align="center" label="备注1" prop="remarks" />
|
|
<el-table-column align="center" label="备注1" prop="remarks" />
|
|
<el-table-column align="center" label="备注2" prop="remark" />
|
|
<el-table-column align="center" label="备注2" prop="remark" />
|
|
- <el-table-column align="center" label="状态" prop="status">
|
|
|
|
- <template slot-scope="scope">
|
|
|
|
- <span v-if="scope.row.status==1">
|
|
|
|
- 未收款
|
|
|
|
- </span>
|
|
|
|
- <span v-if="scope.row.status==2">
|
|
|
|
- 部分收款
|
|
|
|
- </span>
|
|
|
|
- <span v-if="scope.row.status==3">
|
|
|
|
- 已收款
|
|
|
|
- </span>
|
|
|
|
- </template>
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
+ <!-- <el-table-column align="center" label="状态" prop="status"> -->
|
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
|
+ <span v-if="scope.row.status==1">
|
|
|
|
+ 未收款
|
|
|
|
+ </span>
|
|
|
|
+ <span v-if="scope.row.status==2">
|
|
|
|
+ 部分收款
|
|
|
|
+ </span>
|
|
|
|
+ <span v-if="scope.row.status==3">
|
|
|
|
+ 已收款
|
|
|
|
+ </span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column> -->
|
|
<el-table-column align="center" label="操作" class-name="small-padding" width="250px">
|
|
<el-table-column align="center" label="操作" class-name="small-padding" width="250px">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button
|
|
<el-button
|
|
@@ -170,21 +171,21 @@
|
|
<el-form-item label="装车日期" prop="closingDate">
|
|
<el-form-item label="装车日期" prop="closingDate">
|
|
<el-input v-model="dataForm.closingDate" />
|
|
<el-input v-model="dataForm.closingDate" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="已付金额" prop="amountPaid">
|
|
|
|
|
|
+ <!-- <el-form-item label="已付金额" prop="amountPaid">
|
|
<el-input v-model="dataForm.amountPaid" />
|
|
<el-input v-model="dataForm.amountPaid" />
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="未付金额" prop="unpaidAmount">
|
|
|
|
|
|
+ </el-form-item> -->
|
|
|
|
+ <!-- <el-form-item label="未付金额" prop="unpaidAmount">
|
|
<el-input v-model="dataForm.unpaidAmount" />
|
|
<el-input v-model="dataForm.unpaidAmount" />
|
|
- </el-form-item>
|
|
|
|
|
|
+ </el-form-item> -->
|
|
<el-form-item label="备注1" prop="remarks">
|
|
<el-form-item label="备注1" prop="remarks">
|
|
<el-input v-model="dataForm.remarks" />
|
|
<el-input v-model="dataForm.remarks" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="备注2" prop="remark">
|
|
<el-form-item label="备注2" prop="remark">
|
|
<el-input v-model="dataForm.remark" />
|
|
<el-input v-model="dataForm.remark" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="状态" prop="status">
|
|
|
|
|
|
+ <!-- <el-form-item label="状态" prop="status">
|
|
<el-input v-model="dataForm.status" />
|
|
<el-input v-model="dataForm.status" />
|
|
- </el-form-item>
|
|
|
|
|
|
+ </el-form-item> -->
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
<el-button @click="dialogFormVisible = false">取消</el-button>
|
|
<el-button @click="dialogFormVisible = false">取消</el-button>
|
|
@@ -205,22 +206,18 @@ import {
|
|
deleteCustomerBillingInfo,
|
|
deleteCustomerBillingInfo,
|
|
exportXlsx
|
|
exportXlsx
|
|
} from '@/api/customerBillingInfo'
|
|
} from '@/api/customerBillingInfo'
|
|
|
|
+import {
|
|
|
|
+ listcustomer
|
|
|
|
+} from '@/api/collectionPayment'
|
|
import Pagination from '@/components/Pagination'
|
|
import Pagination from '@/components/Pagination'
|
|
export default {
|
|
export default {
|
|
name: 'CustomerBillingInfo',
|
|
name: 'CustomerBillingInfo',
|
|
components: { Pagination },
|
|
components: { Pagination },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- khList: [
|
|
|
|
- {
|
|
|
|
- value: '小李',
|
|
|
|
- label: '小李'
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- value: '小李',
|
|
|
|
- label: '小张'
|
|
|
|
- }
|
|
|
|
- ],
|
|
|
|
|
|
+ isAllowExport: true,
|
|
|
|
+ khList: [],
|
|
|
|
+ khList1: [],
|
|
skList: [
|
|
skList: [
|
|
{
|
|
{
|
|
value: 1,
|
|
value: 1,
|
|
@@ -355,10 +352,24 @@ export default {
|
|
obj.cost = v.合计成本
|
|
obj.cost = v.合计成本
|
|
obj.sendComp = v.发货公司
|
|
obj.sendComp = v.发货公司
|
|
obj.carTeam = v.车队
|
|
obj.carTeam = v.车队
|
|
-
|
|
|
|
- _this.excelFreightspace.push(obj)
|
|
|
|
|
|
+ for (let i = 0; i < _this.khList.length; i++) {
|
|
|
|
+ _this.khList1.push(_this.khList[i].customer)
|
|
|
|
+ }
|
|
|
|
+ if (!_this.khList1.includes(obj.customer)) {
|
|
|
|
+ _this.isAllowExport = false
|
|
|
|
+ _this.$notify({
|
|
|
|
+ title: '失败',
|
|
|
|
+ message: '导入失败,导入数据中客户不存在,请重新编辑',
|
|
|
|
+ type: 'error'
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ } else {
|
|
|
|
+ _this.excelFreightspace.push(obj)
|
|
|
|
+ _this.isAllowExport = true
|
|
|
|
+ }
|
|
|
|
+ // _this.excelFreightspace.push(obj)
|
|
})
|
|
})
|
|
- if (_this.excelFreightspace) {
|
|
|
|
|
|
+ if (_this.excelFreightspace && _this.isAllowExport) {
|
|
importWord(_this.excelFreightspace).then((response) => {
|
|
importWord(_this.excelFreightspace).then((response) => {
|
|
if (response.status == '200') {
|
|
if (response.status == '200') {
|
|
_this.$notify({
|
|
_this.$notify({
|
|
@@ -490,6 +501,13 @@ export default {
|
|
this.total = 0
|
|
this.total = 0
|
|
this.listLoading = false
|
|
this.listLoading = false
|
|
})
|
|
})
|
|
|
|
+ listcustomer().then(response => {
|
|
|
|
+ console.log(response)
|
|
|
|
+ this.khList = response.data.data
|
|
|
|
+ })
|
|
|
|
+ .catch(() => {
|
|
|
|
+
|
|
|
|
+ })
|
|
},
|
|
},
|
|
handleFilter() {
|
|
handleFilter() {
|
|
this.listQuery.page = 1
|
|
this.listQuery.page = 1
|
|
@@ -500,7 +518,7 @@ export default {
|
|
id: undefined
|
|
id: undefined
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- handleLook(row) { debugger
|
|
|
|
|
|
+ handleLook(row) {
|
|
this.$router.push({
|
|
this.$router.push({
|
|
path: 'customerBillingInfolook',
|
|
path: 'customerBillingInfolook',
|
|
query: {
|
|
query: {
|