Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
15 changed files
with
203 additions
and
82 deletions
... | @@ -12,6 +12,8 @@ export function addJtfcCxjgXx (data) { | ... | @@ -12,6 +12,8 @@ export function addJtfcCxjgXx (data) { |
12 | return request({ | 12 | return request({ |
13 | url: '/sqcx/addJtfcCxjgXx', | 13 | url: '/sqcx/addJtfcCxjgXx', |
14 | method: 'post', | 14 | method: 'post', |
15 | data | 15 | data, |
16 | showLoading: true, | ||
17 | loadingTarget: '正在查询中...' | ||
16 | }) | 18 | }) |
17 | } | 19 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -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 | ... | ... |
... | @@ -2,9 +2,12 @@ | ... | @@ -2,9 +2,12 @@ |
2 | <transition name="fade" mode="out-in" v-if="isShow"> | 2 | <transition name="fade" mode="out-in" v-if="isShow"> |
3 | <div class="ls-mask" v-loading="loading"> | 3 | <div class="ls-mask" v-loading="loading"> |
4 | <div class="ls-mask-window" :style="{'width':width,'height':height}"> | 4 | <div class="ls-mask-window" :style="{'width':width,'height':height}"> |
5 | <div :style="{'text-align':titleStyle}"><b>{{title}}</b></div> | 5 | <div class="ls-head"> |
6 | <div class="ls-title" :style="{'text-align':titleStyle}"><b>{{title}}</b></div> | ||
6 | <i class="el-icon-close" @click="onCancel"></i> | 7 | <i class="el-icon-close" @click="onCancel"></i> |
7 | <div class="ls-mask-content"> | 8 | </div> |
9 | |||
10 | <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}"> | ||
8 | <component :is="editItem" ref='childRef' @loading='loadingFn' :formData='formData' /> | 11 | <component :is="editItem" ref='childRef' @loading='loadingFn' :formData='formData' /> |
9 | </div> | 12 | </div> |
10 | <div class="ls-mask-footer"> | 13 | <div class="ls-mask-footer"> |
... | @@ -30,10 +33,12 @@ export default { | ... | @@ -30,10 +33,12 @@ export default { |
30 | editItem: "", | 33 | editItem: "", |
31 | titleStyle: 'center', | 34 | titleStyle: 'center', |
32 | width: "75%", | 35 | width: "75%", |
33 | height: "500px", | 36 | height: "auto", |
34 | formData: "",//父组件传递的参数 负责传给子组件 | 37 | formData: "",//父组件传递的参数 负责传给子组件 |
38 | contentHeight:"", | ||
35 | } | 39 | } |
36 | }, | 40 | }, |
41 | |||
37 | props: { | 42 | props: { |
38 | loading: { type: Boolean, default: false }, | 43 | loading: { type: Boolean, default: false }, |
39 | }, | 44 | }, |
... | @@ -42,6 +47,12 @@ export default { | ... | @@ -42,6 +47,12 @@ export default { |
42 | this.editItem = this.loadViewFn(this.editItem) | 47 | this.editItem = this.loadViewFn(this.editItem) |
43 | }, | 48 | }, |
44 | }, | 49 | }, |
50 | mounted(){ | ||
51 | // 计算滚动条高度 | ||
52 | setTimeout(() => { | ||
53 | this.contentHeight = this.$refs.contentRef.offsetHeight | ||
54 | }, 1000); | ||
55 | }, | ||
45 | methods: { | 56 | methods: { |
46 | onCancel () { | 57 | onCancel () { |
47 | this.isShow = false | 58 | this.isShow = false |
... | @@ -82,36 +93,47 @@ export default { | ... | @@ -82,36 +93,47 @@ export default { |
82 | left: 0; | 93 | left: 0; |
83 | top: 0; | 94 | top: 0; |
84 | background: rgba(0, 0, 0, 0.3); | 95 | background: rgba(0, 0, 0, 0.3); |
96 | |||
85 | } | 97 | } |
86 | 98 | ||
87 | .ls-mask-window { | 99 | .ls-mask-window { |
88 | padding-top: 20px; | ||
89 | background: white; | 100 | background: white; |
90 | position: absolute; | 101 | position: relative; |
91 | left: 50%; | 102 | left: 50%; |
92 | top: 50%; | 103 | top: 50%; |
104 | min-height: 200px; | ||
93 | transform: translate(-50%, -50%); | 105 | transform: translate(-50%, -50%); |
106 | border-radius: 10px; | ||
107 | } | ||
108 | .ls-head{ | ||
109 | position: relative; | ||
94 | } | 110 | } |
95 | |||
96 | .ls-mask-window b { | 111 | .ls-mask-window b { |
97 | padding-left: 12px; | 112 | padding-left: 12px; |
98 | } | 113 | } |
99 | 114 | .ls-title{ | |
115 | padding: 20px; | ||
116 | background: #1E9FFF; | ||
117 | color: #ffffff; | ||
118 | } | ||
100 | .ls-mask-content { | 119 | .ls-mask-content { |
101 | padding: 20px; | 120 | padding: 20px; |
102 | text-align: center; | 121 | text-align: center; |
122 | position: absolute; | ||
123 | width: 100%; | ||
124 | overflow: scroll; | ||
103 | } | 125 | } |
104 | 126 | ||
105 | .ls-mask-footer { | 127 | .ls-mask-footer { |
106 | height: 45px; | 128 | height: 65px; |
107 | border-top: 1px solid #f0f0f0; | 129 | border-top: 1px solid #f0f0f0; |
108 | display: flex; | 130 | display: flex; |
109 | justify-content: flex-end; | 131 | justify-content: center; |
110 | padding: 2px; | ||
111 | position: absolute; | 132 | position: absolute; |
112 | width: 98%; | 133 | width: 100%; |
113 | bottom: 10px; | 134 | bottom: 0px; |
114 | right: 12px; | 135 | right: 0px; |
136 | background: #f3f3f3; | ||
115 | } | 137 | } |
116 | 138 | ||
117 | /deep/.el-icon-close { | 139 | /deep/.el-icon-close { |
... | @@ -120,10 +142,14 @@ export default { | ... | @@ -120,10 +142,14 @@ export default { |
120 | right: 12px; | 142 | right: 12px; |
121 | font-size: 20px; | 143 | font-size: 20px; |
122 | cursor: pointer; | 144 | cursor: pointer; |
145 | color: #ffffff; | ||
123 | } | 146 | } |
124 | 147 | ||
125 | /deep/.el-loading-mask { | 148 | /deep/.el-loading-mask { |
126 | background: none; | 149 | background: none; |
127 | } | 150 | } |
151 | /deep/.el-button{ | ||
152 | margin: 15px 10px; | ||
153 | } | ||
128 | </style> | 154 | </style> |
129 | 155 | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -16,7 +16,8 @@ export default { | ... | @@ -16,7 +16,8 @@ export default { |
16 | sqrxm: '', | 16 | sqrxm: '', |
17 | sqrzjlxbm: '', | 17 | sqrzjlxbm: '', |
18 | sqrzjhm: '', | 18 | sqrzjhm: '', |
19 | lxdh: '' | 19 | lxdh: '', |
20 | inputErr: false | ||
20 | }] | 21 | }] |
21 | } | 22 | } |
22 | }, | 23 | }, |
... | @@ -91,8 +92,16 @@ export default { | ... | @@ -91,8 +92,16 @@ export default { |
91 | label: '联系电话', | 92 | label: '联系电话', |
92 | render: (h, scope) => { | 93 | render: (h, scope) => { |
93 | return ( | 94 | return ( |
95 | <div class='typePhone'> | ||
94 | <el-input placeholder="联系电话" value={scope.row[scope.column.property]} | 96 | <el-input placeholder="联系电话" value={scope.row[scope.column.property]} |
95 | onInput={(val) => { scope.row[scope.column.property] = val }} type='tel' maxlength='11'></el-input> | 97 | onInput={(val) => { scope.row[scope.column.property] = val }} |
98 | onBlur={(val) => { this.teltest(scope.row) }} | ||
99 | type='tel' maxlength='11' | ||
100 | ></el-input> | ||
101 | <span v-show={scope.row.inputErr} style={{ | ||
102 | fontSize: '12px', color: 'red', position: 'absolute', bottom: '-2px', left: '0' | ||
103 | }}>请输入正确手机号</span> | ||
104 | </div> | ||
96 | ) | 105 | ) |
97 | } | 106 | } |
98 | } | 107 | } |
... | @@ -114,6 +123,7 @@ export default { | ... | @@ -114,6 +123,7 @@ export default { |
114 | dataList: { | 123 | dataList: { |
115 | handler (newValue, oldName) { | 124 | handler (newValue, oldName) { |
116 | this.tableData.data = _.cloneDeep(newValue) | 125 | this.tableData.data = _.cloneDeep(newValue) |
126 | console.log(this.tableData.data, 'this.tableData.datathis.tableData.data'); | ||
117 | }, | 127 | }, |
118 | deep: true, | 128 | deep: true, |
119 | immediate: true | 129 | immediate: true |
... | @@ -125,14 +135,29 @@ export default { | ... | @@ -125,14 +135,29 @@ export default { |
125 | sqrxm: '', | 135 | sqrxm: '', |
126 | sqrzjlxbm: '', | 136 | sqrzjlxbm: '', |
127 | sqrzjhm: '', | 137 | sqrzjhm: '', |
128 | lxdh: '' | 138 | lxdh: '', |
139 | inputErr: false | ||
129 | }) | 140 | }) |
130 | }, | 141 | }, |
131 | handleMinus (index, row) { | 142 | handleMinus (index, row) { |
132 | this.tableData.data.splice(index, 1) | 143 | this.tableData.data.splice(index, 1) |
133 | }, | 144 | }, |
134 | }, | 145 | teltest (row) { |
146 | const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/; | ||
147 | if (row.lxdh == '' || row.lxdh.length <= 10 || !reg.test(row.lxdh)) { | ||
148 | row.inputErr = true | ||
149 | return false | ||
150 | |||
151 | } else { | ||
152 | row.inputErr = false | ||
153 | return true | ||
154 | } | ||
155 | } | ||
156 | } | ||
135 | } | 157 | } |
136 | </script> | 158 | </script> |
137 | <style scoped lang='scss'> | 159 | <style scoped lang='scss'> |
160 | /deep/.el-table__cell { | ||
161 | padding: 12px 0; | ||
162 | } | ||
138 | </style> | 163 | </style> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -4,19 +4,19 @@ | ... | @@ -4,19 +4,19 @@ |
4 | <div class="jtfccx-edit-con"> | 4 | <div class="jtfccx-edit-con"> |
5 | <b class="title">申请信息</b> | 5 | <b class="title">申请信息</b> |
6 | <personInfoTable @getInfoList="handleGetSqList" :dataList="sqdataList" /> | 6 | <personInfoTable @getInfoList="handleGetSqList" :dataList="sqdataList" /> |
7 | <el-form :model="ruleForm" label-width="100px"> | 7 | <el-form :model="ruleForm" label-width="120px"> |
8 | <el-row> | 8 | <el-row> |
9 | <el-col :span="12"> | 9 | <el-col :span="8"> |
10 | <el-form-item label="活动名称" prop="name"> | 10 | <el-form-item label="查询用途" label-width="90px"> |
11 | <el-input v-model="ruleForm.name"></el-input> | 11 | <el-input v-model="ruleForm.cxyt"></el-input> |
12 | </el-form-item> | 12 | </el-form-item> |
13 | </el-col> | 13 | </el-col> |
14 | <el-col :span="12"> | 14 | <el-col :span="16"> |
15 | <el-form-item label="活动名称" prop="name"> | 15 | <el-form-item label="与产权人的关系"> |
16 | <el-radio-group v-model="ruleForm.radio"> | 16 | <el-radio-group v-model="ruleForm.ycyrgx"> |
17 | <el-radio :label="1">房屋权利人</el-radio> | 17 | <el-radio :label="1">房屋权利人</el-radio> |
18 | <el-radio :label="2">委托人</el-radio> | 18 | <el-radio :label="2">产权利害关系人</el-radio> |
19 | <el-radio :label="3">产权利害关系人</el-radio> | 19 | <el-radio :label="3">委托人</el-radio> |
20 | </el-radio-group> | 20 | </el-radio-group> |
21 | </el-form-item> | 21 | </el-form-item> |
22 | </el-col> | 22 | </el-col> |
... | @@ -36,7 +36,8 @@ | ... | @@ -36,7 +36,8 @@ |
36 | </div> | 36 | </div> |
37 | 37 | ||
38 | <div class="submit-button" style="padding-bottom:20px"> | 38 | <div class="submit-button" style="padding-bottom:20px"> |
39 | <el-button type="primary">打印(1)</el-button> | 39 | <el-button type="primary">无房证明打印(1)</el-button> |
40 | <el-button type="primary">房产结果打印(1)</el-button> | ||
40 | <el-button @click="closeDialog">关闭</el-button> | 41 | <el-button @click="closeDialog">关闭</el-button> |
41 | </div> | 42 | </div> |
42 | </div> | 43 | </div> |
... | @@ -56,11 +57,16 @@ export default { | ... | @@ -56,11 +57,16 @@ export default { |
56 | data () { | 57 | data () { |
57 | return { | 58 | return { |
58 | myValue: this.value, | 59 | myValue: this.value, |
60 | ruleForm: { | ||
61 | cxyt: '', | ||
62 | ycyrgx: 1 | ||
63 | }, | ||
59 | dataList: [{ | 64 | dataList: [{ |
60 | sqrxm: '', | 65 | sqrxm: '', |
61 | sqrzjlxbm: '', | 66 | sqrzjlxbm: '', |
62 | sqrzjhm: '', | 67 | sqrzjhm: '', |
63 | lxdh: '' | 68 | lxdh: '', |
69 | inputErr: false | ||
64 | }], | 70 | }], |
65 | sqdataList: [], | 71 | sqdataList: [], |
66 | qldataList: [], | 72 | qldataList: [], |
... | @@ -135,11 +141,8 @@ export default { | ... | @@ -135,11 +141,8 @@ export default { |
135 | ], | 141 | ], |
136 | data: [] | 142 | data: [] |
137 | }, | 143 | }, |
138 | ruleForm: { | ||
139 | name: '', | ||
140 | radio: 1 | ||
141 | }, | ||
142 | addJtfc: { | 144 | addJtfc: { |
145 | djSqcxDO: {}, | ||
143 | sqxx: [], | 146 | sqxx: [], |
144 | qlrxx: [], | 147 | qlrxx: [], |
145 | } | 148 | } |
... | @@ -153,7 +156,7 @@ export default { | ... | @@ -153,7 +156,7 @@ export default { |
153 | this.addJtfc.sqxx = _.cloneDeep(this.dataList) | 156 | this.addJtfc.sqxx = _.cloneDeep(this.dataList) |
154 | this.addJtfc.qlrxx = _.cloneDeep(this.dataList) | 157 | this.addJtfc.qlrxx = _.cloneDeep(this.dataList) |
155 | }, | 158 | }, |
156 | 'ruleForm.radio' (val) { | 159 | 'ruleForm.ycyrgx' (val) { |
157 | if (val != 1) { | 160 | if (val != 1) { |
158 | this.qldataList = _.cloneDeep(this.dataList) | 161 | this.qldataList = _.cloneDeep(this.dataList) |
159 | this.addJtfc.qlrxx = _.cloneDeep(this.dataList) | 162 | this.addJtfc.qlrxx = _.cloneDeep(this.dataList) |
... | @@ -168,20 +171,21 @@ export default { | ... | @@ -168,20 +171,21 @@ export default { |
168 | this.$emit('input', false) | 171 | this.$emit('input', false) |
169 | }, | 172 | }, |
170 | handleGetSqList (val) { | 173 | handleGetSqList (val) { |
171 | if (!_.isEqual(val, this.dataList) && this.ruleForm.radio == 1) { | 174 | if (!_.isEqual(val, this.dataList) && this.ruleForm.ycyrgx == 1) { |
172 | this.qldataList = val | 175 | this.qldataList = val |
173 | this.addJtfc.qlrxx = val | 176 | this.addJtfc.qlrxx = val |
174 | } else | 177 | } else |
175 | this.addJtfc.sqxx = val | 178 | this.addJtfc.sqxx = val |
176 | }, | 179 | }, |
177 | handleGetQlList (val) { | 180 | handleGetQlList (val) { |
178 | if (this.ruleForm.radio != 1) { | 181 | if (this.ruleForm.ycyrgx != 1) { |
179 | this.addJtfc.qlrxx = val | 182 | this.addJtfc.qlrxx = val |
180 | } | 183 | } |
181 | }, | 184 | }, |
182 | handleSearch () { | 185 | handleSearch () { |
186 | this.addJtfc.djSqcxDO = { ...this.ruleForm } | ||
183 | addJtfcCxjgXx(this.addJtfc).then(res => { | 187 | addJtfcCxjgXx(this.addJtfc).then(res => { |
184 | // console.log(res); | 188 | console.log(res); |
185 | }) | 189 | }) |
186 | }, | 190 | }, |
187 | handleReset () { | 191 | handleReset () { | ... | ... |
... | @@ -16,25 +16,9 @@ | ... | @@ -16,25 +16,9 @@ |
16 | </el-input> | 16 | </el-input> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | </el-col> | 18 | </el-col> |
19 | <el-col :span="5"> | 19 | <el-col :span="14" class="btnCol"> |
20 | <el-form-item label="查询用途"> | ||
21 | <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途"> | ||
22 | <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value"> | ||
23 | </el-option> | ||
24 | </el-select> | ||
25 | </el-form-item> | ||
26 | </el-col> | ||
27 | <el-col :span="5"> | ||
28 | <el-form-item label="业务号"> | ||
29 | <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px"> | ||
30 | </el-input> | ||
31 | </el-form-item> | ||
32 | </el-col> | ||
33 | <el-col :span="4" class="btnCol"> | ||
34 | <el-form-item> | ||
35 | <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button> | 20 | <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button> |
36 | <el-button @click="moreQueryClick()">高级查询</el-button> | 21 | <el-button type="primary" @click="handleAdd" icon="el-icon-plus">新增</el-button> |
37 | </el-form-item> | ||
38 | </el-col> | 22 | </el-col> |
39 | </el-row> | 23 | </el-row> |
40 | </el-form> | 24 | </el-form> |
... | @@ -46,28 +30,29 @@ | ... | @@ -46,28 +30,29 @@ |
46 | :data="tableData.data"> | 30 | :data="tableData.data"> |
47 | </lb-table> | 31 | </lb-table> |
48 | </div> | 32 | </div> |
33 | <editDialog v-model="isDialog" /> | ||
49 | </div> | 34 | </div> |
50 | </template> | 35 | </template> |
51 | <script> | 36 | <script> |
52 | import table from "@/utils/mixin/table"; | 37 | import table from "@/utils/mixin/table"; |
53 | import { datas, sendThis } from "./jtfcdata"; | 38 | import { datas, sendThis } from "./jtfcdata"; |
54 | import { getJtfcPage } from "@/api/sqcx"; | 39 | import { getJtfcPage } from "@/api/sqcx"; |
40 | import editDialog from "../components/editDialog.vue" | ||
55 | export default { | 41 | export default { |
56 | name: "jtfc", | 42 | name: "jtfc", |
57 | components: {}, | 43 | components: { editDialog }, |
58 | mixins: [table], | 44 | mixins: [table], |
59 | mounted () { | 45 | mounted () { |
60 | sendThis(this); | 46 | sendThis(this); |
61 | }, | 47 | }, |
62 | data () { | 48 | data () { |
63 | return { | 49 | return { |
50 | isDialog: false, | ||
64 | sqrOption: [], | 51 | sqrOption: [], |
65 | cxytOption: [], | 52 | cxytOption: [], |
66 | queryForm: { | 53 | queryForm: { |
67 | cxbh: "", | 54 | cxbh: "", |
68 | sqr: "", | 55 | sqr: "" |
69 | cxyt: "", | ||
70 | ywh: "", | ||
71 | }, | 56 | }, |
72 | tableData: { | 57 | tableData: { |
73 | total: 0, | 58 | total: 0, |
... | @@ -92,15 +77,18 @@ export default { | ... | @@ -92,15 +77,18 @@ export default { |
92 | fetchData () { | 77 | fetchData () { |
93 | getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { | 78 | getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { |
94 | let { records, total } = res.result; | 79 | let { records, total } = res.result; |
95 | // this.tableData.data = records | 80 | this.tableData.data = records |
96 | this.tableData.total = total; | 81 | this.tableData.total = total; |
97 | }); | 82 | }); |
98 | }, | 83 | }, |
99 | handleSort (name, sort) { | 84 | handleSort (name, sort) { |
100 | console.log(name, sort); | 85 | console.log(name, sort); |
101 | }, | 86 | }, |
102 | }, | 87 | handleAdd () { |
103 | }; | 88 | this.isDialog = true |
89 | } | ||
90 | } | ||
91 | } | ||
104 | </script> | 92 | </script> |
105 | <style scoped lang="scss"> | 93 | <style scoped lang="scss"> |
106 | @import "~@/styles/public.scss"; | 94 | @import "~@/styles/public.scss"; | ... | ... |
... | @@ -13,7 +13,14 @@ class data extends filter { | ... | @@ -13,7 +13,14 @@ class data extends filter { |
13 | { | 13 | { |
14 | label: '序号', | 14 | label: '序号', |
15 | type: 'index', | 15 | type: 'index', |
16 | width: '50' | 16 | width: '50', |
17 | render: (h, scope) => { | ||
18 | return ( | ||
19 | <div> | ||
20 | {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1} | ||
21 | </div> | ||
22 | ) | ||
23 | } | ||
17 | }, | 24 | }, |
18 | { | 25 | { |
19 | prop: "cxlx", | 26 | prop: "cxlx", | ... | ... |
... | @@ -51,7 +51,7 @@ | ... | @@ -51,7 +51,7 @@ |
51 | </div> | 51 | </div> |
52 | </template> | 52 | </template> |
53 | <script> | 53 | <script> |
54 | import editDialog from "./components/editDialog.vue" | 54 | import editDialog from "../components/editDialog.vue" |
55 | import table from "@/utils/mixin/table" | 55 | import table from "@/utils/mixin/table" |
56 | import { datas, sendThis } from "./sqcxjldata" | 56 | import { datas, sendThis } from "./sqcxjldata" |
57 | import { getJtfcPage } from '@/api/sqcx' | 57 | import { getJtfcPage } from '@/api/sqcx' | ... | ... |
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 | // 默认选中 |
... | @@ -156,7 +152,11 @@ export default { | ... | @@ -156,7 +152,11 @@ export default { |
156 | case "B1": | 152 | case "B1": |
157 | getWorkFlowImage(this.bsmSlsq).then(res => { | 153 | getWorkFlowImage(this.bsmSlsq).then(res => { |
158 | this.imgSrc = URL.createObjectURL(res) | 154 | this.imgSrc = URL.createObjectURL(res) |
159 | this.myValue = true | 155 | this.$popup({ |
156 | title: '流程图', | ||
157 | editItem: 'workflow/components/flowChart', | ||
158 | formData: this.imgSrc | ||
159 | }) | ||
160 | }) | 160 | }) |
161 | break; | 161 | break; |
162 | case "B5": | 162 | case "B5": | ... | ... |
... | @@ -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