Merge remote-tracking branch 'origin/master'
Showing
24 changed files
with
159 additions
and
65 deletions
1 | VUE_APP_api = 'https://192.168.2.111:8006' | 1 | VUE_APP_api = 'https://192.168.2.111:8006' |
2 | VUE_APP_api1 = 'https://127.0.0.1:8006' | 2 | VUE_APP_api1 = 'https://127.0.0.1:8006' |
3 | VUE_APP_api2 = 'https://192.168.2.9:8006' | 3 | VUE_APP_api2 = 'https://192.168.2.145:8006' |
4 | VUE_APP_api3 = 'https://192.168.2.11:8006' | 4 | VUE_APP_api3 = 'https://192.168.2.119:8006' |
5 | VUE_APP_api4 = 'http://192.168.2.111:18080' | 5 | VUE_APP_api4 = 'http://192.168.2.146:8006' |
6 | VUE_APP_api5 = 'https://192.168.2.142:8006' | ||
6 | VUE_APP_name = '开发环境' | 7 | VUE_APP_name = '开发环境' |
7 | NODE_ENV="development" | 8 | NODE_ENV="development" |
8 | VUE_APP_VERSION = 'psh' | 9 | VUE_APP_VERSION = 'psh' | ... | ... |
... | @@ -11,3 +11,14 @@ export function getQjLqDetailById(data) { | ... | @@ -11,3 +11,14 @@ export function getQjLqDetailById(data) { |
11 | } | 11 | } |
12 | }) | 12 | }) |
13 | } | 13 | } |
14 | /** | ||
15 | * 保存林权信息 | ||
16 | */ | ||
17 | export function updateQjLq(data) { | ||
18 | return request({ | ||
19 | url: '/system/qjLq/updateQjLq', | ||
20 | method: 'put', | ||
21 | data: data | ||
22 | }) | ||
23 | } | ||
24 | ... | ... |
... | @@ -44,6 +44,19 @@ export function getQlrInfoByGlbsm(data) { | ... | @@ -44,6 +44,19 @@ export function getQlrInfoByGlbsm(data) { |
44 | }, | 44 | }, |
45 | }) | 45 | }) |
46 | } | 46 | } |
47 | /** | ||
48 | * 根据glbsm和type查询qlr信息 | ||
49 | */ | ||
50 | export function getQlrByGlbsmAndType(data) { | ||
51 | return request({ | ||
52 | url: '/system/Qlr/getQlrByGlbsmAndType', | ||
53 | method: 'get', | ||
54 | params: { | ||
55 | glbsm:data.bsm, | ||
56 | type:data.type | ||
57 | }, | ||
58 | }) | ||
59 | } | ||
47 | 60 | ||
48 | /** | 61 | /** |
49 | * 更新权利人共有公用情况 | 62 | * 更新权利人共有公用情况 | ... | ... |
src/api/tdcb.js
0 → 100644
1 | import request from '@/plugin/axios' | ||
2 | |||
3 | /** | ||
4 | * 查询土地承包经营权、农用地其他使用权调查表基本信息 | ||
5 | */ | ||
6 | export function getQjTdcbjyqNydqtsyqdcDetailByZdbsm(data) { | ||
7 | return request({ | ||
8 | url: '/zd/qjTdcbjyqNydqtsyqdc/getQjTdcbjyqNydqtsyqdcDetailByZdbsm', | ||
9 | method: 'get', | ||
10 | params: { | ||
11 | zdbsm: data, | ||
12 | } | ||
13 | }) | ||
14 | } | ||
15 | |||
16 | /** | ||
17 | * 保存权籍_土地承包经营权、农用地其他使用权调查基本信息 | ||
18 | */ | ||
19 | export function saveOrUpdateQjTdcbjyqNydqtsyqdc(data) { | ||
20 | return request({ | ||
21 | url: '/zd/qjTdcbjyqNydqtsyqdc/saveOrUpdateQjTdcbjyqNydqtsyqdc', | ||
22 | method: 'post', | ||
23 | data: data, | ||
24 | }) | ||
25 | } |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> | 12 | <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> |
13 | <el-row :gutter="10" class="shop"> | 13 | <el-row :gutter="10" class="shop"> |
14 | <el-col :span="4" class="inputtitle"> | 14 | <el-col :span="4" class="inputtitle"> |
15 | 宗地编码: | 15 | 宗地代码: |
16 | </el-col> | 16 | </el-col> |
17 | <el-col :span="8" class=""> | 17 | <el-col :span="8" class=""> |
18 | <el-input v-model="queryData.zddm"></el-input> | 18 | <el-input v-model="queryData.zddm"></el-input> | ... | ... |
... | @@ -176,10 +176,10 @@ | ... | @@ -176,10 +176,10 @@ |
176 | <el-row> | 176 | <el-row> |
177 | <el-col :span="24"> | 177 | <el-col :span="24"> |
178 | <el-form :inline="true" class="demo-form-inline"> | 178 | <el-form :inline="true" class="demo-form-inline"> |
179 | <el-form-item label="宗地编码"> | 179 | <el-form-item label="宗地代码"> |
180 | <el-input | 180 | <el-input |
181 | v-model="queryData.zddm" | 181 | v-model="queryData.zddm" |
182 | placeholder="输入宗地编码" | 182 | placeholder="输入宗地代码" |
183 | ></el-input> | 183 | ></el-input> |
184 | </el-form-item> | 184 | </el-form-item> |
185 | <el-form-item label="不动产权证号"> | 185 | <el-form-item label="不动产权证号"> |
... | @@ -274,10 +274,10 @@ | ... | @@ -274,10 +274,10 @@ |
274 | <el-row> | 274 | <el-row> |
275 | <el-col :span="24"> | 275 | <el-col :span="24"> |
276 | <el-form :inline="true" class="demo-form-inline"> | 276 | <el-form :inline="true" class="demo-form-inline"> |
277 | <el-form-item label="宗地编码"> | 277 | <el-form-item label="宗地代码"> |
278 | <el-input | 278 | <el-input |
279 | v-model="queryData.zddm" | 279 | v-model="queryData.zddm" |
280 | placeholder="输入宗地编码" | 280 | placeholder="输入宗地代码" |
281 | ></el-input> | 281 | ></el-input> |
282 | </el-form-item> | 282 | </el-form-item> |
283 | <el-form-item label="不动产权证号"> | 283 | <el-form-item label="不动产权证号"> | ... | ... |
... | @@ -11,10 +11,10 @@ | ... | @@ -11,10 +11,10 @@ |
11 | <el-row> | 11 | <el-row> |
12 | <el-col :span="24"> | 12 | <el-col :span="24"> |
13 | <el-form :inline="true" class="demo-form-inline"> | 13 | <el-form :inline="true" class="demo-form-inline"> |
14 | <el-form-item label="宗地编码"> | 14 | <el-form-item label="宗地代码"> |
15 | <el-input | 15 | <el-input |
16 | v-model="queryData.zddm" | 16 | v-model="queryData.zddm" |
17 | placeholder="输入宗地编码" | 17 | placeholder="输入宗地代码" |
18 | ></el-input> | 18 | ></el-input> |
19 | </el-form-item> | 19 | </el-form-item> |
20 | <el-form-item label="不动产权证号"> | 20 | <el-form-item label="不动产权证号"> | ... | ... |
... | @@ -2,9 +2,14 @@ | ... | @@ -2,9 +2,14 @@ |
2 | <div class="temp"> | 2 | <div class="temp"> |
3 | <table class="tempTable" cellspacing="0" cellpadding="0" border="1"> | 3 | <table class="tempTable" cellspacing="0" cellpadding="0" border="1"> |
4 | <tr> | 4 | <tr> |
5 | <template v-if="lq == ''"> | ||
5 | <td colspan="2"><span class="table-title">权利人信息</span></td> | 6 | <td colspan="2"><span class="table-title">权利人信息</span></td> |
6 | <td colspan="2">共有方式</td> | 7 | <td colspan="2">共有方式</td> |
7 | <td colspan="8"> | 8 | </template> |
9 | <template v-else> | ||
10 | <td colspan="2">共有方式</td> | ||
11 | </template> | ||
12 | <td :colspan="lq == '' ? 8 : 10"> | ||
8 | <el-row> | 13 | <el-row> |
9 | <el-col :span="14" class="fl" style="line-height:32px"> | 14 | <el-col :span="14" class="fl" style="line-height:32px"> |
10 | <el-radio-group v-model="gyfs" @change="updateGyfs"> | 15 | <el-radio-group v-model="gyfs" @change="updateGyfs"> |
... | @@ -311,7 +316,7 @@ | ... | @@ -311,7 +316,7 @@ |
311 | 316 | ||
312 | <script> | 317 | <script> |
313 | import {getDdicByMC} from "@api/common"; | 318 | import {getDdicByMC} from "@api/common"; |
314 | import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk} from "@api/qlr"; | 319 | import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk,getQlrByGlbsmAndType} from "@api/qlr"; |
315 | 320 | ||
316 | export default { | 321 | export default { |
317 | props: { | 322 | props: { |
... | @@ -338,7 +343,13 @@ | ... | @@ -338,7 +343,13 @@ |
338 | lq:{ | 343 | lq:{ |
339 | type: String, | 344 | type: String, |
340 | default: "", | 345 | default: "", |
341 | } | 346 | }, |
347 | // lqData:{ | ||
348 | // type: Array, | ||
349 | // default: () => { | ||
350 | // return []; | ||
351 | // }, | ||
352 | // } | ||
342 | }, | 353 | }, |
343 | data() { | 354 | data() { |
344 | return { | 355 | return { |
... | @@ -649,6 +660,7 @@ | ... | @@ -649,6 +660,7 @@ |
649 | } | 660 | } |
650 | }, | 661 | }, |
651 | getQlrInfo(bsm){ | 662 | getQlrInfo(bsm){ |
663 | if(this.lq == ""){ | ||
652 | getQlrInfoByGlbsm(bsm).then((res)=>{ | 664 | getQlrInfoByGlbsm(bsm).then((res)=>{ |
653 | if(res.code){ | 665 | if(res.code){ |
654 | if(res.result!=null){ | 666 | if(res.result!=null){ |
... | @@ -661,6 +673,24 @@ | ... | @@ -661,6 +673,24 @@ |
661 | } | 673 | } |
662 | } | 674 | } |
663 | }) | 675 | }) |
676 | }else{ | ||
677 | let params = { | ||
678 | bsm:bsm, | ||
679 | type:this.lq | ||
680 | } | ||
681 | getQlrByGlbsmAndType(params).then((res)=>{ | ||
682 | if(res.code){ | ||
683 | if(res.result!=null){ | ||
684 | this.tableData=res.result; | ||
685 | if(this.tableData.length===0){ | ||
686 | this.gyfs=this.$store.state.gyfsList[0].bsm; | ||
687 | }else { | ||
688 | this.gyfs=res.result[0].gyfsbsm; | ||
689 | } | ||
690 | } | ||
691 | } | ||
692 | }) | ||
693 | } | ||
664 | } | 694 | } |
665 | }, | 695 | }, |
666 | created(){ | 696 | created(){ | ... | ... |
... | @@ -7,10 +7,10 @@ | ... | @@ -7,10 +7,10 @@ |
7 | <el-row> | 7 | <el-row> |
8 | <el-col :span="24"> | 8 | <el-col :span="24"> |
9 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> | 9 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
10 | <el-form-item label="宗地编码"> | 10 | <el-form-item label="宗地代码"> |
11 | <el-input | 11 | <el-input |
12 | v-model="queryData.zddm" | 12 | v-model="queryData.zddm" |
13 | placeholder="输入宗地编码" | 13 | placeholder="输入宗地代码" |
14 | @change="query" | 14 | @change="query" |
15 | ></el-input> | 15 | ></el-input> |
16 | </el-form-item> | 16 | </el-form-item> | ... | ... |
... | @@ -5,7 +5,7 @@ | ... | @@ -5,7 +5,7 @@ |
5 | <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> | 5 | <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> |
6 | <el-row :gutter="10" class="shop"> | 6 | <el-row :gutter="10" class="shop"> |
7 | <el-col :span="4" class="inputtitle"> | 7 | <el-col :span="4" class="inputtitle"> |
8 | 宗地编码: | 8 | 宗地代码: |
9 | </el-col> | 9 | </el-col> |
10 | <el-col :span="8" class=""> | 10 | <el-col :span="8" class=""> |
11 | <el-input v-model="queryData.zddm"></el-input> | 11 | <el-input v-model="queryData.zddm"></el-input> | ... | ... |
... | @@ -14,10 +14,10 @@ | ... | @@ -14,10 +14,10 @@ |
14 | <el-row> | 14 | <el-row> |
15 | <el-col :span="24"> | 15 | <el-col :span="24"> |
16 | <el-form :inline="true" class="demo-form-inline"> | 16 | <el-form :inline="true" class="demo-form-inline"> |
17 | <el-form-item label="宗地编码"> | 17 | <el-form-item label="宗地代码"> |
18 | <el-input | 18 | <el-input |
19 | v-model="queryData.zddm" | 19 | v-model="queryData.zddm" |
20 | placeholder="输入宗地编码" | 20 | placeholder="输入宗地代码" |
21 | ></el-input> | 21 | ></el-input> |
22 | </el-form-item> | 22 | </el-form-item> |
23 | <el-form-item label="不动产权证号"> | 23 | <el-form-item label="不动产权证号"> | ... | ... |
... | @@ -4,10 +4,11 @@ | ... | @@ -4,10 +4,11 @@ |
4 | <el-row> | 4 | <el-row> |
5 | <el-col :span="18"> | 5 | <el-col :span="18"> |
6 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> | 6 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
7 | <el-form-item label="宗地编码"> | 7 | <el-form-item label="宗地代码"> |
8 | <el-input | 8 | <el-input |
9 | v-model="queryData.zddm" | 9 | v-model="queryData.zddm" |
10 | placeholder="输入宗地编码" | 10 | placeholder="输入宗地代码" |
11 | maxlength="19" | ||
11 | @change="query" | 12 | @change="query" |
12 | ></el-input> | 13 | ></el-input> |
13 | </el-form-item> | 14 | </el-form-item> |
... | @@ -76,11 +77,10 @@ | ... | @@ -76,11 +77,10 @@ |
76 | <el-checkbox label="zd" name="type">宗地</el-checkbox> | 77 | <el-checkbox label="zd" name="type">宗地</el-checkbox> |
77 | <el-checkbox label="dz" name="type">多幢</el-checkbox> | 78 | <el-checkbox label="dz" name="type">多幢</el-checkbox> |
78 | <el-checkbox label="zrz" name="type">自然幢</el-checkbox> | 79 | <el-checkbox label="zrz" name="type">自然幢</el-checkbox> |
79 | <el-checkbox label="gzw" name="type">构筑物</el-checkbox> | 80 | <el-checkbox label="gzw" name="type" v-show="type !== 'add'">构筑物</el-checkbox> |
81 | <el-checkbox label="lq" name="type" v-show="type !== 'add'">林权</el-checkbox> | ||
80 | <el-checkbox label="h" name="type" v-show="type !== 'add'">户</el-checkbox> | 82 | <el-checkbox label="h" name="type" v-show="type !== 'add'">户</el-checkbox> |
81 | <!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox> | 83 | <!-- <el-checkbox label="zh" name="type">宗海</el-checkbox> --> |
82 | <el-checkbox label="lq" name="type">林权</el-checkbox> | ||
83 | <el-checkbox label="zh" name="type">宗海</el-checkbox> --> | ||
84 | </el-checkbox-group> | 84 | </el-checkbox-group> |
85 | </el-form-item> | 85 | </el-form-item> |
86 | </el-form> | 86 | </el-form> | ... | ... |
... | @@ -11,10 +11,10 @@ | ... | @@ -11,10 +11,10 @@ |
11 | <el-row> | 11 | <el-row> |
12 | <el-col :span="24"> | 12 | <el-col :span="24"> |
13 | <el-form :inline="true" class="demo-form-inline"> | 13 | <el-form :inline="true" class="demo-form-inline"> |
14 | <el-form-item label="宗地编码"> | 14 | <el-form-item label="宗地代码"> |
15 | <el-input | 15 | <el-input |
16 | v-model="queryData.zddm" | 16 | v-model="queryData.zddm" |
17 | placeholder="输入宗地编码" | 17 | placeholder="输入宗地代码" |
18 | ></el-input> | 18 | ></el-input> |
19 | </el-form-item> | 19 | </el-form-item> |
20 | <el-form-item label="不动产权证号"> | 20 | <el-form-item label="不动产权证号"> | ... | ... |
... | @@ -55,6 +55,9 @@ const store = new Vuex.Store({ | ... | @@ -55,6 +55,9 @@ const store = new Vuex.Store({ |
55 | newZdbsm:'', | 55 | newZdbsm:'', |
56 | isWorkFlow:false, // 判断是否工作流数据 | 56 | isWorkFlow:false, // 判断是否工作流数据 |
57 | lcgzShow:false,//是否待办箱的数据,显示流程追踪 | 57 | lcgzShow:false,//是否待办箱的数据,显示流程追踪 |
58 | familyList:[], //家庭关系分类 | ||
59 | syttlx:[],//水域滩涂类型 | ||
60 | yzyfs:[] //养殖业方式 | ||
58 | }, | 61 | }, |
59 | modules: { | 62 | modules: { |
60 | user, | 63 | user, | ... | ... |
... | @@ -321,6 +321,10 @@ export default { | ... | @@ -321,6 +321,10 @@ export default { |
321 | s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions; | 321 | s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions; |
322 | s.jgOptions = s.jgOptions.length == 0 ?await this.getDicData("房屋结构") : s.jgOptions; | 322 | s.jgOptions = s.jgOptions.length == 0 ?await this.getDicData("房屋结构") : s.jgOptions; |
323 | s.gmjjhyflbsmList = s.gmjjhyflbsmList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.gmjjhyflbsmList; | 323 | s.gmjjhyflbsmList = s.gmjjhyflbsmList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.gmjjhyflbsmList; |
324 | s.familyList = s.familyList.length == 0 ?await this.getDicData("家庭成员") : s.familyList; | ||
325 | s.syttlx = s.syttlx.length == 0 ?await this.getDicData("水域滩涂类型") : s.syttlx; | ||
326 | s.yzyfs = s.yzyfs.length == 0 ?await this.getDicData("养殖业方式") : s.yzyfs; | ||
327 | |||
324 | }, | 328 | }, |
325 | async getDicData(name) { | 329 | async getDicData(name) { |
326 | return await getDdicByMC(name).then((res)=> { | 330 | return await getDdicByMC(name).then((res)=> { | ... | ... |
... | @@ -22,6 +22,7 @@ | ... | @@ -22,6 +22,7 @@ |
22 | :qszt="formData.qszt" | 22 | :qszt="formData.qszt" |
23 | type="lq" | 23 | type="lq" |
24 | lq="1" | 24 | lq="1" |
25 | v-if="qlrShow" | ||
25 | ></Qlr> | 26 | ></Qlr> |
26 | </td> | 27 | </td> |
27 | </tr> | 28 | </tr> |
... | @@ -34,6 +35,7 @@ | ... | @@ -34,6 +35,7 @@ |
34 | :qszt="formData.qszt" | 35 | :qszt="formData.qszt" |
35 | type="lx" | 36 | type="lx" |
36 | lq="2" | 37 | lq="2" |
38 | v-if="qlrShow" | ||
37 | ></Qlr> | 39 | ></Qlr> |
38 | </td> | 40 | </td> |
39 | </tr> | 41 | </tr> |
... | @@ -85,7 +87,7 @@ | ... | @@ -85,7 +87,7 @@ |
85 | type="text" | 87 | type="text" |
86 | :disabled="disabled" | 88 | :disabled="disabled" |
87 | class="formInput" | 89 | class="formInput" |
88 | v-model="formData.djh" | 90 | v-model="formData.zlnd" |
89 | /> | 91 | /> |
90 | </td> | 92 | </td> |
91 | 93 | ||
... | @@ -154,7 +156,7 @@ | ... | @@ -154,7 +156,7 @@ |
154 | type="text" | 156 | type="text" |
155 | :disabled="disabled" | 157 | :disabled="disabled" |
156 | class="formInput" | 158 | class="formInput" |
157 | v-model="formData.mj" | 159 | v-model="formData.syqmj " |
158 | /> | 160 | /> |
159 | </td> | 161 | </td> |
160 | <td colspan="2" class="tdright">起源</td> | 162 | <td colspan="2" class="tdright">起源</td> |
... | @@ -191,11 +193,11 @@ | ... | @@ -191,11 +193,11 @@ |
191 | <td colspan="2" class="tdright">林种</td> | 193 | <td colspan="2" class="tdright">林种</td> |
192 | <td colspan="10"> | 194 | <td colspan="10"> |
193 | <el-radio-group class="fl" v-model="formData.lz"> | 195 | <el-radio-group class="fl" v-model="formData.lz"> |
194 | <el-radio :label="1">防护林</el-radio> | 196 | <el-radio label="1">防护林</el-radio> |
195 | <el-radio :label="2">用材林</el-radio> | 197 | <el-radio label="2">用材林</el-radio> |
196 | <el-radio :label="3">经济林</el-radio> | 198 | <el-radio label="3">经济林</el-radio> |
197 | <el-radio :label="4">薪炭林</el-radio> | 199 | <el-radio label="4">薪炭林</el-radio> |
198 | <el-radio :label="5">特种用途体</el-radio> | 200 | <el-radio label="5">特种用途体</el-radio> |
199 | </el-radio-group> | 201 | </el-radio-group> |
200 | </td> | 202 | </td> |
201 | </tr> | 203 | </tr> |
... | @@ -220,7 +222,7 @@ | ... | @@ -220,7 +222,7 @@ |
220 | @blur="inputBlur($event, false)" | 222 | @blur="inputBlur($event, false)" |
221 | maxlength="3" | 223 | maxlength="3" |
222 | onkeyup="value=value.replace(/[^\d]/g,'')" | 224 | onkeyup="value=value.replace(/[^\d]/g,'')" |
223 | v-model="formData.syqx" | 225 | v-model="formData.ldsyqx" |
224 | class="formInput" | 226 | class="formInput" |
225 | /> | 227 | /> |
226 | </td> | 228 | </td> |
... | @@ -274,14 +276,14 @@ | ... | @@ -274,14 +276,14 @@ |
274 | </table> | 276 | </table> |
275 | 277 | ||
276 | <div class="header-button" :style="{ width: mainBoxWidth + 'px' }"> | 278 | <div class="header-button" :style="{ width: mainBoxWidth + 'px' }"> |
277 | <el-button type="primary">保存</el-button> | 279 | <el-button type="primary" @click="updateQjLq">保存</el-button> |
278 | </div> | 280 | </div> |
279 | </div> | 281 | </div> |
280 | </template> | 282 | </template> |
281 | 283 | ||
282 | <script> | 284 | <script> |
283 | import Qlr from "@components/formMenu/qlr"; | 285 | import Qlr from "@components/formMenu/qlr"; |
284 | import { getQjLqDetailById } from "@api/lq" | 286 | import { getQjLqDetailById,updateQjLq } from "@api/lq" |
285 | export default { | 287 | export default { |
286 | name: "", | 288 | name: "", |
287 | components: { | 289 | components: { |
... | @@ -294,18 +296,20 @@ export default { | ... | @@ -294,18 +296,20 @@ export default { |
294 | formData: { | 296 | formData: { |
295 | mjdw: "", | 297 | mjdw: "", |
296 | zddm: "", | 298 | zddm: "", |
299 | zlnd:"", | ||
300 | dzwlx:"1", | ||
297 | bdcdyh: "", | 301 | bdcdyh: "", |
298 | zl: "", | 302 | zl: "", |
299 | xdm: "", | 303 | xdm: "", |
300 | lb: "", | 304 | lb: "", |
301 | xb: "", | 305 | xb: "", |
302 | mj: "", | 306 | syqmj : "", |
303 | qy: "", | 307 | qy: "", |
304 | zs: "", | 308 | zs: "", |
305 | zysz: "", | 309 | zysz: "", |
306 | lz: "", | 310 | lz: "", |
307 | ldsyqssj: "", | 311 | ldsyqssj: "", |
308 | syqx: "", | 312 | ldsyqx: "", |
309 | ldsyjssj: "", | 313 | ldsyjssj: "", |
310 | gyqk: "", | 314 | gyqk: "", |
311 | shyj: "", | 315 | shyj: "", |
... | @@ -324,6 +328,7 @@ export default { | ... | @@ -324,6 +328,7 @@ export default { |
324 | }, | 328 | }, |
325 | ], | 329 | ], |
326 | mainBoxWidth: 0, | 330 | mainBoxWidth: 0, |
331 | qlrShow:false, | ||
327 | }; | 332 | }; |
328 | }, | 333 | }, |
329 | created() {}, | 334 | created() {}, |
... | @@ -340,9 +345,25 @@ export default { | ... | @@ -340,9 +345,25 @@ export default { |
340 | getQjLqDetailById(bsm).then((res) => { | 345 | getQjLqDetailById(bsm).then((res) => { |
341 | if (res.success) { | 346 | if (res.success) { |
342 | console.log(res, "林权信息"); | 347 | console.log(res, "林权信息"); |
348 | this.formData = res.result; | ||
349 | this.formData.dzwlx = "1"; | ||
350 | this.qlrShow = true; | ||
343 | } | 351 | } |
344 | }); | 352 | }); |
345 | }, | 353 | }, |
354 | //生成宗地代码 | ||
355 | generatorCode(){ | ||
356 | |||
357 | }, | ||
358 | //保存林权信息 | ||
359 | updateQjLq(){ | ||
360 | updateQjLq(this.formData).then((res) => { | ||
361 | if (res.success) { | ||
362 | console.log(res, "保存成功"); | ||
363 | this.$message.success("保存成功") | ||
364 | } | ||
365 | }); | ||
366 | } | ||
346 | }, | 367 | }, |
347 | computed: {}, | 368 | computed: {}, |
348 | watch: {}, | 369 | watch: {}, | ... | ... |
... | @@ -6,10 +6,10 @@ | ... | @@ -6,10 +6,10 @@ |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="24" style="margin-left: -10px;"> | 7 | <el-col :span="24" style="margin-left: -10px;"> |
8 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> | 8 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
9 | <el-form-item label="宗地编码"> | 9 | <el-form-item label="宗地代码"> |
10 | <el-input | 10 | <el-input |
11 | v-model="queryData.zddm" | 11 | v-model="queryData.zddm" |
12 | placeholder="输入宗地编码" | 12 | placeholder="输入宗地代码" |
13 | ></el-input> | 13 | ></el-input> |
14 | </el-form-item> | 14 | </el-form-item> |
15 | <el-form-item label="不动产权证号"> | 15 | <el-form-item label="不动产权证号"> | ... | ... |
... | @@ -3,10 +3,10 @@ | ... | @@ -3,10 +3,10 @@ |
3 | <el-row v-show="isSearch"> | 3 | <el-row v-show="isSearch"> |
4 | <el-col :span="24"> | 4 | <el-col :span="24"> |
5 | <el-form :inline="true" class="demo-form-inline"> | 5 | <el-form :inline="true" class="demo-form-inline"> |
6 | <el-form-item label="宗地编码"> | 6 | <el-form-item label="宗地代码"> |
7 | <el-input | 7 | <el-input |
8 | v-model="queryData.zddm" | 8 | v-model="queryData.zddm" |
9 | placeholder="输入宗地编码" | 9 | placeholder="输入宗地代码" |
10 | ></el-input> | 10 | ></el-input> |
11 | </el-form-item> | 11 | </el-form-item> |
12 | <el-form-item label="不动产权证号"> | 12 | <el-form-item label="不动产权证号"> | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -817,6 +817,7 @@ export default { | ... | @@ -817,6 +817,7 @@ export default { |
817 | item.style.border = ''; | 817 | item.style.border = ''; |
818 | item.className = ''; | 818 | item.className = ''; |
819 | }); | 819 | }); |
820 | this.bsms=bsms; | ||
820 | //清除选中户 | 821 | //清除选中户 |
821 | // this.$refs.lpbContent.clearChoosedH(); | 822 | // this.$refs.lpbContent.clearChoosedH(); |
822 | this.$nextTick(()=>{ | 823 | this.$nextTick(()=>{ | ... | ... |
... | @@ -5,7 +5,6 @@ let Timestamp = new Date().getTime(); | ... | @@ -5,7 +5,6 @@ let Timestamp = new Date().getTime(); |
5 | function resolve(dir) { | 5 | function resolve(dir) { |
6 | return path.join(__dirname, dir) | 6 | return path.join(__dirname, dir) |
7 | } | 7 | } |
8 | const UglifyJsPlugin = require("uglifyjs-webpack-plugin"); | ||
9 | 8 | ||
10 | module.exports = { | 9 | module.exports = { |
11 | publicPath: './', | 10 | publicPath: './', |
... | @@ -20,7 +19,6 @@ module.exports = { | ... | @@ -20,7 +19,6 @@ module.exports = { |
20 | .set('@libs', resolve('src/libs')) | 19 | .set('@libs', resolve('src/libs')) |
21 | .set('@router', resolve('src/router')) | 20 | .set('@router', resolve('src/router')) |
22 | .set('@components', resolve('src/components')) | 21 | .set('@components', resolve('src/components')) |
23 | .set('@assets', resolve('src/assets')) | ||
24 | }, | 22 | }, |
25 | pluginOptions: { | 23 | pluginOptions: { |
26 | 'style-resources-loader': { | 24 | 'style-resources-loader': { |
... | @@ -33,17 +31,8 @@ module.exports = { | ... | @@ -33,17 +31,8 @@ module.exports = { |
33 | filename: `js/[name].${Timestamp}.js`, | 31 | filename: `js/[name].${Timestamp}.js`, |
34 | chunkFilename: `js/[name].${Timestamp}.js` | 32 | chunkFilename: `js/[name].${Timestamp}.js` |
35 | }, | 33 | }, |
36 | plugins: [ | 34 | devtool: 'source-map' |
37 | // 去除console和debugger | 35 | // plugins: [ |
38 | // new UglifyJsPlugin({ | ||
39 | // uglifyOptions: { | ||
40 | // compress: { | ||
41 | // drop_console: true, | ||
42 | // drop_debugger: true, | ||
43 | // }, | ||
44 | // }, | ||
45 | // parallel: true, | ||
46 | // }), | ||
47 | // new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例 | 36 | // new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例 |
48 | // onEnd: { | 37 | // onEnd: { |
49 | // mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹 | 38 | // mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹 |
... | @@ -52,20 +41,16 @@ module.exports = { | ... | @@ -52,20 +41,16 @@ module.exports = { |
52 | // ] | 41 | // ] |
53 | // } | 42 | // } |
54 | // }) | 43 | // }) |
55 | ] | 44 | // ] |
56 | }, | 45 | }, |
57 | devServer: { | 46 | devServer: { |
58 | host: "192.168.2.61", | ||
59 | host: "0.0.0.0", | 47 | host: "0.0.0.0", |
60 | port: 8008, | 48 | port: 8006, |
61 | https: false, | 49 | https: false, |
62 | hotOnly: false, | 50 | hotOnly: false, |
63 | proxy: { | 51 | proxy: { |
64 | "/api": { | 52 | "/api": { |
65 | // target: 'https://192.168.2.119:8006', //泽平 | 53 | target: process.env.VUE_APP_api2, |
66 | // target: process.env.VUE_APP_api1, //本地 | ||
67 | target: process.env.VUE_APP_api, //赵千 | ||
68 | // target: process.env.VUE_APP_api4, //赵千 | ||
69 | changeOrigin: true, | 54 | changeOrigin: true, |
70 | pathRewrite: { | 55 | pathRewrite: { |
71 | "^/api": "/", | 56 | "^/api": "/", | ... | ... |
-
Please register or sign in to post a comment