Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
# Conflicts: # src/components/tanchuang/index.vue
Showing
9 changed files
with
97 additions
and
24 deletions
| ... | @@ -106,3 +106,21 @@ export function selectCfdj (data) { | ... | @@ -106,3 +106,21 @@ export function selectCfdj (data) { |
| 106 | data | 106 | data |
| 107 | }) | 107 | }) |
| 108 | } | 108 | } |
| 109 | /* | ||
| 110 | 业务办理-业务申请-添加收藏业务 | ||
| 111 | */ | ||
| 112 | export function addCollectBiz (bsmSqyw) { | ||
| 113 | return request({ | ||
| 114 | url: '/ywbl/BusinessApply/addCollectBiz?bsmSqyw=' + bsmSqyw, | ||
| 115 | method: 'post' | ||
| 116 | }) | ||
| 117 | } | ||
| 118 | /* | ||
| 119 | 业务办理-业务申请-添加收藏业务 | ||
| 120 | */ | ||
| 121 | export function deleteCollectBiz (bsmSqyw) { | ||
| 122 | return request({ | ||
| 123 | url: '/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw, | ||
| 124 | method: 'post' | ||
| 125 | }) | ||
| 126 | } | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -93,6 +93,7 @@ export default { | ... | @@ -93,6 +93,7 @@ export default { |
| 93 | left: 0; | 93 | left: 0; |
| 94 | top: 0; | 94 | top: 0; |
| 95 | background: rgba(0, 0, 0, 0.3); | 95 | background: rgba(0, 0, 0, 0.3); |
| 96 | |||
| 96 | } | 97 | } |
| 97 | 98 | ||
| 98 | .ls-mask-window { | 99 | .ls-mask-window { |
| ... | @@ -102,6 +103,7 @@ export default { | ... | @@ -102,6 +103,7 @@ export default { |
| 102 | top: 50%; | 103 | top: 50%; |
| 103 | min-height: 200px; | 104 | min-height: 200px; |
| 104 | transform: translate(-50%, -50%); | 105 | transform: translate(-50%, -50%); |
| 106 | border-radius: 10px; | ||
| 105 | } | 107 | } |
| 106 | .ls-head{ | 108 | .ls-head{ |
| 107 | position: relative; | 109 | position: relative; | ... | ... |
src/views/workflow/components/flowChart.vue
0 → 100644
| 1 | <!-- | ||
| 2 | 功能:流程图 | ||
| 3 | 作者:calliope | ||
| 4 | --> | ||
| 5 | <template> | ||
| 6 | <div class='flowChart'> | ||
| 7 | <img :src="formData" alt=""> | ||
| 8 | </div> | ||
| 9 | </template> | ||
| 10 | <script> | ||
| 11 | |||
| 12 | export default { | ||
| 13 | props: { | ||
| 14 | formData: { | ||
| 15 | type: String, | ||
| 16 | default: '' | ||
| 17 | } | ||
| 18 | } | ||
| 19 | } | ||
| 20 | </script> | ||
| 21 | <style scoped lang="scss"> | ||
| 22 | @import "~@/styles/mixin.scss"; | ||
| 23 | |||
| 24 | .flowChart { | ||
| 25 | margin: 20px 0; | ||
| 26 | } | ||
| 27 | </style> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| ... | @@ -56,9 +56,6 @@ | ... | @@ -56,9 +56,6 @@ |
| 56 | </div> | 56 | </div> |
| 57 | </div> | 57 | </div> |
| 58 | </div> | 58 | </div> |
| 59 | <dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false"> | ||
| 60 | <img :src="imgSrc" style="margin: 20px 0" /> | ||
| 61 | </dialogBox> | ||
| 62 | </div> | 59 | </div> |
| 63 | </template> | 60 | </template> |
| 64 | 61 | ||
| ... | @@ -82,7 +79,6 @@ export default { | ... | @@ -82,7 +79,6 @@ export default { |
| 82 | return { | 79 | return { |
| 83 | // 流程图 | 80 | // 流程图 |
| 84 | imgSrc: '', | 81 | imgSrc: '', |
| 85 | myValue: false, | ||
| 86 | // 折叠 | 82 | // 折叠 |
| 87 | isShowdrawer: true, | 83 | isShowdrawer: true, |
| 88 | // 默认选中 | 84 | // 默认选中 |
| ... | @@ -149,18 +145,24 @@ export default { | ... | @@ -149,18 +145,24 @@ export default { |
| 149 | }, | 145 | }, |
| 150 | //流程环节操作按钮 | 146 | //流程环节操作按钮 |
| 151 | operation (index, item) { | 147 | operation (index, item) { |
| 148 | //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 | ||
| 149 | //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout | ||
| 152 | let that = this; | 150 | let that = this; |
| 153 | switch (item.value) { | 151 | switch (item.value) { |
| 154 | case "B1": | 152 | case "B1": |
| 155 | getWorkFlowImage(this.bsmSlsq).then(res => { | 153 | getWorkFlowImage(this.bsmSlsq).then(res => { |
| 156 | this.imgSrc = URL.createObjectURL(res) | 154 | this.imgSrc = URL.createObjectURL(res) |
| 157 | this.myValue = true | 155 | this.$popup({ |
| 156 | title: '流程图', | ||
| 157 | editItem: 'workflow/components/flowChart', | ||
| 158 | formData: this.imgSrc | ||
| 159 | }) | ||
| 158 | }) | 160 | }) |
| 159 | break; | 161 | break; |
| 160 | case "zsyl": | 162 | case "B5": |
| 161 | this.zsylFlag = true; | 163 | this.zsylFlag = true; |
| 162 | break; | 164 | break; |
| 163 | case "clfp": //材料分屏按钮 | 165 | case "B2": //材料分屏按钮 |
| 164 | this.splitScreen = this.splitScreen ? false : true; | 166 | this.splitScreen = this.splitScreen ? false : true; |
| 165 | this.$store.dispatch('app/settScreen', this.splitScreen) | 167 | this.$store.dispatch('app/settScreen', this.splitScreen) |
| 166 | if (this.splitScreen) { | 168 | if (this.splitScreen) { |
| ... | @@ -174,9 +176,9 @@ export default { | ... | @@ -174,9 +176,9 @@ export default { |
| 174 | this.tabList.splice(this.clxxIndex, 1, this.clxxTab); | 176 | this.tabList.splice(this.clxxIndex, 1, this.clxxTab); |
| 175 | } | 177 | } |
| 176 | break; | 178 | break; |
| 177 | case "th": //退回按钮 | 179 | case "back": //退回按钮 |
| 178 | break; | 180 | break; |
| 179 | case "zc": //转件按钮 | 181 | case "transfer": //转件按钮 |
| 180 | getNextLinkInfo({ | 182 | getNextLinkInfo({ |
| 181 | bsmSlsq: this.bsmSlsq, | 183 | bsmSlsq: this.bsmSlsq, |
| 182 | bestepid: this.bestepid, | 184 | bestepid: this.bestepid, |
| ... | @@ -186,10 +188,10 @@ export default { | ... | @@ -186,10 +188,10 @@ export default { |
| 186 | } | 188 | } |
| 187 | }); | 189 | }); |
| 188 | break; | 190 | break; |
| 189 | case "tc": | 191 | case "signout": |
| 190 | window.close(); | 192 | window.close(); |
| 191 | break; | 193 | break; |
| 192 | case "db": | 194 | case "record": |
| 193 | var formdata = new FormData(); | 195 | var formdata = new FormData(); |
| 194 | formdata.append("bsmSlsq", this.bsmSlsq); | 196 | formdata.append("bsmSlsq", this.bsmSlsq); |
| 195 | formdata.append("bestepid", this.bestepid); | 197 | formdata.append("bestepid", this.bestepid); | ... | ... |
| ... | @@ -106,7 +106,7 @@ export default { | ... | @@ -106,7 +106,7 @@ export default { |
| 106 | fetchData () { | 106 | fetchData () { |
| 107 | if (this.bsmSqyw) { | 107 | if (this.bsmSqyw) { |
| 108 | this.queryForm.sqywbm = this.djywbm; | 108 | this.queryForm.sqywbm = this.djywbm; |
| 109 | 109 | console.log(this.queryForm, this.bsmSqyw); | |
| 110 | selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => { | 110 | selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => { |
| 111 | if (res.code === 200) { | 111 | if (res.code === 200) { |
| 112 | let { total, records } = res.result; | 112 | let { total, records } = res.result; | ... | ... |
| ... | @@ -9,6 +9,8 @@ export function queueDjywmc (djywbm) { | ... | @@ -9,6 +9,8 @@ export function queueDjywmc (djywbm) { |
| 9 | case "A03200": | 9 | case "A03200": |
| 10 | case "A03300": | 10 | case "A03300": |
| 11 | case "A03400": | 11 | case "A03400": |
| 12 | vm = "jsydsyq200"; | ||
| 13 | break; | ||
| 12 | case "A04100": | 14 | case "A04100": |
| 13 | vm = "houseOwnership"; | 15 | vm = "houseOwnership"; |
| 14 | break; | 16 | break; | ... | ... |
| ... | @@ -23,8 +23,9 @@ | ... | @@ -23,8 +23,9 @@ |
| 23 | <p> | 23 | <p> |
| 24 | {{ item.nodename }} | 24 | {{ item.nodename }} |
| 25 | </p> | 25 | </p> |
| 26 | <p v-if="item.sffqlc == 1" :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)"> | 26 | <p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''" |
| 27 | <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i> | 27 | @click.stop="handleCollection(item)"> |
| 28 | <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i> | ||
| 28 | </p> | 29 | </p> |
| 29 | </li> | 30 | </li> |
| 30 | </ul> | 31 | </ul> |
| ... | @@ -38,8 +39,9 @@ | ... | @@ -38,8 +39,9 @@ |
| 38 | <p> | 39 | <p> |
| 39 | {{ item.nodename }} | 40 | {{ item.nodename }} |
| 40 | </p> | 41 | </p> |
| 41 | <p v-if="item.sffqlc == 1" :class="item.select ? 'active' : ''" @click="handleCollection(item)"> | 42 | <p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''" |
| 42 | <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i> | 43 | @click.stop="handleCollection(item)"> |
| 44 | <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i> | ||
| 43 | </p> | 45 | </p> |
| 44 | </li> | 46 | </li> |
| 45 | </ul> | 47 | </ul> |
| ... | @@ -52,8 +54,8 @@ | ... | @@ -52,8 +54,8 @@ |
| 52 | <p> | 54 | <p> |
| 53 | {{ item.nodename }} | 55 | {{ item.nodename }} |
| 54 | </p> | 56 | </p> |
| 55 | <p :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)"> | 57 | <p :class="item.userCollect==1 ? 'active' : ''" @click.stop="handleCollection(item)"> |
| 56 | <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i> | 58 | <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i> |
| 57 | </p> | 59 | </p> |
| 58 | </li> | 60 | </li> |
| 59 | </ul> | 61 | </ul> |
| ... | @@ -67,7 +69,7 @@ | ... | @@ -67,7 +69,7 @@ |
| 67 | </div> | 69 | </div> |
| 68 | </template> | 70 | </template> |
| 69 | <script> | 71 | <script> |
| 70 | import { getCollectBiz, getleftMenu, getNextNode } from "@/api/ywbl" | 72 | import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl" |
| 71 | import fqsqDialog from "./slectBdc.vue" | 73 | import fqsqDialog from "./slectBdc.vue" |
| 72 | export default { | 74 | export default { |
| 73 | data () { | 75 | data () { |
| ... | @@ -88,8 +90,7 @@ export default { | ... | @@ -88,8 +90,7 @@ export default { |
| 88 | djqxObj: { | 90 | djqxObj: { |
| 89 | djqxbm: "", | 91 | djqxbm: "", |
| 90 | djqxmc: "", | 92 | djqxmc: "", |
| 91 | }, | 93 | } |
| 92 | |||
| 93 | } | 94 | } |
| 94 | }, | 95 | }, |
| 95 | components: { | 96 | components: { |
| ... | @@ -161,7 +162,28 @@ export default { | ... | @@ -161,7 +162,28 @@ export default { |
| 161 | }) | 162 | }) |
| 162 | }, | 163 | }, |
| 163 | handleCollection (item) { | 164 | handleCollection (item) { |
| 164 | item.select = !item.select | 165 | let that = this |
| 166 | if (item.userCollect == '2') { | ||
| 167 | addCollectBiz(item.bsmSqyw).then(res => { | ||
| 168 | if (res.code == 200) { | ||
| 169 | item.userCollect = '1' | ||
| 170 | that.$message({ | ||
| 171 | message: '收藏成功!', | ||
| 172 | type: 'success' | ||
| 173 | }) | ||
| 174 | } | ||
| 175 | }) | ||
| 176 | } else { | ||
| 177 | deleteCollectBiz(item.bsmSqyw).then(res => { | ||
| 178 | if (res.code == 200) { | ||
| 179 | item.userCollect = '2' | ||
| 180 | that.$message({ | ||
| 181 | message: '取消收藏成功!', | ||
| 182 | type: 'success' | ||
| 183 | }) | ||
| 184 | } | ||
| 185 | }) | ||
| 186 | } | ||
| 165 | }, | 187 | }, |
| 166 | handleSelect (item) { | 188 | handleSelect (item) { |
| 167 | this.busList.forEach(item => { | 189 | this.busList.forEach(item => { | ... | ... |
-
Please register or sign in to post a comment