suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面问题修改

Browse Source
dev-scheduling
taozi 4 months ago
parent 166fcc9e6e
commit d845ffb01f
4 changed files with 29 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/views/safetyManagement/wastewater/components/addEditDialogDischargeRec.vue
  2. 66
      src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue
  3. 33
      src/views/safetyManagement/wastewater/components/addEditDialogTestRecord.vue
  4. 18
      src/views/safetyManagement/wastewater/components/dosingRecord.vue

25
src/views/safetyManagement/wastewater/components/addEditDialogDischargeRec.vue
Unescape View File

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

66
src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue
Unescape View File

@ -1,10 +1,10 @@
<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>
</div>
<el-table :data="tableData" style="width: 100%" border :cell-style="{padding: '5px'}">
<el-table :data="tableData" style="width: 100%" border :cell-style="{ padding: '5px' }">
<!-- 设施 -->
<el-table-column prop="device" label="设施" align="center" width="170">
<template #header>
@ -51,18 +51,18 @@
<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>
<!-- 备注（输入框） -->
<el-table-column prop="memo" label="备注" align="center" >
<el-table-column prop="memo" label="备注" align="center">
<template #default="scope">
<el-input v-model="scope.row.memo" placeholder="请输入备注" />
</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: [
// 初始化一行空数据
{
device: null,
drug: null,
dose: null,
dosingTime: null,
dosingMan: null,
memo: '', // 备注
},
],
tableData:[],
};
},
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({
device: null,
drug: null,
dose: null,
dosingTime: null,
dosingMan: null,
memo: '', // 备注
});
this.tableData.push({});
},
// 删除行
delTable() {
if (this.tableData.length <= 1) {
this.$message.warning('至少保留一行数据');
return;
}
this.tableData.pop(); // 删除最后一行
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);
this.closeDialog(); // 提交后关闭弹窗
// 如果所有必填项都填写了，则进行提交操作
// if(res.code == 200){
// this.$message.success("提交成功");
// this.closeDialog(); // 提交后关闭弹窗
// this.$emit("submitData"); // 通知父组件刷新表格数据
// }else{
// this.$message.error("提交失败");
// }
}
},
},

33
src/views/safetyManagement/wastewater/components/addEditDialogTestRecord.vue
Unescape View File

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

18
src/views/safetyManagement/wastewater/components/dosingRecord.vue
Unescape View File

@ -13,8 +13,8 @@
</template>
</avue-crud>
<!-- 新增弹窗 -->
<addEditDialogDosingRecord v-if="addOpen" :showDialog="addOpen" @closeDialog="closeDialog"
:moldAddMore="moldAddMore" @submitData="handleSubmitData">
<addEditDialogDosingRecord ref="addEditDialogDosingRecord"
: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.addOpen = true
this.$refs.addEditDialogDosingRecord.show()
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);
},
},
};

Write Preview
Loading…
Cancel
Save