Merge branch 'dev' into build

# Conflicts:
#	project/oms/apps/develop/AppDeployCustom/add.vue
This commit is contained in:
aixianling
2022-08-23 15:20:21 +08:00
5 changed files with 23 additions and 33 deletions

View File

@@ -77,9 +77,18 @@
</el-row>
</template>
<template v-else-if="form.type=='web'">
<el-form-item label="接口是否单服务">
<el-checkbox v-model="form.isSingleService"/>
</el-form-item>
<el-row type="flex">
<div class="fill">
<el-form-item label="接口是否单服务">
<el-checkbox v-model="form.isSingleService"/>
</el-form-item>
</div>
<div class="fill">
<el-form-item label="开启百度流量">
<el-checkbox v-model="form.hmt"/>
</el-form-item>
</div>
</el-row>
</template>
</template>
</ai-card>

View File

@@ -79,7 +79,7 @@ export default {
},
data() {
return {
search: {productName: ""},
search: {productName: "", queryType: 0},
page: {current: 1, size: 10, total: 0},
tableData: [],
colConfigs: [
@@ -104,7 +104,7 @@ export default {
}).then(res => {
if (res?.data) {
this.tableData = res.data?.records.map(e => {
let guaranteeModeLabel = e.guaranteeMode.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
let guaranteeModeLabel = e.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
return {...e, guaranteeModeLabel}
})
this.page.total = res.data.total

View File

@@ -22,9 +22,6 @@
maxlength="11"/>
</el-form-item>
</el-row>
<el-form-item label="企业微信二维码" prop="qrCodeUrl">
<ai-uploader v-model="form.qrCodeUrl" :instance="instance" :limit="1" isShowTip valueIsUrl/>
</el-form-item>
</template>
</ai-card>
<ai-card title="适用范围">
@@ -41,16 +38,6 @@
</el-form-item>
</template>
</ai-card>
<ai-card title="办理渠道">
<template #content>
<el-form-item label="业务办理渠道" prop="handlingChannels">
<ai-select v-model="form.handlingChannels" :selectList="dict.getDict('financialProductChannels')" @change="form.zwspId=null"/>
</el-form-item>
<el-form-item v-if="form.handlingChannels==1" label="关联贷款联审" prop="zwspId">
<ai-select v-model="form.zwspId" :instance="instance" action="/approval-process-def/list?processDefStatus=1" :prop="{label:'processName'}"/>
</el-form-item>
</template>
</ai-card>
</el-form>
</template>
<template #footer>
@@ -71,7 +58,7 @@ export default {
},
computed: {
addTitle() {
return !!this.$route.query.id ? "编辑金融产品" : "添加金融产品"
return !!this.$route.query.id ? "编辑担保产品" : "添加担保产品"
},
rules() {
return {
@@ -96,8 +83,8 @@ export default {
productFeatures: [{required: true, message: "请输入产品特色", trigger: 'blur'}],
handlingChannels: [{required: true, message: "请选择办理渠道"}],
zwspId: [{required: true, message: "请选择关联贷款联审"}],
// bankCounterpart: [{required: true, message: "请输入客户经理姓名", trigger: 'change'}],
// consultationTelephone: [ {required: true, message: "请输入客户经理电话", trigger: 'change'}],
bankCounterpart: [{required: true, message: "请输入客户经理", trigger: 'change'}],
consultationTelephone: [{required: true, message: "请输入联系方式", trigger: 'change'}],
}
}
},

View File

@@ -1,7 +1,7 @@
<template>
<section class="productDetail">
<ai-detail>
<ai-title slot="title" title="金融产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
<ai-title slot="title" title="担保产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
<template #rightBtn>
<el-button v-if="isAdmin&&detail.status==0" type="primary" @click="dialog=true">审核</el-button>
</template>
@@ -19,9 +19,6 @@
<el-form-item label="客户经理" class="half">{{ detail.bankCounterpart }}</el-form-item>
<el-form-item label="联系方式" class="half">{{ detail.consultationTelephone }}</el-form-item>
</el-row>
<el-form-item label="企业微信二维码" v-if="detail.qrCodeUrl">
<el-image class="qrCode" :src="detail.qrCodeUrl" :preview-src-list="[detail.qrCodeUrl]"/>
</el-form-item>
</template>
</ai-card>
<ai-card title="适用范围">
@@ -30,12 +27,6 @@
<el-form-item label="面向对象">{{ detail.faceUserLabel }}</el-form-item>
</template>
</ai-card>
<ai-card title="办理渠道">
<template #content>
<el-form-item label="业务办理渠道">{{ dict.getLabel('financialProductChannels', detail.handlingChannels) }}</el-form-item>
<el-form-item label="关联贷款联审" v-if="detail.handlingChannels==1">{{ detail.zwspName }}</el-form-item>
</template>
</ai-card>
<ai-card title="审核结果" v-if="!isAuthing">
<template #content>
<el-row type="flex" class="flexWrap">

View File

@@ -12,7 +12,7 @@
<div class="col-row">
<div class="item" v-for="(v,label) in overviews" :key="label">
<p v-text="label"/>
<h2 v-text="v"/>
<h2 v-text="formatValue(v)"/>
</div>
</div>
<div class="chart-flex">
@@ -178,7 +178,7 @@ export default {
data() {
return {
search: {},
overviews: [],
overviews: {},
productTop10: [],
tradeTrend: [],
applyInfo: {}
@@ -227,6 +227,9 @@ export default {
}
})
},
formatValue(v) {
return typeof v == "number" ? (v?.toFixed(1) || v) : v
}
},
created() {
this.getStaData()