156a53a1 by xiaomiao

--no commit message

1 parent a38313b6
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
32 <div> 32 <div>
33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p> 33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p> 34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
35
36 <!-- <p class="title-detail">{{ item.zl }}</p> -->
37 </div> 35 </div>
38 <i 36 <i
39 class="el-icon-delete" 37 class="el-icon-delete"
...@@ -106,9 +104,10 @@ export default { ...@@ -106,9 +104,10 @@ export default {
106 }; 104 };
107 }, 105 },
108 mounted() { 106 mounted() {
107 this.loadBdcdylist();
108 this.getleftMenubl();
109
109 110
110 this.loadBdcdylist();
111 this.getleftMenubl();
112 }, 111 },
113 computed: { 112 computed: {
114 // ...mapGetters(["isRefresh"]), 113 // ...mapGetters(["isRefresh"]),
...@@ -130,7 +129,6 @@ export default { ...@@ -130,7 +129,6 @@ export default {
130 leftMenu(formdata).then((res) => { 129 leftMenu(formdata).then((res) => {
131 if (res.code === 200 && res.result) { 130 if (res.code === 200 && res.result) {
132 this.currentSelectProps = res.result[0]; 131 this.currentSelectProps = res.result[0];
133 console.log("读取申请单元信息");
134 this.$emit("getCurrentSelectProps", this.currentSelectProps); 132 this.$emit("getCurrentSelectProps", this.currentSelectProps);
135 if(add){ 133 if(add){
136 this.$parent.getQllxByBdcdyid() 134 this.$parent.getQllxByBdcdyid()
...@@ -143,8 +141,6 @@ export default { ...@@ -143,8 +141,6 @@ export default {
143 getleftMenubl(row) { 141 getleftMenubl(row) {
144 leftMenubl(this.bsmSlsq).then((res) => { 142 leftMenubl(this.bsmSlsq).then((res) => {
145 this.supplementarylist = res.result; 143 this.supplementarylist = res.result;
146 console.log("获取右侧菜单");
147 this.unitClick(0)
148 if(row){ 144 if(row){
149 this.supplementarylist.forEach((item,index) => { 145 this.supplementarylist.forEach((item,index) => {
150 if(item.bsmRepair==row.bsmRepair){ 146 if(item.bsmRepair==row.bsmRepair){
...@@ -154,6 +150,11 @@ export default { ...@@ -154,6 +150,11 @@ export default {
154 } 150 }
155 }) 151 })
156 } 152 }
153 if(this.supplementarylist.length){
154 this.unitClick(0)
155 }else{
156 this.$emit("getCurrentSelectProps", this.currentSelectProps);
157 }
157 }); 158 });
158 }, 159 },
159 handleNodeClick(data, node, elem) { 160 handleNodeClick(data, node, elem) {
...@@ -162,7 +163,6 @@ export default { ...@@ -162,7 +163,6 @@ export default {
162 }, 163 },
163 //申请单元点击事件 164 //申请单元点击事件
164 unitClick(index) { 165 unitClick(index) {
165 console.log("申请单元点击事件");
166 this.currentSelectProps = this.supplementarylist[index]; 166 this.currentSelectProps = this.supplementarylist[index];
167 this.$emit("getCurrentSelectProps", this.currentSelectProps); 167 this.$emit("getCurrentSelectProps", this.currentSelectProps);
168 }, 168 },
...@@ -185,6 +185,11 @@ export default { ...@@ -185,6 +185,11 @@ export default {
185 }); 185 });
186 this.$nextTick(() => { 186 this.$nextTick(() => {
187 this.getleftMenubl(); 187 this.getleftMenubl();
188 this.blxxClick()
189 if(!this.supplementarylist.length){
190 getdjblist()
191 }
192
188 }); 193 });
189 }); 194 });
190 }) 195 })
...@@ -197,7 +202,10 @@ export default { ...@@ -197,7 +202,10 @@ export default {
197 }, 202 },
198 //补录信息点击事件默认展示第一条补录记录 203 //补录信息点击事件默认展示第一条补录记录
199 blxxClick() { 204 blxxClick() {
200 this.unitClick(0); 205 if(this.supplementarylist.length){
206 this.unitClick(0);
207 }
208
201 }, 209 },
202 }, 210 },
203 }; 211 };
......
...@@ -332,12 +332,11 @@ export default { ...@@ -332,12 +332,11 @@ export default {
332 mounted() {}, 332 mounted() {},
333 methods: { 333 methods: {
334 loadData() { 334 loadData() {
335 console.log("房地产权"); 335 console.log("房地产权",this.propsParam);
336 init(this.propsParam.bsmRepair).then((res) => { 336 init(this.propsParam.bsmRepair).then((res) => {
337 if (res.code == 200) { 337 if (res.code == 200) {
338 338
339 this.ruleForm = res.result; 339 this.ruleForm = res.result;
340 console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
341 this.isShow = true; 340 this.isShow = true;
342 // this.tableData = res.result; 341 // this.tableData = res.result;
343 // if (this.tableData.length < datas.columns().emptycolNum) { 342 // if (this.tableData.length < datas.columns().emptycolNum) {
......
...@@ -77,6 +77,7 @@ import { getStepFormInfo } from "@/api/fqsq.js" ...@@ -77,6 +77,7 @@ import { getStepFormInfo } from "@/api/fqsq.js"
77 import NoticeBar from "@/components/NoticeBar/index"; 77 import NoticeBar from "@/components/NoticeBar/index";
78 import ProcessViewer from "./components/processViewer.vue"; 78 import ProcessViewer from "./components/processViewer.vue";
79 // 引入左侧菜单 79 // 引入左侧菜单
80 import { leftMenubl } from "@/api/djbbl.js";
80 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 81 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
81 import qllxDailog from "./djbBook/components/qllxDailog"; 82 import qllxDailog from "./djbBook/components/qllxDailog";
82 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 83 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
...@@ -131,22 +132,29 @@ export default { ...@@ -131,22 +132,29 @@ export default {
131 }; 132 };
132 }, 133 },
133 mounted() { 134 mounted() {
134 135 // this.getleftMenubl()
135 }, 136 },
136 137
137 methods: { 138 methods: {
138 139
139 stepForm (qllx) { 140 stepForm (qllx) {
140 this.oneSelectProps.qllx=qllx 141 this.oneSelectProps.qllx=qllx
141 getStepFormInfo(this.oneSelectProps).then((res) => { 142 if(this.$refs.Menu.supplementarylist.length){
142 this.tabList=res.result 143 getStepFormInfo(this.oneSelectProps).then((res) => {
143 this.$nextTick(function () { 144 this.$nextTick(function () {
145 this.tabList=res.result
144 this.tabName =this.tabList[0].value; 146 this.tabName =this.tabList[0].value;
145 console.log("this.tabName",this.tabName); 147 this.getFromRouter(this.tabName)
146 }); 148 });
147 }) 149 })
150 }
148 }, 151 },
149 152 // 获取右侧菜单
153 // getleftMenubl() {
154 // leftMenubl(this.bsmSlsq).then((res) => {
155 // this.supplementarylist = res.result;
156 // })
157 // },
150 getQllxByBdcdyid() { 158 getQllxByBdcdyid() {
151 if(this.currentSelectProps.bdcdyid){ 159 if(this.currentSelectProps.bdcdyid){
152 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 160 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
...@@ -162,25 +170,19 @@ export default { ...@@ -162,25 +170,19 @@ export default {
162 }, 170 },
163 // 获取右侧选项卡 171 // 获取右侧选项卡
164 getCurrentSelectProps(val) { 172 getCurrentSelectProps(val) {
165 console.log("vallllllllllllllllll",val);
166 if(val.bdcdyid){ 173 if(val.bdcdyid){
167 this.oneSelectProps = val; 174 this.oneSelectProps = val;
168 } 175 }
169 console.log("this.oneSelectProps",this.oneSelectProps);
170
171 this.currentSelectProps = val; 176 this.currentSelectProps = val;
172 if (this.currentSelectProps.bsmRepair) { 177 if (this.currentSelectProps.bsmRepair) {
173 console.log("进入补录"); 178 this.stepForm (this.currentSelectProps.qllx)
174 this.tabset(val);
175 } else if(!this.oneget){ 179 } else if(!this.oneget){
176 console.log("进入登记簿");
177 this.getdjblist(); 180 this.getdjblist();
178 181
179 } 182 }
180 if(this.oneget){ 183 if(this.oneget){
181 console.log("进入补录");
182 this.oneget=false 184 this.oneget=false
183 this.tabset(val); 185 this.stepForm (this.currentSelectProps.qllx)
184 186
185 } 187 }
186 188
...@@ -197,15 +199,10 @@ export default { ...@@ -197,15 +199,10 @@ export default {
197 this.defaultNode = getNode( 199 this.defaultNode = getNode(
198 this.currentSelectProps.qllx, 200 this.currentSelectProps.qllx,
199 { linShi: 0, xianShi: 0, liShi: 0 }, 201 { linShi: 0, xianShi: 0, liShi: 0 },
200 ""
201 ); 202 );
202 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点 203 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
203 }); 204 });
204 } 205 let settree = JSON.parse(JSON.stringify(this.treedata));
205 });
206
207 setTimeout(() => {
208 let settree = JSON.parse(JSON.stringify(this.treedata));
209 this.tabdata = [ 206 this.tabdata = [
210 ...settree, 207 ...settree,
211 ...settree[1].children[0].children[0].children, 208 ...settree[1].children[0].children[0].children,
...@@ -215,66 +212,15 @@ export default { ...@@ -215,66 +212,15 @@ export default {
215 arr[index].value = item.id; 212 arr[index].value = item.id;
216 }); 213 });
217 this.tabList = this.tabdata; 214 this.tabList = this.tabdata;
218 }, 200); 215 }
219 }, 216 });
220 tabset(val) {
221 console.log("valsweqweqrfwqerqweq",val);
222 // console.log("this.currentSelectProps2222222222222",this.currentSelectProps);
223 this.stepForm (this.currentSelectProps.qllx)
224
225 // this.tabList = [
226 // {
227 // name: val.qllxmc + "补录信息",
228 // value: "slxx",
229 // sort: 1,
230 // },
231 // {
232 // name: "审批意见",
233 // value: "spyj",
234 // sort: 2,
235 // },
236 // {
237 // name: "材料信息",
238 // value: "clxx",
239 // sort: 2,
240 // },
241 // ];
242
243
244 }, 217 },
245 // tabset(val) {
246 // this.tabName = "";
247 // this.tabList = [
248 // {
249 // name: val.qllxmc + "补录信息",
250 // value: "slxx",
251 // sort: 1,
252 // },
253 // {
254 // name: "审批意见",
255 // value: "spyj",
256 // sort: 2,
257 // },
258 // {
259 // name: "材料信息",
260 // value: "clxx",
261 // sort: 2,
262 // },
263 // ];
264
265 // this.$nextTick(function () {
266 // this.tabName = "slxx";
267 // });
268 // },
269
270 //右侧表单选项卡事件 218 //右侧表单选项卡事件
271 beforeLeave(activeName, oldActiveName) { 219 beforeLeave(activeName) {
272 console.log("右侧表单选项卡事件",activeName);
273 if (activeName && activeName != 0) this.getFromRouter(activeName); 220 if (activeName && activeName != 0) this.getFromRouter(activeName);
274 }, 221 },
275 //切换选项卡内容组件 222 //切换选项卡内容组件
276 getFromRouter(tabname) { 223 getFromRouter(tabname) {
277 console.log("tabnameaaaaaaaaaaaaaaaaaaaa",tabname);
278 this.componentTag = getForm(tabname); 224 this.componentTag = getForm(tabname);
279 }, 225 },
280 226
...@@ -314,7 +260,7 @@ export default { ...@@ -314,7 +260,7 @@ export default {
314 } 260 }
315 }).catch((res) => { 261 }).catch((res) => {
316 262
317 console.log("错i了哦",res); 263 console.log("错",res);
318 });; 264 });;
319 }, 265 },
320 }, 266 },
......