diff --git a/src/views/enterprise/dangerousEngineering/components/engineerDetails.vue b/src/views/enterprise/dangerousEngineering/components/engineerDetails.vue
index 3bf7829..df608e8 100644
--- a/src/views/enterprise/dangerousEngineering/components/engineerDetails.vue
+++ b/src/views/enterprise/dangerousEngineering/components/engineerDetails.vue
@@ -290,8 +290,12 @@
-
- {{ row.question }}
+
+
+
+
+
+ {{ row.question == 1 ? "一般隐患" : row.question == 2 ? "重大隐患" : "无隐患" }}
@@ -556,6 +560,10 @@ const confirmAdd = async (row: any, index: any) => {
switch (true) {
case tabPosition.value < 5 || tabPosition.value == 8:
let updateArr = [] as any;
+ if (!requestData.annexName || requestData.fileList.length == 0) {
+ ElMessage.error("请输入名称以及上传附件");
+ break;
+ }
requestData.fileList.map(item => {
updateArr.push({
createTime: item.response.createTime,
@@ -570,10 +578,10 @@ const confirmAdd = async (row: any, index: any) => {
requestData.annexFiles = updateArr;
requestData.type = tabPosition.value;
delete requestData.fileList;
- const res = await addOperation[tabPosition.value](requestData);
+ const res = await addOperation[0](requestData);
if (res.success) {
ElMessage.success("操作成功");
- listOperation[tabPosition.value]();
+ listOperation[0]();
}
break;
default:
@@ -600,8 +608,8 @@ const removeEngineeringSingle = async (row: any, index: any) => {
if (row.id) {
switch (true) {
case tabPosition.value < 5 || tabPosition.value == 8:
- await useHandleData(deleteOperation[tabPosition.value], { id: row.id }, `删除【${row.annexName}】`);
- listOperation[tabPosition.value]();
+ await useHandleData(deleteOperation[0], { id: row.id }, `删除【${row.annexName}】`);
+ listOperation[0]();
break;
default:
await useHandleData(deleteOperation[tabPosition.value - 4], { id: row.id }, "删除");
@@ -609,17 +617,17 @@ const removeEngineeringSingle = async (row: any, index: any) => {
break;
}
} else {
- switch (tabPosition.value) {
- case 0:
+ switch (true) {
+ case tabPosition.value < 5 || tabPosition.value == 8:
arrOne.value.splice(index, 1);
break;
- case 5:
+ case tabPosition.value == 5:
arrFive.value.splice(index, 1);
break;
- case 6:
+ case tabPosition.value == 6:
arrSeven.value.splice(index, 1);
break;
- case 7:
+ case tabPosition.value == 7:
arrEight.value.splice(index, 1);
break;
default:
@@ -686,40 +694,64 @@ const addData = () => {
console.log(tabPosition.value);
switch (true) {
case tabPosition.value < 5 || tabPosition.value == 8:
- arrOne.value.push({
- annexName: "",
- fileList: []
+ let findOneItem = arrOne.value.find(item => {
+ return item.insertNew;
});
+ if (!findOneItem) {
+ arrOne.value.push({
+ annexName: "",
+ fileList: [],
+ insertNew: true
+ });
+ }
break;
case tabPosition.value == 5:
- arrFive.value.push({
- currentProgress: "",
- imageUrl: "",
- // createByName: "",
- // createTime: "",
- isEdit: true
+ let findTwoItem = arrFive.value.find(item => {
+ return item.insertNew;
});
+ if (!findTwoItem) {
+ arrFive.value.push({
+ currentProgress: "",
+ imageUrl: "",
+ // createByName: "",
+ // createTime: "",
+ isEdit: true,
+ insertNew: true
+ });
+ }
break;
case tabPosition.value == 6:
- arrSeven.value.push({
- inspectResult: "",
- inspectUser: "",
- inspectTime: "",
- question: "",
- solveUser: "",
- questionDesc: "",
- isEdit: true
+ let findThreeItem = arrSeven.value.find(item => {
+ return item.insertNew;
});
+ if (!findThreeItem) {
+ arrSeven.value.push({
+ inspectResult: "",
+ inspectUser: "",
+ inspectTime: "",
+ question: "",
+ solveUser: "",
+ questionDesc: "",
+ isEdit: true,
+ insertNew: true
+ });
+ }
break;
case tabPosition.value == 7:
- arrEight.value.push({
- type: null,
- result: null,
- state: null,
- imageUrl: "",
- acceptTime: "",
- isEdit: true
+ let findFourItem = arrEight.value.find(item => {
+ return item.insertNew;
});
+ if (!findFourItem) {
+ arrEight.value.push({
+ type: null,
+ result: null,
+ state: null,
+ imageUrl: "",
+ acceptTime: "",
+ isEdit: true,
+ insertNew: true
+ });
+ }
break;
default:
break;
diff --git a/src/views/enterprise/hoistingMachineryRecord/components/addHoistMachinery.vue b/src/views/enterprise/hoistingMachineryRecord/components/addHoistMachinery.vue
index aef8e8a..f16a1e4 100644
--- a/src/views/enterprise/hoistingMachineryRecord/components/addHoistMachinery.vue
+++ b/src/views/enterprise/hoistingMachineryRecord/components/addHoistMachinery.vue
@@ -693,6 +693,11 @@ const submitForm = async (formEl: FormInstance | undefined) => {
const closeMain = () => {
visible.value = false;
};
+const getAnnexDicMainList = async () => {
+ // 起重机械设备附件字典
+ const res = await getDicList({ dictType: "equip_attachment_name" });
+ documentData.value = res.result.map(item => ({ ...item, fileList: [] }));
+};
// 监听父组件的visible，用来简介控制el-dialog的弹框开关，一般是用于开
watch(
() => props.addDialog,
@@ -731,6 +736,7 @@ watch(
towerPermanentStandard: ""
};
activeName.value = "first";
+ getAnnexDicMainList();
}
}
);
@@ -741,9 +747,7 @@ watch(visible, (n, o) => {
onMounted(async () => {
await getTypeDicMainList();
- // 起重机械设备附件字典
- const res = await getDicList({ dictType: "equip_attachment_name" });
- documentData.value = res.result.map(item => ({ ...item, fileList: [] }));
+ await getAnnexDicMainList();
});