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";
//登记簿点击事件
djbClick () {
this.currentSelectProps.batchOperation = true;
this.activeIndex = "-1";
this.$parent.getdjblist()
},
......
......@@ -113,13 +113,13 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -5,11 +5,11 @@
-->
<template>
<div class="clmlmx-box">
<div class="title">申请材料目录</div>
<div class="title">申请材料目录1111</div>
<lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
</lb-table>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
<el-button @click="$popupCacel">取消11111</el-button>
</div>
</div>
</template>
......
......@@ -522,7 +522,7 @@ export default {
//查看明细
viewDetail () {
console.log("查看明细");
this.$popupDialog("查看明细", "djbBook/components/clxxDetailDialog", {
this.$popupDialog("查看明细", "djbworkflow/djbBook/components/clxxDetailDialog", {
data: this.tableData
}, "60%")
},
......
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-09 09:20:10
-->
<template>
<dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
<dialogBox title="新建材料信息1111111" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
:isFullscreen="false">
<el-form :model="ruleForm" ref="ruleForm" label-width="70px">
<el-row>
......
......@@ -9,7 +9,7 @@
<!-- 材料预览 -->
<div class="clyl-box">
<div class="menu-tree">
<el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细</el-button>
<el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细111111</el-button>
<div class="item">
材料目录({{tableData.length}})
<div style="margin-top:10px">
......
......@@ -6,7 +6,7 @@
<template>
<div class='spyj loadingtext'>
<div class="box">
<b class="spyj_title">审批表</b>
<b class="spyj_title">审批表11112222</b>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
<div class="spyj_form" v-for="(item, index) in tableData" :key="index">
<div class="item_left">
......
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -111,12 +111,12 @@
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -116,14 +116,14 @@
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -140,12 +140,12 @@
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -114,6 +114,9 @@ export default {
});
this.isshow = false;
},
closeDialog(){
}
},
};
......
<!--
* @Description :预告登记
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:44:18
* @LastEditTime : 2023-06-12 09:17:17
-->
<template>
<div class="djxxTable">
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -107,12 +107,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -41,7 +41,7 @@ export function getForm (tabName, djywbm) {
form = require("@/views/djbworkflow/components/spyj.vue");
break;
case "zdjbxx":
form = require("@/views/djbBook/zdjbxx.vue");
form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
break;
case "ygmm100":
form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
......@@ -57,31 +57,31 @@ export function getForm (tabName, djywbm) {
form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
break;
case "cfdj":
form = require("@/views/djbBook/cfdj.vue");
form = require("@/views/djbworkflow/djbBook/cfdj.vue");
break;
case "jsydsyq":
form = require("@/views/djbBook/jsydsyq.vue");
form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
break;
case "nydsyq":
form = require("@/views/djbBook/nydsyq.vue");
form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
break;
case "fdcq2":
form = require("@/views/djbBook/fdcq2.vue");
form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
break;
case "diyaq":
form = require("@/views/djbBook/diyaq.vue");
form = require("@/views/djbworkflow/djbBook/diyaq.vue");
break;
case "ygdj":
form = require("@/views/djbBook/ygdj.vue");
form = require("@/views/djbworkflow/djbBook/ygdj.vue");
break;
case "diyiq":
form = require("@/views/djbBook/diyiq.vue");
form = require("@/views/djbworkflow/djbBook/diyiq.vue");
break;
case "djbfm":
form = require("@/views/djbBook/djbfm.vue");
form = require("@/views/djbworkflow/djbBook/djbfm.vue");
break;
case "yydj":
form = require("@/views/djbBook/yydj.vue");
form = require("@/views/djbworkflow/djbBook/yydj.vue");
break;
case "szxx":
form = require("@/views/djbworkflow/components/szxx.vue");
......@@ -93,13 +93,13 @@ export function getForm (tabName, djywbm) {
form = require("@/views/djbworkflow/components/zdt.vue");
break;
case "slxx":
form = require("@/views/djbBook/slxx.vue");
form = require("@/views/djbworkflow/djbBook/slxx.vue");
break;
// case "spyj":
// form = require("@/views/djbBook/spyj.vue");
// form = require("@/views/djbworkflow/djbBook/spyj.vue");
// break;
// case "clxx":
// form = require("@/views/djbBook/clxx.vue");
// form = require("@/views/djbworkflow/djbBook/clxx.vue");
// break;
default:
form = require("@/views/error-page/404.vue");
......
......@@ -122,7 +122,6 @@ export default {
},
mounted() {
this.getdjblist()
this.tabset()
},
methods: {
......@@ -138,7 +137,7 @@ this.getdjblist()
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
console.log("this.defaultNode.id",this.defaultNode.id);
console.log("this.defaultNode.idssssssssssssssssss",this.defaultNode.id);
this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
});
}
......@@ -161,7 +160,6 @@ this.getdjblist()
arr[index].value=item.id
})
this.tabList=this.tabdata
console.log( " this.tabdataaaaaaaaaaaaaaaa",this.tabdata);
}, 200)
......@@ -190,36 +188,23 @@ this.getdjblist()
this.tabName = 'slxx';
},
stepForm(index){
console.log("stepForm()",11111111111111111,index);
},
// 展示事件
// loadComponent(currentSelectProps, data) {
// this.tabset()
// this.currentSelectProps = currentSelectProps;
// this.componentTag = (r) =>
// require.ensure([], () => r(require("@/views/djbBook/" + data.form)));
// stepForm(index){
// console.log("stepForm()",11111111111111111,index);
// },
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
console.log("执行",activeName);
if (activeName && activeName != 0) this.getFromRouter(activeName)
},
//切换选项卡内容组件
getFromRouter (tabname) {
console.log("2执行");
//根据tabname获取选中的表单 此操作为了获取后端返回的表单对象,使用里面的是否可操作的属性
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
break;
}
}
console.log("this.$route.query.sqywbm",this.$route.query.sqywbm);
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
console.log(" this.componentTag", this.componentTag);
}
},
};
......