|
@@ -28,22 +28,21 @@
|
|
</a-collapse>
|
|
</a-collapse>
|
|
<a-collapse :activeKey="['1']" class="bzj-collapse" v-if="pageInfo&&pageInfo.settleType">
|
|
<a-collapse :activeKey="['1']" class="bzj-collapse" v-if="pageInfo&&pageInfo.settleType">
|
|
<a-collapse-panel key="1" header="保证金 ( 保证金的新增/编辑/删除请在左侧菜单“保证金管理”功能中操作 )">
|
|
<a-collapse-panel key="1" header="保证金 ( 保证金的新增/编辑/删除请在左侧菜单“保证金管理”功能中操作 )">
|
|
- <s-table
|
|
|
|
|
|
+ <a-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
ref="table"
|
|
ref="table"
|
|
size="small"
|
|
size="small"
|
|
rowKey="id"
|
|
rowKey="id"
|
|
- :showPagination="false"
|
|
|
|
|
|
+ :pagination="false"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
- :data="loadData"
|
|
|
|
- :defaultLoadData="true"
|
|
|
|
|
|
+ :data-source="loadData"
|
|
bordered>
|
|
bordered>
|
|
<template slot="status" slot-scope="text, record">
|
|
<template slot="status" slot-scope="text, record">
|
|
<a-button type="link" @click="handleEdit(record)" id="settlementSet-handleEdit">编辑</a-button>
|
|
<a-button type="link" @click="handleEdit(record)" id="settlementSet-handleEdit">编辑</a-button>
|
|
<a-button type="link" @click="handleDel(record)" id="settlementSet-handleDel">删除</a-button>
|
|
<a-button type="link" @click="handleDel(record)" id="settlementSet-handleDel">删除</a-button>
|
|
<!-- <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span> -->
|
|
<!-- <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span> -->
|
|
</template>
|
|
</template>
|
|
- </s-table>
|
|
|
|
|
|
+ </a-table>
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
</a-card>
|
|
</a-card>
|
|
@@ -188,13 +187,13 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-import { STable, VSelect } from '@/components'
|
|
|
|
|
|
+import { VSelect } from '@/components'
|
|
import { shelfDetail, shelfSettleRuleSave, settleRuleDetail } from '@/api/shelf.js'
|
|
import { shelfDetail, shelfSettleRuleSave, settleRuleDetail } from '@/api/shelf.js'
|
|
import { bondRecordList } from '@/api/boundRecord.js'
|
|
import { bondRecordList } from '@/api/boundRecord.js'
|
|
import settlementModifyModal from './settlementModifyModal.vue'
|
|
import settlementModifyModal from './settlementModifyModal.vue'
|
|
import { toThousands } from '@/libs/tools.js'
|
|
import { toThousands } from '@/libs/tools.js'
|
|
export default {
|
|
export default {
|
|
- components: { STable, settlementModifyModal, VSelect },
|
|
|
|
|
|
+ components: { settlementModifyModal, VSelect },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -214,7 +213,7 @@ export default {
|
|
creditWarnLimit: '', // 结算提醒金额
|
|
creditWarnLimit: '', // 结算提醒金额
|
|
settleDay: undefined, // 每月结算日
|
|
settleDay: undefined, // 每月结算日
|
|
warnBeforeDays: undefined, // 结算提醒提前天数
|
|
warnBeforeDays: undefined, // 结算提醒提前天数
|
|
- limitFlag: '', // 是否限制使用
|
|
|
|
|
|
+ limitFlag: 0, // 是否限制使用
|
|
bondFlag: '', // 是否缴纳保证金
|
|
bondFlag: '', // 是否缴纳保证金
|
|
bondAmount: '' // 保证金金额
|
|
bondAmount: '' // 保证金金额
|
|
},
|
|
},
|
|
@@ -236,24 +235,7 @@ export default {
|
|
{ title: '保证金金额', dataIndex: 'bondAmount', width: '30%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
|
|
{ title: '保证金金额', dataIndex: 'bondAmount', width: '30%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
|
|
{ title: '状态', dataIndex: 'stateDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '状态', dataIndex: 'stateDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '支付时间', width: '20%', align: 'center', dataIndex: 'payDate' }
|
|
{ title: '支付时间', width: '20%', align: 'center', dataIndex: 'payDate' }
|
|
- ],
|
|
|
|
- // 加载数据方法 必须为 Promise 对象
|
|
|
|
- loadData: parameter => {
|
|
|
|
- this.spinning = true
|
|
|
|
- return bondRecordList(Object.assign({ shelfSn: this.$route.params.shelfSn })).then(res => {
|
|
|
|
- let data
|
|
|
|
- if (res.status == 200) {
|
|
|
|
- data = res.data
|
|
|
|
- const no = (data.pageNo - 1) * data.pageSize
|
|
|
|
- for (let i = 0; i < data.length; i++) {
|
|
|
|
- const _item = data[i]
|
|
|
|
- _item.no = no + i + 1
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- this.spinning = false
|
|
|
|
- return data
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+ ]
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -288,6 +270,15 @@ export default {
|
|
changeRadio (e) {
|
|
changeRadio (e) {
|
|
this.isEdit = e.target.value
|
|
this.isEdit = e.target.value
|
|
},
|
|
},
|
|
|
|
+ getbondRecordList () {
|
|
|
|
+ this.spinning = true
|
|
|
|
+ bondRecordList(Object.assign({ shelfSn: this.$route.params.shelfSn })).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ this.loadData = res.data || []
|
|
|
|
+ }
|
|
|
|
+ this.spinning = false
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 数字货架详情
|
|
// 数字货架详情
|
|
getShelfDetail () {
|
|
getShelfDetail () {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
@@ -318,7 +309,6 @@ export default {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.form = Object.assign({}, res.data)
|
|
this.form = Object.assign({}, res.data)
|
|
this.form.limitFlag = Number(this.form.limitFlag)
|
|
this.form.limitFlag = Number(this.form.limitFlag)
|
|
-
|
|
|
|
this.settleInfo = res.data
|
|
this.settleInfo = res.data
|
|
} else {
|
|
} else {
|
|
this.form = {}
|
|
this.form = {}
|
|
@@ -338,11 +328,9 @@ export default {
|
|
},
|
|
},
|
|
// 修改
|
|
// 修改
|
|
handleModify (shelfVal, settleVal) {
|
|
handleModify (shelfVal, settleVal) {
|
|
- console.log(shelfVal, settleVal, '----------修改')
|
|
|
|
this.pageInfo = shelfVal
|
|
this.pageInfo = shelfVal
|
|
this.settleInfo = settleVal
|
|
this.settleInfo = settleVal
|
|
this.openModal = true
|
|
this.openModal = true
|
|
- console.log('----------修改')
|
|
|
|
},
|
|
},
|
|
// 保存
|
|
// 保存
|
|
handleSubmit () {
|
|
handleSubmit () {
|
|
@@ -350,10 +338,10 @@ export default {
|
|
this.$refs.ruleForm.validate(valid => {
|
|
this.$refs.ruleForm.validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
const params = Object.assign({}, _this.form)
|
|
const params = Object.assign({}, _this.form)
|
|
- console.log(params, 'params')
|
|
|
|
- if (params.limitFlag == '') {
|
|
|
|
- params.limitFlag = 0
|
|
|
|
- }
|
|
|
|
|
|
+ console.log(params, 'params', _this.form)
|
|
|
|
+ // if (params.limitFlag == '') {
|
|
|
|
+ // params.limitFlag = 0
|
|
|
|
+ // }
|
|
if (this.pageInfo) {
|
|
if (this.pageInfo) {
|
|
params.shelfSn = this.pageInfo.shelfSn
|
|
params.shelfSn = this.pageInfo.shelfSn
|
|
params.storeSn = this.pageInfo.storeSn
|
|
params.storeSn = this.pageInfo.storeSn
|
|
@@ -380,6 +368,7 @@ export default {
|
|
},
|
|
},
|
|
pageInit () {
|
|
pageInit () {
|
|
this.getShelfDetail()
|
|
this.getShelfDetail()
|
|
|
|
+ this.getbondRecordList()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|