From c56e67c77e2a36c894346830c1ab1e6df36fe935 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 01 十二月 2023 16:55:02 +0800
Subject: [PATCH] 测试bug调整
---
pages/new-application/new-application.vue | 130 ++++++++++++++++++++++++++++++-------------
1 files changed, 90 insertions(+), 40 deletions(-)
diff --git a/pages/new-application/new-application.vue b/pages/new-application/new-application.vue
index f4d7ca8..cf51a50 100644
--- a/pages/new-application/new-application.vue
+++ b/pages/new-application/new-application.vue
@@ -2,27 +2,49 @@
<!-- 鏂板鐢宠 -->
<view class="new-application">
<!-- 鎼滅储鍖哄煙 -->
- <view class="searchBox">
+ <!-- <view class="searchBox">
<view class="search">
<u-search @clickIcon="searchIconClick" :clearabled="false" :showAction="false" placeholder="璇疯緭鍏ユ爣棰�" v-model="searchData" shape="square"></u-search>
</view>
- <!-- 鐘舵�侀�夋嫨鍣� -->
<view class="data-selet" @click="statusSeletShow = true">
<view class="content">
<text>{{ dataSeletText }}</text>
</view>
<view class="uni-select__icon"><image src="@/static/icon/select.png" mode="鍔犺浇澶辫触"></image></view>
</view>
- </view>
-
+ </view> -->
+ <combined-title title="鐢宠妯℃澘"></combined-title>
<!-- 鍗＄墖鍖哄煙 -->
- <view class="newApplicationCard" @click="toNewApplicationDetails" v-for="(item,index) in newApplicationData" :key="index">
- <view class="card" >
+ <template v-if="permissions.yunxiao_xswaybill_add">
+ <view
+ class="newApplicationCard"
+ @click="toNewApplicationDetails"
+ v-for="(item, index) in newApplicationData" :key="index">
+ <view class="card">
+ <view class="card-left">
+ <view class="card-left_top">
+ <text>{{ item.description }}</text>
+ </view>
+ <view class="card-left_bottom">
+ <text>鐗堟湰锛歷{{ item.version }}</text>
+ <text>鎵�灞炲垎绫伙細{{ item.categoryTitle|| '' }}</text>
+ </view>
+ </view>
+ <view class="card-right">
+ <view class="icon"><image src="@/static/groupAppTotalImg/back_1.png" mode=""></image></view>
+ </view>
+ </view>
+ </view>
+ </template>
+
+ <view
+ v-if="permissions.yunxiao_gatheringbill_add"
+ class="newApplicationCard shoukuanDetailCard"
+ @click="ToPaymentForm">
+ <view class="card">
<view class="card-left">
- <view class="card-left_top"><text>{{item.description}}</text></view>
<view class="card-left_bottom">
- <text>鐗堟湰锛歷{{item.version}}</text>
- <text>鎵�灞炲垎绫伙細{{item.categoryTitle}}</text>
+ <text>鏂板鏀舵</text>
</view>
</view>
<view class="card-right">
@@ -30,10 +52,11 @@
</view>
</view>
</view>
-
+
+
<!-- 閫夋嫨鍣� -->
<u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker>
-
+
<!-- 鑿滃崟鏍� -->
<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
</view>
@@ -41,7 +64,13 @@
<script>
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+import combinedTitle from '@/components/common/combined-title/combined-title.vue';
+import {mapGetters} from 'vuex'
export default {
+ name: 'new-application',
+ computed:{
+ ...mapGetters(['permissions']),
+ },
data() {
return {
searchData: '',
@@ -49,53 +78,56 @@
// 閫夋嫨鍣�
statusSeletShow: false,
statusList: [['涓浗', '缇庡浗', '鏃ユ湰']],
- menuShow:false,
- updateData:{
- showLatest:true,
- filter:true,
- status:1,
- pageNumber:1,
- pageSize:10,
- sort:"createTime",
- order:"desc"
+ menuShow: false,
+ updateData: {
+ showLatest: true,
+ filter: true,
+ status: 1,
+ pageNumber: 1,
+ pageSize: 10,
+ sort: 'createTime',
+ order: 'desc'
},
- newApplicationData:[]
+ newApplicationData: []
};
},
- onShow(){
- if(this.menuShow == true){
- this.$refs.menuRef.menuClick()
+ onShow() {
+ if (this.menuShow == true) {
+ this.$refs.menuRef.menuClick();
}
this.init();
},
- getCurrentPages(e){
- console.log(e);
+ getCurrentPages(e) {
},
// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
onNavigationBarButtonTap(e) {
// console.log(e);
- this.$refs.menuRef.menuClick()
+ this.$refs.menuRef.menuClick();
},
- components:{
- popupMenu
+ components: {
+ popupMenu,
+ combinedTitle
},
methods: {
- init(){
+ init() {
this.newApplicationData = [];
- this.$reqGet('getNewProcessDataList',this.updateData).then(res=>{
- if(res.code === 0){
- res.data.records.forEach(item=>{
- if(item.id=="WAY_BILL:4:87504"){
+ uni.showLoading({
+ title:'鍔犺浇涓�...'
+ })
+ this.$reqGet('getNewProcessDataList', this.updateData).then(res => {
+ uni.hideLoading();
+ if (res.code === 0) {
+ res.data.records.forEach(item => {
+ if (item.name == '鍙戣繍閫氱煡鍗�'||item.description == '鍙戣繍閫氱煡鍗�') {
this.newApplicationData.push(item);
}
- })
-
- console.log("鏂板",res);
+ });
+ console.log('鏂板', res);
}
- })
+ });
},
- menushow(e){
- this.menuShow = e
+ menushow(e) {
+ this.menuShow = e;
},
// 鎼滅储
searchIconClick() {
@@ -106,6 +138,12 @@
uni.navigateTo({
url: '/pages/new-application-form-data/new-application-form-data'
});
+ },
+ //鏂板鏀舵鏄庣粏
+ ToPaymentForm() {
+ uni.navigateTo({
+ url:'/pages/payment-form-data/payment-form-data'
+ })
}
}
};
@@ -202,5 +240,17 @@
}
}
}
+ .shoukuanDetailCard{
+ .card{
+ height: auto;
+ .card-left_bottom {
+ font-size: vww(13);
+ margin: vww(12) 0;
+ text {
+ margin-right: vww(16);
+ }
+ }
+ }
+ }
}
</style>
--
Gitblit v1.9.1