Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c075fdae by jikai
Options

Merge remote-tracking branch 'origin/master'

2 parents bd291794 8488098c
Expand all
Inline Side-by-side
Showing 37 changed files with 650 additions and 88 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'
......
1 import request from "@/plugin/axios";
2
3
4 /**
5 * 新增个性化配置信息
6 */
7 export function insertGxh(data) {
8 return request({
9 url: '/gxh/insertGxh',
10 method: 'post',
11 data: data,
12 })
13 }
14 /**
15 * 修改个性化配置信息
16 */
17 export function updateGxh(data) {
18 return request({
19 url: '/gxh/updateGxh',
20 method: 'post',
21 data: data,
22 })
23 }
24 /**
25 * 查询个性化配置信息
26 */
27 export function getGxhList(data) {
28 return request({
29 url: '/gxh/getGxhList',
30 method: 'get',
31 params: {
32 title: data.title,
33 code: data.code,
34 pageNo: data.pageNo,
35 pageSize: data.pageSize,
36 }
37 })
38 }
39 // export function getGxhList(data) {
40 // return request({
41 // url: '/gxh/getGxhList',
42 // method: 'post',
43 // params: data
44 // })
45 // }
...\ No newline at end of file ...\ No newline at end of file
...@@ -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 * 更新权利人共有公用情况
......
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>
......
...@@ -385,7 +385,7 @@ export default { ...@@ -385,7 +385,7 @@ export default {
385 } 385 }
386 } 386 }
387 } 387 }
388 .iszrz{ 388 .iszrz,.isgzw{
389 left: 0px!important; 389 left: 0px!important;
390 text-indent: 96px; 390 text-indent: 96px;
391 } 391 }
......
...@@ -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>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 action="/api/tx/excelGeo/import" 12 action="/api/tx/excelGeo/import"
13 :data="sxdrData" 13 :data="sxdrData"
14 :on-success="uploadSuccess" 14 :on-success="uploadSuccess"
15 :before-upload="uploadProgress"
15 :show-file-list="false" 16 :show-file-list="false"
16 multiple 17 multiple
17 > 18 >
...@@ -92,17 +93,21 @@ ...@@ -92,17 +93,21 @@
92 elemIF.style.display = "none"; 93 elemIF.style.display = "none";
93 document.body.appendChild(elemIF) 94 document.body.appendChild(elemIF)
94 }, 95 },
96 uploadProgress(){
97 vm.loadingShow('正在导入中')
98 },
95 uploadSuccess(res, file, fileList) { 99 uploadSuccess(res, file, fileList) {
96 this.errorData = []; 100 this.errorData = [];
101 vm.loadingHide();
97 if (res.success) { 102 if (res.success) {
98 this.$message.success("上传成功") 103 this.$message.success("导入成功")
99 this.loading(); 104 this.loading();
100 this.close() 105 this.close()
101 } else { 106 } else {
102 if (res.result == null) { 107 if (res.result == null) {
103 this.$message.error(res.message) 108 this.$message.error(res.message)
104 } else { 109 } else {
105 this.$message.error("上传失败") 110 this.$message.error("导入失败")
106 this.errorData = res.result; 111 this.errorData = res.result;
107 } 112 }
108 } 113 }
......
...@@ -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="不动产权证号">
......
...@@ -117,6 +117,12 @@ const constantRoutes = [ ...@@ -117,6 +117,12 @@ const constantRoutes = [
117 code: "1-3", 117 code: "1-3",
118 component: () => import("@/views/lq/index"), 118 component: () => import("@/views/lq/index"),
119 }, 119 },
120 {
121 path: "/zykfzddgxhgl",
122 name: "个性化管理",
123 code: "1-4",
124 component: () => import("@/views/manage/gxhgl/index"),
125 },
120 ], 126 ],
121 }, 127 },
122 ]; 128 ];
......
...@@ -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)=> {
......
1 <template> 1 <template>
2 <div class="main">暂无登记薄（功能接口开发中）</div> 2 <div class="main">暂无登记薄</div>
3 </template> 3 </template>
4 4
5 <script> 5 <script>
......
...@@ -196,6 +196,8 @@ ...@@ -196,6 +196,8 @@
196 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 196 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
197 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" 197 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
198 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button> 198 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
199 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
200 v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
199 <el-button type="primary" @click="registerCall">登记调用</el-button> 201 <el-button type="primary" @click="registerCall">登记调用</el-button>
200 </div> 202 </div>
201 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 203 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
...@@ -204,6 +206,9 @@ ...@@ -204,6 +206,9 @@
204 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button> 206 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
205 <el-button type="primary" @click="shdz" v-if="workFlowState">审核</el-button> 207 <el-button type="primary" @click="shdz" v-if="workFlowState">审核</el-button>
206 </div> 208 </div>
209 <div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
210 <el-button type="primary" @click="onSubmitWithoutWorkflow" :disabled="disabled" >提交</el-button>
211 </div>
207 </div> 212 </div>
208 213
209 </template> 214 </template>
...@@ -606,6 +611,22 @@ ...@@ -606,6 +611,22 @@
606 // } 611 // }
607 // }) 612 // })
608 }, 613 },
614
615 onSubmitWithoutWorkflow(){
616 console.log(this.form)
617 let data={
618 glbsm:this.bsm,
619 status:1,
620 type:"dz"
621 }
622 submit(data).then((res)=>{
623 if(res.code===200){
624 this.$message.success("提交完成！");
625 this.getDzDetailByBsm(this.$route.query.bsm)
626 this.getTreeByBsm(this.$route.query.bsm,'dz','0,1,2')
627 }
628 })
629 },
609 getZddm(zdbsm){ 630 getZddm(zdbsm){
610 getQjZdjbxxDetailById(zdbsm).then((res)=>{ 631 getQjZdjbxxDetailById(zdbsm).then((res)=>{
611 if(res.code===200){ 632 if(res.code===200){
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
17 </td> 17 </td>
18 </tr> 18 </tr>
19 <tr height="30"> 19 <tr height="30">
20 <td colspan="2" align="center" >坐落</td> 20 <td colspan="2" align="center" ><i class="requisite">*</i>坐落</td>
21 <td colspan="4" > 21 <td colspan="4" >
22 <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl"> 22 <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl">
23 </td> 23 </td>
24 <td colspan="2" align="center" >不动产单元号</td> 24 <td colspan="2" align="center" ><i class="requisite">*</i>不动产单元号</td>
25 <td colspan="4" class="psr"> 25 <td colspan="4" class="psr">
26 <input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh"> 26 <input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh">
27 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button> 27 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button>
......
...@@ -5,33 +5,22 @@ ...@@ -5,33 +5,22 @@
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 import Lqdcb from "./lqdcb" 8 import Lqdcb from "./lqdcb";
9 export default { 9 export default {
10 name: "", 10 name: "",
11 components: { 11 components: {
12 Lqdcb 12 Lqdcb,
13 }, 13 },
14 props: {}, 14 props: {},
15 data() { 15 data() {
16 return { 16 return {
17 activeName:'lqdcb' 17 activeName: "lqdcb",
18 }; 18 };
19 }, 19 },
20 methods: { 20 methods: {
21 // getZdData(bsm) {
22 // getQjLqjbxxDetailById(bsm).then((res) => {
23 // if (res.success) {
24 // console.log(res, "宗地信息");
25 // this.isFldc = res.result.zdtzmbsm === "PSHGSBDCQJDC000000000000DC440010";
26 // this.isTdcb = res.result.zdtzmbsm === ("PSHGSBDCQJDC000000000000DC440060" || "PSHGSBDCQJDC000000000000DC440070" ||"PSHGSBDCQJDC000000000000DC440080");
27
28 // }
29 // });
30 // },
31 }, 21 },
32 created() {}, 22 created() {},
33 mounted() { 23 mounted() {
34 // this.getZdData(this.$route.query.bsm);
35 }, 24 },
36 computed: { 25 computed: {
37 lhbsm() { 26 lhbsm() {
...@@ -39,9 +28,7 @@ export default { ...@@ -39,9 +28,7 @@ export default {
39 }, 28 },
40 }, 29 },
41 watch: { 30 watch: {
42 lhbsm: function(val) { 31 lhbsm: function(val) {},
43
44 },
45 }, 32 },
46 }; 33 };
47 </script> 34 </script>
......
...@@ -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: {},
......
1 <template>
2 <!-- <el-tabs v-model="activeName"> -->
3 <!-- <el-tab-pane label="个性化管理" name="zhcx"> -->
4 <div class="main">
5 <!-- <p class="tips">查询条件</p> -->
6 <el-form
7 :inline="true"
8 ref="ruleForm"
9 class="demo-form-inline"
10 >
11 <el-form-item label="个性化标题" class="w100" prop="syqlx">
12 <el-input
13 placeholder="输入个性化标题"
14 v-model="queryData.title"
15 @change="getData"
16 ></el-input>
17 </el-form-item>
18 <el-form-item label="个性化代码" class="w100" prop="zdtzm">
19 <el-input
20 placeholder="输入个性化代码"
21 v-model="queryData.code"
22 @change="getData"
23 ></el-input>
24 </el-form-item>
25 <el-form-item class="ml20">
26 <el-button type="primary" @click="getData" icon="el-icon-search"
27 >查询</el-button
28 >
29 <el-button
30 type="warning"
31 style="margin-left:60px"
32 @click="reset"
33 icon="el-icon-refresh"
34 >重置</el-button
35 >
36 </el-form-item>
37 <el-form-item style="margin-left:-20px">
38 <el-button
39 type="primary"
40 @click="gxhVisible = true"
41 icon="el-icon-plus"
42 >新增</el-button
43 >
44 <el-button
45 type="success"
46 style="margin-left:60px"
47 @click="save"
48 icon="el-icon-folder"
49 >保存</el-button
50 >
51 </el-form-item>
52 </el-form>
53 <!-- <p class="tips">查询列表</p> -->
54 <div class="dataGrid" ref="dataGrid">
55 <el-table
56 :data="tableData"
57 :height="tableHeight"
58 >
59 <el-table-column
60 type="index"
61 width="80"
62 align="center"
63 label="序号"
64 >
65 </el-table-column>
66 <el-table-column prop="title" align="center" label="个性化标题">
67 </el-table-column>
68 <el-table-column prop="code" align="center" label="个性化代码">
69 </el-table-column>
70 <el-table-column prop="bz" align="center" label="备注">
71 </el-table-column>
72 <el-table-column prop="open" align="center" label="是否开启">
73 <template slot-scope="scope">
74 <el-switch
75 v-model="scope.row.open"
76 active-value="1"
77 inactive-value="0"
78 active-color="#409EFF"
79 inactive-color="#F56C6C"
80 @change="changeEnabled(scope.row)"
81 />
82 </template>
83 </el-table-column>
84 <!-- <el-table-column width="80px" align="center" label="操作">
85 <template slot-scope="scope">
86 <el-tooltip class="item" effect="light" content="删除" placement="top">
87 <i class="iconfont iconshanchu1" @click="handleClick(scope.row)" style="padding:0 10px"></i>
88 </el-tooltip>
89 </template>
90 </el-table-column> -->
91 </el-table>
92 <div class="pagination">
93 <el-pagination
94 background
95 layout="prev, pager, next,total"
96 :total="total"
97 :current-page="pageNo"
98 :page-size="pageSize"
99 @current-change="handleCurrentChange"
100 >
101 </el-pagination>
102 </div>
103 <el-dialog
104 v-dialogDrag
105 :close-on-click-modal="false"
106 title="新增个性化配置"
107 :visible.sync="gxhVisible"
108 width="30%"
109 >
110 <el-form ref="form" class="addForm" :model="form" label-width="100px">
111 <el-form-item label="个性化标题">
112 <el-input v-model="form.title"></el-input>
113 </el-form-item>
114 <el-form-item label="个性化代码">
115 <el-input v-model="form.code"></el-input>
116 </el-form-item>
117 <el-form-item label="是否开启">
118 <el-switch v-model="form.open" active-value="1" inactive-value="0" ></el-switch>
119 </el-form-item>
120 <el-form-item label="备注">
121 <el-input v-model="form.bz"></el-input>
122 </el-form-item>
123 </el-form>
124 <div class="btnGroup">
125 <el-button type="primary" @click="addGxhData">确定</el-button>
126 <el-button type="primary" @click="gxhVisible = false"
127 >取消</el-button>
128 </div>
129 </el-dialog>
130 </div>
131 </div>
132 <!-- </el-tab-pane> -->
133 <!-- </el-tabs> -->
134 </template>
135
136 <script>
137 import { getGxhList,updateGxh,insertGxh } from "@api/gxhgl";
138
139 export default {
140 name: "",
141 inject: ["getRightTree", "getTreeByBsm"],
142 components: {},
143 props: {},
144 data() {
145 return {
146 activeName: "zhcx",
147 type: "all",
148 total: 0,
149 pageNo: 1,
150 pageSize: 15,
151 tableData: [
152 {
153 title: "宗地坐落必填",
154 code: "ZDZLBT",
155 bz: "宗地坐落必填",
156 open: true,
157 },
158 {
159 title: "宗地附件材料显示",
160 code: "ZDFJCLXS",
161 bz: "宗地附件材料显示",
162 open: false,
163 },
164 ],
165 tableHeight: 0,
166 queryData: {
167 title: "",
168 code: "",
169 },
170 gxhVisible: false,
171 //新增数据
172 form:{
173 title: "",
174 code: "",
175 open:false,
176 bz:''
177 },
178 //已修改的数据
179 hasChanged:[],
180 };
181 },
182 created() {},
183 mounted() {
184 this.getData(this.queryData);
185 this.$nextTick(() => {
186 this.tableHeight =
187 (document.documentElement.clientHeight || document.body.clientHeight) -
188 277;
189 });
190 },
191 methods: {
192 //获取数据
193 getData() {
194 this.queryData.pageSize = this.pageSize;
195 this.queryData.pageNo = this.pageNo;
196 getGxhList(this.queryData).then((res) => {
197 this.tableData = res.result.records
198 this.total = res.result.total
199 // 查询后重置修改项
200 this.hasChanged = [];
201 })
202 .catch((error) => {});
203 //调用查询接口 给tableData赋值 TODO
204 },
205 //新增个性化配置
206 addGxhData() {
207 //调用接口 新增个性化配置数据 传入this.form TODO
208 insertGxh(this.form).then((res) => {
209 if(res.code == 200){
210 this.$message.success("添加成功")
211 this.gxhVisible = false;
212 this.getData();
213 }
214 })
215 .catch((error) => {});
216 },
217 //重置查询条件
218 reset() {
219 this.queryData = {
220 title: "",
221 code: "",
222 pageSize:"15",
223 pageNo:"1",
224 }
225 },
226 //翻页
227 handleCurrentChange(val) {
228 this.pageNo = val;
229 this.getData();
230 },
231 // 是否开启
232 changeEnabled(data) {
233 if(this.hasChanged.some( i => i.bsm == data.bsm)){
234 this.hasChanged.filter(i => i.bsm == data.bsm)
235 }else{
236 this.hasChanged.push(data);
237 }
238 },
239 //保存修改后的数据
240 save(){
241 if(this.hasChanged.length < 1){
242 this.$message.warning("暂无数据修改")
243 }else{
244 //接口调用 hasChanged为已修改数据项数组 TODO
245 updateGxh(this.hasChanged).then((res) => {
246 if(res.code == 200){
247 this.$message.success("修改成功")
248 }
249 this.getData();
250 })
251 .catch((error) => {});
252 }
253 },
254 //删除
255 handleClick(row){
256 //调用删除个性化数据接口，row是整条记录，需要id或者bsm自取 TODO
257 }
258 },
259 computed: {},
260 watch: {},
261 };
262 </script>
263 <style scoped lang="less">
264 .main {
265 width: 100%;
266 height: 100%;
267 box-sizing: border-box;
268 padding: 0 18px 0 0;
269 display: flex;
270 flex-direction: column;
271 //background-color: #F4F9FF;
272 background-color: #f4f9ff;
273
274 .el-form {
275 width: 100%;
276 border: 1px solid #e6e6e6;
277 background-color: white;
278 -webkit-box-sizing: border-box;
279 box-sizing: border-box;
280 padding: 10px 15px;
281 /deep/.el-form-item {
282 margin-bottom: 0;
283 }
284 /deep/.el-form-item__label {
285 width: 100px;
286 }
287 /deep/ .el-form-item__content {
288 width: 300px;
289 .el-select {
290 width: 100%;
291 }
292 }
293 }
294 .addForm{
295 border: 0;
296 /deep/.el-form-item {
297 margin-bottom: 10px;
298 }
299 /deep/ .el-form-item__content {
300 width: auto;
301 }
302 }
303 .tips {
304 color: #9b9b9b;
305 margin-left: 2px;
306 margin-bottom: 10px;
307 }
308 .demo-form-inline {
309 margin: 0 0 18px 0;
310 .moreSearchBtn {
311 background-color: #1ad6e1;
312 border-color: #1ad6e1;
313 }
314 .moreSearchBtn:focus,
315 .moreSearchBtn:hover {
316 background-color: rgba(28, 200, 229, 0.6);
317 }
318 }
319 .dataGrid {
320 flex: 1;
321 .pagination {
322 padding: 18px 0;
323 }
324 }
325 .hbjDialog {
326 /deep/ .el-dialog {
327 margin-top: 10vh !important;
328 }
329 }
330 .btnGroup {
331 margin: 20px auto 0;
332 width: 230px;
333 .el-button+.el-button{
334 margin-left: 90px;
335 }
336 }
337 .ml20 {
338 margin-left: 20px;
339 }
340 .iconfont{
341 cursor: pointer;
342 }
343 }
344 </style>
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane> 3 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
4 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane> 4 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
5 <el-tab-pane label="号段管理" name="hdgl"><hdgl></hdgl></el-tab-pane> 5 <el-tab-pane label="号段管理" name="hdgl"><hdgl></hdgl></el-tab-pane>
6 <el-tab-pane label="个性化管理" name="gxhgl"><gxhgl></gxhgl></el-tab-pane>
6 </el-tabs> 7 </el-tabs>
7 </template> 8 </template>
8 9
...@@ -10,10 +11,11 @@ ...@@ -10,10 +11,11 @@
10 import log from "./log" 11 import log from "./log"
11 import dictionary from "./dictionary" 12 import dictionary from "./dictionary"
12 import hdgl from "./hdgl"; 13 import hdgl from "./hdgl";
14 import gxhgl from "./gxhgl";
13 export default { 15 export default {
14 name: "index", 16 name: "index",
15 components: { 17 components: {
16 log,dictionary,hdgl 18 log,dictionary,hdgl,gxhgl
17 }, 19 },
18 data() { 20 data() {
19 return { 21 return {
......
...@@ -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="不动产权证号">
......
...@@ -157,6 +157,11 @@ ...@@ -157,6 +157,11 @@
157 this.getTreeByBsm(row.glbsm,"gzw",'0,1,2'); 157 this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
158 path = "/gzw"; 158 path = "/gzw";
159 break; 159 break;
160 case "lq":
161 this.$store.state.gzwbsm = row.glbsm;
162 this.getTreeByBsm(row.glbsm,"lq",'0,1,2');
163 path = "/lq";
164 break;
160 default: 165 default:
161 break; 166 break;
162 } 167 }
......
1 <template> 1 <template>
2 <div class="main">暂无登记薄（功能接口开发中）</div> 2 <div class="main">暂无登记薄</div>
3 </template> 3 </template>
4 4
5 <script> 5 <script>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 :on-preview="handlePreview" 7 :on-preview="handlePreview"
8 :on-remove="handleRemove" 8 :on-remove="handleRemove"
9 :before-remove="beforeRemove" 9 :before-remove="beforeRemove"
10 :before-upload="uploadProgress"
10 :on-success="uploadSuccess" 11 :on-success="uploadSuccess"
11 :on-error="uploadError" 12 :on-error="uploadError"
12 :show-file-list="false" 13 :show-file-list="false"
...@@ -143,7 +144,11 @@ ...@@ -143,7 +144,11 @@
143 uploadError(err, file, fileList) { 144 uploadError(err, file, fileList) {
144 console.log("上传文件失败", err) 145 console.log("上传文件失败", err)
145 }, 146 },
147 uploadProgress(){
148 vm.loadingShow('正在上传中')
149 },
146 uploadSuccess(res, file, fileList) { 150 uploadSuccess(res, file, fileList) {
151 this.$message.success("上传成功")
147 this.getFileList(); 152 this.getFileList();
148 }, 153 },
149 handleRemove(file, fileList) { 154 handleRemove(file, fileList) {
......
...@@ -366,6 +366,8 @@ ...@@ -366,6 +366,8 @@
366 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 366 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun" 367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
368 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button> 368 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
369 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
370 v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
369 <el-button type="primary" @click="registerCall">登记调用</el-button> 371 <el-button type="primary" @click="registerCall">登记调用</el-button>
370 </div> 372 </div>
371 </div> 373 </div>
...@@ -375,6 +377,9 @@ ...@@ -375,6 +377,9 @@
375 <el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button> 377 <el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button>
376 <el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button> 378 <el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button>
377 </div> 379 </div>
380 <div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
381 <el-button type="primary" @click="submitZDxxWithoutWorkflow" :disabled="disabled">提交</el-button>
382 </div>
378 </div> 383 </div>
379 </template> 384 </template>
380 385
...@@ -900,6 +905,22 @@ ...@@ -900,6 +905,22 @@
900 // } 905 // }
901 // }) 906 // })
902 }, 907 },
908 //提交宗地基本信息
909 submitZDxxWithoutWorkflow() {
910 let data = {
911 glbsm: this.$store.state.zdbsm,
912 status: 1,
913 type: "zd"
914 }
915 submit(data).then((res) => {
916 if (res.code === 200) {
917 this.$message.success("提交成功！")
918 this.getZdjbxxData(this.curZdbsm);
919 this.$store.state.oldZdbsm = '';
920 this.getRightTree(this.curZdbsm,'0,1,2')
921 }
922 })
923 },
903 getQlrxxData() { 924 getQlrxxData() {
904 // console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据 925 // console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
905 // console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据 926 // console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据
......
1 <template> 1 <template>
2 <div class="main">暂无登记薄（功能接口开发中）</div> 2 <div class="main">暂无登记薄</div>
3 </template> 3 </template>
4 4
5 <script> 5 <script>
......
...@@ -330,6 +330,7 @@ ...@@ -330,6 +330,7 @@
330 :on-preview="handlePreview" 330 :on-preview="handlePreview"
331 :on-remove="handleRemove" 331 :on-remove="handleRemove"
332 :before-remove="beforeRemove" 332 :before-remove="beforeRemove"
333 :before-upload="uploadProgress"
333 :on-success="uploadSuccess" 334 :on-success="uploadSuccess"
334 :on-error="uploadError" 335 :on-error="uploadError"
335 :show-file-list="false" 336 :show-file-list="false"
...@@ -564,7 +565,11 @@ export default { ...@@ -564,7 +565,11 @@ export default {
564 Message.error("上传文件失败") 565 Message.error("上传文件失败")
565 console.log("上传文件失败", err) 566 console.log("上传文件失败", err)
566 }, 567 },
568 uploadProgress(){
569 vm.loadingShow('正在上传中')
570 },
567 uploadSuccess(res, file, fileList) { 571 uploadSuccess(res, file, fileList) {
572 vm.loadingHide();
568 Message.success("上传成功") 573 Message.success("上传成功")
569 this.uploadVisible = false; 574 this.uploadVisible = false;
570 }, 575 },
...@@ -817,6 +822,7 @@ export default { ...@@ -817,6 +822,7 @@ export default {
817 item.style.border = ''; 822 item.style.border = '';
818 item.className = ''; 823 item.className = '';
819 }); 824 });
825 this.bsms=bsms;
820 //清除选中户 826 //清除选中户
821 // this.$refs.lpbContent.clearChoosedH(); 827 // this.$refs.lpbContent.clearChoosedH();
822 this.$nextTick(()=>{ 828 this.$nextTick(()=>{
......
...@@ -275,6 +275,8 @@ ...@@ -275,6 +275,8 @@
275 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 275 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun" 276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
277 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button> 277 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
278 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
279 v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
278 <el-button type="primary" @click="registerCall">登记调用</el-button> 280 <el-button type="primary" @click="registerCall">登记调用</el-button>
279 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> --> 281 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
280 </div> 282 </div>
...@@ -285,6 +287,9 @@ ...@@ -285,6 +287,9 @@
285 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button> 287 <el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
286 <el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button> 288 <el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button>
287 </div> 289 </div>
290 <div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
291 <el-button type="primary" @click="onSubmitWithoutWorkflow" :disabled="disabled" >提交</el-button>
292 </div>
288 </div> 293 </div>
289 </template> 294 </template>
290 295
...@@ -659,6 +664,23 @@ ...@@ -659,6 +664,23 @@
659 // } 664 // }
660 // }) 665 // })
661 }, 666 },
667 onSubmitWithoutWorkflow(){
668 let data={
669 glbsm:this.bsm,
670 status:1,
671 type:"zrz"
672 }
673 submit(data).then((res)=>{
674 if(res.code===200){
675 this.$message.success("提交完成！");
676 this.getZrzDetailByBsm(this.$route.query.bsm);
677 this.$store.state.oldZdbsm = '';
678 this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2')
679 }else{
680 this.$message.error(res.message);
681 }
682 })
683 },
662 shzrz(){ 684 shzrz(){
663 let data = { 685 let data = {
664 bdcdyh:this.form.bdcdyh, 686 bdcdyh:this.form.bdcdyh,
......
...@@ -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": "/",
......