jsk

common/api.js

@@ -301,6 +301,19 @@ module.exports = {
 	
 	
 	addCard:"greenCard/addCard",//添加申请
+	addCardData:"greenNewCard/addCardData",//添加申请
+	getAuditCheckUser:"greenNewCard/getAuditCheckUser",//职工卡-获取审核人列表 
+	getAuditCheckUser2:"greenNewCard/getAuditCheckUser2",//第三方人员/VIP贵宾/临时出入证/施工出入证-根据选择的部门获取获取审核人 
+	getDetailInfo:"greenNewCard/getDetailInfo",//获取门禁记录及详情
+	getDeptList:"greenNewCard/getDeptList",//获取门禁部门接口
+	getUserInfoByDept:"greenNewCard/getUserInfoByDept",//获取部门下人员
+	getDictByType:"greenNewCard/getDictByType",//根据类型查询字段
+	getAuditData:"greenNewCard/getAuditData",
+	getCardList:"greenNewCard/getCardList",
+	getHistoryPros:"greenNewCard/getHistoryPros",
+	auditData:"greenNewCard/auditData",
+	updateCardStatus:"greenNewCard/updateCardStatus",
+	
 	getCard:"greenCard/getCard",//获取详情
 	updateCard:"greenCard/updateCard",//添加申请
 	getCardByUserId:"greenCard/getCardByUserId",//添加申请

pages/access-card/access-card.vue

@@ -138,7 +138,7 @@
 									<view class="ipt-box select">
 										<image class="arrow" src="/static/icons/right-arrow.png" mode=""></image>
 										<picker class="picker" v-if="examList.length > 0" :range="examList" @change="changeExamList"
-											range-key="name">
+											range-key="userName">
 											<view>{{ examList[examIndex].userName }}</view>
 										</picker>
 									</view>
@@ -719,15 +719,14 @@
 						<image src="/static/img/cardIcon.png" mode="" style="width: 35upx;height: 40upx;margin-left: 20upx;vertical-align: middle;"></image>
 						<text class="font-tilte">{{item.typeName}}申请</text>
 						<text v-if="item.examineState ==0" class="statusred" style="color: #ff9000;background-color: #FFEFE3;">
-							<text v-if="!item.examineState">待审核</text>
+							<text v-if="item.examineState==0">待审核</text>
-							<text v-if="item.examineState==0">审核中</text>
+							<text v-if="item.examineState!=0">审核中</text>
-							<text v-if="item.examineState==1">待制作</text>
 						</text>
-						<text v-if="item.examineBatch ==2" class="statusred" style="color: #BD1515;background-color: #F6DFDF;">已拒绝</text>
+						<text v-if="item.examineState ==2" class="statusred" style="color: #BD1515;background-color: #F6DFDF;">已拒绝</text>
-						<text v-if="item.examineBatch ==1" class="statusred" style="color: #0DB0A7;background-color: #C1EFEA;">
+						<text v-if="item.examineState ==1" class="statusred" style="color: #0DB0A7;background-color: #C1EFEA;">
-							<text v-if="item.examineBatch==2">待领取</text>
+							<text v-if="item.cardStatus==1">待制作</text>
-							<text v-if="item.examineBatch==3">已领取</text>
+							<text v-if="item.cardStatus==2">待领取</text>
-							<text v-if="item.examineBatch==4">已挂失</text>
+							<text v-if="item.cardStatus==3">已领取</text>
 						</text>
 					</view>
 
@@ -738,7 +737,7 @@
 						</view>
 						<view class="info-item">
 							<text>门卡类型：</text>
-							<text class="infoSpan">{{item.cardType}}</text>
+							<text class="infoSpan">{{item.carType}}</text>
 						</view>
 						<view class="info-item">
 							<text>申请人：</text>
@@ -1298,6 +1297,7 @@
 					if (res.returnCode == 1) {
 						if (res.returnData.length > 0) {
 							this.unitUserList = res.returnData;
+							this.handlerPhone=this.unitUserList[this.unitUserIndex].phone;
 						} else {
 							this.unitUserList = []
 						}
@@ -1310,6 +1310,7 @@
 			changeUserUnit(e) {
 				console.log(e)
 				this.unitUserIndex = e.detail.value;
+				this.handlerPhone=this.unitUserList[this.unitUserIndex].phone;
 			},
 			//新办卡-第三方-选择申请类别
 			changeApplyType(e) {
@@ -1399,6 +1400,7 @@
 					if (res.returnCode == 1) {
 						if (res.returnData.length > 0) {
 							this.unitUserList2 = res.returnData;
+							this.handlerPhone2=this.unitUserList2[this.unitUserIndex2].phone;
 						} else {
 							this.unitUserList2 = []
 						}
@@ -1411,6 +1413,7 @@
 			changeUserUnit2(e) {
 				console.log(e)
 				this.unitUserIndex2 = e.detail.value;
+				this.handlerPhone2=this.unitUserList2[this.unitUserIndex2].phone;
 			},
 			getDeptExamineAuth2() {
 				let params = {
@@ -1619,6 +1622,7 @@
 					if (res.returnCode == 1) {
 						if (res.returnData.length > 0) {
 							this.unitUserList4 = res.returnData;
+							this.handlerPhone4=this.unitUserList4[this.unitUserIndex4].phone;
 						} else {
 							this.unitUserList4 = []
 						}
@@ -1629,8 +1633,8 @@
 			},
 			//新办卡-施工出入证-经办部门负责人
 			changeUserUnit4(e) {
-				console.log(e)
 				this.unitUserIndex4 = e.detail.value;
+				this.handlerPhone4=this.unitUserList4[this.unitUserIndex4].phone;
 			},
 			//获取新办证-施工出入证-项目归口部门负责人
 			getDeptExamineAuth4() {

pages/access-card/card-record-detail.vue

@@ -149,7 +149,11 @@
 								<view class="ipt-box"><uni-datetime-picker :clear-icon="false" v-model="realBackDate"
 										type="date" :border="false"/></view>
 							</view>
-							<view class="form-item" v-if="item.operType==2">
+							<view class="form-item" v-if="item.operType==2 && item.remark!=null">
+								<text class="label">备注:</text>
+								<text class="infoSpan">{{item.remark}}</text>
+							</view>
+							<view class="form-item" v-if="item.operType==2 && item.remark==null">
 								<text class="label">备注<text style="color: red;">*</text>:</text>
 								<view class="ipt-box"><input class="top-t" v-model="remarks" placeholder="请输入" type="text"
 									maxlength="50" /></view>