Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b8e5f748 by 田浩浩
Options

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

2 parents 96536c02 8bfee1ce
Inline Side-by-side
Showing 19 changed files with 214 additions and 79 deletions
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
24 "nprogress": "0.2.0", 24 "nprogress": "0.2.0",
25 "vue": "2.6.10", 25 "vue": "2.6.10",
26 "vue-router": "3.0.2", 26 "vue-router": "3.0.2",
27 "vue-seamless-scroll": "^1.1.23",
27 "vuex": "3.1.0" 28 "vuex": "3.1.0"
28 }, 29 },
29 "devDependencies": { 30 "devDependencies": {
......
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
56 } 56 }
57 } 57 }
58 58
59 .el-icon-date {
60 display: none;
61 }
62
59 // to fixed https://github.com/ElemeFE/element/issues/2461 63 // to fixed https://github.com/ElemeFE/element/issues/2461
60 // refine element ui upload 64 // refine element ui upload
61 .el-input.is-disabled .el-input__inner { 65 .el-input.is-disabled .el-input__inner {
...@@ -120,6 +124,7 @@ ...@@ -120,6 +124,7 @@
120 ::-webkit-scrollbar-thumb:hover { 124 ::-webkit-scrollbar-thumb:hover {
121 background-color: rgb(162, 164, 167); 125 background-color: rgb(162, 164, 167);
122 } 126 }
127
123 // element 样式补丁 128 // element 样式补丁
124 .el-menu--horizontal { 129 .el-menu--horizontal {
125 border-bottom: none !important; 130 border-bottom: none !important;
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
55 overflow: hidden; 55 overflow: hidden;
56 text-overflow: ellipsis; 56 text-overflow: ellipsis;
57 white-space: nowrap; 57 white-space: nowrap;
58 width: 75%;
58 } 59 }
59 60
60 ul { 61 ul {
...@@ -70,7 +71,7 @@ ...@@ -70,7 +71,7 @@
70 71
71 .box-mountNode { 72 .box-mountNode {
72 flex: 1; 73 flex: 1;
73 height: calc(100% - 500px); 74 height: calc(100% - 510px);
74 } 75 }
75 76
76 .home-right { 77 .home-right {
......
...@@ -14,47 +14,50 @@ ...@@ -14,47 +14,50 @@
14 </el-card> 14 </el-card>
15 </el-col> 15 </el-col>
16 <el-col :span="12"> 16 <el-col :span="12">
17 <el-card shadow="hover" style="height:245px"> 17 <el-card shadow="hover" style="height:247px">
18 <div slot="header" class="flexst"> 18 <div slot="header" class="flexst">
19 <h5 class="title">系统通知</h5> 19 <h5 class="title">系统通知</h5>
20 <i class="el-icon-s-unfold pointer"></i> 20 <i class="el-icon-s-unfold pointer"></i>
21 </div> 21 </div>
22 <vue-seamless-scroll :data="noticeList" :class-option="classOption">
22 <ul> 23 <ul>
23 <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice" class="flexst pointer"> 24 <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice" class="flexst pointer">
24 <p class="list-title">{{ item.noticeTitle }}</p> 25 <p class="list-title">{{ item.noticeTitle }}</p>
25 <p class="marginZL15">{{ item.createtime }}</p> 26 <p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p>
26 <p v-if="item.userBrowse == '1'" style="color:red">未读</p> 27 <p v-if="item.userBrowse == '1'" style="color:red">未读</p>
27 <p v-else>已读</p> 28 <p v-else>已读</p>
28 </li> 29 </li>
29 </ul> 30 </ul>
31 </vue-seamless-scroll>
30 </el-card> 32 </el-card>
31 </el-col> 33 </el-col>
32 </el-row> 34 </el-row>
33 <el-row :gutter="8" class="marginTop10"> 35 <el-row :gutter="8" class="marginTop10">
34 <el-col :span="12"> 36 <el-col :span="12">
35 <el-card shadow="hover" style="height:280px"> 37 <el-card shadow="hover" style="height:247px">
36 <div slot="header" class="flexst"> 38 <div slot="header" class="flexst">
37 <h5 class="title">待办事项</h5> 39 <h5 class="title">待办事项</h5>
38 <i class="el-icon-s-unfold pointer"></i> 40 <i class="el-icon-s-unfold pointer"></i>
39 </div> 41 </div>
40 <ul> 42 <ul>
41 <li v-for="(item, index) in todoList" :key="index" class="flexst"> 43 <li v-for="(item, index) in todoList" :key="index" class="flexst">
42 <p class="right15">{{ item.dealTime }}</p> 44 <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
43 <p class="list-title">{{ item.dealBusiness }} ({{item.dealStep+ '环节'}})</p> 45 <p class="list-title" style="text-align:right">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
44 </li> 46 </li>
45 </ul> 47 </ul>
46 </el-card> 48 </el-card>
47 </el-col> 49 </el-col>
48 <el-col :span="12"> 50 <el-col :span="12">
49 <el-card shadow="hover" style="height:280px"> 51 <el-card shadow="hover" style="height:247px">
50 <div slot="header" class="flexst"> 52 <div slot="header" class="flexst">
51 <h5 class="title">政策法规</h5> 53 <h5 class="title">政策法规</h5>
52 <i class="el-icon-s-unfold pointer"></i> 54 <i class="el-icon-s-unfold pointer"></i>
53 </div> 55 </div>
54 <ul> 56 <ul>
55 <li v-for="(item, index) in policyList" @click="handleView(item.noticeFileUrl)" :key="index" class="flexst pointer"> 57 <li v-for="(item, index) in policyList" @click="handleView(item.noticeFileUrl)" :key="index"
56 <p class="right15">{{ item.noticeTitle }}</p> 58 class="flexst pointer">
57 <p class="list-title">{{ item.createtime }}</p> 59 <p class="right15 list-title">{{ item.noticeTitle }}</p>
60 <p>{{ item.createtime.substring(0, 10) }}</p>
58 </li> 61 </li>
59 </ul> 62 </ul>
60 </el-card> 63 </el-card>
...@@ -67,15 +70,15 @@ ...@@ -67,15 +70,15 @@
67 </div> 70 </div>
68 <div class="home-right"> 71 <div class="home-right">
69 <calendar /> 72 <calendar />
70 <el-card shadow="hover" class="marginTop10"> 73 <el-card shadow="hover" class="marginTop10" style="height:345px">
71 <div slot="header" class="flexst"> 74 <div slot="header" class="flexst">
72 <h5 class="title">动态信息</h5> 75 <h5 class="title">动态信息</h5>
73 <i class="el-icon-s-unfold pointer"></i> 76 <i class="el-icon-s-unfold pointer"></i>
74 </div> 77 </div>
75 <ul> 78 <ul>
76 <li v-for="(item, index) in doneList" :key="index" class="flexst"> 79 <li v-for="(item, index) in doneList" :key="index" class="flexst">
77 <p class="right15">{{ item.dealTime }}</p> 80 <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
78 <p class="list-title">{{ item.dealBusiness }} ({{item.dealStep+ '环节'}})</p> 81 <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
79 </li> 82 </li>
80 </ul> 83 </ul>
81 </el-card> 84 </el-card>
...@@ -85,11 +88,12 @@ ...@@ -85,11 +88,12 @@
85 <script> 88 <script>
86 import * as G2 from '@antv/g2' 89 import * as G2 from '@antv/g2'
87 import calendar from '@/components/Calendar/index' 90 import calendar from '@/components/Calendar/index'
91 import vueSeamlessScroll from "vue-seamless-scroll"
88 import { getHomeNoticeList, getHomeTodoList, getHomeDoneList } from "@/api/home.js"; 92 import { getHomeNoticeList, getHomeTodoList, getHomeDoneList } from "@/api/home.js";
89 import { setReadStatus } from "@/api/notice.js"; 93 import { setReadStatus } from "@/api/notice.js";
90 export default { 94 export default {
91 name: 'home', 95 name: 'home',
92 components: { calendar }, 96 components: { calendar, vueSeamlessScroll },
93 data () { 97 data () {
94 return { 98 return {
95 newsListData: [ 99 newsListData: [
...@@ -143,9 +147,6 @@ export default { ...@@ -143,9 +147,6 @@ export default {
143 year: '1996', 147 year: '1996',
144 value: 31056 148 value: 31056
145 }, { 149 }, {
146 year: '1995',
147 value: 17000
148 }, {
149 year: '1996', 150 year: '1996',
150 value: 31056 151 value: 31056
151 }], 152 }],
...@@ -155,6 +156,19 @@ export default { ...@@ -155,6 +156,19 @@ export default {
155 policyList: [] 156 policyList: []
156 } 157 }
157 }, 158 },
159 // 计算属性 类似于data概念
160 computed: {
161 classOption () {
162 return {
163 step: 0.5, // 数值越大速度滚动越快
164 limitMoveNum: 2, // 开始无缝滚动的数据量 this.dataList.length
165 hoverStop: true, // 是否开启鼠标悬停stop
166 direction: 1, // 0向下 1向上 2向左 3向右
167 openWatch: true, // 开启数据实时监控刷新dom
168 singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
169 };
170 },
171 },
158 mounted () { 172 mounted () {
159 this.buildChart(); 173 this.buildChart();
160 this.queryTodoList(); 174 this.queryTodoList();
...@@ -167,30 +181,47 @@ export default { ...@@ -167,30 +181,47 @@ export default {
167 window.open(href, '_blank'); 181 window.open(href, '_blank');
168 }, 182 },
169 //获取待办事项列表 183 //获取待办事项列表
170 queryTodoList(){ 184 queryTodoList () {
171 getHomeTodoList().then(res => { 185 getHomeTodoList().then(res => {
172 if(res.result){ 186 if (res.result) {
173 this.todoList = res.result 187 this.todoList = res.result.slice(0, 5)
174 } 188 }
175 }) 189 })
176 }, 190 },
177 //获取已办事项列表 191 //获取已办事项列表
178 queryDoneList(){ 192 queryDoneList () {
179 getHomeDoneList().then(res => { 193 getHomeDoneList().then(res => {
180 if(res.result){ 194 if (res.result) {
181 this.doneList = res.result 195 this.doneList = res.result
182 } 196 }
183 }) 197 })
184 }, 198 },
185 //获取通知列表 199 //获取通知列表
186 queryNoticeList(){ 200 queryNoticeList () {
187 getHomeNoticeList().then(res => { 201 getHomeNoticeList().then(res => {
188 if(res.result){ 202 if (res.result) {
189 this.noticeList = res.result.noticeList 203 this.noticeList = res.result.noticeList
190 this.policyList = res.result.policyList 204 this.noticeList.forEach(item => {
205 item.createtime = this._timedate(item.createtime)
206 })
207 this.policyList = res.result.policyList.slice(0, 5)
191 } 208 }
192 }) 209 })
193 }, 210 },
211 _timedate (d) {
212 var td = new Date();
213 td = new Date(td.getFullYear(), td.getMonth(), td.getDate());
214 var od = new Date(d);
215 od = new Date(od.getFullYear(), od.getMonth(), od.getDate());
216 var xc = (od - td) / 1000 / 60 / 60 / 24;
217 if (xc == -1) {
218 return "昨天";
219 } else if (xc == 0) {
220 return "今天";
221 } else {
222 return d
223 }
224 },
194 buildChart () { 225 buildChart () {
195 let height = document.getElementById("mountNodeCon").offsetHeight - 20 226 let height = document.getElementById("mountNodeCon").offsetHeight - 20
196 var chart = new G2.Chart({ 227 var chart = new G2.Chart({
...@@ -231,4 +262,9 @@ export default { ...@@ -231,4 +262,9 @@ export default {
231 <style scoped lang="scss"> 262 <style scoped lang="scss">
232 @import "~@/styles/mixin.scss"; 263 @import "~@/styles/mixin.scss";
233 @import "./index.scss"; 264 @import "./index.scss";
265
266 /deep/.el-card__body {
267 padding: 3px 10px 5px 10px;
268 overflow: hidden;
269 }
234 </style> 270 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
26 26
27 <script> 27 <script>
28 import '@/styles/package/theme/index.scss' 28 import '@/styles/package/theme/index.scss'
29 import { addSysNotice} from "@/api/notice.js" 29 import { addSysNotice } from "@/api/notice.js"
30 import { upload} from "@/api/system.js" 30 import { upload } from "@/api/system.js"
31 export default { 31 export default {
32 props: { 32 props: {
33 value: { type: Boolean, default: false }, 33 value: { type: Boolean, default: false },
...@@ -57,10 +57,12 @@ export default { ...@@ -57,10 +57,12 @@ export default {
57 if (res.code == 200) { 57 if (res.code == 200) {
58 this.$message.success('保存成功') 58 this.$message.success('保存成功')
59 this.$emit("input", false); 59 this.$emit("input", false);
60 this.resetRuleForm();
60 this.$parent.queryClick(); 61 this.$parent.queryClick();
61 } else { 62 } else {
62 this.$message.error(res.message) 63 this.$message.error(res.message)
63 }}) 64 }
65 })
64 } else { 66 } else {
65 // console.log('error submit!!'); 67 // console.log('error submit!!');
66 return false; 68 return false;
...@@ -73,7 +75,7 @@ export default { ...@@ -73,7 +75,7 @@ export default {
73 this.resetRuleForm(); 75 this.resetRuleForm();
74 }, 76 },
75 // 77 //
76 resetRuleForm(){ 78 resetRuleForm () {
77 this.$refs['ruleForm'].resetFields(); 79 this.$refs['ruleForm'].resetFields();
78 this.ruleForm.noticeType = '2' 80 this.ruleForm.noticeType = '2'
79 }, 81 },
...@@ -91,5 +93,5 @@ export default { ...@@ -91,5 +93,5 @@ export default {
91 } 93 }
92 </script> 94 </script>
93 <style scoped lang="scss"> 95 <style scoped lang="scss">
94 @import "~@/styles/public.scss"; 96
95 </style> 97 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
31 <script> 31 <script>
32 import table from "@/utils/mixin/table"; 32 import table from "@/utils/mixin/table";
33 import { datas, sendThis } from "./flfgdata"; 33 import { datas, sendThis } from "./flfgdata";
34 import { getSysPolicyList,deleteSysNotice } from "@/api/notice.js" 34 import { getSysPolicyList, deleteSysNotice } from "@/api/notice.js"
35 import addDialog from "./components/addDialog.vue"; 35 import addDialog from "./components/addDialog.vue";
36 export default { 36 export default {
37 name: "xttz", 37 name: "flfg",
38 components: { addDialog}, 38 components: { addDialog },
39 mixins: [table], 39 mixins: [table],
40 mounted () { 40 mounted () {
41 sendThis(this); 41 sendThis(this);
...@@ -70,15 +70,15 @@ export default { ...@@ -70,15 +70,15 @@ export default {
70 }) 70 })
71 }, 71 },
72 //打开新增弹窗 72 //打开新增弹窗
73 openDialog() { 73 openDialog () {
74 this.isDialog = true; 74 this.isDialog = true;
75 }, 75 },
76 downloadFile(item){ 76 downloadFile (item) {
77 const href = item.noticeFileUrl 77 const href = item.noticeFileUrl
78 window.open(href, '_blank'); 78 window.open(href, '_blank');
79 }, 79 },
80 //删除 80 //删除
81 delNotice(item){ 81 delNotice (item) {
82 this.$confirm('是否确定删除', '提示', { 82 this.$confirm('是否确定删除', '提示', {
83 confirmButtonText: '确定', 83 confirmButtonText: '确定',
84 cancelButtonText: '取消', 84 cancelButtonText: '取消',
......
...@@ -32,9 +32,8 @@ ...@@ -32,9 +32,8 @@
32 </template> 32 </template>
33 33
34 <script> 34 <script>
35 import '@/styles/package/theme/index.scss' 35 import { addSysNotice } from "@/api/notice.js"
36 import { addSysNotice} from "@/api/notice.js" 36 import { upload } from "@/api/system.js"
37 import { upload} from "@/api/system.js"
38 export default { 37 export default {
39 props: { 38 props: {
40 value: { type: Boolean, default: false }, 39 value: { type: Boolean, default: false },
...@@ -67,10 +66,12 @@ export default { ...@@ -67,10 +66,12 @@ export default {
67 if (res.code == 200) { 66 if (res.code == 200) {
68 this.$message.success('保存成功') 67 this.$message.success('保存成功')
69 this.$emit("input", false); 68 this.$emit("input", false);
69 this.resetRuleForm();
70 this.$parent.queryClick(); 70 this.$parent.queryClick();
71 } else { 71 } else {
72 this.$message.error(res.message) 72 this.$message.error(res.message)
73 }}) 73 }
74 })
74 } else { 75 } else {
75 // console.log('error submit!!'); 76 // console.log('error submit!!');
76 return false; 77 return false;
...@@ -83,7 +84,7 @@ export default { ...@@ -83,7 +84,7 @@ export default {
83 this.resetRuleForm(); 84 this.resetRuleForm();
84 }, 85 },
85 // 86 //
86 resetRuleForm(){ 87 resetRuleForm () {
87 this.$refs['ruleForm'].resetFields(); 88 this.$refs['ruleForm'].resetFields();
88 this.ruleForm.noticeType = '1' 89 this.ruleForm.noticeType = '1'
89 }, 90 },
...@@ -101,5 +102,5 @@ export default { ...@@ -101,5 +102,5 @@ export default {
101 } 102 }
102 </script> 103 </script>
103 <style scoped lang="scss"> 104 <style scoped lang="scss">
104 @import "~@/styles/public.scss"; 105
105 </style> 106 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <el-row :gutter="8"> 15 <el-row :gutter="8">
16 <el-col :span="24" class="margin-top-middle"> 16 <el-col :span="24" class="margin-top-middle">
17 附件： 17 附件：
18 <div @click="handleView(formData.item.noticeFileUrl)" class="pointer">{{formData.item.noticeFileName}}</div> 18 <div @click="handleView(formData.item.noticeFileUrl)" class="pointer">{{ formData.item.noticeFileName }}</div>
19 </el-col> 19 </el-col>
20 </el-row> 20 </el-row>
21 </div> 21 </div>
...@@ -26,14 +26,14 @@ export default { ...@@ -26,14 +26,14 @@ export default {
26 return { 26 return {
27 }; 27 };
28 }, 28 },
29 components: { }, 29 components: {},
30 props: { 30 props: {
31 formData: { 31 formData: {
32 type: Object, 32 type: Object,
33 default: () => {} 33 default: () => { }
34 }, 34 },
35 }, 35 },
36 created(){ 36 created () {
37 console.log(this.formData); 37 console.log(this.formData);
38 }, 38 },
39 computed: { 39 computed: {
...@@ -46,8 +46,7 @@ export default { ...@@ -46,8 +46,7 @@ export default {
46 }; 46 };
47 </script> 47 </script>
48 <style scoped lang='scss'> 48 <style scoped lang='scss'>
49 @import "~@/styles/public.scss";
50 .margin-top-middle { 49 .margin-top-middle {
51 margin-top:10px 50 margin-top: 10px
52 } 51 }
53 </style> 52 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
39 <script> 39 <script>
40 import table from "@/utils/mixin/table"; 40 import table from "@/utils/mixin/table";
41 import { datas, sendThis } from "./xttzdata"; 41 import { datas, sendThis } from "./xttzdata";
42 import { getSysNoticeList,deleteSysNotice,publishNotice,unPublishNotice } from "@/api/notice.js" 42 import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/notice.js"
43 import addDialog from "./components/addDialog.vue"; 43 import addDialog from "./components/addDialog.vue";
44 export default { 44 export default {
45 name: "xttz", 45 name: "xttz",
46 components: { addDialog}, 46 components: { addDialog },
47 mixins: [table], 47 mixins: [table],
48 mounted () { 48 mounted () {
49 sendThis(this); 49 sendThis(this);
...@@ -58,8 +58,8 @@ export default { ...@@ -58,8 +58,8 @@ export default {
58 noticeStatus: '' 58 noticeStatus: ''
59 }, 59 },
60 noticeStatusList: [ 60 noticeStatusList: [
61 {"label": '未发布','value':'1'}, 61 { "label": '未发布', 'value': '1' },
62 {'label': '已发布','value':'2'} 62 { 'label': '已发布', 'value': '2' }
63 ], 63 ],
64 tableData: { 64 tableData: {
65 total: 0, 65 total: 0,
...@@ -83,11 +83,11 @@ export default { ...@@ -83,11 +83,11 @@ export default {
83 }) 83 })
84 }, 84 },
85 //打开新增弹窗 85 //打开新增弹窗
86 openDialog() { 86 openDialog () {
87 this.isDialog = true; 87 this.isDialog = true;
88 }, 88 },
89 //删除 89 //删除
90 delNotice(item){ 90 delNotice (item) {
91 this.$confirm('是否确定删除', '提示', { 91 this.$confirm('是否确定删除', '提示', {
92 confirmButtonText: '确定', 92 confirmButtonText: '确定',
93 cancelButtonText: '取消', 93 cancelButtonText: '取消',
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 }); 109 });
110 }, 110 },
111 //发布 111 //发布
112 toPublish(item){ 112 toPublish (item) {
113 this.$confirm('是否确定发布', '提示', { 113 this.$confirm('是否确定发布', '提示', {
114 confirmButtonText: '确定', 114 confirmButtonText: '确定',
115 cancelButtonText: '取消', 115 cancelButtonText: '取消',
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
131 }); 131 });
132 }, 132 },
133 //取消发布 133 //取消发布
134 toUnPublish(item){ 134 toUnPublish (item) {
135 this.$confirm('是否确定取消发布', '提示', { 135 this.$confirm('是否确定取消发布', '提示', {
136 confirmButtonText: '确定', 136 confirmButtonText: '确定',
137 cancelButtonText: '取消', 137 cancelButtonText: '取消',
...@@ -152,11 +152,11 @@ export default { ...@@ -152,11 +152,11 @@ export default {
152 }); 152 });
153 }); 153 });
154 }, 154 },
155 downloadFile(item){ 155 downloadFile (item) {
156 const href = item.noticeFileUrl 156 const href = item.noticeFileUrl
157 window.open(href, '_blank'); 157 window.open(href, '_blank');
158 }, 158 },
159 viewDetail(e){ 159 viewDetail (e) {
160 this.$popup("错误日志", "system/xttz/components/viewDialog", { 160 this.$popup("错误日志", "system/xttz/components/viewDialog", {
161 formData: { 161 formData: {
162 item: e 162 item: e
......
...@@ -74,7 +74,7 @@ class data extends filter { ...@@ -74,7 +74,7 @@ class data extends filter {
74 case '2': 74 case '2':
75 return <div> 75 return <div>
76 <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button> 76 <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button>
77 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>取消发布</el-button> 77 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>撤销通知</el-button>
78 </div> 78 </div>
79 } 79 }
80 } 80 }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <el-col :span="8"> 11 <el-col :span="8">
12 <el-form-item label="家庭关系" prop="jtgxdm"> 12 <el-form-item label="家庭关系" prop="jtgxdm">
13 <el-select clearable v-model="ruleForm.jtgxdm" class="width100" placeholder="请选择"> 13 <el-select clearable v-model="ruleForm.jtgxdm" class="width100" placeholder="请选择">
14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 14 <el-option v-for="item in jtgx" :key="item.value" :label="item.label" :value="item.value">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
...@@ -113,6 +113,17 @@ export default { ...@@ -113,6 +113,17 @@ export default {
113 data () { 113 data () {
114 return { 114 return {
115 myValue: this.value, 115 myValue: this.value,
116 jtgx: [
117 {value:'0',label:'本人或户主'},
118 {value:'1',label:'配偶'},
119 {value:'2',label:'子'},
120 {value:'3',label:'女'},
121 {value:'4',label:'子孙、孙女、外孙子、外孙女'},
122 {value:'5',label:'父母'},
123 {value:'6',label:'祖父母、外祖父母'},
124 {value:'7',label:'兄、弟、姐、妹'},
125 {value:'8',label:'其他'},
126 ],
116 ruleForm: { 127 ruleForm: {
117 qlrlx: '', 128 qlrlx: '',
118 sqrmc: '', 129 sqrmc: '',
......
...@@ -11,8 +11,9 @@ export default { ...@@ -11,8 +11,9 @@ export default {
11 this.isSearch = true 11 this.isSearch = true
12 }, 12 },
13 getSearch (val) { 13 getSearch (val) {
14 console.log(val, 222222222222); 14 if (!val) return
15 this.otherForm = val 15 this.otherForm = val
16 this.queryClick()
16 let obj = { ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' } 17 let obj = { ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' }
17 this.searchList = Object.entries({ ...this.searchForm, ...val }).map((item) => { 18 this.searchList = Object.entries({ ...this.searchForm, ...val }).map((item) => {
18 const [name, value] = item 19 const [name, value] = item
......
...@@ -70,8 +70,7 @@ export default { ...@@ -70,8 +70,7 @@ export default {
70 this.$refs['ruleForm'].resetFields() 70 this.$refs['ruleForm'].resetFields()
71 }, 71 },
72 submitForm () { 72 submitForm () {
73 this.$emit('getSearch', this.ruleForm) 73 this.$emit('getSearch', _.cloneDeep(this.ruleForm))
74 console.log(this.ruleForm);
75 this.$emit('input', false) 74 this.$emit('input', false)
76 this.$refs['ruleForm'].resetFields() 75 this.$refs['ruleForm'].resetFields()
77 } 76 }
......
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
126 queryClick () { 126 queryClick () {
127 this.$startLoading() 127 this.$startLoading()
128 this.searchForm.ywh = this.queryForm.ywh 128 this.searchForm.ywh = this.queryForm.ywh
129 this.getSearch() 129 console.log(this.otherForm);
130 searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => { 130 searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
131 this.$endLoading() 131 this.$endLoading()
132 if (res.code === 200) { 132 if (res.code === 200) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 ref="ruleForm" 7 ref="ruleForm"
8 :label-position="flag ? 'top' : ''" 8 :label-position="flag ? 'top' : ''"
9 :inline="flag" 9 :inline="flag"
10 label-width="120px" 10 label-width="140px"
11 > 11 >
12 <div class="slxx_con"> 12 <div class="slxx_con">
13 <div class="slxx_title title-block"> 13 <div class="slxx_title title-block">
...@@ -126,14 +126,18 @@ ...@@ -126,14 +126,18 @@
126 <el-row :gutter="10"> 126 <el-row :gutter="10">
127 <el-col :span="8"> 127 <el-col :span="8">
128 <el-form-item :class="flag ? 'marginBot0' : ''" label="抵押方式："> 128 <el-form-item :class="flag ? 'marginBot0' : ''" label="抵押方式：">
129 <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> 129 <!-- <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> -->
130 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
131 <el-radio label="1">一般抵押</el-radio>
132 <el-radio label="2">最高额抵押</el-radio>
133 </el-radio-group>
130 </el-form-item> 134 </el-form-item>
131 </el-col> 135 </el-col>
132 <el-col :span="16"> 136 <el-col :span="16">
133 <el-form-item 137 <el-form-item
134 :class="flag ? 'marginBot0' : ''" 138 :class="flag ? 'marginBot0' : ''"
135 label="是否存在禁止或者限制转让抵押不动产的约定：" 139 label="是否存在禁止或者限制转让抵押不动产的约定："
136 label-width="300px" 140 label-width="350px"
137 > 141 >
138 <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz"> 142 <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz">
139 <el-radio label="1">启用</el-radio> 143 <el-radio label="1">启用</el-radio>
...@@ -142,6 +146,69 @@ ...@@ -142,6 +146,69 @@
142 </el-form-item> 146 </el-form-item>
143 </el-col> 147 </el-col>
144 </el-row> 148 </el-row>
149
150 <el-row :gutter="10">
151 <el-col :span="8" v-show="ruleForm.diyaq.dyfs==1">
152 <el-form-item
153 :class="flag ? 'marginBot0' : ''"
154 label="被担保主债权数额："
155 >
156 <el-input v-model="ruleForm.diyaq.bdbzzqse"></el-input>
157 </el-form-item>
158 </el-col>
159
160 <el-col :span="8" v-show="ruleForm.diyaq.dyfs==2">
161 <el-form-item
162 :class="flag ? 'marginBot0' : ''"
163 label="最高债权额："
164 >
165 <el-input v-model="ruleForm.diyaq.zgzqse"></el-input>
166 </el-form-item>
167 </el-col>
168
169 <el-col :span="8">
170 <el-form-item
171 :class="flag ? 'marginBot0' : ''"
172 label="债务履行起始时间："
173 >
174 <el-date-picker v-model="ruleForm.diyaq.zwlxqssj" type="date">
175 </el-date-picker>
176 </el-form-item>
177 </el-col>
178 <el-col :span="8">
179 <el-form-item
180 :class="flag ? 'marginBot0' : ''"
181 label="债务履行结束时间："
182 >
183 <el-date-picker v-model="ruleForm.diyaq.zwlxjssj" type="date">
184 </el-date-picker>
185 </el-form-item>
186 </el-col>
187 </el-row>
188
189
190 <el-row>
191 <el-col :span="24">
192 <el-form-item :class="flag ? 'marginBot0' : ''" label="担保范围：">
193 <el-input v-model="ruleForm.diyaq.dbfw"></el-input>
194 </el-form-item>
195 </el-col>
196 </el-row>
197 <el-row>
198 <el-col :span="24">
199 <el-form-item :class="flag ? 'marginBot0' : ''" label="最高债权确定事实和数额：" label-width="200px">
200 <el-input v-model="ruleForm.diyaq.zgzqqdss"></el-input>
201 </el-form-item>
202 </el-col>
203 </el-row>
204 <el-row >
205 <el-col>
206 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
207 <el-input type="textarea" v-model="ruleForm.diyaq.fj" :disabled="$route.query.viewtype==1"></el-input>
208 </el-form-item>
209 </el-col>
210 </el-row>
211
145 <div class="slxx_title title-block"> 212 <div class="slxx_title title-block">
146 抵押权人信息 213 抵押权人信息
147 <div class="triangle"></div> 214 <div class="triangle"></div>
...@@ -199,6 +266,20 @@ ...@@ -199,6 +266,20 @@
199 @upDateQlrxxList="upDateYwrxxList" 266 @upDateQlrxxList="upDateYwrxxList"
200 :viewtype="$route.query.viewtype" 267 :viewtype="$route.query.viewtype"
201 /> 268 />
269
270 <div class="slxx_title title-block">
271 登记原因
272 <div class="triangle"></div>
273 </div>
274 <el-row :gutter="10">
275 <el-col>
276 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
277 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.diyaq.djyy">
278 </el-input>
279 </el-form-item>
280 </el-col>
281 </el-row>
282
202 </div> 283 </div>
203 <el-row class="btn" v-if="!$route.query.viewtype"> 284 <el-row class="btn" v-if="!$route.query.viewtype">
204 <el-form-item :class="flag ? 'marginBot0' : ''"> 285 <el-form-item :class="flag ? 'marginBot0' : ''">
...@@ -210,7 +291,7 @@ ...@@ -210,7 +291,7 @@
210 </template> 291 </template>
211 <script> 292 <script>
212 import InformationTable from "@/views/workflow/components/InformationTable"; 293 import InformationTable from "@/views/workflow/components/InformationTable";
213 import { Init,saveData } from "@/api/diyaqFlow.js"; 294 import { Init, saveData } from "@/api/diyaqFlow.js";
214 import { mapGetters } from "vuex"; 295 import { mapGetters } from "vuex";
215 export default { 296 export default {
216 async created() { 297 async created() {
......
...@@ -177,9 +177,10 @@ ...@@ -177,9 +177,10 @@
177 <el-col :span="14"> 177 <el-col :span="14">
178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
180 <el-radio label="1">单独所有</el-radio> 180 <el-radio label="0">单独所有</el-radio>
181 <el-radio label="2">共同共有</el-radio> 181 <el-radio label="1">共同共有</el-radio>
182 <el-radio label="3">按份所有</el-radio> 182 <el-radio label="2">按份所有</el-radio>
183 <el-radio label="3">其它共有</el-radio>
183 </el-radio-group> 184 </el-radio-group>
184 </el-form-item> 185 </el-form-item>
185 </el-col> 186 </el-col>
......
...@@ -177,9 +177,10 @@ ...@@ -177,9 +177,10 @@
177 <el-col :span="14"> 177 <el-col :span="14">
178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
180 <el-radio label="1">单独所有</el-radio> 180 <el-radio label="0">单独所有</el-radio>
181 <el-radio label="2">共同共有</el-radio> 181 <el-radio label="1">共同共有</el-radio>
182 <el-radio label="3">按份所有</el-radio> 182 <el-radio label="2">按份所有</el-radio>
183 <el-radio label="3">其它共有</el-radio>
183 </el-radio-group> 184 </el-radio-group>
184 </el-form-item> 185 </el-form-item>
185 </el-col> 186 </el-col>
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
202 p:nth-child(1) { 202 p:nth-child(1) {
203 flex: 1; 203 flex: 1;
204 width: 100%; 204 width: 100%;
205 padding: 3px; 205 padding: 1px;
206 padding-left: 30px; 206 padding-left: 30px;
207 display: flex; 207 display: flex;
208 // align-items: center; 208 // align-items: center;
......
...@@ -168,8 +168,4 @@ export default { ...@@ -168,8 +168,4 @@ export default {
168 </script> 168 </script>
169 <style scoped lang="scss"> 169 <style scoped lang="scss">
170 @import "~@/styles/public.scss"; 170 @import "~@/styles/public.scss";
171
172 /deep/.el-icon-date {
173 display: none;
174 }
175 </style> 171 </style>
......