diff --git a/pages/application/check-record/check_info.vue b/pages/application/check-record/check_info.vue
new file mode 100644
index 0000000..e9f52bd
--- /dev/null
+++ b/pages/application/check-record/check_info.vue
@@ -0,0 +1,441 @@
+
+
+
+ 返回
+ 检查记录详情
+
+
+ 检测内容
+
+
+
+
+
+ 检测内容
+ 状态
+
+
+ {{item.CHECK_CONTENT}}
+
+
+ 合格
+
+ 合格
+
+
+ 不合格
+
+
+ 不涉及
+
+
+ 存在未整改隐患
+
+
+
+
+
+
+ 其他隐患信息
+
+
+
+
+
+ 隐患描述
+ 操作
+
+
+ {{item.HIDDENDESCR}}
+
+ 查看
+
+
+
+
+
+
+
+
+
+ 清单信息
+
+
+
+
+ 清单名称
+
+
+ {{pd.NAME}}
+
+
+
+
+ 排查清单类型
+
+
+ {{pd.SCREENTYPENAME}}
+
+
+
+
+ 检查人
+
+
+ {{pd.USER_NAME}}
+
+
+
+
+ 检查时间
+
+
+ {{pd.CREATTIME}}
+
+
+
+
+ 所属部门
+
+
+ {{pd.DEPARTMENT_NAME}}
+
+
+
+
+ 所属岗位
+
+
+ {{pd.POST_NAME}}
+
+
+
+
+ 排查周期
+
+
+ {{pd.PERIODNAME}}
+
+
+
+
+ 清单类型
+
+
+ {{pd.TYPENAME}}
+
+
+
+
+ 排查日期
+
+
+ {{pd.START_DATE}} - {{pd.END_DATE}}
+
+
+
+
+
+ 签字照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/check-record/check_listmanager.vue b/pages/application/check-record/check_listmanager.vue
index 0eff450..acec0b1 100644
--- a/pages/application/check-record/check_listmanager.vue
+++ b/pages/application/check-record/check_listmanager.vue
@@ -304,7 +304,7 @@
},
goToList(id){
uni.navigateTo({
- url: '/pages/application/check-record/record_list?LISTMANAGER_ID='+id
+ url: '/pages/application/check-record/check_info?LISTMANAGER_ID='+id
});
},
//获取数据类型列表
diff --git a/pages/application/check-record/record_info.vue b/pages/application/check-record/record_info.vue
index 1a7571f..991b8e8 100644
--- a/pages/application/check-record/record_info.vue
+++ b/pages/application/check-record/record_info.vue
@@ -23,7 +23,7 @@
合格
- 不合格
+ 不合格
不涉及
@@ -68,7 +68,7 @@
清单名称
- {{pd.LIST_NAME}}
+ {{pd.NAME}}
@@ -84,7 +84,7 @@
检查人
- {{pd.USERS}}
+ {{pd.BAO_BAO_USER_NAME}}
@@ -92,7 +92,7 @@
检查时间
- {{pd.CHECK_TIME}}
+ {{pd.CREATTIME}}
@@ -172,7 +172,7 @@
return {
recordItemList: [],
baseImgPath: baseImgPath,
- CHECKRECORD_ID: '',
+ CUSTOM_ID: '',
hiddenList: [],
varList: [],
pd: [],
@@ -193,7 +193,7 @@
},
onLoad(e) {
loginSession();
- this.CHECKRECORD_ID = e.CHECKRECORD_ID;
+ this.CUSTOM_ID = e.CUSTOM_ID;
this.getData();
this.getOtherHidden();
this.getMap();
@@ -228,7 +228,7 @@
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
- CHECKRECORD_ID: _this.CHECKRECORD_ID,
+ CUSTOM_ID: _this.CUSTOM_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
@@ -261,14 +261,15 @@
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
- CHECKRECORD_ID: _this.CHECKRECORD_ID,
- CORPINFO_ID:loginUser.CORPINFO_ID,
- USER_ID:loginUser.USER_ID,
+ CUSTOM_ID: _this.CUSTOM_ID,
+ CORPINFO_ID: loginUser.CORPINFO_ID,
+ USER_ID: loginUser.USER_ID,
},
success: (res) => {
if (res.data != null) {
uni.hideLoading();
+ _this.pd = res.data.pd;
_this.otherHiddenList = res.data.hiddenList;
} else {
uni.showToast({
@@ -292,7 +293,7 @@
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
- CHECKRECORD_ID: _this.CHECKRECORD_ID,
+ CUSTOM_ID: _this.CUSTOM_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
diff --git a/pages/application/check-record/record_list.vue b/pages/application/check-record/record_list.vue
index f3ae740..f978202 100644
--- a/pages/application/check-record/record_list.vue
+++ b/pages/application/check-record/record_list.vue
@@ -28,21 +28,21 @@
-
-
- 清单名称:{{item.LIST_NAME}}
-
-
+
+
+ ★清单名称:{{item.NAME}}
+
+
- 人员:{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}}
+ 人员:{{item.USER_NAME?item.USER_NAME:ls.USER_NAME}}
- 检查周期:{{item.DATESTART}}-{{item.DATEEND}}
+ 检查周期:{{item.PERIODNAME}}
- 检查人:{{item.CHECK_USERS}}
- 检查时间:{{item.CHECK_TIME}}
+ 检查人:{{item.BAO_BAO_USER_NAME}}
+ 检查时间:{{item.START_DATE}}
@@ -66,19 +66,20 @@
-
- 清单名称:{{item.LIST_NAME?item.LIST_NAME:ls.NAME}}
-
+
+ ★清单名称:{{item.NAME}}
+
+
- 人员:{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}}
+ 人员:{{item.USER_NAME?item.USER_NAME:ls.USER_NAME}}
- 检查周期:{{item.DATESTART}}-{{item.DATEEND}}
+ 检查周期:{{item.PERIODNAME}}
- 清单类型:{{ls.TYPENAME}}
- 清单周期:{{ls.PERIODNAME}}
+ 清单类型:{{ls.BAO_BAO_USER_NAME}}
+ 清单周期:{{ls.START_DATE}}
@@ -189,27 +190,26 @@
'Content-type':'application/x-www-form-urlencoded'
},
data: {
- LISTMANAGER_ID:_this.LISTMANAGER_ID,
- KEYWORDS:_this.KEYWORDS,
+ USER_NAME: loginUser.NAME,
+ CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
+ SUB_DEPARTMENT_IDS: this.DEPT, //选择的部门
+ IS_MAIN:loginUser.ISMAIN,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
+ ISSUPERVISE:loginUser.ISSUPERVISE,
},
success: (res) => {
- if("success" == res.data.result){
- uni.hideLoading();
- var content = res.data.varList;
- _this.ls = res.data.ls;
- for(var i=0;i {
if("success" == res.data.result){
uni.hideLoading();
- _this.otherHiddenList = res.data.hiddenList;
+ /*_this.otherHiddenList = res.data.hiddenList;*/
} else {
uni.showToast({
icon:'none',
diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
index 40af467..22878d1 100644
--- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
@@ -570,13 +570,15 @@
},
data: {
HIDDEN_ID: _this.id,
- CORPINFO_ID:loginUser.CORPINFO_ID,
- USER_ID:loginUser.USER_ID,
+ CORPINFO_ID: loginUser.CORPINFO_ID,
+ USER_ID: loginUser.USER_ID,
+ OPERATION_TYPE: "1",
},
success: (res) => {
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
+ console.log(res.data.hImgs)
_this.hs = res.data.hs; //参数map
for (let i = 0; i < res.data.hImgs.length; i++) {
if(res.data.hImgs[i].FILEPATH.substring(res.data.hImgs[i].FILEPATH.lastIndexOf(".") + 1, res.data.hImgs[i].FILEPATH.length) === 'mp4'){
diff --git a/pages/basics/basic-info/confirm.vue b/pages/basics/basic-info/confirm.vue
index 700c6bd..412a929 100644
--- a/pages/basics/basic-info/confirm.vue
+++ b/pages/basics/basic-info/confirm.vue
@@ -151,6 +151,14 @@ import {
url: '/pages/login/home'
});
} else if (this.form.REVIEW_RESULT=='-1') {
+ uni.request({
+ url: basePath + '/app/user/setPractitionerConfirmByUser',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type':'application/x-www-form-urlencoded'
+ }
+ })
setloginUserId(null);
setCorpinfoId(null);
setDeptId(null);