diff --git a/manifest.json b/manifest.json
index 5970868e..1dd0197d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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" : {
diff --git a/pages/login/compatibleLogin.vue b/pages/login/compatibleLogin.vue
index 57e7abc3..dfc4786c 100644
--- a/pages/login/compatibleLogin.vue
+++ b/pages/login/compatibleLogin.vue
@@ -22,7 +22,7 @@
忘记密码
- {{ type == "user" ? "用户账号注册" : "供应商账号注册" }}
+
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 085cef1c..2b421aef 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -26,7 +26,7 @@
-
+
项目资料
@@ -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
diff --git a/pages/projectEnd/laborManage/queryStaff.vue b/pages/projectEnd/laborManage/queryStaff.vue
index 9cf8b296..d4324021 100644
--- a/pages/projectEnd/laborManage/queryStaff.vue
+++ b/pages/projectEnd/laborManage/queryStaff.vue
@@ -7,30 +7,41 @@
-
+
搜索
-
+
-
+
- {{item.workerName+'-'+item.teamName+'-'}}{{item.idCard}}
- {{item.workerName+'-'+'临时人员-'}}{{item.idCard}}
- {{item.workerName+'-'+item.departmentName+'-'}}{{item.idCard}}
-
+
+ {{item.workerName+'-'+(item.teamName?item.teamName+'-':'')}}
+ {{item.idCard}}
+
+
+ {{item.workerName+'-'+'临时人员-'}}
+ {{item.idCard}}
+
+
+ {{item.workerName+'-'+(item.departmentName?item.departmentName +'-':'')}}
+ {{item.idCard}}
+
+
暂无数据
-
-
+
+
其他搜索方式
-
+
扫码
@@ -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
})
},
}
}
-
+
\ No newline at end of file
diff --git a/pages/projectEnd/laborManage/searchTeam/detailsMod.vue b/pages/projectEnd/laborManage/searchTeam/detailsMod.vue
index a182a3f1..3ddff4d6 100644
--- a/pages/projectEnd/laborManage/searchTeam/detailsMod.vue
+++ b/pages/projectEnd/laborManage/searchTeam/detailsMod.vue
@@ -60,6 +60,10 @@
城乡居民医疗保险：{{item.medicalInsurance==1?'否':item.medicalInsurance==2?'是':''}}
城乡居民养老保险：{{item.endowmentInsurance==1?'否':item.endowmentInsurance==2?'是':''}}
+
+
+ 暂无数据
+
@@ -67,7 +71,7 @@
已培训
- 培训类型： {{
+
+ 培训日期：{{item.date}}
+ 培训主题：{{item.subject}}
+ 考试分数：{{item.score}}
+ 是否合格：{{item.isPass == 1 ? "是":item.isPass == 0? "否":''}}
@@ -93,15 +97,36 @@
data() {
return {
type: 1,
- info: null
+ info: null,
+ workerId: ""
}
},
onLoad(option) {
this.type = Number(option.type);
+ this.workerId = option.workerId;
this.info = uni.getStorageSync('moduleInfo');
this.getFileInfo();
+ if(this.type == 4){ // 安全教育考试数据特殊处理
+ this.getExamDataList();
+ }
},
methods: {
+ // 获取考试数据
+ getExamDataList() {
+ this.sendRequest({
+ url: 'xmgl/workerInfo/getTrainRecordsByWorkerId',
+ method: 'post',
+ data: {
+ projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+ workerId: this.workerId,
+ },
+ success: res => {
+ if(res.code == 200){
+ this.info = res.result;
+ }
+ }
+ })
+ },
//获取附件信息
getFileInfo() {
let data = JSON.parse(JSON.stringify(this.info))
@@ -151,6 +176,7 @@
+
\ No newline at end of file
diff --git a/pages/standardScheduleNews/auditPage.vue b/pages/standardScheduleNews/auditPage.vue
index c871908b..871d8a8f 100644
--- a/pages/standardScheduleNews/auditPage.vue
+++ b/pages/standardScheduleNews/auditPage.vue
@@ -228,7 +228,8 @@
let that = this;
let requestData = {
...that.condition,
- ...that.option
+ ...that.option,
+ isApprovalList: 1
}
if (this.checkedTab == 1) {
requestData.isAudit = 0
diff --git a/pages/standardScheduleNews/detail.vue b/pages/standardScheduleNews/detail.vue
index 162ed988..3c5f9701 100644
--- a/pages/standardScheduleNews/detail.vue
+++ b/pages/standardScheduleNews/detail.vue
@@ -156,10 +156,12 @@
},
//点击上报
addProgessBtn() {
+ // uni.navigateTo({
+ // url: './addFrom?id=' + this.itemFrom.id
+ // })
uni.navigateTo({
- url: './addFrom?id=' + this.itemFrom.id
+ url: './addFrom?item=' + encodeURIComponent(JSON.stringify(this.itemFrom))
})
-
},
// 开始任务
startTask() {