bonus
/
hz-zhhq-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk 问题修改

This commit is contained in:
skjia 2025-03-14 09:08:40 +08:00
parent 539fd6d2b8
commit 496f1c8107
4 changed files with 145 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pages/access-card/access-card-detail.vue
View File

@ -45,10 +45,10 @@
<br/>
<image class="info-item" v-for="(item, index) in people.idPhoto.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
<view class="info-item" v-if="people.photo!='null'">
<view class="info-item" v-if="people.photo">
<text class="label">身份证图片： </text>
<br/>
<image v-if="item!=''" class="info-item" v-for="(item, index) in people.photo.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
<image class="info-item" v-for="(item, index) in people.photo.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
</view>
</view>
@ -102,13 +102,13 @@
<br/>
<image class="info-item" v-for="(item, index) in item.userInfoVos[0].idPhoto.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
<view class="info-item" v-if="item.userInfoVos[0].photo!='null'">
<view class="info-item" v-if="item.userInfoVos[0].photo">
<text class="label">身份证图片： </text>
<br/>
<image v-if="item!=''" class="info-item" v-for="(item, index) in item.userInfoVos[0].photo.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
<view class="info-item" v-if="item.userInfoVos[0].documentation!='null'">
<text class="label">身份证图片： </text>
<view class="info-item" v-if="item.userInfoVos[0].documentation">
<text class="label">附件： </text>
<br/>
<image v-if="item!=''" class="info-item" v-for="(item, index) in item.userInfoVos[0].documentation.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
@ -145,7 +145,7 @@
<text class="label">实际归还时间:</text>
<text class="infoSpan">{{item.backTime}}</text>
</view>
<view class="form-item">
<view class="form-item" v-if="item.remark">
<text class="label">备注:</text>
<text class="infoSpan">{{item.remark==null?" ":item.remark}}</text>
</view>
@ -172,11 +172,11 @@
</view>
<view class="form-item">
<text class="label">项目归口管理部门:</text>
<text class="infoSpan">{{item.proManagerPhone}}</text>
<text class="infoSpan">{{item.xmgkOrgName}}</text>
</view>
<view class="form-item">
<text class="label">经办人员:</text>
<text class="infoSpan">{{item.proManagerPhone}}</text>
<text class="infoSpan">{{item.jbUserName}}</text>
</view>
<view class="form-item">
<text class="label">合同有效期:</text>
@ -260,7 +260,7 @@
<text class="label">合同有效期:</text>
<text class="infoSpan">{{item.contractStartTime}}</text>~<text class="infoSpan">{{item.contractEndTime}}</text>
</view>
<view class="form-item">
<view class="form-item" v-if="item.carNum">
<text class="label">车牌号:</text>
<text class="infoSpan">{{item.carNum}}</text>
</view>
@ -422,7 +422,7 @@
if(_this.examineBatch == this.itemd.examineBatch){
_this.examineButton = false;
}
// let details = res.returnData.detail||[]
let details = res.returnData.auditVos||[];
// for(let i=0;i<details.length;i++){
// let obj = details[i];
// if(_this.examineBatch == obj.EXAMINE_BATCH){
@ -438,16 +438,23 @@
}
_this.process.push(pObj0);
}
// if(details.length>0){
// for(let i=0;i<details.length;i++){
// let pObj = {
// date: details[i].BATCH_DESCRIPTION,
// info: details[i].USER_NAME+"　"+(details[i].EXAMINE_STATE==1?"同意":"拒绝　"+(details[i].EXAMINE_OPINION||'')),
// time: formatDate(details[i].EXAMINE_TIME,'dateTime')
// }
// _this.process.push(pObj);
// }
// }
if(details.length>0){
for(let i=0;i<details.length;i++){
let pObj = {
date: details[i].batchDescription,
info: details[i].userName+"　"+(details[i].examineState==1?"同意":"拒绝　"+(details[i].examineState||'')),
time: formatDate(details[i].examineTime,'dateTime')
}
if(details[i].EXAMINE_BATCH=='3'){
pObj = {
date: details[i].batchDescription,
info: details[i].userName+"　"+(details[i].examineState==1?"制作完成":"拒绝　"+(details[i].examineState||'')),
time: formatDate(details[i].examineTime,'dateTime')
}
}
_this.process.push(pObj);
}
}
} else {
alertTip(res.returnMsg);
}

139
pages/access-card/access-card.vue
View File

@ -124,10 +124,10 @@
</view>
<view style="font-size: 28rpx;font-weight: 600;color: red;border-bottom: 1px solid #eee;">互联网信息系统严禁存储、传输、处理涉及国家秘密企业秘密以及敏感信息，违者将严肃问责追责!</view>
<view @click="addpeople0()" v-if="peopleIndex==(peopleList0.length-1)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
<view @click="addpeople0()" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
增加人员
</view>
<view v-else @click="delpeople0(peopleIndex)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
<view v-if="peopleList0.length>1" @click="delpeople0(peopleIndex)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
删除人员
</view>
</view>
@ -335,11 +335,7 @@
</view>
</view>
<view style="font-size: 28rpx;font-weight: 600;color: red;border-bottom: 1px solid #eee;">互联网信息系统严禁存储、传输、处理涉及国家秘密企业秘密以及敏感信息，违者将严肃问责追责!</view>
<view class="form-item">
<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>
</view>
<view class="form-box" style="border-radius: 10upx;margin-top: 20upx;">
<view class="form-item">
<text class="label">经办部门负责人<text style="color: red;">*</text>:</text>
@ -492,10 +488,10 @@
</view>
</view>
<view style="font-size: 28rpx;font-weight: 600;color: red;border-bottom: 1px solid #eee;">互联网信息系统严禁存储、传输、处理涉及国家秘密企业秘密以及敏感信息，违者将严肃问责追责!</view>
<view @click="addpeople1()" v-if="peopleIndex==(peopleList0.length-1)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
<view @click="addpeople1()" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
增加办证人员
</view>
<view v-else @click="delpeople1(peopleIndex)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
<view v-if="peopleList1.length>1" @click="delpeople1(peopleIndex)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
删除办证人员
</view>
</view>
@ -596,11 +592,7 @@
<view class="ipt-box"><uni-datetime-picker :clear-icon="false" v-model="dateRange2"
type="daterange" :border="false"/></view>
</view>
<view class="form-item">
<text class="label" style="width: 170rpx;">证件有效期<text style="color: red;">*</text>:</text>
<view class="ipt-box"><uni-datetime-picker :clear-icon="false" v-model="dateRange3"
type="daterange" :border="false"/></view>
</view>
<view class="form-item">
<text class="label">车牌号:</text>
<view class="ipt-box"><input class="top-t" v-model="licenseNumber" placeholder="请输入" type="text"
@ -632,10 +624,10 @@
</view>
</view>
<view style="font-size: 28rpx;font-weight: 600;color: red;border-bottom: 1px solid #eee;">互联网信息系统严禁存储、传输、处理涉及国家秘密企业秘密以及敏感信息，违者将严肃问责追责!</view>
<view @click="addpeople2()" v-if="peopleIndex==(peopleList0.length-1)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
<view @click="addpeople2()" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
增加办证人员
</view>
<view v-else @click="delpeople2(peopleIndex)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
<view v-if="peopleList2.length>1" @click="delpeople2(peopleIndex)" style="color: #02A7F0;width: 100%;text-align: center;margin: 20rpx 0;">
删除办证人员
</view>
</view>
@ -1716,26 +1708,40 @@
// var regNumber = /[^\d]/;
if (this.firstIndex == 0&&this.secondIndex==0) {
var persons=this.peopleList0;
persons.forEach((item, index) => {
if (!item.unit) {
alertTip('请输入人员部门');
if(persons.length<1){
alertTip('请输入人员信息');
return false;
}
var personnelFlage=0;
var personnelMsg="";
persons.forEach((item, index) => {
if (!item.personnel) {
alertTip('请输入人员姓名');
personnelMsg='请输入人员姓名';
personnelFlage=1;
return false;
}
if (!item.unit) {
personnelMsg='请输入人员部门';
personnelFlage=1;
return false;
}
if (!regPhone.test(item.personnelPhone)) {
alertTip('请输入正确的手机号');
personnelMsg='请输入正确的手机号';
personnelFlage=1;
return false;
}
if (this.isEnableFace=='1') {
if (item.faceImgsId.length==0) {
alertTip('请选择登记照片');
personnelMsg='请选择登记照片';
personnelFlage=1;
return false;
}
}
})
if(personnelFlage==1){
alertTip(personnelMsg);
return false;
}
if(this.areaData0.length>0){
let idList = this.areaData0.map(item=>{
return item.areaIds
@ -1815,6 +1821,18 @@
})
this.accessArea1 =idList.join(',')
}
if (!this.accessArea1) {
alertTip('请选择出入区域');
return false;
}
if(this.faceImgsId.length<1){
alertTip('缺少人脸图片');
return false;
}
if(this.idPhotoesId.length>0&&this.idPhotoesId.length<2){
alertTip('身份证照片需要两张');
return false;
}
const peopleListd=[{
personnel: this.personnelName,
personnelPhone: this.personnelPhone,
@ -1854,6 +1872,10 @@
};
console.log("params",params)
}else if (this.firstIndex == 0&&this.secondIndex==2) {
if (this.unitUserList2.length<1||!this.unitUserList2[this.unitUserIndex2].name) {
alertTip('请输入经办人');
return false;
}
if (!this.handlerPhone2) {
alertTip('请输入经办人联系电话');
return false;
@ -1862,6 +1884,14 @@
alertTip('请输入正确的经办人手机号');
return false;
}
if (!this.outDate) {
alertTip('请输入借出时间');
return false;
}
if (!this.backDate) {
alertTip('请输入归还时间');
return false;
}
params = {
method: addCardData,
data: {
@ -1911,16 +1941,43 @@
alertTip('请输入正确的项目负责人手机号');
return false;
}
if (this.unitUserList3.length<1||!this.unitUserList3[this.unitUserIndex3].name) {
alertTip('请输入经办人');
return false;
}
if (!this.dateRange[0]) {
alertTip('请输入合同有效期');
return false;
}
if(this.accessArea.length<1){
alertTip('请选择区域');
return false;
}
const peopleListd=[];
if(this.peopleList1.length<1){
alertTip('填写人员信息');
return false;
}
var txflage=0;
var txmsg="";
this.peopleList1.forEach((item, index) => {
const itemd={
personnel: '',
idPhoto: ''
};
const itemd={personnel: '',idPhoto: ''};
if(!item.personnelName){
txflage=1;
txmsg="填写人员姓名";
}
itemd.personnel=item.personnelName;
if(item.faceImgsId.length<1){
txflage=1;
txmsg="缺少人脸图片";
}
itemd.idPhoto=item.faceImgsId.toString();
peopleListd.push(itemd);
})
if(txflage==1){
alertTip(txmsg);
return false;
}
params = {
method: addCardData,
data: {
@ -1960,10 +2017,6 @@
alertTip('请输入工作内容');
return false;
}
if (!this.ticketNo) {
alertTip('请输入工作票编号');
return false;
}
if (!this.workUnit) {
alertTip('请输入作业单位');
return false;
@ -1988,6 +2041,16 @@
alertTip('请输入正确的工作负责人手机号');
return false;
}
if (!this.dateRange2[0]) {
alertTip('请输入合同时间');
return false;
}
if(this.accessArea1.length<1){
alertTip('请选择区域');
return false;
}
var txflage=0;
var txmsg="";
const peopleListd=[];
this.peopleList2.forEach((item, index) => {
const itemd={
@ -1995,11 +2058,27 @@
idNumber:'',
idPhoto: ''
};
if(!item.personnelName){
txflage=1;
txmsg="填写人员姓名";
}
itemd.personnel=item.personnelName;
if(item.faceImgsId.length<1){
txflage=1;
txmsg="缺少人脸图片";
}
itemd.idPhoto=item.faceImgsId.toString();
if(!item.idNumber){
txflage=1;
txmsg="填写身份证ID";
}
itemd.idNumber=item.idNumber;
peopleListd.push(itemd);
})
if(txflage==1){
alertTip(txmsg);
return false;
}
params = {
method: addCardData,
data: {

16
pages/access-card/card-record-detail.vue
View File

@ -44,7 +44,7 @@
<br/>
<image class="info-item" v-for="(item, index) in people.idPhoto.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
<view class="info-item" v-if="people.photo!='null'">
<view class="info-item" v-if="people.photo">
<text class="label">身份证图片： </text>
<br/>
<image v-if="item!=''" class="info-item" v-for="(item, index) in people.photo.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
@ -101,12 +101,12 @@
<br/>
<image class="info-item" v-for="(item, index) in item.userInfoVos[0].idPhoto.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
<view class="info-item" v-if="item.userInfoVos[0].photo!='null'">
<view class="info-item" v-if="item.userInfoVos[0].photo">
<text class="label">身份证图片： </text>
<br/>
<image v-if="item!=''" class="info-item" v-for="(item, index) in item.userInfoVos[0].photo.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
</view>
<view class="info-item" v-if="item.userInfoVos[0].documentation!='null'">
<view class="info-item" v-if="item.userInfoVos[0].documentation">
<text class="label">身份证图片： </text>
<br/>
<image v-if="item!=''" class="info-item" v-for="(item, index) in item.userInfoVos[0].documentation.split(',')" :key="index" :src="item" :width="100" style="margin-right: 5px;"></image>
@ -286,7 +286,7 @@
<view class="ipt-box"><uni-datetime-picker :clear-icon="false" v-model="dateRange"
type="daterange" :border="false"/></view>
</view>
<view class="form-item">
<view class="form-item" v-if="item.carNum">
<text class="label">车牌号:</text>
<text class="infoSpan">{{item.carNum}}</text>
</view>
@ -572,10 +572,10 @@
if (res.returnCode == 1) {
alertTip(res.returnMsg);
this.closeCirculation();
this.getCard();
// uni.navigateBack({
// delta: 1
// });
// this.getCard();
uni.navigateBack({
delta: 1
});
} else {
alertTip(res.returnMsg);
}

3
pages/access-card/card-record.vue
View File

@ -22,8 +22,7 @@
<image src="/static/img/cardIcon.png" mode="" style="width: 35upx;height: 40upx;margin-left: 20upx;vertical-align: middle;"></image>
<text class="font-tilte">门禁卡申请记录</text>
<text v-if="item.examineState ==0" class="font-result" style="color: #ff9000;background-color: #FFEFE3;">
<text v-if="!item.cardStatus">待审核</text>
<text v-if="item.cardStatus==1">审核中</text>
<text v-if="item.examineState==0">待审核</text>
</text>
<text v-if="item.examineState ==2" class="font-result" style="color: #BD1515;background-color: #F6DFDF;">已拒绝</text>
<text v-if="item.examineState ==1" class="font-result" style="color: #0DB0A7;background-color: #C1EFEA;">