abf30aa5 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 2a59acb8 dfa6cc11
......@@ -74,7 +74,6 @@
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
......@@ -93,7 +92,9 @@
/deep/.el-form-item__label {
padding-bottom: 0px;
}
/deep/.el-form-item__error {
display: none;
}
// 控制表单是否只读
.readonly {
/deep/.el-form-item__content {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-15 10:24:42
* @LastEditTime: 2024-01-30 15:46:45
-->
<template>
<div class="szxx">
......@@ -223,7 +223,7 @@
color: #8b4534;
}
.szxx_body {
min-height: 280px;
height: 330px;
}
}
.zs-card {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 15:24:14
* @LastEditTime: 2024-01-30 15:03:32
-->
<template>
<div class="slxx">
......@@ -72,13 +72,13 @@
<el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限:" prop="cfdj.cfqx">
<el-input v-model="ruleForm.cfdjList[0].cfqx" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:" prop="cfdj.cfqssj">
<el-date-picker v-model="ruleForm.cfdjList[0].cfqssj" class="width100" type="date" placeholder="选择日期"
......@@ -92,30 +92,28 @@
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj">
<el-input v-model="ruleForm.cfdjList[0].cfwj" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw">
<el-input v-model="ruleForm.cfdjList[0].cffw" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="cfdj.fj">
<el-input v-model="ruleForm.cfdjList[0].fj" type="textarea" :disabled="!ableOperation|| isJfOperation">
<el-input v-model="ruleForm.cfdjList[0].fj" :disabled="!ableOperation|| isJfOperation">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdj.djyy">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdjList[0].djyy">
<el-input class="textArea" type="textarea" v-model="ruleForm.cfdjList[0].djyy"
:disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
......@@ -146,9 +144,7 @@
</div>
</div>
<el-row class="btn" v-if="ableOperation">
<el-form-item :class="flag ? 'marginBot0' : ''">
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-row>
</el-form>
</div>
......@@ -164,7 +160,11 @@
ableOperation: true,
disabled: true,
flagTop: this.flag ? "top" : "",
rules: {},
rules: {
'cfdjList[0].djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
},
//传递参数
propsParam: {},
//页面数据
......@@ -213,12 +213,24 @@
* @author: renchao
*/
onSubmit () {
this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
batchSaveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message.success('保存成功');
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
batchSaveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message.success('保存成功');
}
})
} else {
this.$message({
showClose: true,
message: "请输入登记原因",
type: "error"
})
return false;
}
});
},
/**
* @description: changeCflx
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-18 13:12:00
* @LastEditTime: 2024-01-30 15:08:38
-->
<template>
<div class="slxx">
......@@ -296,7 +296,11 @@
viewEdit: false,
disabled: true,
flagTop: this.flag ? "top" : "",
rules: {},
rules: {
'cfdj.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
},
//传递参数
propsParam: {},
//页面数据
......@@ -339,7 +343,7 @@
},
},
computed: {
...mapGetters(["dictData"]),
...mapGetters(["dictData"])
},
methods: {
......@@ -348,11 +352,22 @@
* @author: renchao
*/
onSubmit () {
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message.success("保存成功");
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message.success("保存成功");
}
})
} else {
this.$message({
showClose: true,
message: "请输入登记原因",
type: "error"
})
return false
}
});
})
},
/**
* @description: changeCflx
......@@ -364,10 +379,10 @@
cflxItem = this.dictData["A32"].find((item) => {
return item.dcode == e;
});
this.ruleForm.cfdj.cflxmc = cflxItem.dname;
},
},
};
this.ruleForm.cfdj.cflxmc = cflxItem.dname
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2024-01-26 14:35:46
* @LastEditTime: 2024-01-30 14:25:43
-->
<template>
<div class="slxx">
......@@ -259,7 +259,7 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy">
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="fdcq1.djyy">
<el-input
class="textArea"
type="textarea"
......@@ -364,8 +364,12 @@
propsParam: this.$attrs,
//表单是否可操作
viewEdit: false,
rules: {},
};
rules: {
'fdcq1.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
}
}
},
methods: {
/**
......@@ -500,20 +504,33 @@
})
}
}
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
this.$store.dispatch("user/refreshPage", true);
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
that.$store.dispatch("user/refreshPage", false);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
that.$store.dispatch("user/refreshPage", true);
} else {
that.$message({
showClose: true,
message: res.message,
type: "error"
})
}
})
} else {
this.$message({
that.$message({
showClose: true,
message: res.message,
message: "请输入登记原因",
type: "error"
})
return false
}
})
}
......@@ -522,65 +539,5 @@
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
/deep/.el-form-item__label {
padding: 0;
}
/deep/.el-radio {
margin-right: 10px;
}
/deep/.el-select {
width: 100%;
}
/deep/.el-form-item {
margin-bottom: 3px;
}
.marginBot0 {
margin-bottom: 0 !important;
}
.slxx {
box-sizing: border-box;
}
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
.submit_btn {
height: 50px;
}
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
}
/deep/.el-form-item__label {
padding-bottom: 0px;
}
@import "~@/styles/slxx/slxx.scss";
</style>
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2024-01-26 17:01:19
* @LastEditTime: 2024-01-30 15:17:03
-->
<template>
<div class="slxx">
......@@ -387,7 +387,7 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy">
<el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="fdcq2.djyy">
<el-input
class="textArea"
type="textarea"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-23 15:14:11
* @LastEditTime: 2024-01-30 14:20:09
-->
<template>
<!-- 受理信息 -->
......@@ -234,7 +234,7 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因:" prop="djyy">
<el-form-item label="登记原因:" prop="jsydsyq.djyy">
<el-input
class="textArea"
type="textarea"
......@@ -337,8 +337,12 @@
ruleForm: {},
//传递参数
propsParam: {},
rules: {},
};
rules: {
'jsydsyq.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
}
}
},
methods: {
/**
......@@ -456,21 +460,32 @@
* @description: saveData
* @author: renchao
*/
this.$store.dispatch("user/refreshPage", false);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
this.$store.dispatch("user/refreshPage", true);
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
that.$store.dispatch("user/refreshPage", false);
saveData(that.ruleForm).then((res) => {
if (res.code === 200) {
that.$message({
showClose: true,
message: "保存成功!",
type: "success"
})
that.$store.dispatch("user/refreshPage", true);
} else {
that.$message({
showClose: true,
message: res.message,
type: "error"
})
}
})
} else {
this.$message({
showClose: true,
message: res.message,
message: "请输入登记原因",
type: "error"
})
return false
}
})
}
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-22 10:43:54
* @LastEditTime: 2024-01-30 14:19:35
-->
<template>
<!-- 受理信息 -->
......@@ -260,7 +260,7 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因:" prop="djyy">
<el-form-item label="登记原因:" prop="jsydsyq.djyy">
<el-input
class="textArea"
type="textarea"
......@@ -359,7 +359,11 @@
},
//传递参数
propsParam: {},
rules: {},
rules: {
'jsydsyq.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
}
};
},
methods: {
......@@ -468,29 +472,40 @@
})
}
}
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
this.$store.dispatch("user/refreshPage", true);
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
that.$store.dispatch("user/refreshPage", false)
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
that.$message({
showClose: true,
message: "保存成功!",
type: "success"
})
that.$store.dispatch("user/refreshPage", true)
} else {
that.$message({
showClose: true,
message: res.message,
type: "error"
})
}
})
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
});
message: "请输入登记原因",
type: "error"
})
return false
}
});
})
},
/**
* @description: compare
* @author: renchao
*/
compare () {
console.log("this.ruleForm", this.ruleForm);
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-10 14:32:11
* @LastEditTime: 2024-01-30 14:07:15
-->
<template>
<!-- 受理信息 -->
......@@ -324,7 +324,7 @@
</div>
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因:" prop="djyy">
<el-form-item label="登记原因:" prop="tdsyq.djyy">
<el-input
class="textArea"
maxlength="500"
......@@ -427,8 +427,12 @@
ruleForm: {},
//传递参数
propsParam: {},
rules: {},
};
rules: {
'tdsyq.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
}
}
},
methods: {
/**
......@@ -547,25 +551,37 @@
* @description: saveData
* @author: renchao
*/
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
this.$store.dispatch("user/refreshPage", true);
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
that.$message({
showClose: true,
message: "保存成功!",
type: "success",
});
that.$store.dispatch("user/refreshPage", true);
} else {
that.$message({
showClose: true,
message: res.message,
type: "error"
})
}
})
} else {
this.$message({
showClose: true,
message: res.message,
type: "error",
message: "请输入登记原因",
type: "error"
});
return false;
}
});
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-29 13:06:12
* @LastEditTime: 2024-01-30 14:53:53
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -110,9 +110,15 @@ class data extends filter {
minWidth: '150'
},
{
prop: "ywrmc",
label: "义务人",
width: '100',
width: '120',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.ywrmc} placement="top" popper-class="tooltip-width">
<span class="ellipsis-table"> {scope.row.ywrmc}</span>
</el-tooltip>
)
}
},
{
prop: "ywrzjhm",
......