Skip to content

bdc / bdcdj-web

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

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

2 parents 6f2390be ad696364
Expand all
Inline Side-by-side
Showing 32 changed files with 296 additions and 174 deletions
...@@ -5,4 +5,4 @@ NODE_ENV=development ...@@ -5,4 +5,4 @@ NODE_ENV=development
5 VUE_APP_BASE_API = '/bdcdj' 5 VUE_APP_BASE_API = '/bdcdj'
6 6
7 # 开发环境 7 # 开发环境
8 VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018' 8 VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
......
...@@ -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
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
59 }, 59 },
60 heightNum: { 60 heightNum: {
61 type: Number, 61 type: Number,
62 default: 285, 62 default: 260,
63 }, 63 },
64 maxHeight: { 64 maxHeight: {
65 type: Number, 65 type: Number,
......
...@@ -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 <i class="el-icon-close" @click="onCancel"></i> 6 <div class="ls-title" :style="{'text-align':titleStyle}"><b>{{title}}</b></div>
7 <div class="ls-mask-content"> 7 <i class="el-icon-close" @click="onCancel"></i>
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
......
...@@ -12,6 +12,10 @@ const service = axios.create({ ...@@ -12,6 +12,10 @@ const service = axios.create({
12 headers: { 12 headers: {
13 'Content-Type': 'application/json; charset=utf-8', 13 'Content-Type': 'application/json; charset=utf-8',
14 'Authorization': 'bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO' 14 'Authorization': 'bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO'
15 //token列表
16 //admin:bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO
17 //renc:bearer AT-30-KHB4LXc8-CZXwBEyaFJa9lRmMTc5sHVI
18 //tianh:bearer AT-33-3zFTGkhQ4eUv4nXvzAmbgN5RPZppzEY6
15 }, 19 },
16 timeout: 15000 20 timeout: 15000
17 }) 21 })
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 <div class="thumb-wrap"> 17 <div class="thumb-wrap">
18 <div class="thumb-wrap-button"> 18 <div class="thumb-wrap-button">
19 <el-button type="primary" @click="clickImage">（放大） 显示（缩小）</el-button> 19 <el-button type="primary" @click="clickImage">（放大） 显示（缩小）</el-button>
20 <el-upload class="fileUpdate" action="" :show-file-list="false" multiple :limit="5" :auto-upload="false" 20 <el-upload class="fileUpdate" action="" :show-file-list="false" multiple :auto-upload="false"
21 :on-change="handleChange" accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload"> 21 :on-change="handleChange" accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
22 <el-button icon="el-icon-upload" type="primary">上传</el-button> 22 <el-button icon="el-icon-upload" type="primary">上传</el-button>
23 </el-upload> 23 </el-upload>
......
...@@ -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 (
94 <el-input placeholder="联系电话" value={scope.row[scope.column.property]} 95 <div class='typePhone'>
95 onInput={(val) => { scope.row[scope.column.property] = val }} type='tel' maxlength='11'></el-input> 96 <el-input placeholder="联系电话" value={scope.row[scope.column.property]}
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="查询用途"> 20 <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
21 <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途"> 21 <el-button type="primary" @click="handleAdd" icon="el-icon-plus">新增</el-button>
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>
36 <el-button @click="moreQueryClick()">高级查询</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'
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 </el-collapse-transition> 29 </el-collapse-transition>
30 </div> 30 </div>
31 </div> 31 </div>
32 <image-preview :previewImg="previewImg" @updateList="updateList" /> 32 <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" />
33 </div> 33 </div>
34 </div> 34 </div>
35 <clxxAddDialog v-model="isDialog" /> 35 <clxxAddDialog v-model="isDialog" />
...@@ -233,7 +233,8 @@ export default { ...@@ -233,7 +233,8 @@ export default {
233 }) 233 })
234 }, 234 },
235 updateList (val) { 235 updateList (val) {
236 this.tableData.forEach(item => { 236 if(val!=null){ //删除最后一张图片时 val=null
237 this.tableData.forEach(item => {
237 if (item.bsmSj === val.bsmSj) { 238 if (item.bsmSj === val.bsmSj) {
238 item.children = val.children 239 item.children = val.children
239 } 240 }
...@@ -242,6 +243,15 @@ export default { ...@@ -242,6 +243,15 @@ export default {
242 if (this.previewImg.index == this.previewImg.imgList.length) { 243 if (this.previewImg.index == this.previewImg.imgList.length) {
243 this.previewImg.index = this.previewImg.index - 1 244 this.previewImg.index = this.previewImg.index - 1
244 } 245 }
246 }else{
247 this.previewImg.imgList = []
248 this.tableData.forEach(item => {
249 if(this.treeCheckId == item.bsmSj){
250 item.children = []
251 }
252 })
253 }
254
245 }, 255 },
246 // 左侧菜单点击 256 // 左侧菜单点击
247 menuClick (item) { 257 menuClick (item) {
......
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
1 <template> 1 <template>
2 <div class="from-clues"> 2 <div class="from-clues">
3 <!-- 表单部分 --> 3 <!-- 发证信息 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="ruleForm"> 5 <el-form :model="ruleForm">
6 <el-row :gutter="20"> 6 <el-row :gutter="20">
...@@ -36,14 +36,12 @@ ...@@ -36,14 +36,12 @@
36 <script> 36 <script>
37 import table from "@/utils/mixin/table"; 37 import table from "@/utils/mixin/table";
38 import { getCertificateList } from "@/api/fqsq.js"; 38 import { getCertificateList } from "@/api/fqsq.js";
39 import { datas } from "./fzxxdata"; 39 import { datas } from "../javascript/fzxxdata";
40 export default { 40 export default {
41 mixins: [table], 41 mixins: [table],
42 components: {}, 42 components: {},
43 props: { 43 props: {
44
45 }, 44 },
46
47 data () { 45 data () {
48 return { 46 return {
49 ruleForm: { 47 ruleForm: {
...@@ -56,8 +54,8 @@ export default { ...@@ -56,8 +54,8 @@ export default {
56 total: 0, 54 total: 0,
57 columns: datas.columns(), 55 columns: datas.columns(),
58 data: [], 56 data: [],
59 }, 57 }
60 }; 58 }
61 }, 59 },
62 methods: { 60 methods: {
63 // 列表渲染接口 61 // 列表渲染接口
...@@ -68,9 +66,9 @@ export default { ...@@ -68,9 +66,9 @@ export default {
68 this.tableData.data = res.result 66 this.tableData.data = res.result
69 } 67 }
70 }) 68 })
71 }, 69 }
72 } 70 }
73 }; 71 }
74 </script> 72 </script>
75 <style scoped lang='scss'> 73 <style scoped lang='scss'>
76 @import "~@/styles/public.scss"; 74 @import "~@/styles/public.scss";
......
...@@ -101,15 +101,12 @@ export default { ...@@ -101,15 +101,12 @@ export default {
101 this.$message.error(res.message) 101 this.$message.error(res.message)
102 } 102 }
103 }) 103 })
104 104 }
105 }, 105 }
106
107 },
108 } 106 }
109 </script> 107 </script>
110 <style scoped lang='scss'> 108 <style scoped lang='scss'>
111 @import '~@/styles/mixin.scss'; 109 @import '~@/styles/mixin.scss';
112
113 .spyj { 110 .spyj {
114 margin-left: 5px; 111 margin-left: 5px;
115 112
......
1 <template> 1 <template>
2 <dialogBox title="退回" @submitForm="submitForm" saveButton="确认退回" width="80%" 2 <dialogBox title="退回" @submitForm="submitForm" saveButton="确认退回" width="80%" @closeDialog="closeDialog"
3 @closeDialog="closeDialog" v-model="value"> 3 v-model="value">
4 <div class="from-clues"> 4 <div class="from-clues">
5 <!-- 表单部分 --> 5 <!-- 表单部分 -->
6 <div class="from-clues-header"> 6 <div class="from-clues-header">
7 <el-form ref="queryForm" label-width="120px"> 7 <el-form ref="queryForm" label-width="120px">
8 <div> 8 <div>
9 <!-- <el-form-item label="不动产单元号:"> 9 <lb-table :column="columns" border :heightNum="390" :pagination="false" heightNumSetting :data="tableData">
10 <p>{{item.bdcdyh}}</p> 10 </lb-table>
11 </el-form-item> --> 11 <el-form-item label="退回意见:">
12 <lb-table :column="columns" border :heightNum="390" :pagination="false" heightNumSetting 12 <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
13 :data="tableData"> 13 </el-form-item>
14 </lb-table> 14 </div>
15 <el-form-item label="退回意见:">
16 <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
17 </el-form-item>
18 </div>
19 </el-form> 15 </el-form>
20 </div> 16 </div>
21 </div> 17 </div>
...@@ -23,33 +19,27 @@ ...@@ -23,33 +19,27 @@
23 </template> 19 </template>
24 20
25 <script> 21 <script>
26 import { getTaskBackNode,sendBackTask } from "@/api/fqsq.js" 22 import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
27 export default { 23 export default {
28 components: { 24 components: {
29 }, 25 },
30 props: { 26 props: {
31 value: { type: Boolean, default: false }, 27 value: { type: Boolean, default: false },
32 queryForm:{type:Object}, 28 queryForm: { type: Object },
33 taskId:{type:String}, 29 taskId: { type: String },
34 bsmBusiness:{type:String} 30 bsmBusiness: { type: String }
35 }, 31 },
36 data () { 32 data () {
37 const columns=[ 33 const columns = [
38 // {
39 // label: '',
40 // align: 'center',
41 // render: (h, scope) => {
42 // return <el-radio label={scope.row.taskid} v-model={this.radioVal} >{''}</el-radio>
43 // }
44 // },
45 { 34 {
46 label: "", 35 label: "",
47 width: "36px", 36 width: "36px",
48 render: (h, scope) => { 37 render: (h, scope) => {
49 return ( 38 return (
50 <div class="orgColumn"> 39 <div class="orgColumn">
51 <el-radio v-model={this.radioVal} label={scope.row.taskid} onChange={() => {this.radioClick(scope.row); 40 <el-radio v-model={this.radioVal} label={scope.row.taskid} onChange={() => {
52 }}> 41 this.radioClick(scope.row);
42 }}>
53 {" "} 43 {" "}
54 &ensp; 44 &ensp;
55 </el-radio> 45 </el-radio>
...@@ -65,62 +55,61 @@ export default { ...@@ -65,62 +55,61 @@ export default {
65 prop: "assignee", 55 prop: "assignee",
66 label: "办理人", 56 label: "办理人",
67 }, 57 },
68
69 ]; 58 ];
70 return { 59 return {
71 columns, 60 columns,
72 radioVal:"", 61 radioVal: "",
73 outstepopinion:"", 62 outstepopinion: "",
74 tableData:[], 63 tableData: [],
75 list:{ 64 list: {
76 bsmSlsq:"", 65 bsmSlsq: "",
77 backNodeList:[], 66 backNodeList: [],
78 }, 67 },
79 sumbitList:{}, 68 sumbitList: {},
80 activityId:"", 69 activityId: "",
81 } 70 }
82 }, 71 },
83 mounted(){ 72 mounted () {
84 if(this.$route.query.bsmSlsq){ 73 if (this.$route.query.bsmSlsq) {
85 this.list.bsmSlsq = this.$route.query.bsmSlsq 74 this.list.bsmSlsq = this.$route.query.bsmSlsq
86 } 75 }
87 }, 76 },
88 methods: { 77 methods: {
89 tablelistFn(){ 78 tablelistFn () {
90 getTaskBackNode({bsmBusiness:this.bsmBusiness}).then(res => { 79 getTaskBackNode({ bsmBusiness: this.bsmBusiness }).then(res => {
91 if (res.code === 200) { 80 if (res.code === 200) {
92 this.tableData = res.result 81 this.tableData = res.result
93 } 82 }
94 }) 83 })
95 }, 84 },
96 radioClick(scope){ 85 radioClick (scope) {
97 this.activityId = scope.activityId 86 this.activityId = scope.activityId
98 this.sumbitList = scope 87 this.sumbitList = scope
99 88
100 }, 89 },
101 submitForm () { 90 submitForm () {
102 if(this.activityId==undefined){ 91 if (this.activityId == undefined) {
103 this.$message.error('请至少选择一条数据'); 92 this.$message.error('请至少选择一条数据');
104 return 93 return
105 } 94 }
106 this.list.backNodeList.push({ 95 this.list.backNodeList.push({
107 id:this.taskId, 96 id: this.taskId,
108 taskid:this.activityId, 97 taskid: this.activityId,
109 processInstanceId:this.sumbitList.processInstanceId, 98 processInstanceId: this.sumbitList.processInstanceId,
110 bsmBusiness:this.bsmBusiness, 99 bsmBusiness: this.bsmBusiness,
111 outstepopinion:this.outstepopinion 100 outstepopinion: this.outstepopinion
112 }) 101 })
113 sendBackTask(this.list).then(res => { 102 sendBackTask(this.list).then(res => {
114 if (res.code === 200) { 103 if (res.code === 200) {
115 this.$message.success('退回成功') 104 this.$message.success('退回成功')
116 setTimeout(() => { 105 setTimeout(() => {
117 window.opener = null; 106 window.opener = null;
118 window.open("about:blank", "_self"); 107 window.open("about:blank", "_self");
119 window.close(); 108 window.close();
120 this.$emit('input', false) 109 this.$emit('input', false)
121 }, 1000); 110 }, 1000);
122 111
123 }else{ 112 } else {
124 this.$message.error(res.message) 113 this.$message.error(res.message)
125 } 114 }
126 }) 115 })
...@@ -128,12 +117,13 @@ export default { ...@@ -128,12 +117,13 @@ export default {
128 closeDialog () { 117 closeDialog () {
129 this.$emit("input", false); 118 this.$emit("input", false);
130 }, 119 },
131 120
132 } 121 }
133 } 122 }
134 </script> 123 </script>
135 <style scoped lang="scss"> 124 <style scoped lang="scss">
136 @import "~@/styles/mixin.scss"; 125 @import "~@/styles/mixin.scss";
126
137 .textArea { 127 .textArea {
138 /deep/.el-textarea__inner { 128 /deep/.el-textarea__inner {
139 min-height: 90px !important; 129 min-height: 90px !important;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <script> 28 <script>
29 import table from "@/utils/mixin/table"; 29 import table from "@/utils/mixin/table";
30 import { getCertificateList, issueCertificate } from "@/api/fqsq.js"; 30 import { getCertificateList, issueCertificate } from "@/api/fqsq.js";
31 import { datas } from "./fzxxdata"; 31 import { datas } from "../javascript/fzxxdata";
32 import { mapGetters } from 'vuex' 32 import { mapGetters } from 'vuex'
33 export default { 33 export default {
34 mixins: [table], 34 mixins: [table],
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 </template> 49 </template>
50 50
51 <script> 51 <script>
52 import { datas } from "./zsyl.js"; 52 import { datas } from "../javascript/zsyl.js";
53 import { readYsxlh,certificate } from "@/api/fqsq.js" 53 import { readYsxlh,certificate } from "@/api/fqsq.js"
54 export default { 54 export default {
55 components: { 55 components: {
......
...@@ -3,10 +3,10 @@ export function getForm (tabName) { ...@@ -3,10 +3,10 @@ export function getForm (tabName) {
3 let form; 3 let form;
4 switch (tabName) { 4 switch (tabName) {
5 case "slxx": 5 case "slxx":
6 form = require("@/views/workflow/components/slxx.vue"); 6 form = require("@/views/ywbl/jsydsyq/slxx.vue");
7 break; 7 break;
8 case "slxxCfdj": 8 case "slxxCfdj":
9 form = require("@/views/workflow/components/slxxCfdj.vue"); 9 form = require("@/views/ywbl/cfdj/slxx.vue");
10 break; 10 break;
11 case "clxx": 11 case "clxx":
12 form = require("@/views/workflow/components/clxx.vue"); 12 form = require("@/views/workflow/components/clxx.vue");
......
1 import filter from '@/utils/filter.js' 1 import filter from '@/utils/filter.js'
2
3 class data extends filter { 2 class data extends filter {
4 constructor() { 3 constructor() {
5 super() 4 super()
......
...@@ -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);
...@@ -256,6 +258,7 @@ export default { ...@@ -256,6 +258,7 @@ export default {
256 completeTask({ 258 completeTask({
257 bsmSlsq: this.bsmSlsq, 259 bsmSlsq: this.bsmSlsq,
258 shyj: "this.bestepid", 260 shyj: "this.bestepid",
261 stepform: JSON.stringify(this.tabList)
259 }).then((res) => { 262 }).then((res) => {
260 if (res.code === 200) { 263 if (res.code === 200) {
261 instance.confirmButtonLoading = false; 264 instance.confirmButtonLoading = false;
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 </div> 129 </div>
130 </template> 130 </template>
131 <script> 131 <script>
132 import InformationTable from "./InformationTable"; 132 import InformationTable from "@/views/workflow/components/InformationTable";
133 import { Init, fristReg } from "@/api/cfdjFlow.js"; 133 import { Init, fristReg } from "@/api/cfdjFlow.js";
134 import { mapGetters } from "vuex"; 134 import { mapGetters } from "vuex";
135 export default { 135 export default {
......
1 <template> 1 <template>
2 <!-- 受理信息 -->
2 <div class="slxx"> 3 <div class="slxx">
3 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag" 4 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
4 label-width="120px"> 5 label-width="120px">
...@@ -162,12 +163,11 @@ ...@@ -162,12 +163,11 @@
162 </div> 163 </div>
163 </template> 164 </template>
164 <script> 165 <script>
165 import InformationTable from "./InformationTable"; 166 import InformationTable from "@/views/workflow/components/InformationTable";
166 import { Init, fristReg } from "@/api/jsydsyqFlow.js"; 167 import { Init, fristReg } from "@/api/jsydsyqFlow.js";
167 import { mapGetters } from "vuex"; 168 import { mapGetters } from "vuex";
168 export default { 169 export default {
169 async created () { 170 async created () {
170 //var bsmSldy = this.$parent._data.unitData[0].bsmSldy;
171 this.propsParam = this.$attrs; 171 this.propsParam = this.$attrs;
172 var formdata = new FormData(); 172 var formdata = new FormData();
173 formdata.append("bsmSldy", this.propsParam.bsmSldy); 173 formdata.append("bsmSldy", this.propsParam.bsmSldy);
......
...@@ -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 => {
......