Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
16 changed files
with
180 additions
and
162 deletions
... | @@ -10,6 +10,15 @@ export function addSysNotice (data) { | ... | @@ -10,6 +10,15 @@ export function addSysNotice (data) { |
10 | }) | 10 | }) |
11 | } | 11 | } |
12 | 12 | ||
13 | //编辑系统通知 | ||
14 | export function updateSysNotice (data) { | ||
15 | return request({ | ||
16 | url: SERVER.SERVERAPI + '/rest/system/sysNotice/updateSysNotice', | ||
17 | method: 'post', | ||
18 | data | ||
19 | }) | ||
20 | } | ||
21 | |||
13 | // 获取通知列表 | 22 | // 获取通知列表 |
14 | export function getSysNoticeList (data) { | 23 | export function getSysNoticeList (data) { |
15 | return request({ | 24 | return request({ | ... | ... |
... | @@ -8,22 +8,22 @@ export function Init(data) { | ... | @@ -8,22 +8,22 @@ export function Init(data) { |
8 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/fristInit"; | 8 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/fristInit"; |
9 | break; | 9 | break; |
10 | case "200": | 10 | case "200": |
11 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/transferInit"; | 11 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/transferInit"; |
12 | break; | 12 | break; |
13 | case "300": | 13 | case "300": |
14 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/changeInit"; | 14 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/changeInit"; |
15 | break; | 15 | break; |
16 | case "400": | 16 | case "400": |
17 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/logoutInit"; | 17 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/logoutInit"; |
18 | break; | 18 | break; |
19 | case "500": | 19 | case "500": |
20 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/riviseInit"; | 20 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/riviseInit"; |
21 | break; | 21 | break; |
22 | case "901": | 22 | case "901": |
23 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/renewalInit"; | 23 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/renewalInit"; |
24 | break; | 24 | break; |
25 | case "902": | 25 | case "902": |
26 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/replaceInit"; | 26 | apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/replaceInit"; |
27 | break; | 27 | break; |
28 | } | 28 | } |
29 | return request({ | 29 | return request({ |
... | @@ -34,7 +34,7 @@ export function Init(data) { | ... | @@ -34,7 +34,7 @@ export function Init(data) { |
34 | } | 34 | } |
35 | // 初始化内容 | 35 | // 初始化内容 |
36 | export function saveData (data) { | 36 | export function saveData (data) { |
37 | console.log("222222222222222"); | 37 | console.log("222222222222222"+data); |
38 | return request({ | 38 | return request({ |
39 | url: SERVER.SERVERAPI + '/rest/ywbl/ygdj/saveData', | 39 | url: SERVER.SERVERAPI + '/rest/ywbl/ygdj/saveData', |
40 | method: 'post', | 40 | method: 'post', | ... | ... |
... | @@ -90,6 +90,14 @@ export default { | ... | @@ -90,6 +90,14 @@ export default { |
90 | padding: 3px !important; | 90 | padding: 3px !important; |
91 | } | 91 | } |
92 | 92 | ||
93 | /deep/.el-calendar-table td.is-today { | ||
94 | font-weight: 700; | ||
95 | } | ||
96 | |||
97 | /deep/.el-calendar-table td.is-selected { | ||
98 | background-color: rgb(179, 216, 255); | ||
99 | } | ||
100 | |||
93 | /deep/.el-calendar__header { | 101 | /deep/.el-calendar__header { |
94 | padding: 8px 15px; | 102 | padding: 8px 15px; |
95 | } | 103 | } |
... | @@ -141,9 +149,9 @@ export default { | ... | @@ -141,9 +149,9 @@ export default { |
141 | } | 149 | } |
142 | 150 | ||
143 | /**本月周末设置为红色*/ | 151 | /**本月周末设置为红色*/ |
144 | .el-calendar-table .current:nth-last-child(-n+2) .solar { | 152 | /* .el-calendar-table .current:nth-last-child(-n+2) .solar { |
145 | color: red; | 153 | color: red; |
146 | } | 154 | } */ |
147 | 155 | ||
148 | /**本月农历设置为灰色*/ | 156 | /**本月农历设置为灰色*/ |
149 | .el-calendar-table .current .lunar { | 157 | .el-calendar-table .current .lunar { | ... | ... |
... | @@ -268,6 +268,11 @@ export default { | ... | @@ -268,6 +268,11 @@ export default { |
268 | }; | 268 | }; |
269 | </script> | 269 | </script> |
270 | <style scoped> | 270 | <style scoped> |
271 | /deep/.el-message-box { | ||
272 | width: 500px; | ||
273 | max-height: 95%; | ||
274 | } | ||
275 | |||
271 | /deep/.message-title { | 276 | /deep/.message-title { |
272 | font-size: 18px; | 277 | font-size: 18px; |
273 | font-weight: 700; | 278 | font-weight: 700; | ... | ... |
... | @@ -8,7 +8,9 @@ | ... | @@ -8,7 +8,9 @@ |
8 | <div ref="back" class="back"> | 8 | <div ref="back" class="back"> |
9 | <div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave"> | 9 | <div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave"> |
10 | <p v-for="(item, index) in noticeList" :key="index"> | 10 | <p v-for="(item, index) in noticeList" :key="index"> |
11 | {{ item.title }} | 11 | <span> {{ item.noticeTitle }}</span> |
12 | <span class="noticePublishTime">{{ item.noticePublishTime }}</span> | ||
13 | <el-button type="text" @click="handleNotice(item)" style="color:#F56C6C;font-size: 14px;">[点击查看]</el-button> | ||
12 | </p> | 14 | </p> |
13 | </div> | 15 | </div> |
14 | </div> | 16 | </div> |
... | @@ -34,7 +36,22 @@ export default { | ... | @@ -34,7 +36,22 @@ export default { |
34 | secondAnimationTime: '', // 状态二动画效果 | 36 | secondAnimationTime: '', // 状态二动画效果 |
35 | }; | 37 | }; |
36 | }, | 38 | }, |
39 | watch: { | ||
40 | noticeList: { | ||
41 | handler (newName, oldName) { | ||
42 | let that = this | ||
43 | this.Listener(); | ||
44 | setTimeout(res => { | ||
45 | that.getData(); | ||
46 | }, 100); | ||
47 | }, | ||
48 | deep: true | ||
49 | } | ||
50 | }, | ||
37 | methods: { | 51 | methods: { |
52 | handleNotice (item) { | ||
53 | this.$alertMes(item.noticeTitle, item.noticeContent) | ||
54 | }, | ||
38 | // 获取数据 | 55 | // 获取数据 |
39 | getData () { | 56 | getData () { |
40 | let style = document.styleSheets[0]; | 57 | let style = document.styleSheets[0]; |
... | @@ -53,7 +70,7 @@ export default { | ... | @@ -53,7 +70,7 @@ export default { |
53 | ); | 70 | ); |
54 | setTimeout(res => { | 71 | setTimeout(res => { |
55 | this.changeState(); | 72 | this.changeState(); |
56 | }, 1000); | 73 | }, 300); |
57 | }, | 74 | }, |
58 | // 用速度计算时间(想要保持速度一样,2种状态时间不同需算出) | 75 | // 用速度计算时间(想要保持速度一样,2种状态时间不同需算出) |
59 | ComputationTime () { | 76 | ComputationTime () { |
... | @@ -89,12 +106,6 @@ export default { | ... | @@ -89,12 +106,6 @@ export default { |
89 | let text = this.$refs.text; | 106 | let text = this.$refs.text; |
90 | text.style.animationPlayState = '' | 107 | text.style.animationPlayState = '' |
91 | } | 108 | } |
92 | }, | ||
93 | mounted () { | ||
94 | this.Listener(); | ||
95 | setTimeout(res => { | ||
96 | this.getData(); | ||
97 | }, 100); | ||
98 | } | 109 | } |
99 | }; | 110 | }; |
100 | </script> | 111 | </script> |
... | @@ -104,7 +115,6 @@ export default { | ... | @@ -104,7 +115,6 @@ export default { |
104 | align-items: center; | 115 | align-items: center; |
105 | width: 100%; | 116 | width: 100%; |
106 | height: 28px; | 117 | height: 28px; |
107 | line-height: 28px; | ||
108 | background: rgba(0, 0, 0, 0.1); | 118 | background: rgba(0, 0, 0, 0.1); |
109 | 119 | ||
110 | .icon { | 120 | .icon { |
... | @@ -132,7 +142,11 @@ export default { | ... | @@ -132,7 +142,11 @@ export default { |
132 | display: flex; | 142 | display: flex; |
133 | 143 | ||
134 | p { | 144 | p { |
135 | margin-right: 10px; | 145 | margin-right: 80px; |
146 | display: flex; | ||
147 | align-items: center; | ||
148 | height: 28px; | ||
149 | line-height: 28px; | ||
136 | } | 150 | } |
137 | } | 151 | } |
138 | } | 152 | } | ... | ... |
... | @@ -90,6 +90,14 @@ export default { | ... | @@ -90,6 +90,14 @@ export default { |
90 | padding: 3px !important; | 90 | padding: 3px !important; |
91 | } | 91 | } |
92 | 92 | ||
93 | /deep/.el-calendar-table td.is-today { | ||
94 | font-weight: 700; | ||
95 | } | ||
96 | |||
97 | /deep/.el-calendar-table td.is-selected { | ||
98 | background-color: rgb(179, 216, 255); | ||
99 | } | ||
100 | |||
93 | /deep/.el-calendar__header { | 101 | /deep/.el-calendar__header { |
94 | padding: 8px 15px; | 102 | padding: 8px 15px; |
95 | } | 103 | } |
... | @@ -141,9 +149,9 @@ export default { | ... | @@ -141,9 +149,9 @@ export default { |
141 | } | 149 | } |
142 | 150 | ||
143 | /**本月周末设置为红色*/ | 151 | /**本月周末设置为红色*/ |
144 | .el-calendar-table .current:nth-last-child(-n+2) .solar { | 152 | /* .el-calendar-table .current:nth-last-child(-n+2) .solar { |
145 | color: red; | 153 | color: red; |
146 | } | 154 | } */ |
147 | 155 | ||
148 | /**本月农历设置为灰色*/ | 156 | /**本月农历设置为灰色*/ |
149 | .el-calendar-table .current .lunar { | 157 | .el-calendar-table .current .lunar { | ... | ... |
... | @@ -21,8 +21,11 @@ | ... | @@ -21,8 +21,11 @@ |
21 | </div> | 21 | </div> |
22 | </template> | 22 | </template> |
23 | <script> | 23 | <script> |
24 | import NoticeBar from '@/components/NoticeBar/index' | ||
25 | import { mapGetters } from 'vuex' | 24 | import { mapGetters } from 'vuex' |
25 | import NoticeBar from '@/components/NoticeBar/index' | ||
26 | import { | ||
27 | getHomeNoticeList | ||
28 | } from "@/api/home.js" | ||
26 | export default { | 29 | export default { |
27 | components: { | 30 | components: { |
28 | NoticeBar | 31 | NoticeBar |
... | @@ -33,20 +36,20 @@ export default { | ... | @@ -33,20 +36,20 @@ export default { |
33 | data () { | 36 | data () { |
34 | return { | 37 | return { |
35 | logo: require('../../image/logo.png'), | 38 | logo: require('../../image/logo.png'), |
36 | noticeList: [ | 39 | noticeList: [] |
37 | { | 40 | } |
38 | title: '6666666666666666666' | ||
39 | }, | 41 | }, |
40 | { | 42 | created () { |
41 | title: '3333333333333333333' | 43 | this.queryNoticeList() |
42 | }, | 44 | }, |
43 | { | 45 | methods: { |
44 | title: '6666666666666666666' | 46 | queryNoticeList () { |
45 | } | 47 | getHomeNoticeList().then(res => { |
46 | ] | 48 | if (res.result) { |
49 | this.noticeList = res.result.noticeList | ||
47 | } | 50 | } |
51 | }) | ||
48 | }, | 52 | }, |
49 | methods: { | ||
50 | themeChange (val) { | 53 | themeChange (val) { |
51 | this.$store.dispatch('app/updateTheme', val) | 54 | this.$store.dispatch('app/updateTheme', val) |
52 | }, | 55 | }, | ... | ... |
... | @@ -22,7 +22,7 @@ | ... | @@ -22,7 +22,7 @@ |
22 | <ul> | 22 | <ul> |
23 | <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice(item)" class="flexst pointer"> | 23 | <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice(item)" class="flexst pointer"> |
24 | <p class="list-title">{{ item.noticeTitle }}</p> | 24 | <p class="list-title">{{ item.noticeTitle }}</p> |
25 | <p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p> | 25 | <p class="marginZL15">{{ item.noticePublishTime.substring(0, 10) }}</p> |
26 | <p v-if="item.userBrowse == '1'" style="color:red">未读</p> | 26 | <p v-if="item.userBrowse == '1'" style="color:red">未读</p> |
27 | <p v-else>已读</p> | 27 | <p v-else>已读</p> |
28 | </li> | 28 | </li> |
... | @@ -192,7 +192,7 @@ export default { | ... | @@ -192,7 +192,7 @@ export default { |
192 | if (res.result) { | 192 | if (res.result) { |
193 | this.noticeList = res.result.noticeList | 193 | this.noticeList = res.result.noticeList |
194 | this.noticeList.forEach(item => { | 194 | this.noticeList.forEach(item => { |
195 | item.createtime = this._timedate(item.createtime) | 195 | item.noticePublishTime = this._timedate(item.noticePublishTime) |
196 | }) | 196 | }) |
197 | this.policyList = res.result.policyList | 197 | this.policyList = res.result.policyList |
198 | } | 198 | } | ... | ... |
... | @@ -646,7 +646,7 @@ class data extends filter { | ... | @@ -646,7 +646,7 @@ class data extends filter { |
646 | label: "坐落", | 646 | label: "坐落", |
647 | }, | 647 | }, |
648 | { | 648 | { |
649 | prop: "qlr", | 649 | prop: "qlrmc", |
650 | label: "权利人", | 650 | label: "权利人", |
651 | }, | 651 | }, |
652 | { | 652 | { |
... | @@ -654,11 +654,11 @@ class data extends filter { | ... | @@ -654,11 +654,11 @@ class data extends filter { |
654 | label: "证件种类", | 654 | label: "证件种类", |
655 | }, | 655 | }, |
656 | { | 656 | { |
657 | prop: "qlrzjh", | 657 | prop: "qlrzjhm", |
658 | label: "证件号", | 658 | label: "证件号", |
659 | }, | 659 | }, |
660 | { | 660 | { |
661 | prop: "ywr", | 661 | prop: "ywrmc", |
662 | label: "义务人", | 662 | label: "义务人", |
663 | }, | 663 | }, |
664 | { | 664 | { |
... | @@ -666,7 +666,7 @@ class data extends filter { | ... | @@ -666,7 +666,7 @@ class data extends filter { |
666 | label: "证件种类", | 666 | label: "证件种类", |
667 | }, | 667 | }, |
668 | { | 668 | { |
669 | prop: "ywrzjh", | 669 | prop: "ywrzjhm", |
670 | label: "证件号", | 670 | label: "证件号", |
671 | }, | 671 | }, |
672 | { | 672 | { |
... | @@ -714,7 +714,7 @@ class data extends filter { | ... | @@ -714,7 +714,7 @@ class data extends filter { |
714 | label: "登记时间", | 714 | label: "登记时间", |
715 | }, | 715 | }, |
716 | { | 716 | { |
717 | prop: "bdcdjzmh", | 717 | prop: "bdcqzh", |
718 | label: "不动产登记证明号", | 718 | label: "不动产登记证明号", |
719 | }, | 719 | }, |
720 | { | 720 | { |
... | @@ -722,21 +722,17 @@ class data extends filter { | ... | @@ -722,21 +722,17 @@ class data extends filter { |
722 | label: "登簿人", | 722 | label: "登簿人", |
723 | }, | 723 | }, |
724 | { | 724 | { |
725 | prop: "zxygywh", | 725 | prop: "zxywh", |
726 | label: "注销预告业务号", | 726 | label: "注销预告业务号", |
727 | }, | 727 | }, |
728 | { | 728 | { |
729 | prop: "zxygyy", | 729 | prop: "zxyy", |
730 | label: "注销预告原因", | 730 | label: "注销预告原因", |
731 | }, | 731 | }, |
732 | { | 732 | { |
733 | prop: "zxsj", | 733 | prop: "zxsj", |
734 | label: "注销时间", | 734 | label: "注销时间", |
735 | }, | 735 | } |
736 | { | ||
737 | prop: "qszt", | ||
738 | label: "权属状态", | ||
739 | }, | ||
740 | ], | 736 | ], |
741 | CFDJ: [ | 737 | CFDJ: [ |
742 | { | 738 | { | ... | ... |
1 | <template> | 1 | <template> |
2 | <dialogBox title="新增系统通知" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%" | 2 | <dialogBox :title="title" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%" |
3 | @closeDialog="closeDialog" v-model="value"> | 3 | @closeDialog="closeDialog" v-model="value" :isButton="isButtonFlag"> |
4 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> | 4 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> |
5 | <el-row> | 5 | <el-row> |
6 | <el-col :span="24"> | 6 | <el-col :span="24"> |
... | @@ -23,7 +23,7 @@ | ... | @@ -23,7 +23,7 @@ |
23 | @change="onEditorChange($event)" @ready="onEditorReady($event)"></quill-editor> | 23 | @change="onEditorChange($event)" @ready="onEditorReady($event)"></quill-editor> |
24 | </el-form-item> | 24 | </el-form-item> |
25 | </el-row> | 25 | </el-row> |
26 | <el-row> | 26 | <!-- <el-row> |
27 | <el-col :span="8"> | 27 | <el-col :span="8"> |
28 | <el-form-item label="附件:" prop="noticeFileUrl"> | 28 | <el-form-item label="附件:" prop="noticeFileUrl"> |
29 | <el-upload action multiple :auto-upload="false" :limit="1" :on-change="handleChange" | 29 | <el-upload action multiple :auto-upload="false" :limit="1" :on-change="handleChange" |
... | @@ -33,7 +33,8 @@ | ... | @@ -33,7 +33,8 @@ |
33 | </el-upload> | 33 | </el-upload> |
34 | </el-form-item> | 34 | </el-form-item> |
35 | </el-col> | 35 | </el-col> |
36 | </el-row> | 36 | </el-row> --> |
37 | <!-- 隐藏上传按钮 用于代替触发富文本上传事件 --> | ||
37 | <div v-show="false"> | 38 | <div v-show="false"> |
38 | <el-upload action multiple :auto-upload="false" :on-change="RichTexthandleChange" :before-upload="beforeUpload" | 39 | <el-upload action multiple :auto-upload="false" :on-change="RichTexthandleChange" :before-upload="beforeUpload" |
39 | class="richUpload"> | 40 | class="richUpload"> |
... | @@ -46,12 +47,14 @@ | ... | @@ -46,12 +47,14 @@ |
46 | </template> | 47 | </template> |
47 | 48 | ||
48 | <script> | 49 | <script> |
49 | import { addSysNotice } from "@/api/notice.js"; | 50 | import { addSysNotice,updateSysNotice } from "@/api/notice.js"; |
50 | import { upload } from "@/api/system.js"; | 51 | import { upload } from "@/api/system.js"; |
51 | import { quillEditor } from "vue-quill-editor"; | 52 | import { quillEditor } from "vue-quill-editor"; |
52 | export default { | 53 | export default { |
53 | props: { | 54 | props: { |
54 | value: { type: Boolean, default: false } | 55 | value: { type: Boolean, default: false }, |
56 | isButtonFlag: { type: Boolean, default: true }, | ||
57 | title: {type:String, default: '新增系统通知'} | ||
55 | }, | 58 | }, |
56 | components: { quillEditor }, | 59 | components: { quillEditor }, |
57 | data () { | 60 | data () { |
... | @@ -142,12 +145,30 @@ export default { | ... | @@ -142,12 +145,30 @@ export default { |
142 | } | 145 | } |
143 | } | 146 | } |
144 | }, | 147 | }, |
145 | mounted () { }, | 148 | mounted () {}, |
146 | methods: { | 149 | methods: { |
147 | submitForm () { | 150 | submitForm () { |
148 | let that = this; | 151 | let that = this; |
149 | that.$refs.ruleForm.validate(valid => { | 152 | that.$refs.ruleForm.validate(valid => { |
150 | if (valid) { | 153 | if (valid) { |
154 | if(that.ruleForm.bsmNotice){ | ||
155 | that.editNotice(); | ||
156 | }else{ | ||
157 | that.addNotice(); | ||
158 | } | ||
159 | } else { | ||
160 | // console.log('error submit!!'); | ||
161 | return false; | ||
162 | } | ||
163 | }); | ||
164 | }, | ||
165 | //关闭窗口 | ||
166 | closeDialog () { | ||
167 | this.$emit("input", false); | ||
168 | this.resetRuleForm(); | ||
169 | }, | ||
170 | //新增通知 | ||
171 | addNotice(){ | ||
151 | addSysNotice(this.ruleForm).then(res => { | 172 | addSysNotice(this.ruleForm).then(res => { |
152 | if (res.code == 200) { | 173 | if (res.code == 200) { |
153 | this.$message.success("保存成功"); | 174 | this.$message.success("保存成功"); |
... | @@ -158,21 +179,30 @@ export default { | ... | @@ -158,21 +179,30 @@ export default { |
158 | this.$message.error(res.message); | 179 | this.$message.error(res.message); |
159 | } | 180 | } |
160 | }); | 181 | }); |
161 | } else { | ||
162 | // console.log('error submit!!'); | ||
163 | return false; | ||
164 | } | ||
165 | }); | ||
166 | }, | 182 | }, |
167 | //关闭窗口 | 183 | //编辑通知 |
168 | closeDialog () { | 184 | editNotice(){ |
185 | updateSysNotice(this.ruleForm).then(res => { | ||
186 | if (res.code == 200) { | ||
187 | this.$message.success("编辑成功"); | ||
169 | this.$emit("input", false); | 188 | this.$emit("input", false); |
170 | this.resetRuleForm(); | 189 | this.resetRuleForm(); |
190 | this.$parent.queryClick(); | ||
191 | } else { | ||
192 | this.$message.error(res.message); | ||
193 | } | ||
194 | }); | ||
171 | }, | 195 | }, |
172 | // | 196 | //重置表单 |
173 | resetRuleForm () { | 197 | resetRuleForm () { |
174 | this.$refs["ruleForm"].resetFields(); | 198 | this.ruleForm = { |
175 | this.ruleForm.noticeType = "1"; | 199 | noticeTitle: "", |
200 | noticeContent: "", | ||
201 | noticeFileUrl: "", | ||
202 | noticeSource: "", | ||
203 | noticeType: "1" | ||
204 | } | ||
205 | this.isButtonFlag = true; | ||
176 | }, | 206 | }, |
177 | beforeUpload (file) { | 207 | beforeUpload (file) { |
178 | return true; | 208 | return true; |
... | @@ -193,6 +223,9 @@ export default { | ... | @@ -193,6 +223,9 @@ export default { |
193 | clipboardPictureChange (file) { | 223 | clipboardPictureChange (file) { |
194 | this.uploadPicture(file) | 224 | this.uploadPicture(file) |
195 | }, | 225 | }, |
226 | getDetailInfo(item){ | ||
227 | this.ruleForm = item | ||
228 | }, | ||
196 | uploadPicture (file) { | 229 | uploadPicture (file) { |
197 | let that = this; | 230 | let that = this; |
198 | var formdata = new FormData(); | 231 | var formdata = new FormData(); | ... | ... |
1 | <template> | ||
2 | <div> | ||
3 | <el-row :gutter="8"> | ||
4 | <el-col :span="16"> | ||
5 | 通知标题: | ||
6 | <el-input v-model="formData.item.noticeTitle"></el-input> | ||
7 | </el-col> | ||
8 | </el-row> | ||
9 | <el-row :gutter="8"> | ||
10 | <el-col :span="24" class="margin-top-middle"> | ||
11 | 通知内容: | ||
12 | <quill-editor class="ql-editor" v-model="formData.item.noticeContent" ref="myQuillEditor" | ||
13 | :options="editorOption"> | ||
14 | </quill-editor> | ||
15 | </el-col> | ||
16 | </el-row> | ||
17 | <el-row :gutter="8"> | ||
18 | <el-col :span="24" class="margin-top-middle"> | ||
19 | 附件: | ||
20 | <div @click="handleView(formData.item.noticeFileUrl)" class="pointer">{{ formData.item.noticeFileName }}</div> | ||
21 | </el-col> | ||
22 | </el-row> | ||
23 | </div> | ||
24 | </template> | ||
25 | <script> | ||
26 | import { quillEditor } from "vue-quill-editor"; | ||
27 | export default { | ||
28 | components: { quillEditor }, | ||
29 | data () { | ||
30 | return { | ||
31 | // 富文本编辑器配置 | ||
32 | editorOption: { | ||
33 | theme: "snow", // or 'bubble' | ||
34 | placeholder: "请输入正文", | ||
35 | }, | ||
36 | }; | ||
37 | }, | ||
38 | components: {}, | ||
39 | props: { | ||
40 | formData: { | ||
41 | type: Object, | ||
42 | default: () => { } | ||
43 | }, | ||
44 | }, | ||
45 | created () { | ||
46 | console.log(this.formData); | ||
47 | }, | ||
48 | computed: { | ||
49 | |||
50 | }, | ||
51 | |||
52 | methods: { | ||
53 | |||
54 | }, | ||
55 | }; | ||
56 | </script> | ||
57 | <style scoped lang='scss'> | ||
58 | .margin-top-middle { | ||
59 | margin-top: 10px | ||
60 | } | ||
61 | |||
62 | /deep/.ql-editor { | ||
63 | padding: 0px; | ||
64 | } | ||
65 | </style> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -33,7 +33,7 @@ | ... | @@ -33,7 +33,7 @@ |
33 | :data="tableData.data"> | 33 | :data="tableData.data"> |
34 | </lb-table> | 34 | </lb-table> |
35 | </div> | 35 | </div> |
36 | <addDialog ref="addDialog" v-model="isDialog" /> | 36 | <addDialog ref="addDialog" v-model="isDialog" :isButtonFlag="isButtonFlag" :title="dialogTitle"/> |
37 | </div> | 37 | </div> |
38 | </template> | 38 | </template> |
39 | <script> | 39 | <script> |
... | @@ -52,8 +52,8 @@ export default { | ... | @@ -52,8 +52,8 @@ export default { |
52 | data () { | 52 | data () { |
53 | return { | 53 | return { |
54 | isDialog: false, | 54 | isDialog: false, |
55 | viewDialog: false, | 55 | isButtonFlag: true, |
56 | 56 | dialogTitle: '', | |
57 | ruleForm: { | 57 | ruleForm: { |
58 | noticeTitle: '', | 58 | noticeTitle: '', |
59 | noticeStatus: '' | 59 | noticeStatus: '' |
... | @@ -84,7 +84,17 @@ export default { | ... | @@ -84,7 +84,17 @@ export default { |
84 | }) | 84 | }) |
85 | }, | 85 | }, |
86 | //打开新增弹窗 | 86 | //打开新增弹窗 |
87 | openDialog () { | 87 | openDialog (item) { |
88 | if (item) { | ||
89 | this.$nextTick(() => { | ||
90 | this.isButtonFlag = false; | ||
91 | this.$refs.addDialog.getDetailInfo(item); | ||
92 | this.dialogTitle = '系统通知详情' | ||
93 | }) | ||
94 | }else{ | ||
95 | this.isButtonFlag = true; | ||
96 | this.dialogTitle = '新增系统通知' | ||
97 | } | ||
88 | this.isDialog = true; | 98 | this.isDialog = true; |
89 | }, | 99 | }, |
90 | //删除 | 100 | //删除 |
... | @@ -153,16 +163,18 @@ export default { | ... | @@ -153,16 +163,18 @@ export default { |
153 | }); | 163 | }); |
154 | }); | 164 | }); |
155 | }, | 165 | }, |
166 | //编辑通知 | ||
167 | editNotice(item) { | ||
168 | this.$nextTick(() => { | ||
169 | this.isButtonFlag = true; | ||
170 | this.$refs.addDialog.getDetailInfo(item); | ||
171 | this.dialogTitle = '编辑系统通知' | ||
172 | this.isDialog = true; | ||
173 | }) | ||
174 | }, | ||
156 | downloadFile (item) { | 175 | downloadFile (item) { |
157 | const href = item.noticeFileUrl | 176 | const href = item.noticeFileUrl |
158 | window.open(href, '_blank'); | 177 | window.open(href, '_blank'); |
159 | }, | ||
160 | viewDetail (e) { | ||
161 | this.$popup("错误日志", "system/xttz/components/viewDialog", { | ||
162 | formData: { | ||
163 | item: e | ||
164 | } | ||
165 | }) | ||
166 | } | 178 | } |
167 | }, | 179 | }, |
168 | }; | 180 | }; | ... | ... |
... | @@ -26,6 +26,10 @@ class data extends filter { | ... | @@ -26,6 +26,10 @@ class data extends filter { |
26 | label: "通知标题", | 26 | label: "通知标题", |
27 | }, | 27 | }, |
28 | { | 28 | { |
29 | prop: "noticeSource", | ||
30 | label: "通知来源", | ||
31 | }, | ||
32 | { | ||
29 | label: "通知内容", | 33 | label: "通知内容", |
30 | render: (h, scope) => { | 34 | render: (h, scope) => { |
31 | return <div class="item-cwnr" domPropsInnerHTML={scope.row.noticeContent}></div> | 35 | return <div class="item-cwnr" domPropsInnerHTML={scope.row.noticeContent}></div> |
... | @@ -51,6 +55,10 @@ class data extends filter { | ... | @@ -51,6 +55,10 @@ class data extends filter { |
51 | } | 55 | } |
52 | }, | 56 | }, |
53 | { | 57 | { |
58 | prop: "noticePublishTime", | ||
59 | label: "发布时间", | ||
60 | }, | ||
61 | { | ||
54 | prop: "creater", | 62 | prop: "creater", |
55 | width: '120', | 63 | width: '120', |
56 | label: "创建人", | 64 | label: "创建人", |
... | @@ -67,13 +75,14 @@ class data extends filter { | ... | @@ -67,13 +75,14 @@ class data extends filter { |
67 | switch (scope.row.noticeStatus) { | 75 | switch (scope.row.noticeStatus) { |
68 | case '1': | 76 | case '1': |
69 | return <div> | 77 | return <div> |
78 | <el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope.row) }}>查看</el-button> | ||
79 | <el-button type="text" icon="el-icon-edit" onClick={() => { vm.editNotice(scope.row) }}>编辑</el-button> | ||
70 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toPublish(scope.row) }}>发布</el-button> | 80 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toPublish(scope.row) }}>发布</el-button> |
71 | <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button> | ||
72 | <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delNotice(scope.row) }}>删除</el-button> | 81 | <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delNotice(scope.row) }}>删除</el-button> |
73 | </div> | 82 | </div> |
74 | case '2': | 83 | case '2': |
75 | return <div> | 84 | return <div> |
76 | <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button> | 85 | <el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope.row) }}>查看</el-button> |
77 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>撤销通知</el-button> | 86 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>撤销通知</el-button> |
78 | </div> | 87 | </div> |
79 | } | 88 | } | ... | ... |
1 | //流程环节操作按钮 | 1 | //流程环节操作按钮 |
2 | export function getForm(tabName, djywbm) { | 2 | export function getForm(tabName, djywbm) { |
3 | console.log("88888888"+tabName); | ||
3 | let form; | 4 | let form; |
4 | switch (tabName) { | 5 | switch (tabName) { |
5 | case "jsydsyqslxx100": | 6 | case "jsydsyqslxx100": |
... | @@ -51,10 +52,10 @@ export function getForm(tabName, djywbm) { | ... | @@ -51,10 +52,10 @@ export function getForm(tabName, djywbm) { |
51 | form = require("@/views/registerBook/zdjbxx.vue"); | 52 | form = require("@/views/registerBook/zdjbxx.vue"); |
52 | break; | 53 | break; |
53 | case "ygmm100": | 54 | case "ygmm100": |
54 | form = require("@/views/ywbl/ygdj/slxx.vue"); | 55 | form=require("@/views/ywbl/ygdj/slxx.vue"); |
55 | break; | 56 | break; |
56 | case "ygmm300": | 57 | case "ygmm300": |
57 | form = require("@/views/ywbl/fdcq2/slxx.vue"); | 58 | form=require("@/views/ywbl/ygdj/slxx300.vue"); |
58 | break; | 59 | break; |
59 | case "cfdjxx": | 60 | case "cfdjxx": |
60 | form = require("@/views/registerBook/cfdj.vue"); | 61 | form = require("@/views/registerBook/cfdj.vue"); | ... | ... |
... | @@ -134,28 +134,13 @@ | ... | @@ -134,28 +134,13 @@ |
134 | <el-col :span="14" v-if="ruleForm.qlxx"> | 134 | <el-col :span="14" v-if="ruleForm.qlxx"> |
135 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> | 135 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> |
136 | <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> | 136 | <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> |
137 | <el-radio label="1">单独所有</el-radio> | 137 | <el-radio label="0">单独所有</el-radio> |
138 | <el-radio label="2">共同共有</el-radio> | 138 | <el-radio label="1">共同共有</el-radio> |
139 | <el-radio label="3">按份所有</el-radio> | 139 | <el-radio label="2">按份所有</el-radio> |
140 | <el-radio label="3">其它共有</el-radio> | ||
140 | </el-radio-group> | 141 | </el-radio-group> |
141 | </el-form-item> | 142 | </el-form-item> |
142 | </el-col> | 143 | </el-col> |
143 | <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> | ||
144 | <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证:"> | ||
145 | <el-radio-group v-model="ruleForm.sffbcz"> | ||
146 | <el-radio label="1">是</el-radio> | ||
147 | <el-radio label="0">否</el-radio> | ||
148 | </el-radio-group> | ||
149 | </el-form-item> | ||
150 | </el-col> | ||
151 | <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> | ||
152 | <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人:"> | ||
153 | <el-select v-model="ruleForm.czr" placeholder="持证人"> | ||
154 | <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> | ||
155 | </el-option> | ||
156 | </el-select> | ||
157 | </el-form-item> | ||
158 | </el-col> | ||
159 | </el-row> | 144 | </el-row> |
160 | <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" | 145 | <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" |
161 | :gyfs="ruleForm.qlxx.gyfs" /> | 146 | :gyfs="ruleForm.qlxx.gyfs" /> | ... | ... |
src/views/ywbl/ygdj/slxx300.vue
0 → 100644
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment