页面问题修改

src/views/safetyManagement/wastewater/components/addEditDialogDischargeRec.vue

@@ -83,16 +83,7 @@ export default {
     data() {
         return {
             openShow: false,
-            tableData: [
+            tableData: [],
-                // 初始化一行空数据
-                {
-                    wasteType: null, // 报废槽液类型
-                    teamName: null, // 排放班组
-                    amount: null, // 排放量
-                    dirDate: null, // 日期
-                    memo: '', // 备注
-                },
-            ],
         };
     },
     watch: {
@@ -113,21 +104,11 @@ export default {
         },
         // 插入一行
         addTable() {
-            this.tableData.push({
+            this.tableData.push({});
-                wasteType: null,
-                teamName: null,
-                amount: null,
-                dirDate: null,
-                memo: '',
-            });
         },
         // 删除行
         delTable() {
-            if (this.tableData.length <= 1) {
+            this.tableData.pop()
-                this.$message.warning('至少保留一行数据');
-                return;
-            }
-            this.tableData.pop(); // 删除最后一行
         },
         // 提交数据
         submit() {

src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="新增" append-to-body v-model="openShow" width="70%" @close="closeDialog">
+    <el-dialog title="新增" append-to-body v-model="openShow" width="70%" @close="closeDialog" destroy-on-close>
         <div style="margin-bottom: 12px" v-if="moldAddMore">
             <el-button type="primary" @click="addTable">插入一行</el-button>
             <el-button type="danger" @click="delTable">删除行</el-button>
@@ -51,7 +51,8 @@
                     <span><i style="color: red">*</i>加药时间</span>
                 </template>
                 <template #default="scope">
-                    <el-date-picker v-model="scope.row.dosingTime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择时间" style="width: 100%" />
+                    <el-date-picker v-model="scope.row.dosingTime" format="YYYY-MM-DD HH:mm:ss"
+                        value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择时间" style="width: 100%" />
                 </template>
             </el-table-column>
 
@@ -62,7 +63,6 @@
                 </template>
             </el-table-column>
         </el-table>
-
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="closeDialog">取 消</el-button>
@@ -86,17 +86,7 @@ export default {
     data() {
         return {
             openShow: false,
-            tableData: [
+            tableData:[],
-                // 初始化一行空数据
-                {
-                    device: null, 
-                    drug: null, 
-                    dose: null, 
-                    dosingTime: null,
-                    dosingMan: null, 
-                    memo: '', // 备注
-                },
-            ],
         };
     },
     watch: {
@@ -109,45 +99,24 @@ export default {
         },
     },
     methods: {
+        show(){
+            this.openShow = true;
+            this.tableData = [];
+        },
         closeDialog() {
             this.openShow = false;
-            this.$emit('closeDialog');
-            // 关闭时清空数据
-            this.tableData = 
-            [{ device: null, drug: null, dose: null, dosingTime: null, dosingMan: null, memo: '' }];
         },
         // 插入一行
         addTable() {
-            this.tableData.push({
+            this.tableData.push({});
-                    device: null, 
-                    drug: null, 
-                    dose: null, 
-                    dosingTime: null,
-                    dosingMan: null, 
-                    memo: '', // 备注
-            });
         },
         // 删除行
         delTable() {
-            if (this.tableData.length <= 1) {
+            this.tableData.pop()
-                this.$message.warning('至少保留一行数据');
-                return;
-            }
-            this.tableData.pop(); // 删除最后一行
         },
         // 提交数据
         submit() {
-            // 简单验证：检查必填项
             const isValid = this.tableData.every(row => {
-                // 添加调试信息
-                console.log("验证数据:", {
-                    device: row.device,
-                    drug: row.drug,
-                    dose: row.dose,
-                    dosingTime: row.dosingTime,
-                    dosingMan: row.dosingMan
-                });
-                
                 // 检查所有必填项
                 if (!row.device || !row.drug || !row.dose || !row.dosingTime || !row.dosingMan) {
                     // 指明具体缺少的字段
@@ -163,9 +132,14 @@ export default {
                 return true;
             });
             if (isValid) {
-                // 向父组件传递新增的数据
+                // 如果所有必填项都填写了，则进行提交操作
-                this.$emit('submitData', this.tableData);
+                // if(res.code == 200){
-                this.closeDialog(); // 提交后关闭弹窗
+                //     this.$message.success("提交成功");
+                //     this.closeDialog(); // 提交后关闭弹窗
+                //     this.$emit("submitData"); // 通知父组件刷新表格数据
+                // }else{
+                //     this.$message.error("提交失败");
+                // }
             }
         },
     },

src/views/safetyManagement/wastewater/components/addEditDialogTestRecord.vue

@@ -106,20 +106,7 @@ export default {
     data() {
         return {
             openShow: false,
-            tableData: [
+            tableData: [],
-                // 初始化一行空数据
-                {
-                    device: null,
-                    dosingTime: null,
-                    dosingMan: null,
-                    itNi: null,
-                    itCu: null,
-                    itCr: null,
-                    itCn2: null,
-                    itPh: null,
-                    memo: '',
-                },
-            ],
         };
     },
     watch: {
@@ -151,25 +138,11 @@ export default {
         },
         // 插入一行
         addTable() {
-            this.tableData.push({
+            this.tableData.push({});
-                device: null,
-                dosingTime: null,
-                dosingMan: null,
-                itNi: null,
-                itCu: null,
-                itCr: null,
-                itCn2: null,
-                itPh: null,
-                memo: '',
-            });
         },
         // 删除行
         delTable() {
-            if (this.tableData.length <= 1) {
+            this.tableData.pop()
-                this.$message.warning('至少保留一行数据');
-                return;
-            }
-            this.tableData.pop(); // 删除最后一行
         },
         // 提交数据
         submit() {

src/views/safetyManagement/wastewater/components/dosingRecord.vue

@@ -13,8 +13,8 @@
       </template>
     </avue-crud>
     <!-- 新增弹窗 -->
-    <addEditDialogDosingRecord v-if="addOpen" :showDialog="addOpen" @closeDialog="closeDialog"
+    <addEditDialogDosingRecord ref="addEditDialogDosingRecord" 
-      :moldAddMore="moldAddMore" @submitData="handleSubmitData">
+    :moldAddMore="moldAddMore" @submitData="onLoad()">
     </addEditDialogDosingRecord>
     <!-- 导入 -->
     <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
@@ -32,7 +32,6 @@ export default {
   },
   data() {
     return {
-      addOpen: false,  //新增弹窗
       moldAddMore: false,
       isShowImport: false,
       loading: false,
@@ -186,21 +185,13 @@ export default {
   methods: {
      // 新增
         moldAddFn(row, flag) {
-          console.log(1)
+          this.$refs.addEditDialogDosingRecord.show()
-            this.addOpen = true
             this.moldAddMore = flag
         },
         //关闭弹窗
         closeDialog() {
             this.addOpen = false
         },
-        // 处理子组件提交的数据
-        handleSubmitData(data) {
-            console.log("提交的数据:", data);
-            // 这里可以添加处理提交数据的逻辑
-            this.$message.success("数据提交成功！");
-            this.addOpen = false;
-        },
     // 点击导入按钮
     handleImport() {
       this.isShowImport = true
@@ -307,9 +298,6 @@ export default {
       ];
       this.page.total = this.data.length;
       this.loading = false;
-      setTimeout(() => {
-        this.selectionClear();
-      }, 500);
     },
   },
 };