8e1fff14 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents cd7c56c4 393dbb3a
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-26 13:31:57
* @LastEditTime: 2023-11-02 13:27:43
:show-message="false"
-->
<template>
......@@ -49,7 +49,7 @@
:rules="rules.ztQlxxrules">
<select-table
v-model="ruleForm.ztQlxx"
:table-width="730"
table-width="100%"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange">
......@@ -130,7 +130,7 @@
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="730"
table-width="100%"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
......
......@@ -281,8 +281,8 @@
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
type: "warning",
});
type: "warning"
})
}
})
.catch((res) => {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-09 11:02:50
* @LastEditTime: 2023-11-02 13:21:39
-->
<template>
<div class="djxxTable">
......@@ -157,7 +157,6 @@
}
return name;
},
// 新增一条补录信息
/**
* @description: 新增一条补录信息
* @param {*} row
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:54:12
* @LastEditTime: 2023-11-02 13:38:33
-->
<template>
<div class="djxxTable">
......@@ -175,10 +175,10 @@
})
.then(() => {
this.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!",
});
// this.$message({
// type: "success",
// message: "补录成功!",
// });
})
.catch(() => {
this.$message({
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-09 10:35:11
* @LastEditTime: 2023-11-02 13:38:48
-->
<template>
<div class="djxxTable">
......@@ -171,10 +171,10 @@
.then(() => {
this.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!",
});
// this.$message({
// type: "success",
// message: "补录成功!",
// });
})
.catch(() => {
this.$message({
......
......@@ -177,10 +177,10 @@
}).then(() => {
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
message: '补录成功!'
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
}).catch(() => {
this.$message({
type: 'info',
......
......@@ -79,7 +79,7 @@
qsztList: datas.columns().qsztList,
checkList: datas.columns().checkList,
//传递参数
bdcdyid: this.$route.query.bdcdyid,
bdcdyid: this.$route.query.bdcdyid,
qllx: this.$route.query.qllx,
//列表数据
tableData: [],
......@@ -166,10 +166,10 @@
}).then(() => {
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
message: '补录成功!'
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
}).catch(() => {
this.$message({
type: 'info',
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-22 09:56:51
* @LastEditTime: 2023-11-02 13:39:06
-->
<template>
<div class="all">
......@@ -134,10 +134,10 @@
.then(() => {
this.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!",
});
// this.$message({
// type: "success",
// message: "补录成功!",
// });
})
.catch(() => {
this.$message({
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-25 17:19:17
* @LastEditTime: 2023-11-02 13:39:10
-->
<template>
<div class="djxxTable">
......@@ -217,10 +217,10 @@
}).then(() => {
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
message: '补录成功!'
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
}).catch(() => {
this.$message({
type: 'info',
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-25 17:14:29
* @LastEditTime: 2023-11-02 13:39:13
-->
<template>
<div class="djxxTable">
......@@ -166,10 +166,10 @@
}).then(() => {
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
message: '补录成功!'
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
}).catch(() => {
this.$message({
type: 'info',
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-24 16:15:45
* @LastEditTime: 2023-11-02 13:39:17
-->
<template>
<div class="djxxTable">
......@@ -166,10 +166,10 @@
}).then(() => {
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
message: '补录成功!'
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
}).catch(() => {
this.$message({
type: 'info',
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-01 14:31:16
* @LastEditTime: 2023-11-02 13:39:28
-->
<template>
<div class="tableBox">
......@@ -228,10 +228,10 @@
})
.then(() => {
this.$parent.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!"
})
// this.$message({
// type: "success",
// message: "补录成功!"
// })
})
.catch(() => {
this.$message({
......
<!--
* @Description:
* @Autor: miaofang
* @LastEditTime: 2023-11-01 14:24:12
* @LastEditTime: 2023-11-02 13:39:22
-->
<template>
<div class="djxxTable">
......@@ -287,10 +287,10 @@
.then(() => {
this.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!",
});
// this.$message({
// type: "success",
// message: "补录成功!",
// });
})
.catch(() => {
this.$message({
......