Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
9 changed files
with
138 additions
and
63 deletions
1 | import request from '@/utils/request' | 1 | import request from '@/utils/request' |
2 | import SERVER from './config' | 2 | import SERVER from './config' |
3 | |||
3 | // 初始化内容 | 4 | // 初始化内容 |
4 | export function Init (data) { | 5 | export function Init (data) { |
6 | let apiUrl = ""; | ||
7 | switch (data.get("djlx")) { | ||
8 | case "100": | ||
9 | apiUrl = "/rest/ywbl/jsydsyqlr/fristInit"; | ||
10 | break; | ||
11 | case "200": | ||
12 | apiUrl = "/rest/ywbl/jsydsyqlr/transferInit"; | ||
13 | break; | ||
14 | case "300": | ||
15 | apiUrl = "/rest/ywbl/jsydsyqlr/changeInit"; | ||
16 | break; | ||
17 | case "400": | ||
18 | apiUrl = "/rest/ywbl/jsydsyqlr/logoutInit"; | ||
19 | break; | ||
20 | case "500": | ||
21 | apiUrl = "/rest/ywbl/jsydsyqlr/riviseInit"; | ||
22 | break; | ||
23 | case "901": | ||
24 | apiUrl = "/rest/ywbl/jsydsyqlr/renewalInit"; | ||
25 | break; | ||
26 | case "902": | ||
27 | apiUrl = "/rest/ywbl/jsydsyqlr/replaceInit"; | ||
28 | break; | ||
29 | } | ||
5 | return request({ | 30 | return request({ |
6 | url: SERVER.SERVERAPI + '/rest/ywbl/dyaq/Init', | 31 | url: SERVER.SERVERAPI + apiUrl, |
7 | method: 'post', | 32 | method: 'post', |
8 | data | 33 | data |
9 | }) | 34 | }) |
35 | } | ||
36 | // 受理信息保存 | ||
37 | export function saveData (data) { | ||
38 | return request({ | ||
39 | url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/saveData', | ||
40 | method: 'post', | ||
41 | data | ||
42 | }) | ||
43 | } | ||
44 | |||
45 | // 流程图 | ||
46 | export function getWorkFlowImage (bsmSlsq, bestepid) { | ||
47 | return request({ | ||
48 | url: SERVER.SERVERAPI + '/rest/business/workFlow/getWorkFlowImage', | ||
49 | method: 'get', | ||
50 | params: { | ||
51 | bsmSlsq: bsmSlsq, | ||
52 | bestepid: bestepid | ||
53 | } | ||
54 | }) | ||
55 | } | ||
56 | // 上传单个文件 | ||
57 | export function sjClmxUpload (data) { | ||
58 | return request({ | ||
59 | url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/upload', | ||
60 | method: 'post', | ||
61 | data | ||
62 | }) | ||
63 | } | ||
64 | // 删除上传文件 | ||
65 | export function sjClmxDelete (bsmClmx) { | ||
66 | return request({ | ||
67 | url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/delete?bsmClmx=' + bsmClmx, | ||
68 | method: 'delete' | ||
69 | }) | ||
10 | } | 70 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -30,13 +30,13 @@ | ... | @@ -30,13 +30,13 @@ |
30 | </el-row> | 30 | </el-row> |
31 | <el-row> | 31 | <el-row> |
32 | <el-col :span="16"> | 32 | <el-col :span="16"> |
33 | <el-form-item label="审查人:" prop="scr"> | 33 | <el-form-item label="审查人:" prop="shryxm"> |
34 | {{ item.shryxm }} | 34 | {{item.shryxm }} |
35 | </el-form-item> | 35 | </el-form-item> |
36 | </el-col> | 36 | </el-col> |
37 | <el-col :span="8"> | 37 | <el-col :span="8" > |
38 | <el-form-item label="审核时间:" prop="shjssj"> | 38 | <el-form-item label="审核时间:" prop="shjssj" :key="refresh"> |
39 | {{ item.shjssj }} | 39 | {{item.shjssj }} |
40 | </el-form-item> | 40 | </el-form-item> |
41 | </el-col> | 41 | </el-col> |
42 | </el-row> | 42 | </el-row> |
... | @@ -58,11 +58,15 @@ export default { | ... | @@ -58,11 +58,15 @@ export default { |
58 | data () { | 58 | data () { |
59 | return { | 59 | return { |
60 | bsmSlsq: '', | 60 | bsmSlsq: '', |
61 | //刷新值 | ||
62 | refresh : 10, | ||
61 | bestepid: '', | 63 | bestepid: '', |
62 | ruleForm: { | 64 | ruleForm: { |
63 | shyj: '', | 65 | shyj: '', |
64 | bsmSlsq: this.$route.query.bsmSlsq, | 66 | bsmSlsq: this.$route.query.bsmSlsq, |
65 | stepid: this.$route.query.bestepid | 67 | stepid: this.$route.query.bestepid, |
68 | shryxm: '', | ||
69 | shjssj: '', | ||
66 | }, | 70 | }, |
67 | rules: { | 71 | rules: { |
68 | shyj: [ | 72 | shyj: [ |
... | @@ -97,6 +101,9 @@ export default { | ... | @@ -97,6 +101,9 @@ export default { |
97 | saveSpyjBySlsq(this.ruleForm).then(res => { | 101 | saveSpyjBySlsq(this.ruleForm).then(res => { |
98 | if (res.code === 200) { | 102 | if (res.code === 200) { |
99 | this.$message.success("保存成功") | 103 | this.$message.success("保存成功") |
104 | this.refresh += 1 | ||
105 | this.tableData[this.tableData.length - 1].shryxm = res.result.shryxm | ||
106 | this.tableData[this.tableData.length - 1].shjssj = res.result.shjssj | ||
100 | } else { | 107 | } else { |
101 | this.$message.error(res.message) | 108 | this.$message.error(res.message) |
102 | } | 109 | } | ... | ... |
... | @@ -100,9 +100,7 @@ export default { | ... | @@ -100,9 +100,7 @@ export default { |
100 | let that = this; | 100 | let that = this; |
101 | if(type == 1){ | 101 | if(type == 1){ |
102 | //证书预览 | 102 | //证书预览 |
103 | this.$popup({ | 103 | this.$popup("证书预览","workflow/components/zsyl",{ |
104 | title: "证书预览", | ||
105 | editItem: "workflow/components/zsyl", | ||
106 | height: '650px', | 104 | height: '650px', |
107 | width: "800px", | 105 | width: "800px", |
108 | formData: { | 106 | formData: { |
... | @@ -118,9 +116,7 @@ export default { | ... | @@ -118,9 +116,7 @@ export default { |
118 | }) | 116 | }) |
119 | }else{ | 117 | }else{ |
120 | //证书打印 | 118 | //证书打印 |
121 | this.$popup({ | 119 | this.$popup("证书打印","workflow/components/zsdy",{ |
122 | title: "证书打印", | ||
123 | editItem: "workflow/components/zsdy", | ||
124 | height: '700px', | 120 | height: '700px', |
125 | width: "800px", | 121 | width: "800px", |
126 | formData: { | 122 | formData: { | ... | ... |
... | @@ -24,17 +24,23 @@ export function getForm(tabName, djywbm) { | ... | @@ -24,17 +24,23 @@ export function getForm(tabName, djywbm) { |
24 | form = require("@/views/ywbl/fdcq2/slxx400.vue"); | 24 | form = require("@/views/ywbl/fdcq2/slxx400.vue"); |
25 | break; | 25 | break; |
26 | case "fwsyqslxx900": | 26 | case "fwsyqslxx900": |
27 | form = require("@/views/ywbl/fdcq2/slxx900.vue"); | 27 | form = require("@/views/ywbl/fdcq2/slxx900.vue"); |
28 | break; | 28 | break; |
29 | case "nydsyqslxx100": | 29 | case "nydsyqslxx100": |
30 | form = require("@/views/ywbl/nydsyq/slxx.vue"); | 30 | form = require("@/views/ywbl/nydsyq/slxx.vue"); |
31 | break; | 31 | break; |
32 | case "nydsyqslxx200": | ||
33 | form = require("@/views/ywbl/nydsyq/slxx200.vue"); | ||
34 | break; | ||
32 | case "tdslxxCfdj": | 35 | case "tdslxxCfdj": |
33 | form = require("@/views/ywbl/cfdj/tdslxx.vue"); | 36 | form = require("@/views/ywbl/cfdj/tdslxx.vue"); |
34 | break; | 37 | break; |
35 | case "plslxxCfdj": | 38 | case "plslxxCfdj": |
36 | form = require("@/views/ywbl/cfdj/plcfslxx.vue"); | 39 | form = require("@/views/ywbl/cfdj/plcfslxx.vue"); |
37 | break; | 40 | break; |
41 | case "diyaqSlxx": | ||
42 | form = require("@/views/ywbl/diyaq/slxx.vue"); | ||
43 | break; | ||
38 | case "clxx": | 44 | case "clxx": |
39 | form = require("@/views/workflow/components/clxx.vue"); | 45 | form = require("@/views/workflow/components/clxx.vue"); |
40 | break; | 46 | break; |
... | @@ -52,10 +58,13 @@ export function getForm(tabName, djywbm) { | ... | @@ -52,10 +58,13 @@ export function getForm(tabName, djywbm) { |
52 | break; | 58 | break; |
53 | case "nydsyqQlxx": | 59 | case "nydsyqQlxx": |
54 | form = require("@/views/registerBook/nydsyq.vue"); | 60 | form = require("@/views/registerBook/nydsyq.vue"); |
55 | break; | 61 | break; |
56 | case "fdcq2Qlxx": | 62 | case "fdcq2Qlxx": |
57 | form = require("@/views/registerBook/fdcq2.vue"); | 63 | form = require("@/views/registerBook/fdcq2.vue"); |
58 | break; | 64 | break; |
65 | case "diyaqQlxx": | ||
66 | form = require("@/views/registerBook/diyaq.vue"); | ||
67 | break; | ||
59 | case "szxx": | 68 | case "szxx": |
60 | form = require("@/views/workflow/components/szxx.vue"); | 69 | form = require("@/views/workflow/components/szxx.vue"); |
61 | break; | 70 | break; | ... | ... |
... | @@ -73,6 +73,7 @@ import { | ... | @@ -73,6 +73,7 @@ import { |
73 | record, | 73 | record, |
74 | getNextLinkInfo, | 74 | getNextLinkInfo, |
75 | completeTask, | 75 | completeTask, |
76 | getStepFormInfo | ||
76 | } from "@/api/fqsq.js" | 77 | } from "@/api/fqsq.js" |
77 | import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" | 78 | import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" |
78 | import { getForm } from "./flowform.js" | 79 | import { getForm } from "./flowform.js" |
... | @@ -130,19 +131,19 @@ export default { | ... | @@ -130,19 +131,19 @@ export default { |
130 | if (res.code === 200) { | 131 | if (res.code === 200) { |
131 | this.leftButtonList = res.result.button; | 132 | this.leftButtonList = res.result.button; |
132 | this.rightButtonList = res.result.operation; | 133 | this.rightButtonList = res.result.operation; |
133 | this.tabList = res.result.form; | 134 | // this.tabList = res.result.form; |
134 | //默认选择第一个选项卡内容 | 135 | // //默认选择第一个选项卡内容 |
135 | this.tabName = res.result.form[0].value; | 136 | // this.tabName = res.result.form[0].value; |
136 | let that = this; | 137 | // let that = this; |
137 | this.tabList.forEach(function (item, index) { | 138 | // this.tabList.forEach(function (item, index) { |
138 | if (item.value == "clxx") { | 139 | // if (item.value == "clxx") { |
139 | that.clxxIndex = index; | 140 | // that.clxxIndex = index; |
140 | that.clxxForm = getForm(item.value); | 141 | // that.clxxForm = getForm(item.value); |
141 | that.clxxTab = item; | 142 | // that.clxxTab = item; |
142 | } | 143 | // } |
143 | }); | 144 | // }); |
144 | //默认加载第一个选项卡的组件内容 | 145 | // //默认加载第一个选项卡的组件内容 |
145 | this.getFromRouter(res.result.form[0].value); | 146 | // this.getFromRouter(res.result.form[0].value); |
146 | } | 147 | } |
147 | }) | 148 | }) |
148 | }, | 149 | }, |
... | @@ -193,15 +194,36 @@ export default { | ... | @@ -193,15 +194,36 @@ export default { |
193 | if (res.code === 200) { | 194 | if (res.code === 200) { |
194 | this.unitData = res.result; | 195 | this.unitData = res.result; |
195 | this.currentSelectProps = res.result[0]; | 196 | this.currentSelectProps = res.result[0]; |
197 | this.unitClick(0); | ||
196 | } | 198 | } |
197 | }) | 199 | }) |
198 | }, | 200 | }, |
199 | //申请单元点击事件 | 201 | //申请单元点击事件 |
200 | unitClick (index) { | 202 | unitClick (index) { |
201 | if (this.currentSelectProps.bsmSldy != this.unitData[index].bsmSldy) { | 203 | this.currentSelectProps = this.unitData[index]; |
202 | this.currentSelectProps = this.unitData[index]; | 204 | this.currentSelectProps.type = 'ONLY_READ'; |
203 | this.fresh += 1; | 205 | getStepFormInfo(this.currentSelectProps).then((res) => { |
204 | } | 206 | if (res.code === 200) { |
207 | this.fresh += 1; | ||
208 | //获取单元对应的所有表单信息 | ||
209 | this.tabList = res.result; | ||
210 | //默认加载第一个表单信息 | ||
211 | this.tabName = res.result[0].value; | ||
212 | //处理分屏材料信息 | ||
213 | // let that = this; | ||
214 | // this.tabList.forEach(function (item, index) { | ||
215 | // if (item.value == "clxx") { | ||
216 | // that.clxxIndex = index; | ||
217 | // that.clxxForm = getForm(item.value, that.$route.query.sqywbm); | ||
218 | // that.clxxTab = item; | ||
219 | // } | ||
220 | // }); | ||
221 | } | ||
222 | }); | ||
223 | // if (this.currentSelectProps.bsmSldy != this.unitData[index].bsmSldy) { | ||
224 | // this.currentSelectProps = this.unitData[index]; | ||
225 | // this.fresh += 1; | ||
226 | // } | ||
205 | }, | 227 | }, |
206 | //表单选项卡事件 | 228 | //表单选项卡事件 |
207 | tabClick (tab, event) { | 229 | tabClick (tab, event) { | ... | ... |
... | @@ -194,17 +194,15 @@ import { mapGetters } from "vuex"; | ... | @@ -194,17 +194,15 @@ import { mapGetters } from "vuex"; |
194 | export default { | 194 | export default { |
195 | async created () { | 195 | async created () { |
196 | this.propsParam = this.$attrs; | 196 | this.propsParam = this.$attrs; |
197 | Init({ | 197 | var formdata = new FormData(); |
198 | bsmSldy: this.propsParam.bsmSldy.split(",") | 198 | formdata.append("bsmSldy", this.propsParam.bsmSldy); |
199 | }).then((res) => { | 199 | formdata.append("djlx", this.propsParam.djlx); |
200 | Init(formdata).then((res) => { | ||
200 | if (res.code === 200 && res.result) { | 201 | if (res.code === 200 && res.result) { |
201 | this.ruleForm = { | 202 | this.ruleForm = { |
202 | ...res.result, | 203 | ...res.result, |
203 | ...res.result.zdjbxxdatas, | ||
204 | ...res.result.qlxxdatas, | 204 | ...res.result.qlxxdatas, |
205 | ...res.result.jsydsyqdatas, | ||
206 | } | 205 | } |
207 | console.log(this.ruleForm, 'this.ruleFormthis.ruleFormthis.ruleForm'); | ||
208 | } | 206 | } |
209 | }); | 207 | }); |
210 | }, | 208 | }, | ... | ... |
... | @@ -286,16 +286,11 @@ export default { | ... | @@ -286,16 +286,11 @@ export default { |
286 | }, | 286 | }, |
287 | upDateQlrxxList (val) { | 287 | upDateQlrxxList (val) { |
288 | this.ruleForm.qlrList = _.cloneDeep(val) | 288 | this.ruleForm.qlrList = _.cloneDeep(val) |
289 | // this.$store.dispatch('slxx/setQlrxxNew', { | ||
290 | // qlrxx: this.ruleForm.qlrxx, | ||
291 | // fj: this.ruleForm.fj, | ||
292 | // gyfs: this.ruleForm.gyfs, | ||
293 | // djyy: this.ruleForm.djyy | ||
294 | // }) | ||
295 | }, | 289 | }, |
296 | upDateJtcyList (val) { | 290 | upDateJtcyList (val) { |
297 | this.ruleForm.jtcyList = _.cloneDeep(val) | 291 | this.ruleForm.jtcyList = _.cloneDeep(val) |
298 | }, | 292 | }, |
293 | //水域滩涂类型变化事件 | ||
299 | changeSyttlx(e){ | 294 | changeSyttlx(e){ |
300 | let itemLx = {} | 295 | let itemLx = {} |
301 | itemLx = this.dictData['A23'].find((item) => { | 296 | itemLx = this.dictData['A23'].find((item) => { |
... | @@ -303,6 +298,7 @@ export default { | ... | @@ -303,6 +298,7 @@ export default { |
303 | }) | 298 | }) |
304 | this.ruleForm.nydsyq.syttlxmc = itemLx.dname; | 299 | this.ruleForm.nydsyq.syttlxmc = itemLx.dname; |
305 | }, | 300 | }, |
301 | //养殖业方式变化事件 | ||
306 | changeYzyfs(e){ | 302 | changeYzyfs(e){ |
307 | let itemLx = {} | 303 | let itemLx = {} |
308 | itemLx = this.dictData['A24'].find((item) => { | 304 | itemLx = this.dictData['A24'].find((item) => { |
... | @@ -310,6 +306,7 @@ export default { | ... | @@ -310,6 +306,7 @@ export default { |
310 | }) | 306 | }) |
311 | this.ruleForm.nydsyq.yzyfsmc = itemLx.dname; | 307 | this.ruleForm.nydsyq.yzyfsmc = itemLx.dname; |
312 | }, | 308 | }, |
309 | //用地用海变化事件 | ||
313 | changeYdyhfl(e){ | 310 | changeYdyhfl(e){ |
314 | let itemLx = {} | 311 | let itemLx = {} |
315 | itemLx = this.dictData['A51'].find((item) => { | 312 | itemLx = this.dictData['A51'].find((item) => { | ... | ... |
src/views/ywbl/nydsyq/slxx200.vue
0 → 100644
This diff is collapsed.
Click to expand it.
... | @@ -4,33 +4,19 @@ | ... | @@ -4,33 +4,19 @@ |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="queryForm" ref="queryForm" label-width="120px"> | 5 | <el-form :model="queryForm" ref="queryForm" label-width="120px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="8"> | 7 | <el-col :span="10"> |
8 | <el-form-item label="不动产单元号"> | 8 | <el-form-item label="不动产单元号"> |
9 | <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width300px"> | 9 | <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width300px"> |
10 | </el-input> | 10 | </el-input> |
11 | </el-form-item> | 11 | </el-form-item> |
12 | </el-col> | 12 | </el-col> |
13 | <el-col :span="8"> | 13 | <el-col :span="10"> |
14 | <el-form-item label="不动产权证号"> | ||
15 | <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width300px"> | ||
16 | </el-input> | ||
17 | </el-form-item> | ||
18 | </el-col> | ||
19 | <el-col :span="8"> | ||
20 | <el-form-item label="权利人"> | ||
21 | <el-input placeholder="请输入不动产单元号" v-model="queryForm.zl" clearable class="width300px"> | ||
22 | </el-input> | ||
23 | </el-form-item> | ||
24 | </el-col> | ||
25 | </el-row> | ||
26 | <el-row> | ||
27 | <el-col :span="8"> | ||
28 | <el-form-item label="坐落"> | 14 | <el-form-item label="坐落"> |
29 | <el-input placeholder="请输入不动产单元号" v-model="queryForm.zl" clearable class="width300px"> | 15 | <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width300px"> |
30 | </el-input> | 16 | </el-input> |
31 | </el-form-item> | 17 | </el-form-item> |
32 | </el-col> | 18 | </el-col> |
33 | <el-col :span="2" class="btnColRight"> | 19 | <el-col :span="4" class="btnColRight"> |
34 | <el-form-item> | 20 | <el-form-item> |
35 | <el-button type="primary" @click="fetchData">查询</el-button> | 21 | <el-button type="primary" @click="fetchData">查询</el-button> |
36 | </el-form-item> | 22 | </el-form-item> | ... | ... |
-
Please register or sign in to post a comment