admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 项目资料添加权限以及修改查人员页面中的样式问题

Browse Source
This commit is contained in:
kun 2024-06-29 20:03:02 +08:00
parent c757ce183c
commit c275f70bc3
3 changed files with 90 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "智慧安全", //中建四局
"appid" : "__UNI__4AA4101",
"description" : "",
"versionName" : "1.6.3",
"versionCode" : 163,
"versionName" : "1.6.4",
"versionCode" : 164,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

14
pages/my/my.vue
View File

@ -26,7 +26,7 @@
</view>
</view>
<!-- v-if="COMPANY != 'nanchang'" -->
<view class="operateBar" @click="viewFileFn">
<view class="operateBar" @click="viewFileFn" v-if="isShowProjectDocument">
<view class="left">
<image class="operateIcon" src="@/static/file.png" mode="widthFix"></image>
项目资料
@ -99,22 +99,12 @@
if (val.type == 1) {
this.flag = false
}
this.isShowProjectDocument = JSON.parse(uni.getStorageSync('userInfo')).systemLogoConfig.showFileCenter
},
onShow() {
this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
this.getModuleList();
},
methods: {
// 获取全部模块
getModuleList() {
let allModuleList = this.userInfo.menuAuthority.moduleList;
for (let i = 0; i < allModuleList.length; i++) {
if (allModuleList[i].modulePath == '/companyAdmin/docManage') { // 筛选资料中心
this.isShowProjectDocument = true;
break;
}
}
},
viewVersionInfo() {
var that = this

149
pages/projectEnd/laborManage/queryStaff.vue
View File

@ -7,30 +7,41 @@
</headers>
<view class="content">
<view class="flex input_Wrap">
<input placeholder="请输入人员姓名/身份证" @input="changeSeek" @focus="showValue=true" @blur="blur" class="input_c" placeholder-style="font-size:28rpx" :value="inputVal" />
<input placeholder="请输入人员姓名/身份证" @input="changeSeek" @focus="showValue=true" @blur="blur"
class="input_c" placeholder-style="font-size:28rpx" :value="inputVal" />
<text class="seekBtn" @click="changeSeek({detail:{value:inputVal}})">搜索</text>
</view>
<view class="results_wrap" v-if="showValue">
<view class="value flex3" v-if="listData.length>0" v-for="(item,index) in listData" :key="index" @click="showDetailsBtn(item.id)">
<view class="value" v-if="listData.length>0" v-for="(item,index) in listData" :key="index"
@click="showDetailsBtn(item.id)">
<!-- <text v-if="item.personType==1">{{item.workerName+'-'+item.teamName+'-'}}<text class="font_weight">{{item.idCard}}</text></text>
<text v-else>{{item.workerName+'-'+item.departmentName+'-'}}<text class="font_weight">{{item.idCard}}</text></text> -->
<text v-if="item.personType==1">{{item.workerName+'-'+item.teamName+'-'}}<text class="font_weight">{{item.idCard}}</text></text>
<text v-else-if="item.personType==3">{{item.workerName+'-'+'临时人员-'}}<text class="font_weight">{{item.idCard}}</text></text>
<text v-else>{{item.workerName+'-'+item.departmentName+'-'}}<text class="font_weight">{{item.idCard}}</text></text>
<uni-icons class="arrowright" type="arrowright"></uni-icons>
<view v-if="item.personType==1">
<text>{{item.workerName+'-'+(item.teamName?item.teamName+'-':'')}}</text>
<text class="font_weight">{{item.idCard}}</text>
</view>
<view v-else-if="item.personType==3">
<text>{{item.workerName+'-'+'临时人员-'}}</text>
<text class="font_weight">{{item.idCard}}</text>
</view>
<view v-else>
<text>{{item.workerName+'-'+(item.departmentName?item.departmentName +'-':'')}}</text>
<text class="font_weight">{{item.idCard}}</text>
</view>
<!-- <uni-icons class="arrowright" type="arrowright"></uni-icons> -->
</view>
<view v-if="listData.length==0" class="noData">暂无数据</view>
</view>
<view class="margin_top" v-else-if="COMPANY != 'nanchang'">
<view class="placeholder flex2">
<view class="striping"></view>
<view style="margin:0 10px;">其他搜索方式</view>
<view class="striping"></view>
</view>
<view class="func_wrap flex2" >
<view class="func_wrap flex2">
<view class="item" @click="scanQRcodeBtn">
<image src="../../../static/scan.png" class="icon"></image>
<view>扫码</view>
@ -47,72 +58,71 @@
data() {
return {
inputVal: "",
showValue:false,
projectSn:'',
listData:[],
showValue: false,
projectSn: '',
listData: [],
}
},
onLoad(){
onLoad() {
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
},
methods: {
//输入内容时
changeSeek(val){
changeSeek(val) {
let that = this;
this.inputVal = val.detail.value;
if(val.detail.value==""){
this.listData = [];
this.showValue = true;
return
if (val.detail.value == "") {
this.listData = [];
this.showValue = true;
return
}
this.sendRequest({
url:'xmgl/workerInfo/selectAppWorkerList',
method:"post",
data:{
projectSn:that.projectSn,
searchCondition:val.detail.value
url: 'xmgl/workerInfo/selectAppWorkerList',
method: "post",
data: {
projectSn: that.projectSn,
searchCondition: val.detail.value
},
success:res=>{
success: res => {
this.listData = res.result;
this.listData.map(item => {
let str = "***************"
item.idCard = item.idCard.substring(0,3)+str+item.idCard.substring(16)
item.idCard = item.idCard.substring(0, 3) + str + item.idCard.substring(16)
})
}
})
},
//扫码按钮
scanQRcodeBtn(){
scanQRcodeBtn() {
let that = this;
// 只允许通过相机扫码
uni.scanCode({
onlyFromCamera: true,
success: function (res) {
that.showDetailsBtn(res.result)
},
fail:function(error){
}
onlyFromCamera: true,
success: function(res) {
that.showDetailsBtn(res.result)
},
fail: function(error) {}
});
},
//输入框失去焦点时
blur(){
if(this.inputVal==''){
this.showValue = false;
blur() {
if (this.inputVal == '') {
this.showValue = false;
}
},
showDetailsBtn(id){
showDetailsBtn(id) {
uni.navigateTo({
url:'./searchTeam/personDetail?id='+id
url: './searchTeam/personDetail?id=' + id
})
},
}
}
</script>
<style>
<style scoped lang="scss">
.flex {
display: flex;
align-items: center;
@ -123,6 +133,7 @@
align-items: center;
justify-content: center;
}
.flex3 {
display: flex;
align-items: center;
@ -143,11 +154,11 @@
.input_Wrap {
width: 80%;
/* margin: 0 auto; */
border: 1px solid #d8d8e5;
box-sizing: border-box;
padding: 0;
border-radius: 20px;
/* margin: 0 auto; */
border: 1px solid #d8d8e5;
box-sizing: border-box;
padding: 0;
border-radius: 20px;
}
.input_Wrap .input_c {
@ -168,9 +179,9 @@
font-size: 28rpx;
/* border-radius: 2px; */
border-radius: 20px;
position: absolute;
right: 15px;
position: absolute;
right: 15px;
}
.seekBtn:active {
@ -184,11 +195,13 @@
font-size: 30rpx;
color: rgba(38, 45, 71, 0.8);
}
.striping{
.striping {
background-color: rgba(38, 45, 71, 0.6);
height: 1px;
width: 120rpx;
}
.func_wrap .item {
text-align: center;
margin: 18px 0;
@ -201,29 +214,39 @@
width: 78rpx;
height: 39px;
}
.results_wrap .value{
text-align: center;
font-size: 28rpx;
line-height: 35px;
margin: 5px 0;
border-bottom: 1px dashed #babcc5;
.results_wrap .value {
/* text-align: center; */
font-size: 28rpx;
line-height: 35px;
margin: 5px 0;
border-bottom: 1px dashed #babcc5;
>view{
width: 100%;
// display: flex;
// align-items: center;
// text:nth-child(1){
// display: block;
// }
}
}
.arrowright{
.arrowright {
color: #999 !important;
}
.margin_top {
margin-top: 100px;
}
.font_weight{
.font_weight {
font-weight: 700;
}
.noData{
.noData {
text-align: center;
margin-top: 50px;
font-size: 28rpx;
color: #999;
}
</style>
</style>