|
@@ -27,11 +27,11 @@
|
|
src="../../../public/img/sousuo.png"
|
|
src="../../../public/img/sousuo.png"
|
|
alt=""
|
|
alt=""
|
|
/></ws-button>
|
|
/></ws-button>
|
|
- <el-button class="bg-bottom" type="primary" size="small" @click="installDepositRatio()"
|
|
|
|
|
|
+ <el-button class="bg-bottom" type="primary" size="small" @click="installRatio()"
|
|
>默认定金比例</el-button
|
|
>默认定金比例</el-button
|
|
>
|
|
>
|
|
<WinseaContentModal
|
|
<WinseaContentModal
|
|
- v-model="outerVisible"
|
|
|
|
|
|
+ v-model="outerVisibleEdit"
|
|
title="设置默认定金比例"
|
|
title="设置默认定金比例"
|
|
@on-cancel="handleClose"
|
|
@on-cancel="handleClose"
|
|
>
|
|
>
|
|
@@ -43,12 +43,12 @@
|
|
:rows="2"
|
|
:rows="2"
|
|
maxlength="30"
|
|
maxlength="30"
|
|
placeholder="请输入定金比例"
|
|
placeholder="请输入定金比例"
|
|
- v-model="auditMind"
|
|
|
|
|
|
+ v-model="auditMindEdit"
|
|
>
|
|
>
|
|
</el-input>
|
|
</el-input>
|
|
</div>
|
|
</div>
|
|
<div class="dialog-footer">
|
|
<div class="dialog-footer">
|
|
- <el-button @click="outerVisible = false">取 消</el-button>
|
|
|
|
|
|
+ <el-button @click="outerVisibleEdit = false">取 消</el-button>
|
|
<el-button type="primary" @click="editDepositRatio()">确定</el-button>
|
|
<el-button type="primary" @click="editDepositRatio()">确定</el-button>
|
|
</div>
|
|
</div>
|
|
</WinseaContentModal>
|
|
</WinseaContentModal>
|
|
@@ -76,7 +76,7 @@
|
|
|
|
|
|
<div class="dialog-footer">
|
|
<div class="dialog-footer">
|
|
<el-button @click="outerVisibleAdd = false">取 消</el-button>
|
|
<el-button @click="outerVisibleAdd = false">取 消</el-button>
|
|
- <el-button type="primary" @click="editPriceAdd()">确定</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="editPrice(0)">确定</el-button>
|
|
</div>
|
|
</div>
|
|
</WinseaContentModal>
|
|
</WinseaContentModal>
|
|
|
|
|
|
@@ -102,7 +102,7 @@
|
|
|
|
|
|
<div class="dialog-footer">
|
|
<div class="dialog-footer">
|
|
<el-button @click="outerVisibleReturn = false">取 消</el-button>
|
|
<el-button @click="outerVisibleReturn = false">取 消</el-button>
|
|
- <el-button type="primary" @click="editPriceReturn()">确定</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="editPrice(1)">确定</el-button>
|
|
</div>
|
|
</div>
|
|
</WinseaContentModal>
|
|
</WinseaContentModal>
|
|
</template>
|
|
</template>
|
|
@@ -111,7 +111,7 @@
|
|
<div>
|
|
<div>
|
|
<el-table
|
|
<el-table
|
|
class="wenzi"
|
|
class="wenzi"
|
|
- :data="warehouseList.records"
|
|
|
|
|
|
+ :data="customerList.records"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
height="780"
|
|
height="780"
|
|
>
|
|
>
|
|
@@ -122,18 +122,21 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="customerName" label="客户名称">
|
|
<el-table-column prop="customerName" label="客户名称">
|
|
|
|
+ <template scope="scope">
|
|
|
|
+ <span v-if="scope.row.customerName == '' || scope.row.customerName == null">{{scope.row.compName}}</span>
|
|
|
|
+ <span v-if="scope.row.compName == '' || scope.row.compName == null">{{scope.row.customerName}}</span>
|
|
|
|
+ </template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="compAddress" label="地址">
|
|
|
|
- <template>asddddddd</template>
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
+ <el-table-column prop="compAddress" label="地址"></el-table-column>
|
|
<el-table-column prop="customerPhone" label="电话"> </el-table-column>
|
|
<el-table-column prop="customerPhone" label="电话"> </el-table-column>
|
|
<el-table-column prop="payTaxesCard" label="纳税人识别号"> </el-table-column>
|
|
<el-table-column prop="payTaxesCard" label="纳税人识别号"> </el-table-column>
|
|
<el-table-column prop="bankDeposit" label="开户行"> </el-table-column>
|
|
<el-table-column prop="bankDeposit" label="开户行"> </el-table-column>
|
|
<el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
|
|
<el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
|
|
<el-table-column prop="totalDeposit" label="总定金(元)"> </el-table-column>
|
|
<el-table-column prop="totalDeposit" label="总定金(元)"> </el-table-column>
|
|
<el-table-column prop="freezingDeposit" label="冻结定金(元)"> </el-table-column>
|
|
<el-table-column prop="freezingDeposit" label="冻结定金(元)"> </el-table-column>
|
|
- <el-table-column prop="processStatus" label="定金比例(元/吨)">
|
|
|
|
|
|
+ <el-table-column prop="depositRatio" label="定金比例(元/吨)">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
|
+ {{scope.row.depositRatio}}
|
|
<img
|
|
<img
|
|
width="17"
|
|
width="17"
|
|
height="18"
|
|
height="18"
|
|
@@ -147,9 +150,9 @@
|
|
<el-table-column prop="updateDate" label="更新时间"> </el-table-column>
|
|
<el-table-column prop="updateDate" label="更新时间"> </el-table-column>
|
|
<el-table-column prop="seller" label="操作" width="280" >
|
|
<el-table-column prop="seller" label="操作" width="280" >
|
|
<template>
|
|
<template>
|
|
- <el-button class="find" type="primary" @click="addPrice()"
|
|
|
|
|
|
+ <el-button class="find" type="primary" @click="editClick(1)"
|
|
>增加定金</el-button>
|
|
>增加定金</el-button>
|
|
- <el-button class="find" type="primary" @click="returnPrice()"
|
|
|
|
|
|
+ <el-button class="find" type="primary" @click="editClick(2)"
|
|
>退回定金</el-button>
|
|
>退回定金</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -167,7 +170,11 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
-import { automobileList, alsostate } from '@/model/transport/index'
|
|
|
|
|
|
+import {
|
|
|
|
+ getList,
|
|
|
|
+ installDepositRatio,
|
|
|
|
+ editCustomerInfo
|
|
|
|
+} from '@/model/customer/index'
|
|
import Pagination from '@/components/Pagination'
|
|
import Pagination from '@/components/Pagination'
|
|
import WsUpload from '@/components/WsUpload'
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
|
|
|
@@ -202,9 +209,8 @@ export default {
|
|
currentPage: 1,
|
|
currentPage: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
deptBudgetTotal: 0,
|
|
deptBudgetTotal: 0,
|
|
- searchTypeText: '执行中',
|
|
|
|
searchKeyWord: '',
|
|
searchKeyWord: '',
|
|
- outerVisible: false,
|
|
|
|
|
|
+ outerVisibleEdit: false,
|
|
outerVisibleAdd: false,
|
|
outerVisibleAdd: false,
|
|
outerVisibleReturn: false,
|
|
outerVisibleReturn: false,
|
|
contractType: 2,
|
|
contractType: 2,
|
|
@@ -213,29 +219,20 @@ export default {
|
|
submitType: true,
|
|
submitType: true,
|
|
size: 10,
|
|
size: 10,
|
|
spanArr: [],
|
|
spanArr: [],
|
|
- inOutDate: [],
|
|
|
|
- auditMind: '',
|
|
|
|
|
|
+ auditMindEdit: '',
|
|
auditMindAdd: '',
|
|
auditMindAdd: '',
|
|
auditMindReturn: '',
|
|
auditMindReturn: '',
|
|
- tranTypeKey: '1',
|
|
|
|
- warehouseName: '',
|
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
deptCircularPage: {},
|
|
deptCircularPage: {},
|
|
- warehouseList: [],
|
|
|
|
|
|
+ customerList: [],
|
|
deptBudgetList: {},
|
|
deptBudgetList: {},
|
|
historyList: [],
|
|
historyList: [],
|
|
- taskTypeList: [
|
|
|
|
- { value: '执行中', type: 1 },
|
|
|
|
- { value: '已完成', type: 2 },
|
|
|
|
- { value: '全部任务', type: '' },
|
|
|
|
- ],
|
|
|
|
pickerBeginDateBefore: {
|
|
pickerBeginDateBefore: {
|
|
disabledDate: (time) => {
|
|
disabledDate: (time) => {
|
|
return time.getTime() > Date.now()
|
|
return time.getTime() > Date.now()
|
|
},
|
|
},
|
|
},
|
|
},
|
|
accessoryTFs: false,
|
|
accessoryTFs: false,
|
|
-
|
|
|
|
}
|
|
}
|
|
},
|
|
},
|
|
activated() {
|
|
activated() {
|
|
@@ -244,43 +241,29 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
//设置默认定金比例
|
|
//设置默认定金比例
|
|
- installDepositRatio(){
|
|
|
|
- this.outerVisible = true
|
|
|
|
|
|
+ installRatio(){
|
|
|
|
+ // installDepositRatio({
|
|
|
|
+ // compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
|
+ // depositRatio:this.depositRatio,
|
|
|
|
+ // })
|
|
|
|
+ this.outerVisibleEdit = true
|
|
},
|
|
},
|
|
editDepositRatio(){
|
|
editDepositRatio(){
|
|
-
|
|
|
|
- if (!this.auditMind) {
|
|
|
|
- this.$message({
|
|
|
|
- message: '默认定金比例不能为空!',
|
|
|
|
- type: 'warning',
|
|
|
|
- })
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- //增加定金
|
|
|
|
- addPrice(){
|
|
|
|
- this.outerVisibleAdd = true
|
|
|
|
- },
|
|
|
|
- editPriceAdd(){
|
|
|
|
-
|
|
|
|
- if (!this.auditMindAdd) {
|
|
|
|
- this.$message({
|
|
|
|
- message: '增加金额不能为空!',
|
|
|
|
- type: 'warning',
|
|
|
|
|
|
+ installDepositRatio({
|
|
|
|
+ compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
|
+ depositRatio:this.depositRatio,
|
|
|
|
+ })
|
|
|
|
+ .toPromise()
|
|
|
|
+ .then((response) => {
|
|
|
|
+ // this.deptCircularPage.currentPage = response.current
|
|
|
|
+ // this.deptCircularPage.pageSize = response.size
|
|
|
|
+ // this.deptBudgetTotal = response.total
|
|
|
|
+ // this.customerList = response
|
|
|
|
+ console.log('成功')
|
|
})
|
|
})
|
|
- return
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- //退回定金
|
|
|
|
- returnPrice(){
|
|
|
|
- this.outerVisibleReturn = true
|
|
|
|
- },
|
|
|
|
- editPriceReturn(){
|
|
|
|
- if (!this.auditMindOneReturn) {
|
|
|
|
|
|
+ if (!this.auditMindEdit) {
|
|
this.$message({
|
|
this.$message({
|
|
- message: '退回金额不能为空!',
|
|
|
|
|
|
+ message: '默认定金比例不能为空!',
|
|
type: 'warning',
|
|
type: 'warning',
|
|
})
|
|
})
|
|
return
|
|
return
|
|
@@ -335,59 +318,65 @@ export default {
|
|
this.getList()
|
|
this.getList()
|
|
},
|
|
},
|
|
getList() {
|
|
getList() {
|
|
- automobileList({
|
|
|
|
|
|
+ getList({
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
currentPage: this.currentPage,
|
|
currentPage: this.currentPage,
|
|
pageSize: this.pageSize,
|
|
pageSize: this.pageSize,
|
|
- searchType: this.searchType,
|
|
|
|
- startDate: this.startDate,
|
|
|
|
- endDate: this.endDate,
|
|
|
|
searchKeyWord: this.searchKeyWord,
|
|
searchKeyWord: this.searchKeyWord,
|
|
- tranTypeKey: this.tranTypeKey,
|
|
|
|
|
|
+ customerTypeFlag: this.customerTypeFlag,
|
|
})
|
|
})
|
|
.toPromise()
|
|
.toPromise()
|
|
.then((response) => {
|
|
.then((response) => {
|
|
this.deptCircularPage.currentPage = response.current
|
|
this.deptCircularPage.currentPage = response.current
|
|
this.deptCircularPage.pageSize = response.size
|
|
this.deptCircularPage.pageSize = response.size
|
|
this.deptBudgetTotal = response.total
|
|
this.deptBudgetTotal = response.total
|
|
- this.warehouseList = response
|
|
|
|
|
|
+ this.customerList = response
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- editClick(row) {
|
|
|
|
- var status = ''
|
|
|
|
- if (row.processStatus == '待执行' || row.processStatus == '已完成') {
|
|
|
|
- status = '执行中'
|
|
|
|
- } else if (row.processStatus == '执行中') {
|
|
|
|
- status = '已完成'
|
|
|
|
- }
|
|
|
|
- //cancelButtonClass: "btn-custom-cancel"
|
|
|
|
- this.$confirm(`是否将状态改为${status}`, {
|
|
|
|
- confirmButtonText: '确定',
|
|
|
|
- cancelButtonText: '取消',
|
|
|
|
- type: 'warning',
|
|
|
|
|
|
+ editClick(index) {
|
|
|
|
+ editCustomerInfo({
|
|
|
|
+
|
|
})
|
|
})
|
|
- .then(() => {
|
|
|
|
- alsostate({ id: row.id })
|
|
|
|
- .toPromise()
|
|
|
|
- .then((response) => {
|
|
|
|
- this.$notify.success({
|
|
|
|
- title: '成功',
|
|
|
|
- message: '状态修改成功',
|
|
|
|
- })
|
|
|
|
- this.getList()
|
|
|
|
- })
|
|
|
|
- .catch((response) => {
|
|
|
|
- // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
|
- })
|
|
|
|
- })
|
|
|
|
- .catch(() => {
|
|
|
|
- return false
|
|
|
|
|
|
+ .toPromise()
|
|
|
|
+ .then((response) => {
|
|
|
|
+ // this.deptCircularPage.currentPage = response.current
|
|
|
|
+ // this.deptCircularPage.pageSize = response.size
|
|
|
|
+ // this.deptBudgetTotal = response.total
|
|
|
|
+ // this.customerList = response
|
|
|
|
+ console.log('成功')
|
|
})
|
|
})
|
|
|
|
+ //更改定金比例
|
|
|
|
+ if(index == 0){
|
|
|
|
+ this.outerVisibleEdit = true
|
|
|
|
+ }
|
|
|
|
+ //增加定金
|
|
|
|
+ else if(index == 1){
|
|
|
|
+ this.outerVisibleAdd = true
|
|
|
|
+ }
|
|
|
|
+ //退回定金
|
|
|
|
+ else{
|
|
|
|
+ this.outerVisibleReturn = true
|
|
|
|
+ }
|
|
},
|
|
},
|
|
- selecttaskType(e) {
|
|
|
|
- for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
|
|
- if (this.taskTypeList[i].value == e) {
|
|
|
|
- this.searchType = this.taskTypeList[i].type
|
|
|
|
|
|
+ editPrice(asdf){
|
|
|
|
+ //增加定金
|
|
|
|
+ if(asdf == 0){
|
|
|
|
+ if (!this.auditMindAdd) {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: '增加金额不能为空!',
|
|
|
|
+ type: 'warning',
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //退回定金
|
|
|
|
+ if(asdf == 1){
|
|
|
|
+ if (!this.auditMindOneReturn) {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: '退回金额不能为空!',
|
|
|
|
+ type: 'warning',
|
|
|
|
+ })
|
|
|
|
+ return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -398,19 +387,7 @@ export default {
|
|
this.historyList = response
|
|
this.historyList = response
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- find() {
|
|
|
|
- if (this.inOutDate != null) {
|
|
|
|
- if (this.inOutDate.length > 0) {
|
|
|
|
- this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
|
|
|
|
- this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
|
|
|
|
- } else {
|
|
|
|
- this.startDate = ''
|
|
|
|
- this.endDate = ''
|
|
|
|
- }
|
|
|
|
- }else{
|
|
|
|
- this.startDate = ''
|
|
|
|
- this.endDate = ''
|
|
|
|
- }
|
|
|
|
|
|
+ find() {
|
|
this.currentPage = 1
|
|
this.currentPage = 1
|
|
this.getList()
|
|
this.getList()
|
|
},
|
|
},
|