hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-10 04:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

申请列表--已审批跳转可以详情后反显审批结果和审批信息

Browse Source
This commit is contained in:
liyuetong
2021-09-18 16:29:00 +08:00
committed by zhangqi1
parent 69da12fac8
commit ecc3aa013e
16 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ebiz/allowance/application/IndexBar.vue
View File

@@ -23,7 +23,7 @@
</div>
</template>
<script>
import { Icon, Image as VanImage } from 'vant'
import { Icon, Image } from 'vant'
export default {
name: 'IndexBar',
@@ -54,7 +54,7 @@ export default {
},
components: {
[Icon.name]: Icon,
[VanImage.name]: VanImage
[Image.name]: Image
},
data() {
return {

4
src/components/ebiz/allowance/myInfo/IndexBar.vue
View File

@@ -23,7 +23,7 @@
</div>
</template>
<script>
import { Icon, Image as VanImage } from 'vant'
import { Icon, Image } from 'vant'
export default {
name: 'IndexBar',
@@ -54,7 +54,7 @@ export default {
},
components: {
[Icon.name]: Icon,
[VanImage.name]: VanImage
[Image.name]: Image
},
data() {
return {

4
src/components/ebiz/insureAgain/ProgressBar.vue
View File

@@ -22,12 +22,12 @@
</template>
<script>
import { Image as VanImage } from 'vant'
import { Image } from 'vant'
import CacheUtils from '@/assets/js/utils/cacheUtils'
export default {
name: 'ProgressBar',
components: {
[VanImage.name]: VanImage
[Image.name]: Image
},
props: {
active: {

3
src/components/ebiz/parentList/Parent.vue
View File

@@ -15,7 +15,7 @@
</div>
<div v-else class='text-center'>
<img class='mt40 w200' src='../../../assets/images/pic_page-non.png' />
<p class='mt15'>暂无数据</p>
<p class='mt15'>{{ locationHashFlag !== -1 ? '暂无数据':'暂无数据，请在我的资料或申请流程中添加父母信息' }}</p>
</div>
</van-index-bar>
@@ -34,7 +34,6 @@
import { getAllowanceBaseList, check } from '@/api/ebiz/parentList/parentList'
import { getAllowanceBaseDetail } from '@/api/ebiz/allowance/myInfo'
import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
import utils from '@/assets/js/business-common'
import { IndexBar, IndexAnchor, Tag, Icon, Dialog } from 'vant'
export default {

4
src/components/ebiz/sale/IndexBar.vue
View File

@@ -22,7 +22,7 @@
</div>
</template>
<script>
import { Icon, Image as VanImage } from 'vant'
import { Icon, Image } from 'vant'
export default {
name: 'IndexBar',
props: {
@@ -46,7 +46,7 @@ export default {
},
components: {
[Icon.name]: Icon,
[VanImage.name]: VanImage
[Image.name]: Image
},
data() {
return {

12
src/views/ebiz/allowance/Detail.vue
View File

@@ -1,5 +1,5 @@
<template>
<div :class="['orderDetail-container', 'bg-white', type == '1' ? 'pb50' : 'pb30']">
<div :class="['orderDetail-container', 'bg-white', (type == '1'||type == '2') ? 'pb50' : 'pb30']">
<van-collapse v-model="activeNames">
<!-- 基本信息 开始 -->
<van-collapse-item class="main-title" name="baseInfo">
@@ -111,12 +111,12 @@
</van-collapse-item>
<!-- 签名信息 结束 -->
<!-- 审批结论 开始 -->
<van-collapse-item class="main-title bg-white" name="signInfo" v-if="type == '1'">
<van-collapse-item class="main-title bg-white" name="signInfo" v-if="type == '1'||type == '2'">
<template slot="title">
<span>审批结论</span>
</template>
<div class="ml15 mt20 mb10">
<van-radio-group v-model="approveResult">
<van-radio-group v-model="approveResult" :disabled="type == '2'">
<van-radio class="mb10" name="1" checked-color="#2E4591">通过</van-radio>
<van-radio name="0" checked-color="#2E4591">驳回</van-radio>
</van-radio-group>
@@ -126,6 +126,7 @@
v-if="approveResult == '0'"
v-model="approveMsg"
rows="2"
:disabled="type == '2'"
autosize
label=""
type="textarea"
@@ -172,7 +173,7 @@ export default {
colorButton: '#2E4591', //select-radio中按钮颜色
typeButton: 'default',
allowanceNo: this.$route.query.allowanceNo, //数据流水号
type: this.$route.query.type, //type 0申请详情 1审批详情
type: this.$route.query.type, //type 0申请详情 1去审批 2审批详情
areaList,
areaStr: '',
border: true,
@@ -184,6 +185,7 @@ export default {
mediaDTOSList: [], //影像信息--证件类型
allowanceBankDTO: {},
allowanceSignDTOLst: [],
approveNodeDTO: {}, //审批相关信息
activeNames: ['baseInfo', 'accountInfo', 'MediaInfo', 'signInfo'],
sexRadio: [
{
@@ -246,6 +248,8 @@ export default {
this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst
this.allowanceBankDTO = allowanceDTO.allowanceBankDTO //银行卡相关信息
this.allowanceSignDTOLst = allowanceDTO.allowanceSignDTOLst //签字相关信息
this.approveResult = allowanceDTO.approveNodeDTO.approveResult, //审批结果 (0-审批拒绝,1-审批通过)
this.approveMsg = allowanceDTO.approveNodeDTO.approveMsg, //审批信息
this.showbackBankAddressStr(this.allowanceBankDTO.bankProvinceCode, this.allowanceBankDTO.bankAreaCode) // provinceCode, cityCode查询省市，数据反显
//处理影像中的关系证明
if (this.mediaUploadDTOLst != null) {

14
src/views/ebiz/allowance/application/List.vue
View File

@@ -14,7 +14,7 @@
<div class="flex justify-content-s align-items-c">
<div>
<div class="w70 inline-b">
<van-tag plain color="#5CA7DE">申请人</van-tag>
<van-tag plain color="#2e4591">申请人</van-tag>
</div>
<span class="fs15 c-gray-dark">{{ order.name }}</span>
</div>
@@ -24,7 +24,7 @@
<div class="w70 inline-b">
<van-tag
plain
color="#5CA7DE
color="#2e4591
"
>申请时间</van-tag
>
@@ -113,12 +113,11 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/allowance/application/BaseInfo?type=add&parentShowPicker=true'
url: location.origin + '/#/allowance/myInfo/BaseInfo?parentShowPicker=true'
},
routerInfo: {
path: '/allowance/application/BaseInfo',
path: '/allowance/myInfo/BaseInfo',
query: {
type: 'add',
parentShowPicker: true
}
}
@@ -307,12 +306,11 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/allowance/application/BaseInfo?type=add&parentShowPicker=true'
url: location.origin + '/#/allowance/myInfo/BaseInfo?parentShowPicker=true'
},
routerInfo: {
path: '/allowance/application/BaseInfo',
path: '/allowance/myInfo/BaseInfo',
query: {
type: 'add',
parentShowPicker: true
}
}

6
src/views/ebiz/allowance/application/process.vue
View File

@@ -2,7 +2,7 @@
<div class="entry-container pt60 pb30 bg-white">
<div class="ml130 w200 nowrap flex align-items-c text-center">
<div class="w110 inline-b text-center">
提交申请<br /><span class="grey">{{ approveMapping[0].createdDate }}</span>
提交申请<br /><span class="grey"></span>
</div>
<van-tag class="w45" color="green" plain style="margin-top: -14px">已完成</van-tag>
</div>
@@ -133,7 +133,9 @@ export default {
Dialog.confirm({
className: 'dialog-check',
title: '*驳回原因',
message: approveMsg
message: approveMsg,
confirmButtonText:'去修改',
cancelButtonText:'关闭'
// cancelButtonColor: '#E9332E',
// confirmButtonColor: '#FFFFFF'
})

14
src/views/ebiz/allowance/approval/List.vue
View File

@@ -18,7 +18,7 @@
<div class="flex justify-content-s align-items-c">
<div>
<div class="w70 inline-b">
<van-tag plain color="#5CA7DE">申请人</van-tag>
<van-tag plain color="#2e4591">申请人</van-tag>
</div>
<span class="fs15 c-gray-dark">{{ order.name }}</span>
</div>
@@ -28,7 +28,7 @@
<div class="w70 inline-b">
<van-tag
plain
color="#5CA7DE
color="#2e4591
"
>申请时间</van-tag
>
@@ -55,12 +55,12 @@
> 
</div>
<div class="bottom-btn bg-white pt10 pb10 flex justify-content-s" style="border-top: 1px solid #dadada" v-if="active == 'uncommit'">
<div class="bottom-btn bg-white flex justify-content-s" style="border-top: 1px solid #2e4591" v-if="active == 'uncommit'">
<div>
<van-checkbox class="ml10" v-model="checkedAll" checked-color="#2e4591" @click="checkAll">全选</van-checkbox>
<van-checkbox class="ml10 mt15" v-model="checkedAll" checked-color="#2e4591" @click="checkAll">全选</van-checkbox>
</div>
<div>
<van-button class="ffcb6b" type="danger" round size="small" @click="passHandle" v-no-more-click="1000">审批通过</van-button>
<van-button class="ffcb6b pl10 pr10" type="danger" size="large" @click="passHandle" v-no-more-click="1000">审批通过</van-button>
</div>
</div>
</div>
@@ -163,13 +163,13 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + `/#/allowance/detail?allowanceNo=${order.allowanceNo}&type=0`
url: location.origin + `/#/allowance/detail?allowanceNo=${order.allowanceNo}&type=2`
},
routerInfo: {
path: '/allowance/detail',
query: {
allowanceNo: order.allowanceNo,
type: '0'
type: '2'
}
}
})

0
src/views/ebiz/allowance/myInfo/SignatureConfirmation.vue
View File

4
src/views/ebiz/common/SelectedProduct.vue
View File

@@ -116,7 +116,7 @@
</div>
</template>
<script>
import { Tag, SubmitBar, Icon, Dialog, RadioGroup, Radio, Image as VanImage } from 'vant'
import { Tag, SubmitBar, Icon, Dialog, RadioGroup, Radio, Image } from 'vant'
import FieldPicker from '@/components/ebiz/FieldPicker'
import { orderDetail, deleteOrderInfo } from '@/api/ebiz/common/common'
import { formatAllRisk } from '@/assets/js/utils/formatRiskList'
@@ -155,7 +155,7 @@ export default {
[IndexBar.name]: IndexBar,
[RadioGroup.name]: RadioGroup,
[Radio.name]: Radio,
[VanImage.name]: VanImage
[Image.name]: Image
},
mounted() {
if (localStorage.isFrom == 'sale') {

4
src/views/ebiz/goodStart/GoodStartScheme.vue
View File

@@ -11,7 +11,7 @@
</template>
<script>
import { Grid, GridItem, Image as VanImage, ImagePreview, Pagination } from 'vant'
import { Grid, GridItem, Image, ImagePreview, Pagination } from 'vant'
import { getSchemePics } from '@/api/ebiz/goodStart'
import Vue from 'vue'
@@ -21,7 +21,7 @@ export default {
components: {
[Grid.name]: Grid,
[GridItem.name]: GridItem,
[VanImage.name]: VanImage,
[Image.name]: Image,
[Pagination.name]: Pagination
},
data() {

4
src/views/ebiz/my/UserWxHead.vue
View File

@@ -29,13 +29,13 @@
</template>
<script>
import { Image as VanImage, Lazyload, Grid, GridItem } from 'vant'
import { Image, Lazyload, Grid, GridItem } from 'vant'
import { createWXHeadImg, getWXHeadImgConfig } from '@/api/ebiz/my/my.js'
import config from '@/config'
export default {
components: {
[VanImage.name]: VanImage,
[Image.name]: Image,
[Grid.name]: Grid,
[GridItem.name]: GridItem,
[Lazyload.name]: Lazyload

4
src/views/ebiz/my/UserWxHead2.vue
View File

@@ -43,13 +43,13 @@
</template>
<script>
import { Image as VanImage, Lazyload, Grid, GridItem, Loading } from 'vant'
import { Image, Lazyload, Grid, GridItem, Loading } from 'vant'
import { createWXHeadImg, getWXHeadImgConfig } from '@/api/ebiz/my/my.js'
import config from '@/config'
export default {
components: {
[VanImage.name]: VanImage,
[Image.name]: Image,
[Grid.name]: Grid,
[GridItem.name]: GridItem,
[Lazyload.name]: Lazyload,

4
src/views/ebiz/product-store/StoreDetail.vue
View File

@@ -74,7 +74,7 @@
</template>
<script>
import { NoticeBar, Field, Radio, Popup, RadioGroup, Toast, Grid, GridItem, Image as VanImage, ImagePreview } from 'vant'
import { NoticeBar, Field, Radio, Popup, RadioGroup, Toast, Grid, GridItem, Image, ImagePreview } from 'vant'
import icon from '@/assets/images/jilu@3x.png'
import { getShopList, saveShareTrack } from '@/api/ebiz/product-store/product-store'
@@ -88,7 +88,7 @@ export default {
[Field.name]: Field,
[Grid.name]: Grid,
[GridItem.name]: GridItem,
[VanImage.name]: VanImage,
[Image.name]: Image,
[ImagePreview.name]: ImagePreview
},
props: {

4
src/views/ebiz/train/TrainLoading.vue
View File

@@ -7,13 +7,13 @@
</template>
<script>
import { Image as VanImage, Lazyload, Grid, GridItem, Toast } from 'vant'
import { Image, Lazyload, Grid, GridItem, Toast } from 'vant'
import { trainHomeUrl } from '@/api/ebiz/train/train.js'
export default {
components: {
[Toast.name]: Toast,
[VanImage.name]: VanImage,
[Image.name]: Image,
[Grid.name]: Grid,
[GridItem.name]: GridItem,
[Lazyload.name]: Lazyload