5a669229 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents bd1d48ef 3f8965b6
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-12 17:12:42 4 * @LastEditTime: 2023-10-13 11:24:29
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
221 * @author: renchao 221 * @author: renchao
222 */ 222 */
223 unitClick (index) { 223 unitClick (index) {
224 window.currentSelect = this.unitData[index] 224 window.currentSelect = this.aroundUnitData[index]
225 this.activeHIndex = '-1' 225 this.activeHIndex = '-1'
226 this.currentSelectProps = this.aroundUnitData[index]; 226 this.currentSelectProps = this.aroundUnitData[index];
227 this.currentSelectProps.issave = '1' 227 this.currentSelectProps.issave = '1'
...@@ -233,12 +233,12 @@ ...@@ -233,12 +233,12 @@
233 this.$parent.stepForm(index); 233 this.$parent.stepForm(index);
234 }, 234 },
235 /** 235 /**
236 * @description: handleAfterunitClick 236 * @description: 变更后单元
237 * @param {*} index 237 * @param {*} index
238 * @author: renchao 238 * @author: renchao
239 */ 239 */
240 handleAfterunitClick (index) { 240 handleAfterunitClick (index) {
241 window.currentSelect = this.unitData[index] 241 window.currentSelect = this.afterUnitData[index]
242 this.activeIndex = '-1' 242 this.activeIndex = '-1'
243 this.currentSelectProps = this.afterUnitData[index]; 243 this.currentSelectProps = this.afterUnitData[index];
244 this.currentSelectProps.batchOperation = false; 244 this.currentSelectProps.batchOperation = false;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
23 } 23 }
24 }, 24 },
25 mounted () { 25 mounted () {
26 console.log(this.formData, 'this.formData');
26 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) { 27 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
27 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode); 28 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
28 this.router = this.loadView(view); 29 this.router = this.loadView(view);
......