Skip to content

任超 / js.CadastralSystem

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

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

2 parents 23538d49 57ec4db4
Inline Side-by-side
Showing 5 changed files with 262 additions and 165 deletions
...@@ -4,25 +4,107 @@ ...@@ -4,25 +4,107 @@
4 <div class="loading" v-show="isShow"> 4 <div class="loading" v-show="isShow">
5 <div class="content"> 5 <div class="content">
6 <i class="fa fa-spinner fa-pulse fa-3x fa-fw" style="color:#0081FF"></i> 6 <i class="fa fa-spinner fa-pulse fa-3x fa-fw" style="color:#0081FF"></i>
7 <span>{{tips}}</span> 7 <span>{{ tips }}</span>
8 </div> 8 </div>
9 </div> 9 </div>
10 <!-- 审核 -->
11 <el-dialog
12 v-dialogDrag
13 :modal="false"
14 :close-on-click-modal="false"
15 title="审核"
16 :visible.sync="shVisible"
17 width="600px"
18 class="sh-dialog"
19 >
20 <div class="sh-wrap">
21 <el-row :gutter="20">
22 <el-col :span="24">
23 <span class="label">不动产单元号：</span>
24 <span class="value">{{shData.bdcdyh}}</span>
25 </el-col>
26 </el-row>
27 <el-row :gutter="20">
28 <el-col :span="24">
29 <span class="label">坐落：</span>
30 <span class="value">{{shData.zl}}</span>
31 </el-col>
32 </el-row>
33 <el-row :gutter="20">
34 <el-col :span="24">
35 <span class="label">审核意见：</span>
36 <el-input
37 class="value"
38 type="textarea"
39 :rows="2"
40 placeholder="请输入内容"
41 v-model="shData.shyj">
42 </el-input>
43 </el-col>
44 </el-row>
45 <el-row :gutter="20">
46 <el-col :span="12">
47 <span class="label">审核人：</span>
48 <span class="value">{{shData.shr}}</span>
49 </el-col>
50 <el-col :span="12">
51 <span class="label">审核时间：</span>
52 <span class="value">{{shData.shsj}}</span>
53 </el-col>
54 </el-row>
55 </div>
56 <span slot="footer" class="dialog-footer">
57 <el-button type="primary" @click="confirm('sh')">确 定</el-button>
58 <el-button @click="cancel">取 消</el-button>
59 </span>
60 </el-dialog>
61 <!-- 提交 -->
62 <el-dialog
63 v-dialogDrag
64 :close-on-click-modal="false"
65 title="选择审批人"
66 :visible.sync="tjVisible"
67 width="500px"
68 @close="visible = false"
69 :modal-append-to-body="false"
70 >
71 <div class="spr">
72 <el-radio
73 v-model="spr"
74 :label="item.accountNo"
75 v-for="item in sprList"
76 :key="item.accountNo"
77 border
78 >{{ item.name }}</el-radio
79 >
80 </div>
81 <div class="dialog-footer">
82 <el-button type="primary" @click="confirm('tj')">确 定</el-button>
83 <el-button @click="tjVisible = false">取 消</el-button>
84 </div>
85 </el-dialog>
10 </div> 86 </div>
11 </template> 87 </template>
12 88
13 <script> 89 <script>
90 import { rollbackProcess, transitProcess,pretransitProcess } from "@api/user";
14 export default { 91 export default {
15 provide(){ 92 provide() {
16 return{ 93 return {
17 reload:this.reload 94 reload: this.reload,
18 } 95 };
19 }, 96 },
20 data(){ 97 data() {
21 return{ 98 return {
22 isRouterAlive:true, 99 isRouterAlive: true,
23 isShow:false, 100 isShow: false,
24 tips:'正在努力加载中...' 101 tips: "正在努力加载中...",
25 } 102 shVisible:false,
103 shData:{},
104 tjVisible:false,
105 sprList:[],
106 spr:''
107 };
26 }, 108 },
27 mounted() { 109 mounted() {
28 window.addEventListener("unload", this.saveState); 110 window.addEventListener("unload", this.saveState);
...@@ -32,28 +114,92 @@ export default { ...@@ -32,28 +114,92 @@ export default {
32 saveState() { 114 saveState() {
33 sessionStorage.setItem("state", JSON.stringify(this.$store.state)); 115 sessionStorage.setItem("state", JSON.stringify(this.$store.state));
34 }, 116 },
35 reload(){ 117 reload() {
36 this.isRouterAlive = false; 118 this.isRouterAlive = false;
37 this.$nextTick(function () { 119 this.$nextTick(function() {
38 this.isRouterAlive = true; 120 this.isRouterAlive = true;
39 }) 121 });
40 }, 122 },
41 loadingShow(tips){ 123 loadingShow(tips) {
42 this.isShow = true; 124 this.isShow = true;
43 this.tips = tips+'...'; 125 this.tips = tips + "...";
44 }, 126 },
45 loadingHide(){ 127 loadingHide() {
46 this.isShow = false; 128 this.isShow = false;
47 } 129 },
130 //审核内容弹框
131 setShDialog(flag,data){
132 this.shVisible = flag;
133 this.shData = data;
134 console.log(data,'data');
135 },
136 //提交流程弹框
137 setTjDialog(flag){
138 this.tjVisible = flag;
139 },
140 //获取提交的审批人
141 getSpr() {
142 let params = {
143 params: {},
144 workitemInstanceId: this.$route.query.workitemInstanceId,
145 };
146 pretransitProcess(params).then((res) => {
147 this.sprList = res[0].masterActors;
148 this.spr = res[0].masterActors[0].accountNo;
149 });
150 },
151 cancel(){
152 this.shVisible = false;
153 },
154 confirm(type){
155 if (type == 'sh') {
156 let params = {
157 executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
158 message: "",
159 params: {
160 shyj:this.shData.shyj
161 },
162 targetNodes: [],
163 workitemInstanceId:this.$route.query.workitemInstanceId
164 };
165 transitProcess(params).then((res) => {
166 this.$message({
167 type:'success',
168 message:'审核通过'
169 })
170 });
171 }else{
172 let params = {
173 executeActors: this.sprList.filter(i => i.activityInstance == this.spr),
174 message: "",
175 params: {},
176 targetNodes: [],
177 workitemInstanceId:this.$route.query.workitemInstanceId
178 };
179 transitProcess(params).then((res) => {
180 this.$message.success("提交成功！")
181 });
182 }
183 },
184 },
185 watch: {
186 tjVisible: {
187 handler(val) {
188 if (val) {
189 this.getSpr();
190 }
191 },
192 immediate: true,
193 },
48 }, 194 },
49 }; 195 };
50 </script> 196 </script>
51 197
52 <style lang="less"> 198 <style lang="less">
53 #app{ 199 #app {
54 position: relative; 200 position: relative;
55 201
56 .loading{ 202 .loading {
57 width: 100%; 203 width: 100%;
58 height: 100%; 204 height: 100%;
59 // background-color: rgba(255, 255, 255, .3); 205 // background-color: rgba(255, 255, 255, .3);
...@@ -61,13 +207,13 @@ export default { ...@@ -61,13 +207,13 @@ export default {
61 top: 0; 207 top: 0;
62 left: 0; 208 left: 0;
63 z-index: 1000; 209 z-index: 1000;
64 .content{ 210 .content {
65 width: 240px; 211 width: 240px;
66 height: 160px; 212 height: 160px;
67 background: #FFFFFF; 213 background: #ffffff;
68 box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.24); 214 box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.24);
69 border-radius: 4px; 215 border-radius: 4px;
70 border: 1px solid #E6E6E6; 216 border: 1px solid #e6e6e6;
71 box-sizing: border-box; 217 box-sizing: border-box;
72 padding: 32px; 218 padding: 32px;
73 position: absolute; 219 position: absolute;
...@@ -75,53 +221,84 @@ export default { ...@@ -75,53 +221,84 @@ export default {
75 left: 50%; 221 left: 50%;
76 margin-left: -80px; 222 margin-left: -80px;
77 margin-top: -120px; 223 margin-top: -120px;
78 i,span{ 224 i,
225 span {
79 display: block; 226 display: block;
80 margin: 0 auto; 227 margin: 0 auto;
81 text-align: center; 228 text-align: center;
82 } 229 }
83 span{ 230 span {
84 margin-top: 26px; 231 margin-top: 26px;
85 color: #6D7278; 232 color: #6d7278;
86 font-size: 14px; 233 font-size: 14px;
87 } 234 }
88 } 235 }
89 } 236 }
237 .sh-dialog{
238 /deep/.el-dialog__body{
239 padding-bottom: 0!important;
240 }
241
242 .sh-wrap{
243 margin-top: 10px;
244 .el-row{
245 margin: 20px 0;
246 font-size: 16px;
247 .label{
248 display: inline-block;
249 width: 114px;
250 text-align: right;
251 vertical-align: top;
252 }
253 .value{
254 display: inline-block;
255 width: calc(100% - 114px);
256 vertical-align: top;
257 }
258 }
259 }
260 }
261 .spr {
262 margin: 20px 0;
263 }
264 .dialog-footer {
265 text-align: center;
266 }
90 } 267 }
91 .popper-zxx{ 268 .popper-zxx {
92 padding: 0!important; 269 padding: 0 !important;
93 /deep/ .el-tabs__header{ 270 /deep/ .el-tabs__header {
94 margin-bottom: 10px; 271 margin-bottom: 10px;
95 } 272 }
96 ul{ 273 ul {
97 margin-bottom: 10px; 274 margin-bottom: 10px;
98 li{ 275 li {
99 cursor: pointer; 276 cursor: pointer;
100 padding: 8px 16px; 277 padding: 8px 16px;
101 position: relative; 278 position: relative;
102 i{ 279 i {
103 position: absolute; 280 position: absolute;
104 right: 20px; 281 right: 20px;
105 top: 11px; 282 top: 11px;
106 color: #4EB2FF; 283 color: #4eb2ff;
107 display: none; 284 display: none;
108 } 285 }
109 } 286 }
110 li:hover{ 287 li:hover {
111 background: #F0F9FF; 288 background: #f0f9ff;
112 } 289 }
113 .cantClick{ 290 .cantClick {
114 color: #BBB!important; 291 color: #bbb !important;
115 cursor: not-allowed!important; 292 cursor: not-allowed !important;
116 } 293 }
117 .cantClick:hover{ 294 .cantClick:hover {
118 background: #ffffff!important; 295 background: #ffffff !important;
119 } 296 }
120 .choosed{ 297 .choosed {
121 i{ 298 i {
122 display: inline-block; 299 display: inline-block;
123 } 300 }
124 } 301 }
125 } 302 }
126 } 303 }
127 </style>
...\ No newline at end of file ...\ No newline at end of file
304 </style>
......
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>
...@@ -324,7 +324,7 @@ export default { ...@@ -324,7 +324,7 @@ export default {
324 .then((res) => { 324 .then((res) => {
325 console.log(res); 325 console.log(res);
326 if (res.needShow) { 326 if (res.needShow) {
327 // this.getRightTree(res.result,'0,1,2'); 327 this.getRightTree(res.processInstance.title,'0,1,2');
328 this.$message({ 328 this.$message({
329 message: "创建成功！", 329 message: "创建成功！",
330 type: "success", 330 type: "success",
...@@ -332,15 +332,15 @@ export default { ...@@ -332,15 +332,15 @@ export default {
332 this.close(); 332 this.close();
333 // 根据res.processInstance.businessId去查询zdbsm TODO 333 // 根据res.processInstance.businessId去查询zdbsm TODO
334 334
335 // this.$store.state.zdbsm = res.result; 335 this.$store.state.zdbsm = res.processInstance.title;
336 //todo 跳转到宗地基本信息内容表页面 (预留) 336 // todo 跳转到宗地基本信息内容表页面 (预留)
337 // this.close(); 337 this.close();
338 // this.$router.push({ 338 this.$router.push({
339 // path: '/zd', query:{ 339 path: '/zd', query:{
340 // source: 2, 340 source: 2,
341 // bsm:res.result 341 bsm:res.processInstance.title
342 // } 342 }
343 // }); 343 });
344 } else { 344 } else {
345 this.$message.error(res.message); 345 this.$message.error(res.message);
346 } 346 }
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane> 13 <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
14 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 14 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
15 <el-tab-pane label="附件材料" name="fjcl"> 15 <el-tab-pane label="附件材料" name="fjcl">
16 <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 16 <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl>
17 </el-tab-pane>
17 </el-tabs> 18 </el-tabs>
18 <!-- </div> --> 19 <!-- </div> -->
19 </template> 20 </template>
......
...@@ -368,7 +368,9 @@ ...@@ -368,7 +368,9 @@
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 class="sh-btn">
373 <el-button type="primary" @click="shzd">审核</el-button>
372 </div> 374 </div>
373 </div> 375 </div>
374 </template> 376 </template>
...@@ -377,7 +379,6 @@ ...@@ -377,7 +379,6 @@
377 import Qlr from "@components/formMenu/qlr"; 379 import Qlr from "@components/formMenu/qlr";
378 import Qlxz from "@components/formMenu/qlxz"; 380 import Qlxz from "@components/formMenu/qlxz";
379 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 381 import geoUtils from "@components/lineTree/tx/js/geoUtils";
380 import Lcytj from "@components/lcytj"
381 import { 382 import {
382 getAllList, 383 getAllList,
383 getDdicByMC, 384 getDdicByMC,
...@@ -400,7 +401,6 @@ ...@@ -400,7 +401,6 @@
400 components: { 401 components: {
401 Qlr, 402 Qlr,
402 Qlxz, 403 Qlxz,
403 Lcytj
404 }, 404 },
405 props: {}, 405 props: {},
406 data() { 406 data() {
...@@ -481,8 +481,6 @@ ...@@ -481,8 +481,6 @@
481 DJZQDM: "", 481 DJZQDM: "",
482 SYQLXID: "", 482 SYQLXID: "",
483 }, 483 },
484 lcytjVisible:false,
485 workitemInstanceId:'',
486 }; 484 };
487 }, 485 },
488 mixins: [geoUtils], 486 mixins: [geoUtils],
...@@ -857,14 +855,12 @@ ...@@ -857,14 +855,12 @@
857 }, 855 },
858 //提交宗地基本信息 856 //提交宗地基本信息
859 submitZDxx() { 857 submitZDxx() {
860 let data = { 858 vm.setTjDialog(true);
861 glbsm: this.$store.state.zdbsm, 859 // let data = {
862 status: 1, 860 // glbsm: this.$store.state.zdbsm,
863 type: "zd" 861 // status: 1,
864 } 862 // type: "zd"
865 this.lcytjVisible = false; 863 // }
866 this.lcytjVisible = true;
867 this.workitemInstanceId = this.$route.query.workitemInstanceId;
868 // submit(data).then((res) => { 864 // submit(data).then((res) => {
869 // if (res.code === 200) { 865 // if (res.code === 200) {
870 // this.$message.success("提交成功！") 866 // this.$message.success("提交成功！")
...@@ -939,6 +935,17 @@ ...@@ -939,6 +935,17 @@
939 }) 935 })
940 .catch((error) => { 936 .catch((error) => {
941 }); 937 });
938 },
939 //宗地审核流程
940 shzd(){
941 let data = {
942 bdcdyh:this.formData.bdcdyh,
943 zl:this.formData.zl,
944 shyj:'',
945 shr:'admin',
946 shsj:'2021-01-22'
947 }
948 vm.setShDialog(true,data)
942 } 949 }
943 }, 950 },
944 computed: { 951 computed: {
...@@ -1082,5 +1089,14 @@ ...@@ -1082,5 +1089,14 @@
1082 border-color: rgba(0, 202, 205, .8); 1089 border-color: rgba(0, 202, 205, .8);
1083 } 1090 }
1084 } 1091 }
1092 .sh-btn{
1093 position: fixed;
1094 top: 74px;
1095 right: 20px;
1096 z-index: 999;
1097 .el-button{
1098 padding: 10px 30px;
1099 }
1100 }
1085 } 1101 }
1086 </style> 1102 </style>
......