diff --git a/src/views/hotwork/forcedRollback/components/delayed.vue b/src/views/hotwork/forcedRollback/components/delayed.vue new file mode 100644 index 0000000..89df947 --- /dev/null +++ b/src/views/hotwork/forcedRollback/components/delayed.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/hotwork/forcedRollback/components/detail.vue b/src/views/hotwork/forcedRollback/components/detail.vue new file mode 100644 index 0000000..8840236 --- /dev/null +++ b/src/views/hotwork/forcedRollback/components/detail.vue @@ -0,0 +1,570 @@ + + + + + diff --git a/src/views/hotwork/forcedRollback/components/list.vue b/src/views/hotwork/forcedRollback/components/list.vue new file mode 100644 index 0000000..8a2dabc --- /dev/null +++ b/src/views/hotwork/forcedRollback/components/list.vue @@ -0,0 +1,279 @@ + + diff --git a/src/views/hotwork/forcedRollback/index.vue b/src/views/hotwork/forcedRollback/index.vue new file mode 100644 index 0000000..1167274 --- /dev/null +++ b/src/views/hotwork/forcedRollback/index.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue index d4d2ab5..c7f6b64 100644 --- a/src/views/safetyenvironmental/inspection/components/add.vue +++ b/src/views/safetyenvironmental/inspection/components/add.vue @@ -376,6 +376,7 @@
确 定 + 暂 存 取 消
@@ -1173,6 +1174,92 @@ export default { this.form.CONFIRM_MESSAGE_SIGN = information.INSPECTION_USER_SIGN_IMG this.form.CONFIRM_MESSAGE_TIME = information.INSPECTION_USER_SIGN_TIME this.$forceUpdate() + }, + /** + * 暂存 也就是采用分开提交的策略 + * 先提交外部表单 + * 然后每确定一条隐患就上传一条隐患 + * 避免一次性提交造成接口超时 + */ + staging() { + let flag = false + this.form.situationList.forEach(item => { + if (!this.validStr(item.SITUATION)) { + flag = true + return + } + }) + if (flag) { + this.$message({ + message: '检查情况不能为空', + type: 'warning' + }) + return false + } + flag = false + this.form.inspectorList.forEach(item => { + if (!this.validStr(item.INSPECTION_USER_ID)) { + flag = true + return + } + }) + if (flag) { + this.$message({ + message: '检查人员不能为空', + type: 'warning' + }) + return false + } + + this.$refs.form.validate(valid => { + if (valid) { + const loading = this.$loading({ + lock: true, + text: '数据保存中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + for (var x in this.form.inspectorList) { + var vector = 0 + for (var y in this.form.inspectorList) { + if (this.form.inspectorList[y].INSPECTION_USER_ID === this.form.inspectorList[x].INSPECTION_USER_ID) vector++ + } + if (vector > 1) { + this.$message.error('检查人重复！请检查相关数据') + return + } + } + const index = this.form.inspectorList.findIndex(item => item.INSPECTION_USER_ID === JSON.parse(sessionStorage.getItem('user')).USER_ID) + if (index < 0) { + this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: JSON.parse(sessionStorage.getItem('user')).DEPARTMENT_ID, INSPECTION_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID }) + } + this.$set(this.form, 'INSPECTORJSON', JSON.stringify(this.form.inspectorList)) + this.$set(this.form, 'SITUATIONJSON', JSON.stringify(this.form.situationList)) + this.$set(this.form, 'HIDDENJSON', JSON.stringify(this.form.hiddenList)) + this.listLoading = true + requestFN( + '/safetyenvironmental/staging', + { ...this.form } + ).then((data) => { + for (let i = 0; i < data.pd.hiddenList.length; i++) { + this.uploadImg(this.hdFile[i]['fileHdImgList'], data.pd.hiddenList[i].HIDDEN_ID) + this.uploadVideo(this.hdFile[i]['fileVideoList'], data.pd.hiddenList[i].HIDDEN_ID) + } + this.$message({ + message: '保存成功', + type: 'success' + }) + this.listLoading = false + loading.close() + this.goBack() + }).catch((e) => { + this.listLoading = false + loading.close() + }) + } else { + return false + } + }) } } }