diff --git a/pages/application/key-project-management/positioning_management/index.vue b/pages/application/key-project-management/positioning_management/index.vue index 5e9c8fc..f65c287 100644 --- a/pages/application/key-project-management/positioning_management/index.vue +++ b/pages/application/key-project-management/positioning_management/index.vue @@ -67,7 +67,7 @@ - + diff --git a/pages/application/key-project-management/safety-environmental-inspection/detail.vue b/pages/application/key-project-management/safety-environmental-inspection/detail.vue index c43b458..31b31a9 100644 --- a/pages/application/key-project-management/safety-environmental-inspection/detail.vue +++ b/pages/application/key-project-management/safety-environmental-inspection/detail.vue @@ -25,19 +25,10 @@ {{form.INSPECTION_CATEGORY}}现场检查记录 - + 被检查单位: - - - - {{ form.UNITS_NAME || '请选择' }} - - - - - {{ form.UNITS_NAME }} + {{ form.UNITS_NAME }} 被检查单位现场负责人: @@ -1519,9 +1510,13 @@ success: (res) => { if ("success" == res.data.result) { _this.treeNode = res.data.varList; - _this.form.UNITS_NAME = _this.treeNode[0].UNITS_NAME - _this.form.UNITS_ID = _this.treeNode[0].UNITS_ID - _this.getUserList('inspectedSiteuserList', _this.treeNode[0].UNITS_ID) + if(!_this.form.UNITS_NAME) { + _this.form.UNITS_NAME = _this.treeNode[0].UNITS_NAME + } + if(!_this.form.UNITS_ID) { + _this.form.UNITS_ID = _this.treeNode[0].UNITS_ID + } + _this.getUserList('inspectedSiteuserList', _this.form.UNITS_ID) } else { uni.showToast({ title: res.data.message, @@ -1577,7 +1572,8 @@ }, success: function(res) { if ("success" == res.data.result) { - console.log(res.data.pd); + _this.form.UNITS_NAME = res.data.pd.UNITS_NAME + _this.form.UNITS_ID = res.data.pd.UNITS_ID _this.form.PERSONNELMANAGEMENT_ID = res.data.pd.PERSONNELMANAGEMENT_ID; _this.form.PERSON_NAME = res.data.pd.NAME; } else { diff --git a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue index 5f1a827..787308d 100644 --- a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue +++ b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue @@ -2,7 +2,7 @@ 返回 - 安全环保检查指派确认人 + 安全环保检查指派 @@ -332,7 +332,7 @@ 整改期限 - + {{ form.RECTIFICATIONDEADLINE ? form.RECTIFICATIONDEADLINE : '请选择' }} @@ -398,6 +398,7 @@ HIDDEN_STATUS: '', // 检查ID principalList: [], form: { + RECTIFICATIONORNAME:'', HIDDENDESCR: '', // 隐患描述 CREATORNAME: '', // 隐患责任人 HIDDENLEVELNAME: '', // 隐患级别 diff --git a/pages/application/safety-environmental-inspection/inspector/detail.vue b/pages/application/safety-environmental-inspection/inspector/detail.vue index df8d3ab..1168752 100644 --- a/pages/application/safety-environmental-inspection/inspector/detail.vue +++ b/pages/application/safety-environmental-inspection/inspector/detail.vue @@ -464,7 +464,7 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.form = res.data.pd; //参数map - _this.form.hiddenForm = res.data.hiddenList[0]; + _this.form.hiddenForm = res.data.pd.hiddenList[0]; for (let i = 0; i < _this.form.inspectorList.length; i++) { _this.inspectorList.push([]) _this.getUserList('inspectorList', _this.form.inspectorList[i].INSPECTION_DEPARTMENT_ID, i)