diff --git a/pages.json b/pages.json
index 650d7b0..943829f 100644
--- a/pages.json
+++ b/pages.json
@@ -333,6 +333,10 @@
"path": "pages/application/hidden-danger-check-standard/custom/list-item-check-next",
"style": {}
},
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/other-hidden-add",
+ "style": {}
+ },
{
"path": "pages/application/hidden-danger-check-standard/record/custom-list",
"style": {}
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
index cf902c2..3cd7857 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
@@ -55,13 +55,13 @@
-
+
隐患描述
@@ -286,7 +286,7 @@
this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.CHECK_CONTENT));
this.pd.CHECK_STANDARD = JSON.parse(decodeURIComponent(event.CHECK_STANDARD));
this.pd.REFERENCE_BASIS = JSON.parse(decodeURIComponent(event.REFERENCE_BASIS));
- this.pd.HIDDENDESCR = JSON.parse(decodeURIComponent(event.CHECK_UNQUALIFIED));
+ this.pd.HIDDENDESCR = JSON.parse(decodeURIComponent(event.CHECK_RESULT));
this.baoBaoType = JSON.parse(decodeURIComponent(event.baoBaoType))+'';
console.log(this.baoBaoType)
this.index = event.index;
@@ -866,6 +866,7 @@
prePage.$vm.initflag = true; // A 页面 init方法 为true
prePage.$vm.list[_this.index].ISNORMAL = 1;
prePage.$vm.list[_this.index].HIDDEN_ID = _this.pd.HIDDEN_ID;
+ prePage.$vm.list[_this.index].CHECK_RESULT = _this.pd.HIDDENDESCR;
prePage.$vm.list[_this.index].CHECK_UNQUALIFIED = _this.pd.HIDDENDESCR;
}
uni.navigateBack({});
@@ -1059,7 +1060,7 @@
},
confirm(info){
this.pd.HIDDENPART = info.HIDDEN_PART
- this.pd.HIDDENDESCR = info.INSPECTION_BASIS
+ // this.pd.HIDDENDESCR = info.INSPECTION_BASIS
this.pd.HIDDENLEVEL = 'hiddenLevel0001'
this.pd.HIDDENLEVELNAME = '一般隐患'
if (info.HIDDEN_TYPE_ONE_NAME){this.pd.HIDDENTYPENAME = info.HIDDEN_TYPE_ONE_NAME}
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
index 71ba647..a8850d7 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
@@ -15,13 +15,10 @@
- 合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_QUALIFIED : '' }}
+ 合格
-
-
-
- 不合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_UNQUALIFIED : '' }}
+ 不合格
-
-
-
@@ -54,6 +48,9 @@
+
+
+
@@ -109,7 +106,7 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/app/hiddenDangerCheckStandardCustom/goCheck',
+ url: basePath + '/app/hiddenDangerCheckStandardCustom/goCheck', // /app/listmanager/goCheck
method: 'POST',
dataType: 'json',
header: {
@@ -134,6 +131,11 @@
_this.list[i].HIDDEN_ID = res.data.records[j].HIDDEN_ID;
_this.list[i].CHECKRECORD_ID = res.data.records[j].CHECKRECORD_ID;
_this.list[i].RECORDITEM_ID = res.data.records[j].RECORDITEM_ID;
+ if (res.data.records[j].ISNORMAL === 0) {
+ _this.list[i].CHECK_QUALIFIED = res.data.records[j].CHECK_RESULT;
+ } else if (res.data.records[j].ISNORMAL === 1) {
+ _this.list[i].CHECK_UNQUALIFIED = res.data.records[j].CHECK_RESULT;
+ }
// _this.list[i].is_checked = 1;
}
}
@@ -158,14 +160,12 @@
//去保存
save: function (){
-
+ var _this = this;
for(var i=0;i<_this.list.length;i++){
if(this.list[i].ISNORMAL && this.list[i].OPERATION_TYPE === 2) {
var CHECK_RESULT = ''
- if (this.list[i].ISNORMAL === 0) {
- CHECK_RESULT = _this.list[i].CHECK_QUALIFIED
- } else if (this.list[i].ISNORMAL === 1) {
- CHECK_RESULT = _this.list[i].CHECK_UNQUALIFIED
+ if (this.list[i].ISNORMAL === 0 || this.list[i].ISNORMAL === 1) {
+ CHECK_RESULT = _this.list[i].CHECK_RESULT
} else if (this.list[i].ISNORMAL === 2) {
CHECK_RESULT = "不涉及"
}
@@ -179,15 +179,6 @@
}
}
}
- if (!_this.other[0].USER_ID) {
- uni.showToast({
- icon: 'none',
- title: '请添加检查人',
- duration: 1500
- });
- return;
- }
- var _this = this;
uni.showLoading({
title: '请稍候'
})
@@ -199,10 +190,8 @@
item.CUSTOM_ITEM_ID = _this.list[i].CUSTOM_ITEM_ID
item.ISNORMAL = _this.list[i].ISNORMAL
- if (_this.list[i].ISNORMAL === 0) {
- item.CHECK_RESULT = _this.list[i].CHECK_QUALIFIED
- } else if (_this.list[i].ISNORMAL === 1) {
- item.CHECK_RESULT = _this.list[i].CHECK_UNQUALIFIED
+ if (_this.list[i].ISNORMAL === 0 || _this.list[i].ISNORMAL === 1) {
+ item.CHECK_RESULT = _this.list[i].CHECK_RESULT
} else {
item.CHECK_RESULT = ''
}
@@ -337,6 +326,13 @@
_this.list[e.index].HIDDEN_ID='';
_this.$forceUpdate();//强制刷新
}
+ if (STATUS === 0) {
+ _this.$set(_this.list[e.index], 'CHECK_RESULT', _this.list[e.index].CHECK_QUALIFIED)
+ } else if (STATUS === 1) {
+ _this.$set(_this.list[e.index], 'CHECK_RESULT', _this.list[e.index].CHECK_UNQUALIFIED)
+ } else {
+ _this.$set(_this.list[e.index], 'CHECK_RESULT', '不涉及')
+ }
},
//跳转事件
goToAdd(e) {
@@ -365,7 +361,7 @@
+'&CHECK_ITEM_NAME='+ encodeURIComponent(JSON.stringify(e.CHECK_ITEM_NAME))
+'&CHECK_STANDARD='+ encodeURIComponent(JSON.stringify(e.CHECK_STANDARD))
+'&REFERENCE_BASIS='+ encodeURIComponent(JSON.stringify(e.REFERENCE_BASIS))
- +'&CHECK_UNQUALIFIED='+ encodeURIComponent(JSON.stringify(e.CHECK_UNQUALIFIED))
+ +'&CHECK_RESULT='+ encodeURIComponent(JSON.stringify(e.CHECK_RESULT))
+'&index='+e.index
+'&baoBaoType='+this.baoBaoType
});
@@ -391,4 +387,9 @@
transform: scale(0.9);
}
+.bgh{
+ background: #f8f6f6;
+ color: #d9d7d7;
+}
+
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
index 68925ef..62db3fa 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
@@ -293,7 +293,7 @@
this.buttonloading = true
return new Promise((resolve, reject) => {
uni.request({
- url: basePath + "/app/checkrecord/finish", //提交接口
+ url: basePath + "/app/customCheckRecord/finish", //提交接口 // /app/checkrecord/finish
method: 'POST',
dataType: 'json',
header:{
@@ -303,7 +303,7 @@
CHECK_TIME:_this.date+' '+_this.time+':00',
DESCR:_this.DESCR,
CHECKRECORD_ID:_this.CHECKRECORD_ID,
- LISTMANAGER_ID:_this.listId,
+ CUSTOM_ID:_this.listId,
OTHER:JSON.stringify(_this.other),
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
@@ -379,7 +379,7 @@
},
addOtherHidden: function (){
uni.navigateTo({
- url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add?listId='+ this.listId
+ url: '/pages/application/hidden-danger-check-standard/custom/other-hidden-add?listId='+ this.listId
});
},
removeOther: function(index){
@@ -396,7 +396,7 @@
success: function (res) {
if (res.cancel) {
uni.request({
- url: basePath + "/app/hidden/delete", //提交接口
+ url: basePath + "/app/customHidden/delete", //提交接口 // /app/hidden/delete
method: 'POST',
dataType: 'json',
header:{
@@ -435,14 +435,14 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/app/hidden/getOtherHidden',
+ url: basePath + '/app/customHidden/getOtherHidden', // /app/hidden/getOtherHidden
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
- LISTMANAGER_ID: _this.listId,
+ CUSTOM_ID: _this.listId,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item.vue b/pages/application/hidden-danger-check-standard/custom/list-item.vue
index d00e454..1c05dca 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item.vue
@@ -19,7 +19,7 @@
- {{item.DICTIONARY_NAMES.replaceAll(',','--')}}
+ {{ item.DICTIONARY_NAMES ? item.DICTIONARY_NAMES.replace(/,/g,'--') : '' }}
所属电子围栏:{{item.ELECTRONIC_FENCE}}
@@ -84,7 +84,7 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/app/hiddenDangerCheckStandardCustom/getCheckItem',
+ url: basePath + '/app/hiddenDangerCheckStandardCustom/getCheckItem', // /app/listmanager/getRisk
method: 'POST',
dataType: 'json',
header: {
@@ -103,7 +103,7 @@
_this.CHECKRECORD_ID = res.data.CHECKRECORD_ID;
if (res.data.checkmap) {
for (var i = 0; i < _this.list.length; i++) {
- if (res.data.checkmap[_this.list[i].CHECK_ITEM] >= _this.list[i].RISK_COUNT) {
+ if (res.data.checkmap[_this.list[i].CHECK_ITEM]) {
_this.list[i].isChecked = 1
}
}
diff --git a/pages/application/hidden-danger-check-standard/custom/list.vue b/pages/application/hidden-danger-check-standard/custom/list.vue
index b36f872..f570c5c 100644
--- a/pages/application/hidden-danger-check-standard/custom/list.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list.vue
@@ -145,6 +145,7 @@
totalList:[],
treeNode: [], //部门下拉数据
DEPT: '',
+ DEPTNAME: '',
page: 1,
rows: 1000,
totalCount:0,
diff --git a/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue b/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
new file mode 100644
index 0000000..c955a1c
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/other-hidden-add.vue
@@ -0,0 +1,1059 @@
+
+
+
+ 返回
+ 其他隐患登记
+
+
+
+
+
+
+ 隐患照片
+
+
+ {{imgList.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 隐患视频
+
+
+ {{videoList.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 隐患描述
+
+
+
+ 隐患部位
+
+
+
+ 隐患级别
+
+
+ {{pd.HIDDENLEVELNAME?pd.HIDDENLEVELNAME:'请选择'}}
+
+
+
+
+ 隐患类型
+
+ {{pd.HIDDENTYPENAME?pd.HIDDENTYPENAME:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是否立即整改
+
+
+
+
+ 是
+
+
+
+
+ 是
+
+
+
+
+ 是
+
+
+
+ 否
+
+
+
+
+
+ 整改责任部门
+
+ {{pd.RECTIFICATIONDEPTNAME?pd.RECTIFICATIONDEPTNAME:'请选择'}}
+
+
+
+
+ 整改责任人
+
+
+ {{pd.RECTIFICATIONORNAME?pd.RECTIFICATIONORNAME:'请选择'}}
+
+
+
+
+ 整改期限
+
+
+ {{pd.RECTIFICATIONDEADLINE?pd.RECTIFICATIONDEADLINE:'请选择'}}
+
+
+
+
+
+ 整改描述
+
+
+
+
+ 整改后图片
+
+
+ {{imgList1.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 播放视频
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
index a747600..fe0615a 100644
--- a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
@@ -295,7 +295,7 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/app/hidden/goEdit',
+ url: basePath + '/app/hidden/goRiskListCheckEdit', // /app/hidden/goEdit
method: 'POST',
dataType: 'json',
header: {
@@ -889,7 +889,7 @@
latitude = result[1];
//发送 post 请求提交保存
uni.request({
- url: basePath+'/app/hidden/appAdd',
+ url: basePath+'/app/hidden/riskListCheckAppAdd',
method: 'POST',
dataType: 'json',
header: {
diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
index ec9143a..76cb64a 100644
--- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
@@ -662,7 +662,7 @@
var _this = this;
this.buttonloading = true
uni.request({
- url: basePath + "/app/hidden/check", //提交接口
+ url: basePath + "/app/hidden/riskListCheckInspection", //提交接口 // /app/hidden/check
method: 'POST',
dataType: 'json',
header: {
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue
index bf2fa9b..79a2896 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list.vue
@@ -248,7 +248,7 @@
if(_this.list[e.index].HIDDEN_ID){
//不合格改为合格时 删除旧隐患
uni.request({
- url: basePath+'/app/hidden/delete',
+ url: basePath+'/app/hidden/riskListCheckHiddenDelete', // /app/hidden/delete
xhrFields: {
withCredentials: true
},
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
index 68925ef..e598aa3 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-next.vue
@@ -396,7 +396,7 @@
success: function (res) {
if (res.cancel) {
uni.request({
- url: basePath + "/app/hidden/delete", //提交接口
+ url: basePath + "/app/hidden/riskListCheckHiddenDelete", //提交接口 // /app/hidden/delete
method: 'POST',
dataType: 'json',
header:{
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
index 29aa7d9..c58c497 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
@@ -213,7 +213,7 @@
permissionID:'',
isUps:false,
buttonloading: false,
- msg:'add',
+ msg:'riskListCheckAdd',
riskId:'',
itemId:'',
LISTMANAGER_ID:'',
@@ -264,7 +264,7 @@
this.rectifyPlanCompletionStartTime = formatDate(tomorrow, 'yyyy-MM-dd');
this.pd.HIDDEN_ID = event.HIDDEN_ID;
if(this.pd.HIDDEN_ID){
- this.msg="edit";
+ this.msg="riskListCheckEdit";
this.getData();
}else {
this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.checkContent));
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue
index 04733f2..31b6581 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app.vue
@@ -145,6 +145,7 @@
totalList:[],
treeNode: [], //部门下拉数据
DEPT: '',
+ DEPTNAME: '',
page: 1,
rows: 1000,
totalCount:0,
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
index c5f24a5..3a29d43 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
@@ -143,6 +143,7 @@
totalList1:[],
treeNode: [], //部门下拉数据
DEPT: '',
+ DEPTNAME: '',
page: 1,
rows: 1000,
totalCount:0,
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
index 18f4da7..37b73e9 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
@@ -222,7 +222,7 @@
permissionID:'',
isUps:false,
buttonloading: false,
- msg:'add',
+ msg:'riskListCheckAdd', // add
riskId:'',
itemId:'',
index:'',
@@ -268,7 +268,7 @@
this.pd.HIDDEN_ID = event.HIDDEN_ID;
this.CHECKRECORD_ID = event.CHECKRECORD_ID;
if(this.pd.HIDDEN_ID){
- this.msg="edit";
+ this.msg="riskListCheckEdit"; // edit
this.getData();
}else {
// this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.checkContent));
@@ -292,7 +292,7 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/app/hidden/goEdit',
+ url: basePath + '/app/hidden/goRiskListCheckEdit', // /app/hidden/goEdit
method: 'POST',
dataType: 'json',
header: {