Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

api/person.js

@@ -7,8 +7,10 @@ let personInfo = {// 用户信息模块
 	person_getGroup:'/yishoudan/agency/getAgencyByAdminTel',// 根据管理员手机号查团队
 	person_addApply:'/yishoudan/agency/merge/add',// 申请合并
 	person_applyTrue:'/yishoudan/agency/merge/agree',// 通过
-	person_applyFalse:'/yishoudan/agency/reject',// 驳回
+	person_applyFalse:'/yishoudan/agency/merge/reject',// 驳回
 	person_applyNum:'/yishoudan/agency/merge/countApply',// 查询待处理数量
+	person_getCreatorTel:'/yishoudan/agency/getCreatorTel',// 获取创建人手机号
+	person_validateMsgCode:'/yishoudan/commons/validateMsgCode',// 校验短信
 }
 
 export default personInfo;

components/panel/formSlot.vue

@@ -72,7 +72,11 @@
 											<div class="g_flex_1 g_mr_16">
 												<u-input maxlength="4" type="number" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r" placeholder-style="color:#999;font-size:16px;" v-model="item.value" @input="(e) => handleCode(e, item, index)" />
 											</div>
-											<div class="btn-text g_flex_c g_flex_none" @click="handleSendMsg(item.tel, item.verifyTel)">
+											<div class="btn-text g_flex_c g_flex_none" @click="handleSendMsg(item.tel, item.verifyTel)"
+													 :style="{
+														 'background-color':msgCode.countdown >= 0 && msgCode.countdown < 60 ? '#dddddd' : '#00b666'
+													 }"
+											>
 												<button class="btn-con g_fs_14 g_c_9 g_flex_row_center" style="width: 100px">{{ msgCode.btnText }}</button>
 											</div>
 										</div>
@@ -251,7 +255,7 @@ export default {
 				// 短信倒计时
 				code: "",
 				btnText: "获取验证码", // 6s
-				countdown: 0,
+				countdown: -1,
 				timer: null,
 			},
 			nationData: {
@@ -452,7 +456,7 @@ export default {
 					type: "assistant",
 				},
 				(res) => {
-					that.msgCode.countdown = 60;
+					that.msgCode.countdown = 59;
 					that.msgCode.btnText = that.msgCode.countdown + "s";
 					clearInterval(that.msgCode.timer);
 					that.msgCode.timer = setInterval(() => {
@@ -741,7 +745,7 @@ export default {
 	}
 
 	.btn-text {
-		background-color: #ededed;
+		background-color: #00b666;
 		text-align: center;
 		border-radius: 126px;
 		.btn-con {
@@ -751,6 +755,7 @@ export default {
 			border-radius: 0;
 			height: 40rpx;
 			line-height: 40rpx;
+			color: #fff;
 		}
 	}
 }

pages/person/index.vue

@@ -22,11 +22,18 @@
 					</view>
 				</view>
 			</view>
-			<view class="g_flex_row_start flex_center g_mt_26 g_fs_16 g_c_8" hover-class="thover" @click="goPage('/root/person/info?active=1')">
+			<view class="g_flex_row_start flex_center g_mt_26 g_fs_16 g_c_8" 
+						hover-class="thover" @click="goPage('/root/person/info?active=1')"
+			>
 				<view class="">
 					{{ agencyInfo.agencyName || agencyInfo.fullName || "-" }}
 				</view>
+				<view style="position: relative;">
 					<i class="iconfont icon-gengduo11" style="line-height: 22px; font-size: 10px"></i>
+					<view class="" style="position: absolute;right: -10px;top: 0;color: #ff4400;font-size: 12px;" v-if="waitNus">
+						{{ waitNus }}
+					</view>
+				</view>
 			</view>
 		</view>
 		<view v-else @click="goPage" class="g_text_c g_pt_24 g_pb_24 g_c_f g_radius_8 g_bg_main g_ml_10 g_mr_10">
@@ -164,6 +171,7 @@ export default {
 	},
 	data() {
 		return {
+			waitNus:0,
 			agencyInfo: {},
 			addMemberShow: false,
 			scrollTop: 0,
@@ -335,13 +343,13 @@ export default {
 				this.getAuthInfo();
 				this.getData();
 				this.getNum();
+				this.getWait();
 				that.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 				that.agencyInfo = uni.getStorageSync("agencyInfo");
 				if (uni.getStorageSync("apply-userinfo").agencyStatus == 1) {
 					this.getCompanyInfo();
 				}
 			});
-
 			// that.userInfo = uni.getStorageSync("apply-userinfo");
 		} else {
 			that.waitNum_ups = 0;
@@ -362,6 +370,12 @@ export default {
 		}
 	},
 	methods: {
+		getWait(){
+			let that = this;
+			that.G.Get(that.api.person_applyNum,{},(res)=>{
+				that.waitNus = res;
+			})
+		},
 		setUserInfo() {
 			let that = this;
 			let defaultList = [

root/person/loginIndex.vue

@@ -406,5 +406,13 @@ export default {
 		border-radius: 48rpx;
 		opacity: 0;
 	}
+
+	.u-input__right-icon{
+		display: flex;
+		display: -webkit-flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		justify-content: center;
+	}
 }
 </style>

root/person/marge.vue

@@ -38,16 +38,22 @@
 					</view>
 					<view class="info-obj g_flex_1 g_flex_column_center" style="margin: 0 10px;">
 						<view class="g_ell_1 g_fs_16 g_fw_600">
-							{{item.targetAgency.agencyName}}
+							{{item.sourceAgency.agencyName}}
 						</view>
-						<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 8px;">
+						<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 4px;">
 							{{item.desp || '-'}}
 						</view>
 					</view>
 					<view class="status-obj g_flex_none g_flex_column_center" >
 						<view class="g_flex_row_end">
-							<g-button type='primary' size='mini' btnText='通过' @clickBtn='handleSet(item,1)'></g-button>
+							<g-button type='primary' size='mini' btnText='通过' @clickBtn='handleSet(item,1)'
-							<g-button type='delete' size='mini' btnText='拒绝' style="margin-left: 12px;" @clickBtn='handleSet(item,0)'></g-button>
+												v-if="item.state == 0"
+							></g-button>
+							<g-button type='delete' size='mini' btnText='拒绝' style="margin-left: 12px;" @clickBtn='handleSet(item,0)'
+												v-if="item.state == 0"
+							></g-button>
+							<view v-if="item.state == 1" style="color: green;font-size: 16px;">已通过</view>
+							<view v-if="item.state == 2" style="color: red;font-size: 16px;">已驳回</view>
 						</view>
 					</view>
 				</view>
@@ -84,7 +90,7 @@
 							<view class="g_ell_1 g_fs_16 g_fw_600">
 								{{item.targetAgency.agencyName}}
 							</view>
-							<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 8px;">
+							<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 4px;">
 								{{item.desp || '-'}}
 							</view>
 						</view>
@@ -157,6 +163,46 @@
 			</view>
 		</u-popup>
 		
+		<u-popup v-model="createData.isShow" mode="center" border-radius="14" width="80%" :closeable='true'>
+			<view style="max-height: calc(100vh - 200px);overflow-y: auto;">
+				<view class="g_flex_c g_h_60 g_fs_16">安全验证</view>
+				<view>
+					<view>
+						<view class="g_fs_14 g_mb_12" style="padding: 0 12px;">
+							<text class="g_fw_600">[申请合并]</text>属于高敏感权限，基于账户安全考虑，请验证创建人手机号:{{createData.telEncrypt}}
+						</view>
+						<g-panel-form-slot
+							:list="[
+								{
+									icon: '',
+									label: '验证码',
+									result: '',
+									path: '',
+									tip: 'slot-code',
+									value: createData.code,
+									tel: createData.tel,
+									type: 'slot',
+									placeholder: '输入验证码',
+									pColumn: 12,
+								},
+							]"
+							@changeCode="getCode"
+						>
+						</g-panel-form-slot>
+					</view>
+					<view class="g_flex_row_center g_p_16" style="padding-bottom: 0;">
+						<view class="g_flex_row_center" style="width: 50%;">
+							<g-button type='default' class="g_w_all" size='small' btnText='取消' @clickBtn='createData.isShow = false'></g-button>
+						</view>
+						<view class="g_flex_row_center" style="width: 50%;">
+							<g-button type='primary' size='small' btnText='确定' @clickBtn='submitValidate'></g-button>
+						</view>
+					</view>
+					<view class="g_h_20"></view>
+				</view>
+			</view>
+		</u-popup>
+		
 	</view>
 </template>
 
@@ -195,6 +241,12 @@ export default {
 			},
 			applysRecord:[],
 			recivesRecord:[],
+			createData:{
+				isShow:false,
+				code:'',
+				tel: "",
+				telEncrypt: ""
+			}
 		};
 	},
 	onShow() {
@@ -220,12 +272,21 @@ export default {
 		},
 		openApply(){
 			let that = this;
-			that.modalApplyData = {
+			if(that.applysRecord && that.applysRecord.length < 1){
+				that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
+					console.log('创建人手机号：',createRes)
+					that.createData = {
 						isShow:true,
-				tel:'',
+						code:'',
-				desp:'',
+						tel: createRes.tel,
-				resultList:[],
+						telEncrypt: createRes.telEncrypt
-				selectResult:''
+					};
+				})
+			}else{
+				uni.showToast({
+					icon:'none',
+					title:'只能有一个审核中的合并申请'
+				})
 			}
 		},
 		handleSearch(){
@@ -258,13 +319,13 @@ export default {
 				})
 				return false;
 			}
-			if(!that.modalApplyData.desp){
+			// if(!that.modalApplyData.desp){
-				uni.showToast({
+			// 	uni.showToast({
-					icon:'none',
+			// 		icon:'none',
-					title:'请输入备注'
+			// 		title:'请输入备注'
-				})
+			// 	})
-				return false;
+			// 	return false;
-			}
+			// }
 			that.G.Post(that.api.person_addApply,{
 				sourceAgencyId:uni.getStorageSync("apply-userinfo").agencyId,
 				targetAgencyId:that.modalApplyData.selectResult,
@@ -304,7 +365,7 @@ export default {
 						if(res.confirm){
 							that.G.Get(that.api.person_applyFalse + '/' + $data.id,{},()=>{
 								uni.showToast({
-									icon:'error',
+									icon:'success',
 									title:'已拒绝'
 								});
 								that.getList();
@@ -313,6 +374,41 @@ export default {
 					}
 				})
 			}
+		},
+		getCode(e) {
+			this.createData.code = e;
+			console.log(e);
+		},
+		submitValidate(){
+			let that = this;
+			if(!that.createData.code){
+				uni.showToast({
+					icon:'none',
+					title:'请输入验证码'
+				})
+				return false;
+			}
+			that.G.Post(that.api.person_validateMsgCode,{
+				tel: that.createData.tel,
+				code: that.createData.code,
+			},(res)=>{
+				console.log('res',res)
+				that.createData = {
+					isShow:false,
+					code:'',
+					tel: '',
+					telEncrypt: ''
+				};
+				that.modalApplyData = {
+					isShow:true,
+					tel:'',
+					desp:'',
+					resultList:[],
+					selectResult:''
+				}
+			},(err)=>{
+				console.log('err',err)
+			})
 		}
 	},
 };