From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/accidentManagementSystem/accidentReport/component/openAdd.vue | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue b/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
index 472e746..de8cecb 100644
--- a/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
+++ b/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
@@ -179,7 +179,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="事故状态" prop="status">
- <el-select v-model="ruleForm.status" :disabled="disabled" class="w100" placeholder="请选择">
+ <el-select v-model="ruleForm.status" :disabled="statusDisabled" class="w100" placeholder="请选择">
<el-option label="处理中" :value="1"></el-option>
<el-option label="已处理" :value="2"></el-option>
</el-select>
@@ -206,7 +206,7 @@
</template>
</el-dialog>
<AccidentName @selectItem="onSelectItem" ref="Shows" />
- <DailogSearchUser @SearchUser="onUser" ref="userRef" />
+ <DailogSearchUserManger @SearchUser="onUser" ref="userRef" />
<RegionsDialog ref="openRef" />
</div>
</template>
@@ -217,11 +217,11 @@
import type { UploadUserFile, FormInstance, FormRules } from 'element-plus';
import { ElMessage } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
-import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
+import DailogSearchUserManger from '/@/components/DailogSearchUserManger/index.vue';
import AccidentName from '/@/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue';
import RegionsDialog from '/@/components/regionsDialog/index.vue';
import uploaderImg from '/@/components/uploaderImg/index.vue';
-import { emergencySuppliesApi } from '/@/api/emergencyResources';
+import { emergencySuppliesApi } from '/@/api/contingencyManagement/emergencyResources';
import { accidentManagementSystemApi } from '/@/api/workInjuryDeclaration';
import { goalManagementApi } from '/@/api/goalManagement';
@@ -229,7 +229,7 @@
name: 'openAdd',
components: {
AccidentName,
- DailogSearchUser,
+ DailogSearchUserManger,
RegionsDialog,
uploaderImg
},
@@ -272,11 +272,22 @@
});
const titles = ref();
const disabled = ref();
+ const statusDisabled = ref(true)
// 打开弹窗
- const openDialog = (title: string, id: number, type: boolean) => {
+ const openDialog = (title: string, id: number, type: boolean,statusDisabledFlag:string) => {
isShowDialog.value = true;
titles.value = title;
disabled.value = type;
+ if(statusDisabledFlag.value=='first'){
+ ruleForm.value.status = 1
+ }else if(statusDisabledFlag.value=='second'){
+ ruleForm.value.status = 2
+ }
+ if (title == '修改事故报告') {
+ statusDisabled.value = false
+ }else {
+ statusDisabled.value = true
+ }
if (title == '查看事故报告' || title == '修改事故报告') {
accidentManagementSystemApi()
.seeAccidentReport(id)
@@ -386,7 +397,7 @@
trigger: 'change',
},
],
- fillInUserUid: [
+ fillInUserName: [
{
required: true,
message: '填写人不能为空',
@@ -623,7 +634,8 @@
newTreeList,
department,
getTreeList,
- propse
+ propse,
+ statusDisabled
};
},
});
--
Gitblit v1.9.2