85972a8e by xiaomiao

--no commit message

1 parent dcde6da8
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
20 此环节为流程最后环节,转出后流程将结束 20 此环节为流程最后环节,转出后流程将结束
21 </el-form-item> 21 </el-form-item>
22 </el-form> 22 </el-form>
23 <div class="invalid-reson">审批意见:</div> 23 <div v-if="this.formData.showidea">
24 <div class="invalid-reson">审批意见:</div>
24 <el-input 25 <el-input
25 class="opinion" 26 class="opinion"
26 v-model="shyj" 27 v-model="shyj"
...@@ -28,6 +29,8 @@ ...@@ -28,6 +29,8 @@
28 type="textarea" 29 type="textarea"
29 :rows="4" 30 :rows="4"
30 ></el-input> 31 ></el-input>
32 </div>
33
31 <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> --> 34 <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
32 <el-button style="float: right" @click="cancelBack">取消转出</el-button> 35 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
33 <el-button type="primary" @click="submitForm" style="float: right" 36 <el-button type="primary" @click="submitForm" style="float: right"
......
...@@ -387,7 +387,6 @@ export default { ...@@ -387,7 +387,6 @@ export default {
387 dname: "历史", 387 dname: "历史",
388 }, 388 },
389 ], 389 ],
390 tdxz: null,
391 isShow: false, 390 isShow: false,
392 disabled: true, 391 disabled: true,
393 czrOptions: [], 392 czrOptions: [],
...@@ -462,11 +461,11 @@ export default { ...@@ -462,11 +461,11 @@ export default {
462 this.ssqlxxshow = false; 461 this.ssqlxxshow = false;
463 } 462 }
464 this.$endLoading(); 463 this.$endLoading();
465 if (this.ruleForm.tdytqxList.length > 0) { 464 // if (this.ruleForm.tdytqxList.length > 0) {
466 this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm; 465 // this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
467 } else { 466 // } else {
468 this.tdxz = null; 467 // this.tdxz = null;
469 } 468 // }
470 this.isShow = true; 469 this.isShow = true;
471 } 470 }
472 }); 471 });
......
...@@ -19,7 +19,7 @@ import { ...@@ -19,7 +19,7 @@ import {
19 } from "@/api/workFlow.js"; 19 } from "@/api/workFlow.js";
20 import { mapGetters } from 'vuex' 20 import { mapGetters } from 'vuex'
21 export default { 21 export default {
22 data () { 22 data() {
23 return { 23 return {
24 //是否开启材料分屏 24 //是否开启材料分屏
25 splitScreen: false, 25 splitScreen: false,
...@@ -35,10 +35,12 @@ export default { ...@@ -35,10 +35,12 @@ export default {
35 batchButtonName: '', 35 batchButtonName: '',
36 // 受理申请信息 36 // 受理申请信息
37 slsq: {}, 37 slsq: {},
38 ableOperation: true 38 ableOperation: true,
39 showidea: false
40
39 } 41 }
40 }, 42 },
41 mounted () { 43 mounted() {
42 this.flowInitParam(); 44 this.flowInitParam();
43 }, 45 },
44 methods: { 46 methods: {
...@@ -47,7 +49,7 @@ export default { ...@@ -47,7 +49,7 @@ export default {
47 * @description: 加载流程初始参数 49 * @description: 加载流程初始参数
48 * @author: renchao 50 * @author: renchao
49 */ 51 */
50 flowInitParam () { 52 flowInitParam() {
51 var formdata = new FormData(); 53 var formdata = new FormData();
52 54
53 formdata.append("bsmSlsq", this.bsmSlsq); 55 formdata.append("bsmSlsq", this.bsmSlsq);
...@@ -58,6 +60,10 @@ export default { ...@@ -58,6 +60,10 @@ export default {
58 stepExpandInfo(formdata).then((res) => { 60 stepExpandInfo(formdata).then((res) => {
59 if (res.code === 200) { 61 if (res.code === 200) {
60 this.leftButtonList = res.result.button; 62 this.leftButtonList = res.result.button;
63 if (res.result.properties.length) {
64 this.showidea = res.result.properties[0].value
65 }
66
61 this.rightButtonList = res.result.operation; 67 this.rightButtonList = res.result.operation;
62 let arr = this.rightButtonList.filter((item) => { 68 let arr = this.rightButtonList.filter((item) => {
63 return item.name == "删除" 69 return item.name == "删除"
...@@ -79,7 +85,7 @@ export default { ...@@ -79,7 +85,7 @@ export default {
79 * @param {*} item 85 * @param {*} item
80 * @author: renchao 86 * @author: renchao
81 */ 87 */
82 operation (item) { 88 operation(item) {
83 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿 89 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
84 //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout 90 //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout
85 let that = this; 91 let that = this;
...@@ -107,21 +113,21 @@ export default { ...@@ -107,21 +113,21 @@ export default {
107 }) 113 })
108 break; 114 break;
109 case "B2": //材料分屏按钮 115 case "B2": //材料分屏按钮
110 this.splitScreen = this.splitScreen ? false : true; 116 this.splitScreen = this.splitScreen ? false : true;
111 this.$store.dispatch("app/settScreen", this.splitScreen); 117 this.$store.dispatch("app/settScreen", this.splitScreen);
112 if (this.splitScreen) { 118 if (this.splitScreen) {
113 119
114 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容 120 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容
115 if (this.tabName == this.clxxTab.value) { 121 if (this.tabName == this.clxxTab.value) {
116 this.tabName = this.tabList[this.clxxIndex - 1].value; 122 this.tabName = this.tabList[this.clxxIndex - 1].value;
117 this.getFromRouter(this.tabList[this.clxxIndex - 1].value); 123 this.getFromRouter(this.tabList[this.clxxIndex - 1].value);
124 }
125 //删除材料信息选项卡数据
126 this.tabList.splice(this.clxxIndex, 1);
127 } else {
128 //新增材料信息选项卡数据
129 this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
118 } 130 }
119 //删除材料信息选项卡数据
120 this.tabList.splice(this.clxxIndex, 1);
121 } else {
122 //新增材料信息选项卡数据
123 this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
124 }
125 // this.closefp() 131 // this.closefp()
126 132
127 // if (this.splitScreen) { 133 // if (this.splitScreen) {
...@@ -289,7 +295,7 @@ export default { ...@@ -289,7 +295,7 @@ export default {
289 * @description: del 295 * @description: del
290 * @author: renchao 296 * @author: renchao
291 */ 297 */
292 del () { 298 del() {
293 let formdata = new FormData(); 299 let formdata = new FormData();
294 formdata.append("bsmSlsq", this.bsmSlsq); 300 formdata.append("bsmSlsq", this.bsmSlsq);
295 this.$confirm("确定要删除吗, 是否继续?", "提示", { 301 this.$confirm("确定要删除吗, 是否继续?", "提示", {
...@@ -324,24 +330,27 @@ export default { ...@@ -324,24 +330,27 @@ export default {
324 * @param {*} obj 330 * @param {*} obj
325 * @author: renchao 331 * @author: renchao
326 */ 332 */
327 sendToNext (obj) { 333 sendToNext(obj) {
328 this.$popupDialog("转出", "djbworkflow/components/zc", { 334 this.$popupDialog("转出", "djbworkflow/components/zc", {
329 obj:obj, 335 obj: obj,
330 bsmSlsq: this.bsmSlsq, 336 bsmSlsq: this.bsmSlsq,
331 tabList: this.tabList 337 tabList: this.tabList,
332 }, '800px', true) 338 tshowidea: this.showidea
339 }, '600px', true)
333 }, 340 },
334 //转出最后一个流程 341 //转出最后一个流程
335 /** 342 /**
336 * @description: 转出最后一个流程 343 * @description: 转出最后一个流程
337 * @author: renchao 344 * @author: renchao
338 */ 345 */
339 sendToEnd () { 346 sendToEnd() {
340 this.$popupDialog("转出", "djbworkflow/components/zc", { 347 this.$popupDialog("转出", "djbworkflow/components/zc", {
341 obj:"", 348 obj: "",
342 bsmSlsq: this.bsmSlsq, 349 bsmSlsq: this.bsmSlsq,
343 tabList: this.tabList 350 tabList: this.tabList,
344 }, '800px', true) 351 showidea: this.showidea
352
353 }, '600px', true)
345 }, 354 },
346 355
347 //批量操作 356 //批量操作
...@@ -349,7 +358,7 @@ export default { ...@@ -349,7 +358,7 @@ export default {
349 * @description: 批量操作 358 * @description: 批量操作
350 * @author: renchao 359 * @author: renchao
351 */ 360 */
352 handleBatchDel () { 361 handleBatchDel() {
353 this.$popupDialog("批量删除", "workflow/components/batchDel", { 362 this.$popupDialog("批量删除", "workflow/components/batchDel", {
354 width: "50%", 363 width: "50%",
355 btnShow: false, 364 btnShow: false,
...@@ -363,7 +372,7 @@ export default { ...@@ -363,7 +372,7 @@ export default {
363 * @param {*} file 372 * @param {*} file
364 * @author: renchao 373 * @author: renchao
365 */ 374 */
366 handleChange (file) { 375 handleChange(file) {
367 var formdata = new FormData(); 376 var formdata = new FormData();
368 formdata.append("file", file.raw); 377 formdata.append("file", file.raw);
369 formdata.append("bsmSldy", this.currentSelectProps.bsmSldy); 378 formdata.append("bsmSldy", this.currentSelectProps.bsmSldy);
...@@ -382,7 +391,7 @@ export default { ...@@ -382,7 +391,7 @@ export default {
382 * @param {*} file 391 * @param {*} file
383 * @author: renchao 392 * @author: renchao
384 */ 393 */
385 beforeUpload (file) { 394 beforeUpload(file) {
386 return true; 395 return true;
387 } 396 }
388 } 397 }
......