1

api/mine/card.js

@@ -45,6 +45,7 @@ export function getQyListNoPage(data) {
   return request({
     'url': '/enterprise/listNoPage',
     'method': 'get',
+	'data':data,
   })
 }
 //营业执照信息-新增 enterprise:enterprise:add

api/mine/work.js

@@ -50,5 +50,14 @@ export function getApplicationNum(data) {
   return request({
     'url': '/application/getLoanApplicationNumber',
     'method': 'post',
+	'data':data
+  })
+}
+// 贷款进度-列表 system:schedule:list
+export function getScheduleList(data) {
+  return request({
+    'url': '/schedule/list',
+    'method': 'get',
+	'data':data
   })
 }

pages/index/index.vue

@@ -88,7 +88,7 @@
 					</view>
 					<view class="flexcj tabt pb12">
 						<view class="left" @click="getFace">待办提醒(<text>8</text>)</view>
-						<view class="right flexc">更多<image :src="rimg"></image></view>
+						<view class="right flexc" @click="getBusListFn(0)" v-if="checkPermi(['system:application:list'])">更多<image :src="rimg"></image></view>
 					</view>
 				</view>
 			</view>

pages/index/notice.vue

@@ -1,7 +1,26 @@
 <template>
-	<view class="notice" :style="'padding-top:' + height + 'rpx;'">
-		<view class="pfixed">
+	<view class="notice" :style="'padding-top:196rpx;'">
+		<view class="pfixed" style="background: transparent;">
 			<tab-list :tablist="tablist" :height="height" :tabidx="tabidx" @getCheck="getCheck"></tab-list>
+			<!-- 筛选条件 -->
+			<view class="flexc checkbox" :class="scroflag?'scbg':''">
+				<picker mode="date"    @change='bindDateChangea'>
+					<view class="chekt">
+						<view>{{sbsj|| "通知时间"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker>
+				<picker range-key='label' :value="shidx" :range="shlist"  @change='bindDateChangeb'>
+					<view class="chekt">
+						<view>{{shzt || "阅读状态"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker>
+				<view class="reset" @click="getResetFn">
+					<image :src="resetimg" ></image>
+					<!-- <image :src="wresetimg" v-else></image> -->
+				</view>
+			</view>
 		</view>
 		<view class="mt12">
 			<view class="cards">
@@ -41,9 +60,22 @@
 		components:{tabList},
 		data(){
 			return{
-				tablist:[{tit:'全部',val:0},{tit:'未读',val:1},{tit:'已读',val:2}],
+				tablist:[{tit:'系统通知',val:0},{tit:'待办通知',val:1}],
+				resetimg:require('@/work/static/images/reset.png'),
+				wresetimg:require('@/work/static/images/wreset.png'),
+				upimg:require('@/work/static/images/sup.png'),
 				tabidx:0,
-				height:100
+				height:100,
+				scroflag:false,
+			}
+		},
+		onPageScroll(e) {
+			var scrollTop = Number(e.scrollTop);
+			// var listTop=Number(this.listTop)-Number(this.nvaHeight)
+			if(scrollTop>2){
+				this.scroflag=true
+			}else{
+				this.scroflag=false
 			}
 		},
 		methods:{
@@ -56,6 +88,7 @@
 </script>
 
 <style lang="scss" scoped>
+.notice /deep/	uni-picker{flex: 1;}
 .cards{width: 702rpx;background: #FFFFFF;border-radius: 10rpx;margin: 0 auto 24rpx;
 	.top{padding: 26rpx 34rpx;
 		.cir{width: 20rpx;height: 20rpx;flex: 0 0 auto;margin-right: 20rpx;border-radius: 20rpx;
@@ -71,4 +104,14 @@
 	}
 
 }
+.checkbox{padding-top: 4rpx;
+	&.scbg{background-color: #FFFFFF;}
+	.chekt{display: flex;align-items: center;margin:0 20rpx;height:88rpx;
+		view{text-align: center;font-weight: bold;font-size: 26rpx;color: #374B61;flex:1;word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: normal;}
+		image{width: 16rpx;height: 12rpx;flex: 0 0 auto;margin-left: 4rpx;}
+	}
+}
+.reset{width:56rpx; height: 88rpx;display: flex;align-items: center;justify-content: center;flex: 1;
+	image{width: 26rpx;height: 30rpx;}
+}
 </style>

uni_modules/lsj-upload/components/lsj-upload/lsj-upload.vue

@@ -39,6 +39,9 @@ export default {
 		// 文件选择触发面高度
 		height: { type: String, default: '80rpx' },
 		fileName: { type: String, default: '' },
+		fileVal:{ type: [String,Number], default: '' },
+		bigType:{ type: [String,Number], default: '' },
+		fjidx:{ type: [String,Number], default: 0 },
 		
 		// top,left,bottom,right仅position=absolute时才需要传入
 		top: { type: [String, Number], default: '' },
@@ -146,6 +149,7 @@ export default {
 			this.onchange(this.lsjFile.files);
 		},
 		setData() {
+			console.log(2)
 			this.lsjFile&&this.lsjFile.setData(...arguments);
 		},
 		getDomStyles(callback) {
@@ -237,9 +241,12 @@ export default {
 		 */
 		onprogress(item,end=false) {
 			this.$emit('progress',item);
+			var fileVal=this.fileVal||'';
+			var bigType=this.bigType||'';
+			var fjidx=this.fjidx||0;
 			if (end) {
 				setTimeout(()=>{
-					this.$emit('uploadEnd',item);
+					this.$emit('uploadEnd',item,fileVal,bigType,fjidx);
 				},0);
 			}
 		},

utils/common.js

@@ -43,6 +43,16 @@ export function selectDictValue(datas, value) {
 	})
 	return actions.join('');
 }
+export function selectDictLabel(datas, value) {
+	var actions = [];
+	Object.keys(datas).some((key) => {
+		if (datas[key].dictLabel == ('' + value)) {
+			actions.push(datas[key].dictValue);
+			return true;
+		}
+	})
+	return actions.join('');
+}
 export function selectValueKey(datas, value) {
 	var actions = [];
 	var idx=0;

work/pages/business/details.vue

@@ -5,10 +5,13 @@
 			<view class="detop">
 				<!-- 归档 归档后没有业务进度-->
 				<image :src="gdicoimg" class="gdimg" v-if="gdflag"></image>
-				<view class="speed" v-else @click="getSpeedFn" :style="type=='ywjd'?'z-index: 6;':''">
-					<image :src="speedimg"></image>
-					<view>业务进度</view>
-				</view>
+				<block v-else>
+					<view class="speed" v-if="checkPermi(['system:schedule:list'])" @click="getSpeedFn" :style="type=='ywjd'?'z-index: 6;':''">
+						<image :src="speedimg"></image>
+						<view>业务进度</view>
+					</view>
+				</block>
+				
 				<view class="head">
 					<view class="top">
 						<view class="toptit">{{datainfo.enterpriseName}}</view>
@@ -171,7 +174,7 @@
 	import ewjcj from "@/work/components/business/ewjcj.vue"
 	import {uploadmore,selectValue} from '@/utils/common.js'
 	import {getDictionaryFn} from "@/api/mine/register.js"
-	import {getApplicationDet} from "@/api/mine/work.js"
+	import {getApplicationDet,getScheduleList} from "@/api/mine/work.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{aqyxx,bfrxx,cfdbrxx,dfjxx,ewjcj,popUp},
@@ -183,7 +186,7 @@
 				gdicoimg:require('@/work/static/images/gdico.png'),
 				tabval:0,
 				type:'',
-				tabList:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3},{tit:"文件出具",val:4},],
+				tabList:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3},{tit:"文件出具",val:4},{tit:"审核信息",val:5},],
 				stepList:[
 					{tit:"业务审核、分配",time:'2024-03-10 16:12',val:0},
 					{tit:"担保初审",time:'2024-03-10 16:12',val:1},

work/pages/business/limit.vue

@@ -80,6 +80,7 @@
 					usagePeriod:'2',//使用期限(月)
 					purposeFunds:'资金用途',//资金用途
 					repaymentSource:'还款来源',//还款来源
+					applicationType:'',//申请类型 1：企业 2：个人
 				},
 				sdyhidx:'',
 				syqxidx:'',
@@ -92,8 +93,9 @@
 				hklylist:[],//还款来源
 			}
 		},
-		onLoad() {
+		onLoad(e) {
 			this.init();
+			this.datainfo.applicationType=e.type;
 		},
 		methods:{
 			checkPermi, checkRole,

work/pages/business/talbclass.vue

@@ -32,12 +32,12 @@
 		data() {
 			return {
 				cateList: [
-					{label:'农、林、牧、渔业',id:0,children:[{label:'农业',id:10},{label:'林业',id:11},{label:'畜牧业',id:12},{label:'渔业',id:13},{label:'农、林、牧、渔专业及辅助 性活动',id:14},]},
-					{label:'1工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
-					{label:'2工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
-					{label:'3工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
-					{label:'4工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
-					{label:'5工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
+					// {label:'农、林、牧、渔业',id:0,children:[{label:'农业',id:10},{label:'林业',id:11},{label:'畜牧业',id:12},{label:'渔业',id:13},{label:'农、林、牧、渔专业及辅助 性活动',id:14},]},
+					// {label:'1工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
+					// {label:'2工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
+					// {label:'3工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
+					// {label:'4工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
+					// {label:'5工业',id:1,children:[{label:'采矿业',id:20},{label:'煤炭开采和洗选业',id:21},{label:'石油和天然气开采业',id:22},{label:'黑色金属矿采选业',id:23},{label:'有色金属矿采选业',id:24},]},
 					],
 				current: 0, //当前点击项
 				rectInfoList: [],

work/pages/prove/zctype.vue

@@ -3,12 +3,12 @@
 		<view class="flex1 zctop">
 			<view class="tit">请选择申报类型</view>
 			<view class="txt">申报前请先按下方的《皖源融资担保有限公司担保材料清单》提 前准备各项资料，以便减少您的操作次数。</view>
-			<view class="zclist" @click="getywFn">
+			<view class="zclist" @click="getywFn(2)">
 				<image :src="grimg" class="headimg"></image>
 				<view>个人用户申报</view>
 				<image :src="rimg" class="rimg"></image>
 			</view>
-			<view class="zclist">
+			<view class="zclist" @click="getywFn(1)">
 				<image :src="qyimg" class="headimg"></image>
 				<view>企业用户申报</view>
 				<image :src="rimg" class="rimg"></image>
@@ -36,8 +36,8 @@
 			getDbclFn(){
 				this.$tab.navigateTo("/work/pages/prove/dbcltips")
 			},
-			getywFn(){
-				this.$tab.navigateTo("/work/pages/business/limit")
+			getywFn(type){
+				this.$tab.navigateTo("/work/pages/business/limit?type="+type)
 			}
 		}
 	}