Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
9931a4ba by jiaozeping@pashanhoo.com
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents 067ed9be 36c5868e
Expand all
Inline Side-by-side
Showing 16 changed files with 195 additions and 177 deletions
......@@ -10,6 +10,15 @@ export function addSysNotice (data) {
})
}
//编辑系统通知
export function updateSysNotice (data) {
return request({
url: SERVER.SERVERAPI + '/rest/system/sysNotice/updateSysNotice',
method: 'post',
data
})
}
// 获取通知列表
export function getSysNoticeList (data) {
return request({
......
......@@ -8,23 +8,23 @@ export function Init(data) {
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/fristInit";
break;
case "200":
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/transferInit";
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/transferInit";
break;
case "300":
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/changeInit";
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/changeInit";
break;
case "400":
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/logoutInit";
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/logoutInit";
break;
case "500":
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/riviseInit";
break;
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/riviseInit";
break;
case "901":
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/renewalInit";
break;
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/renewalInit";
break;
case "902":
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/replaceInit";
break;
apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/replaceInit";
break;
}
return request({
url: apiUrl,
......@@ -34,7 +34,7 @@ export function Init(data) {
}
// 初始化内容
export function saveData (data) {
console.log("222222222222222");
console.log("222222222222222"+data);
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/ygdj/saveData',
method: 'post',
......
......@@ -90,6 +90,14 @@ export default {
padding: 3px !important;
}
/deep/.el-calendar-table td.is-today {
font-weight: 700;
}
/deep/.el-calendar-table td.is-selected {
background-color: rgb(179, 216, 255);
}
/deep/.el-calendar__header {
padding: 8px 15px;
}
......@@ -141,9 +149,9 @@ export default {
}
/**本月周末设置为红色*/
.el-calendar-table .current:nth-last-child(-n+2) .solar {
/* .el-calendar-table .current:nth-last-child(-n+2) .solar {
color: red;
}
} */
/**本月农历设置为灰色*/
.el-calendar-table .current .lunar {
......
......@@ -268,6 +268,11 @@ export default {
};
</script>
<style scoped>
/deep/.el-message-box {
width: 500px;
max-height: 95%;
}
/deep/.message-title {
font-size: 18px;
font-weight: 700;
......
......@@ -8,7 +8,9 @@
<div ref="back" class="back">
<div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave">
<p v-for="(item, index) in noticeList" :key="index">
{{ item.title }}
<span> {{ item.noticeTitle }}</span>
<span class="noticePublishTime">{{ item.noticePublishTime }}</span>
<el-button type="text" @click="handleNotice(item)" style="color:#F56C6C;font-size: 14px;">[点击查看]</el-button>
</p>
</div>
</div>
......@@ -34,7 +36,22 @@ export default {
secondAnimationTime: '', // 状态二动画效果
};
},
watch: {
noticeList: {
handler (newName, oldName) {
let that = this
this.Listener();
setTimeout(res => {
that.getData();
}, 100);
},
deep: true
}
},
methods: {
handleNotice (item) {
this.$alertMes(item.noticeTitle, item.noticeContent)
},
// 获取数据
getData () {
let style = document.styleSheets[0];
......@@ -53,7 +70,7 @@ export default {
);
setTimeout(res => {
this.changeState();
}, 1000);
}, 300);
},
// 用速度计算时间（想要保持速度一样，2种状态时间不同需算出）
ComputationTime () {
......@@ -89,12 +106,6 @@ export default {
let text = this.$refs.text;
text.style.animationPlayState = ''
}
},
mounted () {
this.Listener();
setTimeout(res => {
this.getData();
}, 100);
}
};
</script>
......@@ -104,7 +115,6 @@ export default {
align-items: center;
width: 100%;
height: 28px;
line-height: 28px;
background: rgba(0, 0, 0, 0.1);
.icon {
......@@ -132,7 +142,11 @@ export default {
display: flex;
p {
margin-right: 10px;
margin-right: 80px;
display: flex;
align-items: center;
height: 28px;
line-height: 28px;
}
}
}
......
......@@ -90,6 +90,14 @@ export default {
padding: 3px !important;
}
/deep/.el-calendar-table td.is-today {
font-weight: 700;
}
/deep/.el-calendar-table td.is-selected {
background-color: rgb(179, 216, 255);
}
/deep/.el-calendar__header {
padding: 8px 15px;
}
......@@ -141,9 +149,9 @@ export default {
}
/**本月周末设置为红色*/
.el-calendar-table .current:nth-last-child(-n+2) .solar {
/* .el-calendar-table .current:nth-last-child(-n+2) .solar {
color: red;
}
} */
/**本月农历设置为灰色*/
.el-calendar-table .current .lunar {
......
......@@ -21,8 +21,11 @@
</div>
</template>
<script>
import NoticeBar from '@/components/NoticeBar/index'
import { mapGetters } from 'vuex'
import NoticeBar from '@/components/NoticeBar/index'
import {
getHomeNoticeList
} from "@/api/home.js"
export default {
components: {
NoticeBar
......@@ -33,20 +36,20 @@ export default {
data () {
return {
logo: require('../../image/logo.png'),
noticeList: [
{
title: '6666666666666666666'
},
{
title: '3333333333333333333'
},
{
title: '6666666666666666666'
}
]
noticeList: []
}
},
created () {
this.queryNoticeList()
},
methods: {
queryNoticeList () {
getHomeNoticeList().then(res => {
if (res.result) {
this.noticeList = res.result.noticeList
}
})
},
themeChange (val) {
this.$store.dispatch('app/updateTheme', val)
},
......
......@@ -22,7 +22,7 @@
<ul>
<li v-for="(item, index) in noticeList" :key="index" @click="handleNotice(item)" class="flexst pointer">
<p class="list-title">{{ item.noticeTitle }}</p>
<p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p>
<p class="marginZL15">{{ item.noticePublishTime.substring(0, 10) }}</p>
<p v-if="item.userBrowse == '1'" style="color:red">未读</p>
<p v-else>已读</p>
</li>
......@@ -192,7 +192,7 @@ export default {
if (res.result) {
this.noticeList = res.result.noticeList
this.noticeList.forEach(item => {
item.createtime = this._timedate(item.createtime)
item.noticePublishTime = this._timedate(item.noticePublishTime)
})
this.policyList = res.result.policyList
}
......
......@@ -76,7 +76,7 @@ class data extends filter {
{
prop: "qlrzjhm",
label: "证件号",
},
},
{
prop: "mj",
label: "使用权面积(m²)",
......@@ -198,7 +198,7 @@ class data extends filter {
{
prop: "tdsyqzsj",
label: "土地使用期限",
},
},
{
prop: "syqqzsj",
label: "使用权起止时间",
......@@ -235,7 +235,7 @@ class data extends filter {
prop: "zyjzmj",
label: "专有建筑面积（m2）",
},
{
prop: "ftjzmj",
label: "分摊建筑面积（m2）",
......@@ -317,7 +317,7 @@ class data extends filter {
{
prop: "qlrzjhm",
label: "证件号",
},
},
{
prop: "mj",
label: "使用权面积(m²)",
......@@ -424,7 +424,7 @@ class data extends filter {
prop: "zjjzwzl",
label: "在建建筑物坐落",
},
{
prop: "dyqr",
label: "抵押权人",
......@@ -646,7 +646,7 @@ class data extends filter {
label: "坐落",
},
{
prop: "qlr",
prop: "qlrmc",
label: "权利人",
},
{
......@@ -654,11 +654,11 @@ class data extends filter {
label: "证件种类",
},
{
prop: "qlrzjh",
prop: "qlrzjhm",
label: "证件号",
},
{
prop: "ywr",
prop: "ywrmc",
label: "义务人",
},
{
......@@ -666,7 +666,7 @@ class data extends filter {
label: "证件种类",
},
{
prop: "ywrzjh",
prop: "ywrzjhm",
label: "证件号",
},
{
......@@ -714,7 +714,7 @@ class data extends filter {
label: "登记时间",
},
{
prop: "bdcdjzmh",
prop: "bdcqzh",
label: "不动产登记证明号",
},
{
......@@ -722,21 +722,17 @@ class data extends filter {
label: "登簿人",
},
{
prop: "zxygywh",
prop: "zxywh",
label: "注销预告业务号",
},
{
prop: "zxygyy",
prop: "zxyy",
label: "注销预告原因",
},
{
prop: "zxsj",
label: "注销时间",
},
{
prop: "qszt",
label: "权属状态",
},
}
],
CFDJ: [
{
......@@ -782,8 +778,8 @@ class data extends filter {
{
prop: "qlrzjhm",
label: "证件号",
},
},
{
prop: "cfwh",
label: "查封文号",
......@@ -937,4 +933,4 @@ let datas = new data()
export {
datas
}
\ No newline at end of file
}
......
<template>
<dialogBox title="新增系统通知" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%"
@closeDialog="closeDialog" v-model="value">
<dialogBox :title="title" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%"
@closeDialog="closeDialog" v-model="value" :isButton="isButtonFlag">
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
<el-row>
<el-col :span="24">
......@@ -23,7 +23,7 @@
@change="onEditorChange($event)" @ready="onEditorReady($event)"></quill-editor>
</el-form-item>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item label="附件:" prop="noticeFileUrl">
<el-upload action multiple :auto-upload="false" :limit="1" :on-change="handleChange"
......@@ -33,7 +33,8 @@
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<!-- 隐藏上传按钮 用于代替触发富文本上传事件 -->
<div v-show="false">
<el-upload action multiple :auto-upload="false" :on-change="RichTexthandleChange" :before-upload="beforeUpload"
class="richUpload">
......@@ -46,12 +47,14 @@
</template>
<script>
import { addSysNotice } from "@/api/notice.js";
import { addSysNotice,updateSysNotice } from "@/api/notice.js";
import { upload } from "@/api/system.js";
import { quillEditor } from "vue-quill-editor";
export default {
props: {
value: { type: Boolean, default: false }
value: { type: Boolean, default: false },
isButtonFlag: { type: Boolean, default: true },
title: {type:String, default: '新增系统通知'}
},
components: { quillEditor },
data () {
......@@ -142,22 +145,17 @@ export default {
}
}
},
mounted () { },
mounted () {},
methods: {
submitForm () {
let that = this;
that.$refs.ruleForm.validate(valid => {
if (valid) {
addSysNotice(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.$emit("input", false);
this.resetRuleForm();
this.$parent.queryClick();
} else {
this.$message.error(res.message);
}
});
if(that.ruleForm.bsmNotice){
that.editNotice();
}else{
that.addNotice();
}
} else {
// console.log('error submit!!');
return false;
......@@ -169,10 +167,42 @@ export default {
this.$emit("input", false);
this.resetRuleForm();
},
//
//新增通知
addNotice(){
addSysNotice(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.$emit("input", false);
this.resetRuleForm();
this.$parent.queryClick();
} else {
this.$message.error(res.message);
}
});
},
//编辑通知
editNotice(){
updateSysNotice(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success("编辑成功");
this.$emit("input", false);
this.resetRuleForm();
this.$parent.queryClick();
} else {
this.$message.error(res.message);
}
});
},
//重置表单
resetRuleForm () {
this.$refs["ruleForm"].resetFields();
this.ruleForm.noticeType = "1";
this.ruleForm = {
noticeTitle: "",
noticeContent: "",
noticeFileUrl: "",
noticeSource: "",
noticeType: "1"
}
this.isButtonFlag = true;
},
beforeUpload (file) {
return true;
......@@ -193,6 +223,9 @@ export default {
clipboardPictureChange (file) {
this.uploadPicture(file)
},
getDetailInfo(item){
this.ruleForm = item
},
uploadPicture (file) {
let that = this;
var formdata = new FormData();
......
<template>
<div>
<el-row :gutter="8">
<el-col :span="16">
通知标题：
<el-input v-model="formData.item.noticeTitle"></el-input>
</el-col>
</el-row>
<el-row :gutter="8">
<el-col :span="24" class="margin-top-middle">
通知内容：
<quill-editor class="ql-editor" v-model="formData.item.noticeContent" ref="myQuillEditor"
:options="editorOption">
</quill-editor>
</el-col>
</el-row>
<el-row :gutter="8">
<el-col :span="24" class="margin-top-middle">
附件：
<div @click="handleView(formData.item.noticeFileUrl)" class="pointer">{{ formData.item.noticeFileName }}</div>
</el-col>
</el-row>
</div>
</template>
<script>
import { quillEditor } from "vue-quill-editor";
export default {
components: { quillEditor },
data () {
return {
// 富文本编辑器配置
editorOption: {
theme: "snow", // or 'bubble'
placeholder: "请输入正文",
},
};
},
components: {},
props: {
formData: {
type: Object,
default: () => { }
},
},
created () {
console.log(this.formData);
},
computed: {
},
methods: {
},
};
</script>
<style scoped lang='scss'>
.margin-top-middle {
margin-top: 10px
}
/deep/.ql-editor {
padding: 0px;
}
</style>
\ No newline at end of file
......@@ -33,7 +33,7 @@
:data="tableData.data">
</lb-table>
</div>
<addDialog ref="addDialog" v-model="isDialog" />
<addDialog ref="addDialog" v-model="isDialog" :isButtonFlag="isButtonFlag" :title="dialogTitle"/>
</div>
</template>
<script>
......@@ -52,8 +52,8 @@ export default {
data () {
return {
isDialog: false,
viewDialog: false,
isButtonFlag: true,
dialogTitle: '',
ruleForm: {
noticeTitle: '',
noticeStatus: ''
......@@ -84,7 +84,17 @@ export default {
})
},
//打开新增弹窗
openDialog () {
openDialog (item) {
if (item) {
this.$nextTick(() => {
this.isButtonFlag = false;
this.$refs.addDialog.getDetailInfo(item);
this.dialogTitle = '系统通知详情'
})
}else{
this.isButtonFlag = true;
this.dialogTitle = '新增系统通知'
}
this.isDialog = true;
},
//删除
......@@ -153,16 +163,18 @@ export default {
});
});
},
//编辑通知
editNotice(item) {
this.$nextTick(() => {
this.isButtonFlag = true;
this.$refs.addDialog.getDetailInfo(item);
this.dialogTitle = '编辑系统通知'
this.isDialog = true;
})
},
downloadFile (item) {
const href = item.noticeFileUrl
window.open(href, '_blank');
},
viewDetail (e) {
this.$popup("错误日志", "system/xttz/components/viewDialog", {
formData: {
item: e
}
})
}
},
};
......
......@@ -26,6 +26,10 @@ class data extends filter {
label: "通知标题",
},
{
prop: "noticeSource",
label: "通知来源",
},
{
label: "通知内容",
render: (h, scope) => {
return <div class="item-cwnr" domPropsInnerHTML={scope.row.noticeContent}></div>
......@@ -51,6 +55,10 @@ class data extends filter {
}
},
{
prop: "noticePublishTime",
label: "发布时间",
},
{
prop: "creater",
width: '120',
label: "创建人",
......@@ -67,13 +75,14 @@ class data extends filter {
switch (scope.row.noticeStatus) {
case '1':
return <div>
<el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope.row) }}>查看</el-button>
<el-button type="text" icon="el-icon-edit" onClick={() => { vm.editNotice(scope.row) }}>编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toPublish(scope.row) }}>发布</el-button>
<el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button>
<el-button type="text" icon="el-icon-delete" onClick={() => { vm.delNotice(scope.row) }}>删除</el-button>
</div>
case '2':
return <div>
<el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button>
<el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope.row) }}>查看</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>撤销通知</el-button>
</div>
}
......
//流程环节操作按钮
export function getForm(tabName, djywbm) {
console.log("88888888"+tabName);
let form;
switch (tabName) {
case "jsydsyqslxx100":
......@@ -51,10 +52,10 @@ export function getForm(tabName, djywbm) {
form = require("@/views/registerBook/zdjbxx.vue");
break;
case "ygmm100":
form = require("@/views/ywbl/ygdj/slxx.vue");
form=require("@/views/ywbl/ygdj/slxx.vue");
break;
case "ygmm300":
form = require("@/views/ywbl/fdcq2/slxx.vue");
form=require("@/views/ywbl/ygdj/slxx300.vue");
break;
case "cfdjxx":
form = require("@/views/registerBook/cfdj.vue");
......
......@@ -134,28 +134,13 @@
<el-col :span="14" v-if="ruleForm.qlxx">
<el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
<el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
<el-radio label="1">单独所有</el-radio>
<el-radio label="2">共同共有</el-radio>
<el-radio label="3">按份所有</el-radio>
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
<el-radio label="3">其它共有</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
<el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
<el-radio-group v-model="ruleForm.sffbcz">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
<el-form-item :class="flag ? 'marginBot0' : ''" label="持证人：">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
:gyfs="ruleForm.qlxx.gyfs" />
......