提交 70d03d84 authored 作者: 宋雄's avatar 宋雄

修改二期bug

上级 b3b8c170
NODE_ENV=development NODE_ENV=development
VUE_APP_API_BASE_URL='http://192.168.0.101:9999' VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9998' # VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9999' # VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payWay"> <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payWayName">
<a-input v-model="model.payWay" placeholder="请输入支付方式"></a-input> <a-input v-model="model.payWayName" placeholder="请输入支付方式"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<script> <script>
import { getshareBenefitApi } from '@/api/api' import { getshareBenefitApi } from '@/api/api'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js' import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
const columns = [ const columns = [
{ {
...@@ -162,6 +162,7 @@ export default { ...@@ -162,6 +162,7 @@ export default {
async getPageDetail() { async getPageDetail() {
let { result } = await getshareBenefitApi({ id: this.$route.query.id }) let { result } = await getshareBenefitApi({ id: this.$route.query.id })
result.shareBenefit['orderSourceName'] = result.shareBenefit.orderSource === 'miniapp' ? '小程序' : 'pc' result.shareBenefit['orderSourceName'] = result.shareBenefit.orderSource === 'miniapp' ? '小程序' : 'pc'
result.shareBenefit['payWayName'] = filterDictTextByStatic(PAY_WAY, result.shareBenefit.payWay)
result.shareBenefit['reconciliationStatusName'] = filterDictTextByStatic(FENLICENTRAL_AUDIT_STATUS, result.shareBenefit.reconciliationStatus) result.shareBenefit['reconciliationStatusName'] = filterDictTextByStatic(FENLICENTRAL_AUDIT_STATUS, result.shareBenefit.reconciliationStatus)
this.model = {...result.shareBenefit} this.model = {...result.shareBenefit}
this.dataSource = [...result.list] this.dataSource = [...result.list]
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="状态"> <a-form-item label="状态">
<a-select style="width: 100%" v-model="queryParam.chargeTypeId" placeholder="请选择状态"> <a-select style="width: 100%" v-model="queryParam.reconciliationStatus" placeholder="请选择状态">
<a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option> <a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
...@@ -106,8 +106,8 @@ const columns = [ ...@@ -106,8 +106,8 @@ const columns = [
}, },
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'totalMoney', dataIndex: 'shareMoney',
key: 'totalMoney', key: 'shareMoney',
align: 'center', align: 'center',
}, },
{ {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="状态"> <a-form-item label="状态">
<a-select style="width: 100%" v-model="queryParam.chargeTypeId" placeholder="请选择状态"> <a-select style="width: 100%" v-model="queryParam.balanceStatus" placeholder="请选择状态">
<a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option> <a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论