Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5360f4ac by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 9218dc17 50400282
Inline Side-by-side
Showing 4 changed files with 22 additions and 9 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-12-19 10:02:03 4 * @LastEditTime: 2024-01-23 09:57:51
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import { getPrintTemplateByCode } from "@/api/print"; 7 import { getPrintTemplateByCode } from "@/api/print";
...@@ -173,6 +173,7 @@ export default { ...@@ -173,6 +173,7 @@ export default {
173 case "B-TXDW": 173 case "B-TXDW":
174 getZdInfo(this.currentSelectProps.bdcdyid).then(res => { 174 getZdInfo(this.currentSelectProps.bdcdyid).then(res => {
175 this.bsmZd = res?.result[0]?.bsmZd 175 this.bsmZd = res?.result[0]?.bsmZd
176 console.log(this.bsmZd);
176 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '85%', true) 177 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '85%', true)
177 }) 178 })
178 break; 179 break;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-22 11:00:07 4 * @LastEditTime: 2024-01-23 10:23:02
5 */ 5 */
6 import { getForm } from "../flowform"; 6 import { getForm } from "../flowform";
7 import { getHomeNoticeList } from "@/api/home.js" 7 import { getHomeNoticeList } from "@/api/home.js"
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-22 14:57:22 4 * @LastEditTime: 2024-01-23 10:21:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <div class="rightContainer"> 50 <div class="rightContainer">
51 <div class="count"> 51 <div class="count">
52 当前流程所在环节: 52 当前流程所在环节:
53 <span>{{ $route.query.zbhj }}</span> 53 <span>{{ $route.query.zbhj }} {{tabName}}</span>
54 </div> 54 </div>
55 <el-tabs 55 <el-tabs
56 v-model="tabName" 56 v-model="tabName"
...@@ -245,7 +245,13 @@ ...@@ -245,7 +245,13 @@
245 if (res.code === 200) { 245 if (res.code === 200) {
246 //获取单元对应的所有表单信息 246 //获取单元对应的所有表单信息
247 this.tabList = res.result; 247 this.tabList = res.result;
248 var indexTab = 0
248 //默认加载第一个表单信息 249 //默认加载第一个表单信息
250 res.result.forEach((item, index) => {
251 if (item.defaultForm) {
252 indexTab = index
253 }
254 })
249 let arr = res.result.filter((item) => item.defaultForm); 255 let arr = res.result.filter((item) => item.defaultForm);
250 if (arr.length > 0) { 256 if (arr.length > 0) {
251 this.tabName = arr[0].value; 257 this.tabName = arr[0].value;
...@@ -255,8 +261,8 @@ ...@@ -255,8 +261,8 @@
255 if (sessionStorage.getItem('activeName') == this.tabName) { 261 if (sessionStorage.getItem('activeName') == this.tabName) {
256 this.fresh++; 262 this.fresh++;
257 } 263 }
258 this.ableOperation = this.tabList[0].ableOperation; 264 this.ableOperation = this.tabList[indexTab].ableOperation;
259 this.currentSelectTab = this.tabList[0]; 265 this.currentSelectTab = this.tabList[indexTab];
260 //批量操作无分屏按钮 266 //批量操作无分屏按钮
261 if (index != null) { 267 if (index != null) {
262 //处理分屏材料信息 268 //处理分屏材料信息
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-22 11:04:51 4 * @LastEditTime: 2024-01-23 10:21:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -129,15 +129,21 @@ ...@@ -129,15 +129,21 @@
129 if (res.code === 200) { 129 if (res.code === 200) {
130 //获取单元对应的所有表单信息 130 //获取单元对应的所有表单信息
131 this.tabList = res.result; 131 this.tabList = res.result;
132 var indexTab = 0
132 //默认加载第一个表单信息 133 //默认加载第一个表单信息
134 res.result.forEach((item, index) => {
135 if (item.defaultForm) {
136 indexTab = index
137 }
138 })
133 if (res.result.length > 0) { 139 if (res.result.length > 0) {
134 that.tabName = res.result[0].value; 140 that.tabName = res.result[0].value;
135 } 141 }
136 if (sessionStorage.getItem('activeName') == this.tabName) { 142 if (sessionStorage.getItem('activeName') == this.tabName) {
137 that.fresh++; 143 that.fresh++;
138 } 144 }
139 this.ableOperation = this.tabList[0].ableOperation 145 this.ableOperation = this.tabList[indexTab].ableOperation
140 this.currentSelectTab = this.tabList[0]; 146 this.currentSelectTab = this.tabList[indexTab];
141 //批量操作无分屏按钮 147 //批量操作无分屏按钮
142 if (index != null) { 148 if (index != null) {
143 //处理分屏材料信息 149 //处理分屏材料信息
......