3f23e484 by xiaomiao

登记簿补录文件夹调整

1 parent ac2f7e62
Showing 27 changed files with 45 additions and 58 deletions
...@@ -215,7 +215,6 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -215,7 +215,6 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
215 //登记簿点击事件 215 //登记簿点击事件
216 djbClick () { 216 djbClick () {
217 this.currentSelectProps.batchOperation = true; 217 this.currentSelectProps.batchOperation = true;
218 this.activeIndex = "-1";
219 this.$parent.getdjblist() 218 this.$parent.getdjblist()
220 219
221 }, 220 },
......
...@@ -113,13 +113,13 @@ export default { ...@@ -113,13 +113,13 @@ export default {
113 return name; 113 return name;
114 }, 114 },
115 AddDialog(row){ 115 AddDialog(row){
116 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 116 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
117 datalist:this.columns, 117 datalist:this.columns,
118 data: '' 118 data: ''
119 }) 119 })
120 }, 120 },
121 editDialog(row){ 121 editDialog(row){
122 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 122 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
123 datalist:this.columns, 123 datalist:this.columns,
124 data: row, 124 data: row,
125 125
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <div class="title">申请材料目录</div> 8 <div class="title">申请材料目录1111</div>
9 <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data"> 9 <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
10 </lb-table> 10 </lb-table>
11 <div class="text-center"> 11 <div class="text-center">
12 <el-button @click="$popupCacel">取消</el-button> 12 <el-button @click="$popupCacel">取消11111</el-button>
13 </div> 13 </div>
14 </div> 14 </div>
15 </template> 15 </template>
......
...@@ -522,7 +522,7 @@ export default { ...@@ -522,7 +522,7 @@ export default {
522 //查看明细 522 //查看明细
523 viewDetail () { 523 viewDetail () {
524 console.log("查看明细"); 524 console.log("查看明细");
525 this.$popupDialog("查看明细", "djbBook/components/clxxDetailDialog", { 525 this.$popupDialog("查看明细", "djbworkflow/djbBook/components/clxxDetailDialog", {
526 data: this.tableData 526 data: this.tableData
527 }, "60%") 527 }, "60%")
528 }, 528 },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-05-09 09:20:10 4 * @LastEditTime: 2023-05-09 09:20:10
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit" 7 <dialogBox title="新建材料信息1111111" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
8 :isFullscreen="false"> 8 :isFullscreen="false">
9 <el-form :model="ruleForm" ref="ruleForm" label-width="70px"> 9 <el-form :model="ruleForm" ref="ruleForm" label-width="70px">
10 <el-row> 10 <el-row>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <!-- 材料预览 --> 9 <!-- 材料预览 -->
10 <div class="clyl-box"> 10 <div class="clyl-box">
11 <div class="menu-tree"> 11 <div class="menu-tree">
12 <el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细</el-button> 12 <el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细111111</el-button>
13 <div class="item"> 13 <div class="item">
14 材料目录({{tableData.length}}) 14 材料目录({{tableData.length}})
15 <div style="margin-top:10px"> 15 <div style="margin-top:10px">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class='spyj loadingtext'> 7 <div class='spyj loadingtext'>
8 <div class="box"> 8 <div class="box">
9 <b class="spyj_title">审批表</b> 9 <b class="spyj_title">审批表11112222</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
12 <div class="item_left"> 12 <div class="item_left">
......
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
...@@ -111,12 +111,12 @@ ...@@ -111,12 +111,12 @@
111 return name; 111 return name;
112 }, 112 },
113 AddDialog(row){ 113 AddDialog(row){
114 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
115 data: '' 115 data: ''
116 }) 116 })
117 }, 117 },
118 editDialog(row){ 118 editDialog(row){
119 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 119 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
120 datalist:this.columns, 120 datalist:this.columns,
121 data: row, 121 data: row,
122 122
......
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
...@@ -116,14 +116,14 @@ ...@@ -116,14 +116,14 @@
116 return name; 116 return name;
117 }, 117 },
118 AddDialog(row){ 118 AddDialog(row){
119 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 119 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
120 datalist:this.columns, 120 datalist:this.columns,
121 data: '' 121 data: ''
122 122
123 }) 123 })
124 }, 124 },
125 editDialog(row){ 125 editDialog(row){
126 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 126 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
127 datalist:this.columns, 127 datalist:this.columns,
128 data: row, 128 data: row,
129 129
......
...@@ -140,12 +140,12 @@ ...@@ -140,12 +140,12 @@
140 return name; 140 return name;
141 }, 141 },
142 AddDialog(row){ 142 AddDialog(row){
143 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 143 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
144 data: '' 144 data: ''
145 }) 145 })
146 }, 146 },
147 editDialog(row){ 147 editDialog(row){
148 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 148 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
149 datalist:this.columns, 149 datalist:this.columns,
150 data: row, 150 data: row,
151 151
......
...@@ -114,6 +114,9 @@ export default { ...@@ -114,6 +114,9 @@ export default {
114 }); 114 });
115 this.isshow = false; 115 this.isshow = false;
116 }, 116 },
117 closeDialog(){
118
119 }
117 120
118 }, 121 },
119 }; 122 };
......
1 <!-- 1 <!--
2 * @Description :预告登记 2 * @Description :预告登记
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:44:18 4 * @LastEditTime : 2023-06-12 09:17:17
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
...@@ -107,12 +107,12 @@ export default { ...@@ -107,12 +107,12 @@ export default {
107 return name; 107 return name;
108 }, 108 },
109 AddDialog(row){ 109 AddDialog(row){
110 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 110 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
111 data: '' 111 data: ''
112 }) 112 })
113 }, 113 },
114 editDialog(row){ 114 editDialog(row){
115 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 115 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
116 datalist:this.columns, 116 datalist:this.columns,
117 data: row, 117 data: row,
118 118
......
...@@ -41,7 +41,7 @@ export function getForm (tabName, djywbm) { ...@@ -41,7 +41,7 @@ export function getForm (tabName, djywbm) {
41 form = require("@/views/djbworkflow/components/spyj.vue"); 41 form = require("@/views/djbworkflow/components/spyj.vue");
42 break; 42 break;
43 case "zdjbxx": 43 case "zdjbxx":
44 form = require("@/views/djbBook/zdjbxx.vue"); 44 form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
45 break; 45 break;
46 case "ygmm100": 46 case "ygmm100":
47 form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue"); 47 form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
...@@ -57,31 +57,31 @@ export function getForm (tabName, djywbm) { ...@@ -57,31 +57,31 @@ export function getForm (tabName, djywbm) {
57 form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue"); 57 form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
58 break; 58 break;
59 case "cfdj": 59 case "cfdj":
60 form = require("@/views/djbBook/cfdj.vue"); 60 form = require("@/views/djbworkflow/djbBook/cfdj.vue");
61 break; 61 break;
62 case "jsydsyq": 62 case "jsydsyq":
63 form = require("@/views/djbBook/jsydsyq.vue"); 63 form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
64 break; 64 break;
65 case "nydsyq": 65 case "nydsyq":
66 form = require("@/views/djbBook/nydsyq.vue"); 66 form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
67 break; 67 break;
68 case "fdcq2": 68 case "fdcq2":
69 form = require("@/views/djbBook/fdcq2.vue"); 69 form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
70 break; 70 break;
71 case "diyaq": 71 case "diyaq":
72 form = require("@/views/djbBook/diyaq.vue"); 72 form = require("@/views/djbworkflow/djbBook/diyaq.vue");
73 break; 73 break;
74 case "ygdj": 74 case "ygdj":
75 form = require("@/views/djbBook/ygdj.vue"); 75 form = require("@/views/djbworkflow/djbBook/ygdj.vue");
76 break; 76 break;
77 case "diyiq": 77 case "diyiq":
78 form = require("@/views/djbBook/diyiq.vue"); 78 form = require("@/views/djbworkflow/djbBook/diyiq.vue");
79 break; 79 break;
80 case "djbfm": 80 case "djbfm":
81 form = require("@/views/djbBook/djbfm.vue"); 81 form = require("@/views/djbworkflow/djbBook/djbfm.vue");
82 break; 82 break;
83 case "yydj": 83 case "yydj":
84 form = require("@/views/djbBook/yydj.vue"); 84 form = require("@/views/djbworkflow/djbBook/yydj.vue");
85 break; 85 break;
86 case "szxx": 86 case "szxx":
87 form = require("@/views/djbworkflow/components/szxx.vue"); 87 form = require("@/views/djbworkflow/components/szxx.vue");
...@@ -93,13 +93,13 @@ export function getForm (tabName, djywbm) { ...@@ -93,13 +93,13 @@ export function getForm (tabName, djywbm) {
93 form = require("@/views/djbworkflow/components/zdt.vue"); 93 form = require("@/views/djbworkflow/components/zdt.vue");
94 break; 94 break;
95 case "slxx": 95 case "slxx":
96 form = require("@/views/djbBook/slxx.vue"); 96 form = require("@/views/djbworkflow/djbBook/slxx.vue");
97 break; 97 break;
98 // case "spyj": 98 // case "spyj":
99 // form = require("@/views/djbBook/spyj.vue"); 99 // form = require("@/views/djbworkflow/djbBook/spyj.vue");
100 // break; 100 // break;
101 // case "clxx": 101 // case "clxx":
102 // form = require("@/views/djbBook/clxx.vue"); 102 // form = require("@/views/djbworkflow/djbBook/clxx.vue");
103 // break; 103 // break;
104 default: 104 default:
105 form = require("@/views/error-page/404.vue"); 105 form = require("@/views/error-page/404.vue");
......
...@@ -122,7 +122,6 @@ export default { ...@@ -122,7 +122,6 @@ export default {
122 }, 122 },
123 mounted() { 123 mounted() {
124 this.getdjblist() 124 this.getdjblist()
125 this.tabset()
126 }, 125 },
127 126
128 methods: { 127 methods: {
...@@ -138,7 +137,7 @@ this.getdjblist() ...@@ -138,7 +137,7 @@ this.getdjblist()
138 this.treedata = loadTreeData(res.result, this.bdcdyh); 137 this.treedata = loadTreeData(res.result, this.bdcdyh);
139 this.$nextTick(function () { 138 this.$nextTick(function () {
140 this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, ""); 139 this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
141 console.log("this.defaultNode.id",this.defaultNode.id); 140 console.log("this.defaultNode.idssssssssssssssssss",this.defaultNode.id);
142 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点 141 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
143 }); 142 });
144 } 143 }
...@@ -161,7 +160,6 @@ this.getdjblist() ...@@ -161,7 +160,6 @@ this.getdjblist()
161 arr[index].value=item.id 160 arr[index].value=item.id
162 }) 161 })
163 this.tabList=this.tabdata 162 this.tabList=this.tabdata
164 console.log( " this.tabdataaaaaaaaaaaaaaaa",this.tabdata);
165 163
166 }, 200) 164 }, 200)
167 165
...@@ -190,36 +188,23 @@ this.getdjblist() ...@@ -190,36 +188,23 @@ this.getdjblist()
190 this.tabName = 'slxx'; 188 this.tabName = 'slxx';
191 }, 189 },
192 190
193 stepForm(index){ 191 // stepForm(index){
194 console.log("stepForm()",11111111111111111,index); 192 // console.log("stepForm()",11111111111111111,index);
195 }, 193 // },
196 194
197 // 展示事件
198 // loadComponent(currentSelectProps, data) {
199 // this.tabset()
200 // this.currentSelectProps = currentSelectProps;
201 // this.componentTag = (r) =>
202 // require.ensure([], () => r(require("@/views/djbBook/" + data.form)));
203
204 // },
205 //右侧表单选项卡事件 195 //右侧表单选项卡事件
206 beforeLeave (activeName, oldActiveName) { 196 beforeLeave (activeName, oldActiveName) {
207 console.log("执行",activeName);
208 if (activeName && activeName != 0) this.getFromRouter(activeName) 197 if (activeName && activeName != 0) this.getFromRouter(activeName)
209 }, 198 },
210 //切换选项卡内容组件 199 //切换选项卡内容组件
211 getFromRouter (tabname) { 200 getFromRouter (tabname) {
212 console.log("2执行");
213 //根据tabname获取选中的表单 此操作为了获取后端返回的表单对象,使用里面的是否可操作的属性
214 for (let item of this.tabList) { 201 for (let item of this.tabList) {
215 if (item.value === tabname) { 202 if (item.value === tabname) {
216 this.currentSelectTab = item 203 this.currentSelectTab = item
217 break; 204 break;
218 } 205 }
219 } 206 }
220 console.log("this.$route.query.sqywbm",this.$route.query.sqywbm);
221 this.componentTag = getForm(tabname, this.$route.query.sqywbm); 207 this.componentTag = getForm(tabname, this.$route.query.sqywbm);
222 console.log(" this.componentTag", this.componentTag);
223 } 208 }
224 }, 209 },
225 }; 210 };
......