Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
954a99bc by 焦泽平
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents b57394b8 89a7d9c2
Inline Side-by-side
Showing 13 changed files with 349 additions and 140 deletions
...@@ -4,7 +4,7 @@ import request from '@/plugin/axios' ...@@ -4,7 +4,7 @@ import request from '@/plugin/axios'
4 */ 4 */
5 export function getDbxList(data) { 5 export function getDbxList(data) {
6 return request({ 6 return request({
7 url: '/system/basiccommon/queryDbx', 7 url: '/qj/workarea/getDbx',
8 method: 'post', 8 method: 'post',
9 data : data, 9 data : data,
10 }) 10 })
......
...@@ -18,4 +18,34 @@ export function getInfo(token) { ...@@ -18,4 +18,34 @@ export function getInfo(token) {
18 method: 'get', 18 method: 'get',
19 params: { token } 19 params: { token }
20 }) 20 })
21 }
...\ No newline at end of file ...\ No newline at end of file
21 }
22 /**
23 * 创建工作流
24 */
25 export function createProcessInstance(data) {
26 return request({
27 url: '/workflow/createProcessInstance',
28 method: 'post',
29 data: data
30 })
31 }
32 /**
33 * 流程的预提交
34 */
35 export function pretransitProcess(data) {
36 return request({
37 url: '/workflow/pretransitProcess',
38 method: 'post',
39 data: data
40 })
41 }
42 /**
43 * 流程提交
44 */
45 export function transitProcess(data) {
46 return request({
47 url: '/workflow/transitProcess',
48 method: 'post',
49 data: data
50 })
51 }
......
...@@ -369,4 +369,8 @@ ol, ul { list-style:none; } ...@@ -369,4 +369,8 @@ ol, ul { list-style:none; }
369 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { 369 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
370 background-color: #00cacd; 370 background-color: #00cacd;
371 border-color: #00cacd; 371 border-color: #00cacd;
372 }
373 //表格划过行背景色
374 .el-table--enable-row-hover .el-table__body tr:hover>td{
375 background-color: #F5FBFF;
372 } 376 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template>
2 <el-dialog
3 v-dialogDrag
4 :close-on-click-modal="false"
5 title="选择审批人"
6 :visible.sync="visible"
7 width="500px"
8 @close="visible = false"
9 :modal-append-to-body="false"
10 >
11 <div class="spr">
12 <el-radio
13 v-model="spr"
14 :label="item.activityInstance"
15 v-for="item in sprList"
16 :key="item.activityInstance"
17 border
18 >{{ item.name }}</el-radio
19 >
20 </div>
21 <div class="dialog-footer">
22 <el-button type="primary" @click="confirm">确 定</el-button>
23 <el-button @click="visible = false">取 消</el-button>
24 </div>
25 </el-dialog>
26 </template>
27
28 <script>
29 import { pretransitProcess, transitProcess } from "@api/user";
30 export default {
31 name: "",
32 components: {},
33 props: {
34 visible: {
35 type: Boolean,
36 default: function() {
37 return false;
38 },
39 },
40 workitemInstanceId: {
41 type: String,
42 default: "",
43 },
44 },
45 data() {
46 return {
47 spr: "",
48 sprList: [],
49 };
50 },
51 created() {},
52 mounted() {},
53 methods: {
54 confirm() {
55 let params = {
56 executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
57 message: "",
58 params: {},
59 targetNodes: [],
60 workitemInstanceId:this.$route.query.workitemInstanceId
61 };
62 transitProcess(params).then((res) => {
63 this.$message.success("提交成功！")
64 });
65 },
66 getSpr() {
67 let params = {
68 params: {},
69 workitemInstanceId: this.$route.query.workitemInstanceId,
70 };
71 pretransitProcess(params).then((res) => {
72 this.sprList = res[0].masterActors;
73 this.spr = res[0].masterActors[0].activityInstance;
74 });
75 },
76 },
77 computed: {},
78 watch: {
79 visible: {
80 handler(val) {
81 if (val) {
82 this.getSpr();
83 }
84 },
85 immediate: true,
86 },
87 },
88 };
89 </script>
90 <style scoped lang="less">
91 .spr {
92 margin: 20px 0;
93 }
94 .dialog-footer {
95 text-align: center;
96 }
97 </style>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <el-button type="primary" icon="iconfont iconshangchuan">上传</el-button> 18 <el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
19 </el-upload> 19 </el-upload>
20 </div> 20 </div>
21 <el-button type="primary" class="download" @click="downloadTemplate">下载模板</el-button> 21 <el-button type="primary" class="download" @click="downloadTemplate" icon="iconfont iconxiazai1">下载模板</el-button>
22 </div> 22 </div>
23 <ul> 23 <ul>
24 <li v-for="(item,index) in errorData" :key="index">{{item}}</li> 24 <li v-for="(item,index) in errorData" :key="index">{{item}}</li>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="card"> 2 <div class="main">
3 <div class="main"> 3 <!-- <p class="tips">查询条件</p> -->
4 <!-- <p class="tips">查询条件</p> --> 4 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
5 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 5 <!-- <p class="tips">查询列表</p> -->
6 <!-- <p class="tips">查询列表</p> --> 6 <div class="dataGrid" ref="dataGrid">
7 <div class="dataGrid" ref="dataGrid"> 7 <el-table
8 <el-table 8 :data="tableData"
9 :data="tableData" 9 :height="tableHeight"
10 :height="tableHeight" 10 :row-class-name="tableRowClassName"
11 :row-class-name="tableRowClassName" 11 @row-dblclick="doubleClick"
12 @row-dblclick="doubleClick" 12 >
13 > 13 <el-table-column type="index" width="80" align="center" label="序号">
14 <el-table-column type="index" width="80" align="center" label="序号"> 14 </el-table-column>
15 </el-table-column> 15 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
16 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 16 </el-table-column>
17 </el-table-column> 17 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
18 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 18 </el-table-column>
19 </el-table-column> 19 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
20 <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> 20 </el-table-column>
21 </el-table-column> 21 <el-table-column prop="dylx" align="left" width="100" label="类型">
22 <el-table-column prop="dylx" align="left" width="100" label="类型"> 22 <template slot-scope="scope">
23 <template slot-scope="scope"> 23 {{scope.row.dylx | bdcLxFilter}}
24 {{scope.row.dylx | bdcLxFilter}} 24 </template>
25 </template> 25 </el-table-column>
26 </el-table-column> 26 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
27 <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> 27 </el-table-column>
28 </el-table-column> 28 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
29 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 29 <el-table-column prop="addtime" align="left" width="120" label="转入时间">
30 <el-table-column prop="addtime" align="left" width="120" label="转入时间"> 30 <template slot-scope="scope">
31 <template slot-scope="scope"> 31 {{scope.row.addtime | timeFilter}}
32 {{scope.row.addtime | timeFilter}} 32 </template>
33 </template> 33 </el-table-column>
34 </el-table-column> 34 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
35 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人"> 35 </el-table-column> -->
36 </el-table-column> --> 36 <el-table-column label="操作" align="center" width="100">
37 <el-table-column label="操作" align="center" width="100"> 37 <template slot-scope="scope">
38 <template slot-scope="scope"> 38 <el-tooltip class="item" effect="light" content="查看" placement="top">
39 <el-tooltip class="item" effect="light" content="查看" placement="top"> 39 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
40 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i> 40 </el-tooltip>
41 </el-tooltip> 41 <el-tooltip class="item" effect="light" content="定位" placement="top">
42 <el-tooltip class="item" effect="light" content="定位" placement="top"> 42 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
43 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i> 43 </el-tooltip>
44 </el-tooltip> 44 </template>
45 </template> 45 </el-table-column>
46 </el-table-column> 46 </el-table>
47 </el-table> 47 <div class="pagination">
48 <div class="pagination"> 48 <el-pagination background layout="prev, pager, next,total" :total="total"
49 <el-pagination background layout="prev, pager, next,total" :total="total" 49 :current-page="pageNo" :page-size="pageSize" @current-change="handleCurrentChange">
50 :current-page="pageNo" :page-size="pageSize" @current-change="handleCurrentChange"> 50 </el-pagination>
51 </el-pagination>
52 </div>
53
54 </div> 51 </div>
52
55 </div> 53 </div>
56 </el-tabs> 54 </div>
57 </template> 55 </template>
58 56
59 <script> 57 <script>
...@@ -67,7 +65,7 @@ ...@@ -67,7 +65,7 @@
67 props: {}, 65 props: {},
68 data() { 66 data() {
69 return { 67 return {
70 activeName:'zhcx', 68 activeName:'dbx',
71 type:'add', 69 type:'add',
72 total: 0, 70 total: 0,
73 pageNo: 1, 71 pageNo: 1,
...@@ -161,7 +159,8 @@ ...@@ -161,7 +159,8 @@
161 query: { 159 query: {
162 bsm: row.glbsm, 160 bsm: row.glbsm,
163 source: 2, 161 source: 2,
164 auth: '0,1,2' 162 auth: '0,1,2',
163 workitemInstanceId:row.id
165 } 164 }
166 }); 165 });
167 }, 166 },
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="card" @tab-remove="removeTab"> 2 <el-tabs v-model="activeName" @tab-remove="removeTab">
3 <el-tab-pane label="待办箱" name="dbx"><dbxInfo></dbxInfo></el-tab-pane> 3 <el-tab-pane label="待办箱" name="dbx"><dbxInfo></dbxInfo></el-tab-pane>
4 <!-- <el-tab-pane--> 4 <!-- <el-tab-pane-->
5 <!-- v-for="(item, index) in editableTabs"--> 5 <!-- v-for="(item, index) in editableTabs"-->
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
11 <!-- </el-tab-pane>--> 11 <!-- </el-tab-pane>-->
12 </el-tabs> 12 </el-tabs>
13 </template> 13 </template>
14
15 <script> 14 <script>
16 import dbxInfo from "@/views/dbx/dbxinfo/index" 15 import dbxInfo from "@/views/dbx/dbxinfo/index"
17 16
...@@ -62,7 +61,6 @@ ...@@ -62,7 +61,6 @@
62 } 61 }
63 }); 62 });
64 } 63 }
65
66 this.activeName = activeName; 64 this.activeName = activeName;
67 this.editableTabs = tabs.filter(tab => tab.name !== targetName); 65 this.editableTabs = tabs.filter(tab => tab.name !== targetName);
68 }, 66 },
......
1 <template> 1 <template>
2 <div class="log-content"> 2 <div class="main">
3 <div class="log-search"> 3 <div class="log-search">
4 字典名称： 4 字典名称：
5 <el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input> 5 <el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input>
6 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button> 6 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
7 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button> 7 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
8 </div> 8 </div>
9 <div class="log-detail"> 9 <div class="log-detail" :style="{ height: dicHeight+'px' }">
10 <div class="log-menu"> 10 <div class="log-menu">
11 <div style="height: 40px"> 11 <div style="height: 40px">
12 <span class="menu-title"> 12 <span class="menu-title">
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
33 <div class="log-table"> 33 <div class="log-table">
34 <el-table 34 <el-table
35 :data="concreteDic" 35 :data="concreteDic"
36 style="width: 100%;margin-bottom: 20px;"
37 row-key="bsm" 36 row-key="bsm"
37 height="100%"
38 border 38 border
39 :default-expand-all="false" 39 :default-expand-all="false"
40 :row-class-name="tableRowClassName"
40 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 41 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
41 <el-table-column prop="mc" align="center" label="名称"> 42 <el-table-column prop="mc" align="center" label="名称">
42 </el-table-column> 43 </el-table-column>
...@@ -174,7 +175,7 @@ ...@@ -174,7 +175,7 @@
174 }, 175 },
175 startValue: '', 176 startValue: '',
176 endValue:'', 177 endValue:'',
177 178 dicHeight:0,
178 } 179 }
179 }, 180 },
180 methods:{ 181 methods:{
...@@ -303,9 +304,19 @@ ...@@ -303,9 +304,19 @@
303 removeStorage(){ 304 removeStorage(){
304 sessionStorage.removeItem("state"); 305 sessionStorage.removeItem("state");
305 }, 306 },
307 tableRowClassName({ row, rowIndex }) {
308 if (rowIndex % 2 !== 0) {
309 return "even-row";
310 } else {
311 return "";
312 }
313 },
306 }, 314 },
307 mounted() { 315 mounted() {
308 this.getData(); 316 this.getData();
317 this.$nextTick(() => {
318 this.dicHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 237;
319 })
309 }, 320 },
310 watch:{ 321 watch:{
311 menuvisible(value) { 322 menuvisible(value) {
...@@ -319,7 +330,7 @@ ...@@ -319,7 +330,7 @@
319 } 330 }
320 </script> 331 </script>
321 332
322 <style scoped> 333 <style scoped lang="less">
323 .log-content{ 334 .log-content{
324 width: 100%; 335 width: 100%;
325 /*border: 1px solid red;*/ 336 /*border: 1px solid red;*/
...@@ -336,24 +347,23 @@ ...@@ -336,24 +347,23 @@
336 margin-top: 10px; 347 margin-top: 10px;
337 width: 100%; 348 width: 100%;
338 border: 1px solid #E6E6E6; 349 border: 1px solid #E6E6E6;
339 height: 900px;
340 overflow: scroll;
341 background-color: white; 350 background-color: white;
351 box-sizing: border-box;
352 padding: 6px;
342 } 353 }
343 354
344 .log-menu{ 355 .log-menu{
345 width: 17%; 356 width: 17%;
346 float: left; 357 float: left;
347 height: 900px; 358 height: 100%;
348 overflow: scroll; 359 overflow-y: scroll;
349 border-right: 1px solid #E6E6E6; 360 border-right: 1px solid #E6E6E6;
350 } 361 }
351 362
352 .log-table{ 363 .log-table{
353 width: 81%; 364 width: 81%;
354 float: right; 365 float: right;
355 height: 900px; 366 height: 100%;
356 overflow: scroll;
357 } 367 }
358 368
359 .el-button { 369 .el-button {
...@@ -364,9 +374,13 @@ ...@@ -364,9 +374,13 @@
364 font-weight: bold; 374 font-weight: bold;
365 font-size: 20px; 375 font-size: 20px;
366 margin-top: 20px; 376 margin-top: 20px;
367 margin-left: 5px;
368 float: left; 377 float: left;
369 width: 100% 378 width: 100%;
379 text-indent: 10px;
380 .el-button {
381 position: relative;
382 top: -2px;
383 }
370 } 384 }
371 385
372 ul{ 386 ul{
......
1 <template> 1 <template>
2 <div class="log-content"> 2 <div class="main">
3 <div class="log-search"> 3 <div class="log-search">
4 开始时间： 4 开始时间：
5 <el-date-picker 5 <el-date-picker
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </el-dialog> 47 </el-dialog>
48 48
49 <div class="log-table"> 49 <div class="log-table">
50 <el-table :data="tableData"> 50 <el-table :data="tableData" :height="tableHeight" :row-class-name="tableRowClassName">
51 <el-table-column type="index" width="80" align="center" label="序号"> 51 <el-table-column type="index" width="80" align="center" label="序号">
52 </el-table-column> 52 </el-table-column>
53 <el-table-column prop="operationtype" align="center" label="操作类型"> 53 <el-table-column prop="operationtype" align="center" label="操作类型">
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 84
85 total: 0, 85 total: 0,
86 pageNo: 1, 86 pageNo: 1,
87 pageSize: 50, 87 pageSize: 15,
88 88
89 outerVisible: false, 89 outerVisible: false,
90 innerVisible: false, 90 innerVisible: false,
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 }, 114 },
115 startValue: '', 115 startValue: '',
116 endValue:'', 116 endValue:'',
117 117 tableHeight: 0,
118 } 118 }
119 }, 119 },
120 methods:{ 120 methods:{
...@@ -140,11 +140,12 @@ ...@@ -140,11 +140,12 @@
140 "startTime": this.startValue, 140 "startTime": this.startValue,
141 "endTime": this.endValue, 141 "endTime": this.endValue,
142 "pageNo": 1, 142 "pageNo": 1,
143 "pageSize": 50 143 "pageSize": 15
144 }; 144 };
145 getLogData(data).then((res)=>{ 145 getLogData(data).then((res)=>{
146 console.log(res.result); 146 console.log(res.result);
147 this.tableData = res.result.records; 147 this.tableData = res.result.records;
148 this.total = res.result.total
148 }) 149 })
149 }, 150 },
150 getError(){ 151 getError(){
...@@ -167,10 +168,20 @@ ...@@ -167,10 +168,20 @@
167 openDetail(data){ 168 openDetail(data){
168 this.operationDataVisible = true; 169 this.operationDataVisible = true;
169 this.currentOperationData = data.operationJson; 170 this.currentOperationData = data.operationJson;
170 } 171 },
172 tableRowClassName({ row, rowIndex }) {
173 if (rowIndex % 2 !== 0) {
174 return "even-row";
175 } else {
176 return "";
177 }
178 },
171 }, 179 },
172 mounted() { 180 mounted() {
173 this.getData(); 181 this.getData();
182 this.$nextTick(() => {
183 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 290;
184 })
174 } 185 }
175 } 186 }
176 </script> 187 </script>
...@@ -191,7 +202,7 @@ ...@@ -191,7 +202,7 @@
191 .log-table{ 202 .log-table{
192 margin-top: 10px; 203 margin-top: 10px;
193 width: 100%; 204 width: 100%;
194 border: 1px solid #E6E6E6; 205 box-shadow: 0 2px 15px 1px rgba(49, 132, 245, 0.1);
195 } 206 }
196 .el-button { 207 .el-button {
197 width: 100px; 208 width: 100px;
......
...@@ -161,6 +161,7 @@ import { insertQjZdjbxx } from "@api/zd"; ...@@ -161,6 +161,7 @@ import { insertQjZdjbxx } from "@api/zd";
161 import { insertZrzjbxx } from "@api/zrz"; 161 import { insertZrzjbxx } from "@api/zrz";
162 import { insertDzjbxx } from "@api/dz"; 162 import { insertDzjbxx } from "@api/dz";
163 import { insertGzwjbxx } from "@api/gzw"; 163 import { insertGzwjbxx } from "@api/gzw";
164 import { createProcessInstance } from "@api/user";
164 165
165 export default { 166 export default {
166 name: "", 167 name: "",
...@@ -196,6 +197,7 @@ export default { ...@@ -196,6 +197,7 @@ export default {
196 userbsm: "", 197 userbsm: "",
197 xmmc: "", 198 xmmc: "",
198 xzqbsm: "", 199 xzqbsm: "",
200 type: "zd",
199 zdtzmbsm: "" 201 zdtzmbsm: ""
200 }, 202 },
201 ruleForm1:{ 203 ruleForm1:{
...@@ -291,24 +293,54 @@ export default { ...@@ -291,24 +293,54 @@ export default {
291 newZd() { 293 newZd() {
292 this.$refs['ruleForm'].validate((valid) => { 294 this.$refs['ruleForm'].validate((valid) => {
293 if (valid) { 295 if (valid) {
294 insertQjZdjbxx(this.ruleForm) 296 // insertQjZdjbxx(this.ruleForm)
297 // .then((res) => {
298 // console.log(res.result);
299 // if (res.code == "200") {
300 // this.getRightTree(res.result,'0,1,2');
301 // this.$message({
302 // message: "创建成功！",
303 // type: "success",
304 // });
305 // this.$store.state.zdbsm = res.result;
306 // //todo 跳转到宗地基本信息内容表页面 (预留)
307 // this.close();
308 // this.$router.push({
309 // path: '/zd', query:{
310 // source: 2,
311 // bsm:res.result
312 // }
313 // });
314 // } else {
315 // this.$message.error(res.message);
316 // }
317 // })
318 // .catch((error) => {});
319 let data = {
320 params:this.ruleForm,
321 workflowName:'新建1'
322 }
323 createProcessInstance(data)
295 .then((res) => { 324 .then((res) => {
296 console.log(res.result); 325 console.log(res);
297 if (res.code == "200") { 326 if (res.needShow) {
298 this.getRightTree(res.result,'0,1,2'); 327 // this.getRightTree(res.result,'0,1,2');
299 this.$message({ 328 this.$message({
300 message: "创建成功！", 329 message: "创建成功！",
301 type: "success", 330 type: "success",
302 }); 331 });
303 this.$store.state.zdbsm = res.result;
304 //todo 跳转到宗地基本信息内容表页面 (预留)
305 this.close(); 332 this.close();
306 this.$router.push({ 333 // 根据res.processInstance.businessId去查询zdbsm TODO
307 path: '/zd', query:{ 334
308 source: 2, 335 // this.$store.state.zdbsm = res.result;
309 bsm:res.result 336 //todo 跳转到宗地基本信息内容表页面 (预留)
310 } 337 // this.close();
311 }); 338 // this.$router.push({
339 // path: '/zd', query:{
340 // source: 2,
341 // bsm:res.result
342 // }
343 // });
312 } else { 344 } else {
313 this.$message.error(res.message); 345 this.$message.error(res.message);
314 } 346 }
...@@ -499,6 +531,7 @@ export default { ...@@ -499,6 +531,7 @@ export default {
499 margin-left: 20px; 531 margin-left: 20px;
500 margin-top: 20px; 532 margin-top: 20px;
501 /deep/.el-tabs__content{ 533 /deep/.el-tabs__content{
534 background-color: #fff!important;
502 position: relative!important; 535 position: relative!important;
503 } 536 }
504 .el-tabs__item{ 537 .el-tabs__item{
......
...@@ -364,10 +364,11 @@ ...@@ -364,10 +364,11 @@
364 </tr> 364 </tr>
365 </table> 365 </table>
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 el-icon-search">保存</el-button> 367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button>
368 <el-button type="primary" @click="submitZDxx" :disabled="disabled">提交</el-button> 368 <el-button type="primary" @click="submitZDxx" :disabled="disabled">提交</el-button>
369 <el-button type="primary" @click="registerCall">登记调用</el-button> 369 <el-button type="primary" @click="registerCall">登记调用</el-button>
370 </div> 370 </div>
371 <Lcytj :visible="lcytjVisible" :workitemInstanceId="workitemInstanceId"></Lcytj>
371 </div> 372 </div>
372 </div> 373 </div>
373 </template> 374 </template>
...@@ -376,6 +377,7 @@ ...@@ -376,6 +377,7 @@
376 import Qlr from "@components/formMenu/qlr"; 377 import Qlr from "@components/formMenu/qlr";
377 import Qlxz from "@components/formMenu/qlxz"; 378 import Qlxz from "@components/formMenu/qlxz";
378 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 379 import geoUtils from "@components/lineTree/tx/js/geoUtils";
380 import Lcytj from "@components/lcytj"
379 import { 381 import {
380 getAllList, 382 getAllList,
381 getDdicByMC, 383 getDdicByMC,
...@@ -398,11 +400,11 @@ ...@@ -398,11 +400,11 @@
398 components: { 400 components: {
399 Qlr, 401 Qlr,
400 Qlxz, 402 Qlxz,
403 Lcytj
401 }, 404 },
402 props: {}, 405 props: {},
403 data() { 406 data() {
404 return { 407 return {
405
406 //树型结构 408 //树型结构
407 show: true, 409 show: true,
408 clearable: true, 410 clearable: true,
...@@ -478,7 +480,9 @@ ...@@ -478,7 +480,9 @@
478 BHQKID: "", 480 BHQKID: "",
479 DJZQDM: "", 481 DJZQDM: "",
480 SYQLXID: "", 482 SYQLXID: "",
481 } 483 },
484 lcytjVisible:false,
485 workitemInstanceId:'',
482 }; 486 };
483 }, 487 },
484 mixins: [geoUtils], 488 mixins: [geoUtils],
...@@ -858,14 +862,17 @@ ...@@ -858,14 +862,17 @@
858 status: 1, 862 status: 1,
859 type: "zd" 863 type: "zd"
860 } 864 }
861 submit(data).then((res) => { 865 this.lcytjVisible = false;
862 if (res.code === 200) { 866 this.lcytjVisible = true;
863 this.$message.success("提交成功！") 867 this.workitemInstanceId = this.$route.query.workitemInstanceId;
864 this.getZdjbxxData(this.curZdbsm); 868 // submit(data).then((res) => {
865 this.$store.state.oldZdbsm = ''; 869 // if (res.code === 200) {
866 this.getRightTree(this.curZdbsm,'0,1,2') 870 // this.$message.success("提交成功！")
867 } 871 // this.getZdjbxxData(this.curZdbsm);
868 }) 872 // this.$store.state.oldZdbsm = '';
873 // this.getRightTree(this.curZdbsm,'0,1,2')
874 // }
875 // })
869 }, 876 },
870 getQlrxxData() { 877 getQlrxxData() {
871 // console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据 878 // console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
...@@ -1066,6 +1073,9 @@ ...@@ -1066,6 +1073,9 @@
1066 .saveBtn { 1073 .saveBtn {
1067 background-color: #00CACD; 1074 background-color: #00CACD;
1068 border-color: #00CACD; 1075 border-color: #00CACD;
1076 /deep/.iconfont{
1077 font-size: 14px;
1078 }
1069 } 1079 }
1070 .saveBtn:hover { 1080 .saveBtn:hover {
1071 background-color: rgba(0, 202, 205, .8); 1081 background-color: rgba(0, 202, 205, .8);
......
...@@ -592,9 +592,9 @@ ...@@ -592,9 +592,9 @@
592 registerCall(data).then(res=>{ 592 registerCall(data).then(res=>{
593 if (res.success) { 593 if (res.success) {
594 this.$message.success("登记成功") 594 this.$message.success("登记成功")
595 if(this.lpbParent === 'isLpb'){ 595 // if(this.lpbParent === 'isLpb'){
596 this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx); 596 this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
597 } 597 // }
598 this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2') 598 this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2')
599 } 599 }
600 }) 600 })
......
...@@ -5,34 +5,34 @@ ...@@ -5,34 +5,34 @@
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
6 <tbody> 6 <tbody>
7 <tr height="30"> 7 <tr height="30">
8 <td colspan="12" align="center" ><font size="4">幢单元基本信息</font></td> 8 <td colspan="12" align="center" ><font size="4">幢单元基本信息</font></td>
9 </tr> 9 </tr>
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >幢单元号</td> 11 <td colspan="2" align="center" class="tdright">幢单元号</td>
12 <td colspan="4" > 12 <td colspan="4" >
13 <el-input v-model="form.zdyh"></el-input> 13 <el-input v-model="form.zdyh"></el-input>
14 </td> 14 </td>
15 <td colspan="2" align="center" >幢单元名称</td> 15 <td colspan="2" align="center" class="tdright"><i class="requisite">*</i>幢单元名称</td>
16 <td colspan="4" > 16 <td colspan="4" >
17 <el-input v-model="form.zdymc"></el-input> 17 <el-input v-model="form.zdymc" ref="zdymc"></el-input>
18 </td> 18 </td>
19 </tr> 19 </tr>
20 <tr height="30"> 20 <tr height="30">
21 <td colspan="2" align="center" >地上层数</td> 21 <td colspan="2" align="center" class="tdright">地上层数</td>
22 <td colspan="4" > 22 <td colspan="4" >
23 <el-input v-model="form.dscs"></el-input> 23 <el-input v-model="form.dscs"></el-input>
24 </td> 24 </td>
25 <td colspan="2" align="center" >地下层数</td> 25 <td colspan="2" align="center" class="tdright">地下层数</td>
26 <td colspan="4" > 26 <td colspan="4" >
27 <el-input v-model="form.dxcs"></el-input> 27 <el-input v-model="form.dxcs"></el-input>
28 </td> 28 </td>
29 </tr> 29 </tr>
30 <tr height="30"> 30 <tr height="30">
31 <td colspan="2" align="center" >总层数</td> 31 <td colspan="2" align="center" class="tdright">总层数</td>
32 <td colspan="4" > 32 <td colspan="4" >
33 <el-input v-model="form.zcs"></el-input> 33 <el-input v-model="form.zcs"></el-input>
34 </td> 34 </td>
35 <td colspan="2" align="center" >备注</td> 35 <td colspan="2" align="center" class="tdright">备注</td>
36 <td colspan="4" > 36 <td colspan="4" >
37 <el-input v-model="form.bz"></el-input> 37 <el-input v-model="form.bz"></el-input>
38 </td> 38 </td>
...@@ -93,32 +93,37 @@ ...@@ -93,32 +93,37 @@
93 submitForm(formName,zrzbsm,ljzbsm) { 93 submitForm(formName,zrzbsm,ljzbsm) {
94 this.form.zrzbsm=zrzbsm; 94 this.form.zrzbsm=zrzbsm;
95 this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm; 95 this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm;
96 //判断zdybsm是否为空，不为空的时候是编辑，为空的时候是新增 96 if (this.form.zdymc == '') {
97 if (this.zdybsm == '') { 97 this.$message.warning("请完善表单后再继续操作");
98 this.$refs[formName].validate((valid) => { 98 this.$refs.zdymc.$el.style.border = '1px solid red';
99 if (valid) {
100 insertZdyInfo(this.form).then((res)=>{
101 if(res.code===200){
102 this.$message.success("保存成功!")
103 //更新树结构数据
104 this.$parent.$parent.getLpbMenuTree(zrzbsm);
105 //关闭弹框
106 this.$parent.$parent.closeDaialog()
107 }
108 return true;
109 })
110 } else {
111 console.log('error submit!!');
112 return false;
113 }
114 });
115 }else{ 99 }else{
116 //编辑幢单元接口 100 //判断zdybsm是否为空，不为空的时候是编辑，为空的时候是新增
117 updateQjZdy(this.form).then((res)=>{ 101 if (this.zdybsm == '') {
118 if(res.code === 200){ 102 this.$refs[formName].validate((valid) => {
119 this.$message.success("保存成功") 103 if (valid) {
120 } 104 insertZdyInfo(this.form).then((res)=>{
121 }) 105 if(res.code===200){
106 this.$message.success("保存成功!")
107 //更新树结构数据
108 this.$parent.$parent.getLpbMenuTree(zrzbsm);
109 //关闭弹框
110 this.$parent.$parent.closeDaialog()
111 }
112 return true;
113 })
114 } else {
115 console.log('error submit!!');
116 return false;
117 }
118 });
119 }else{
120 //编辑幢单元接口
121 updateQjZdy(this.form).then((res)=>{
122 if(res.code === 200){
123 this.$message.success("保存成功")
124 }
125 })
126 }
122 } 127 }
123 }, 128 },
124 getZdyInfo(bsm){ 129 getZdyInfo(bsm){
...@@ -150,6 +155,14 @@ ...@@ -150,6 +155,14 @@
150 }, 155 },
151 immediate: true 156 immediate: true
152 }, 157 },
158 "form.zdymc":{
159 handler: function (item) {
160 if(item!=''){
161 this.$refs.zdymc.$el.style.border = '';
162 }
163 },
164 immediate: true
165 },
153 } 166 }
154 } 167 }
155 </script> 168 </script>
......