归档树修改

src/api/sigital/signer.js

@@ -0,0 +1,28 @@
+import request from '@/router/axios';
+//获取岗位列表信息
+export const getRoleList = (params) => {
+    return request({
+        url: '/api/blade-manager/signConfig/roleList',
+        method: 'get',
+        params
+    })
+}
+
+//分页
+export const getListPage = (params) => {
+    return request({
+        url: '/api/blade-manager/signConfig/list',
+        method: 'get',
+        params
+    })
+}
+
+
+//获取元素列表
+export const getElementList = (params) => {
+    return request({
+        url: '/api/blade-manager/signConfig/elementList',
+        method: 'get',
+        params
+    })
+}

src/router/views/index.js

@@ -77,6 +77,7 @@ export default [{
             component: () =>
               import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/detail.vue')
           },
+          
           //归档树配置规则
           {
             path: '/manager/projectinfo/archivetreeRule',
@@ -88,17 +89,18 @@ export default [{
             component: () =>
               import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/archivetreeRule.vue')
           },
-          //台账
-          {
-            path: '/manager/projectinfo/ledger',
-            name: '同步台账',
+
+            //电签角色库
+            {
+            path: '/digital/signer',
+            name: '电签角色库',
             meta: {
-              i18n: 'ledger',
-              menu: false,
+                i18n: 'signer',
+                menu: false,
             },
             component: () =>
-              import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/ledger.vue')
-          },
+                import ( /* webpackChunkName: "views" */'@/views/digital/signer.vue')
+            },
           
         ]
     }, {

src/views/digital/signer.vue

@@ -0,0 +1,380 @@
+<template>
+    <basic-container>
+        <el-row :gutter="20" class="h100p">
+                <el-col :span="6" class="h100p">
+                    <div class="grid-content1">
+                        <el-radio-group v-model="tabPosition" @input="getRoleData">
+                            <el-radio-button label="1">施工</el-radio-button>
+                            <el-radio-button label="2">监理</el-radio-button>
+                            <el-radio-button label="3">业主</el-radio-button>
+                          
+                        </el-radio-group>
+
+                        <div class="flex" style="margin-top: 10px">
+                            <el-input
+                          
+                            placeholder="请输入岗位名称"
+                            clearable
+                            @clear="clearInput"
+                            v-model="postText"
+                            >
+                            </el-input>
+                            <el-button  class="mg-l-10" @click="searchPost"
+                            >搜索</el-button
+                            >
+                            
+                        </div>
+                        <div class="post-list">
+                                <el-scrollbar style="margin-top: 20px; height: 100%" v-loading="roleListLoading">
+                                    <ul
+                                            class="contextmenu"
+                                            >
+                                                <li v-for="item in roleData" :key="item"  
+                                                 :class="{'selected': selectedItem === item}"
+                                                @click="positionClick($event,item)">
+                                                 
+                                                    <span>{{item.roleName}}</span>
+                                                </li>
+                                    </ul>
+                                </el-scrollbar>
+                         </div>
+                    </div>
+                   
+                </el-col>
+                <el-col :span="18" class="h100p">
+                    <div class="grid-content2 ">
+                        <div class="header-btn">
+                           
+                            <el-button type="primary" size="small" @click="addEleClick">新增</el-button>
+                            <el-button type="info" size="small">编辑</el-button>
+                            <el-button type="success" size="small">启用</el-button>
+                            <el-button type="warning" size="small">停用</el-button>
+                            <el-button type="danger" size="small">删除</el-button>
+                        </div>
+                        <div class="table-box">
+                            <el-table
+                                ref="multipleTable"
+                                :data="tableData"
+                                tooltip-effect="dark"
+                                style="width: 100%"
+                                @selection-change="handleSelectionChange">
+                                <el-table-column
+                                type="selection"
+                               >
+                                </el-table-column>
+                                <el-table-column
+                                label="电签元素名称"
+                              >
+                                <template slot-scope="scope">{{ scope.row.date }}</template>
+                                </el-table-column>
+                                <el-table-column
+                                prop="name"
+                                label="字符类型"
+                               >
+                                </el-table-column>
+                                <el-table-column
+                                prop="address"
+                                label="元素来源"
+                               >
+                                </el-table-column>
+                                <el-table-column
+                                prop="address"
+                                label="绑定岗位"
+                               >
+                                </el-table-column>
+                                <el-table-column
+                                    prop="tag"
+                                    label="状态"
+                                    width="100"
+                                    >
+                                    <template slot-scope="scope">
+                                        <el-tag
+                                        :type="scope.row.tag === '家' ? 'primary' : 'success'"
+                                        disable-transitions>{{scope.row.tag}}</el-tag>
+                                    </template>
+                                    </el-table-column>
+                            </el-table>
+                        </div>
+                        <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[10, 20, 30, 40,50]"
+                            :page-size="pageSize"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                         </el-pagination>
+                    </div>
+                </el-col>
+              
+        </el-row>
+
+        <el-dialog
+            append-to-body
+            title="新增电签配置信息"
+            :visible.sync="addDialogVisible"
+            width="80%"
+            :before-close="handleAddClose">
+           <div>
+            <el-table
+                               
+                                :data="tableData1"
+                              
+                                style="width: 100%"
+                              >
+                              
+                                <el-table-column
+                                label="电签元素名称"
+                              >
+                                <template slot-scope="scope">
+                                 
+                                    <el-select v-model="scope.row.elementType" placeholder="请选择元素或搜索"   filterable >
+                                        <el-option
+                                        v-for="item in eleOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                                </el-table-column>
+                                <el-table-column
+                                prop="name"
+                                label="字符类型"
+                               >
+                               <template slot-scope="scope">
+                                
+                               </template>
+                                </el-table-column>
+                                <el-table-column
+                                prop="address"
+                                label="元素来源"
+                               >
+                                </el-table-column>
+                                <el-table-column
+                                prop="address"
+                                label="绑定岗位"
+                               >
+                                </el-table-column>
+                                <el-table-column
+                                    prop="tag"
+                                    label="操作"
+                                    width="100"
+                                    >
+                                    <template slot-scope="scope">
+                                        <!-- <el-tag
+                                        :type="scope.row.tag === '家' ? 'primary' : 'success'"
+                                        disable-transitions>{{scope.row.tag}}</el-tag> -->
+                                    </template>
+                                    </el-table-column>
+                            </el-table>
+           </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+            </el-dialog>
+    </basic-container>
+</template>
+
+<script>
+  import {getRoleList,getListPage,getElementList} from "@/api/sigital/signer.js";
+    export default {
+        data() {
+            return {
+                tabPosition: '1',
+                postText: '',
+                roleData:[],
+                roleListLoading:false,
+                multipleTable:null,
+                tableData: [],
+                selectedItem: {
+                    id: '',
+                },
+                currentPage: 1,
+                pageSize: 10,
+                addDialogVisible: false,
+                tableData1: [{}],
+                eleOptions: [
+                  
+                ]
+            }
+        },
+        methods: {
+            clearInput() {
+                this.postText = ''
+                this.getRoleData();
+            },
+            searchPost() {
+              this.getRoleData();
+            },
+            handleSelectionChange(val) {
+                
+            },
+            //获取岗位列表
+            getRoleData() {
+                this.roleListLoading = true;
+                getRoleList({
+                    type: this.tabPosition,
+                    roleName: this.postText
+                }).then(res => {
+                    this.roleListLoading = false;
+                    if (res.code == 200) {
+                        this.roleListLoading = false;
+                        this.roleData = res.data;
+                    }else{
+                        this.roleData = [];
+                    }
+                })
+            },
+            positionClick(event, item){
+                this.selectedItem = item; 
+            },
+            getTableData() {
+                this.tableLoading = true;
+                getListPage({
+                    size: this.pageSize,
+                    current: this.currentPage,
+                    keyword: this.postText,
+                    id: this.selectedItem.id||'',
+                }).then(res => {
+                    this.tableLoading = false;
+                    if (res.code == 200) {
+                       
+                        this.tableData = res.data;
+                    }else{
+                        this.tableData = [];
+                    }
+                })
+            },
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+                this.pageSize = val;
+                this.getTableData();
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+                this.currentPage = val;
+                this.getTableData();
+            },
+            addEleClick() {
+                this.addDialogVisible = true;
+            },
+            handleAddClose(){
+                this.addDialogVisible = false;
+            },
+            getEleOptions(){
+                getElementList().then(res => {
+                    
+                    if (res.data.code == 200) {
+                        this.eleOptions = res.data.data.map(item => ({
+                            value: item.id,
+                            label: item.eName
+                        }));
+                       
+                        
+                    }
+                });
+            }
+        },
+        mounted() {
+            this.getRoleData();
+            this.getTableData();
+            this.getEleOptions();
+        },
+        components: {}
+    }
+</script>
+<style lang="scss" scoped>
+.h100p{
+    height: 100%;
+}
+  .grid-content1{
+        height: 100%;
+        border-right: 1px solid #D6D6D6;
+        padding-right: 10px;
+        .post-list{
+            margin-top: 10px;
+            height: calc(100% - 110px);
+            border: 1px solid red;
+        }
+
+        
+        .contextmenu {
+        padding: 4px 0;  /* 添加适当的内边距 */
+        // min-width: 120px;
+        }
+
+        .contextmenu ul {
+        list-style: none;  /* 移除小圆点 */
+        padding: 0;
+        margin: 0;
+        // min-width: 80px;
+        background: #fff;
+        border: 1px solid #e4e7ed;
+        border-radius: 4px;
+        box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+        }
+
+
+        .contextmenu li {
+        padding: 8px 16px;
+        line-height: 22px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+        transition: all 0.3s;
+                &.selected {
+                background-color: #409eff;
+                color: white;
+                span {
+                    color: white;
+                }
+            }
+        }
+
+
+        .contextmenu li i {
+        margin-right: 8px;
+        font-size: 16px;
+        }
+
+
+        .contextmenu li span {
+        font-size: 14px;
+        color: #606266;
+        }
+
+
+        .contextmenu li:hover,
+        .contextmenu li.active {
+        background-color: #f5f7fa;
+        color: #409eff;
+        }
+
+
+        .contextmenu li.divider {
+        height: 1px;
+        background-color: #e4e7ed;
+        margin: 4px 0;
+        padding: 0;
+        }
+       
+    }
+.grid-content2{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .header-btn{
+        float: right;
+   }
+   .table-box {
+        flex: 1;
+        overflow: hidden;
+        
+        .el-table {
+            height: 100% !important;
+        }
+    }
+}
+</style>

src/views/manager/archivetree.vue

@@ -4,7 +4,7 @@
     style="height:100%;"
   >
     <el-row class="h-100p">
-      <el-col :span="12"  class=" h-100p">
+      <el-col :span="24"  class=" h-100p">
         <div class="h-100p flex flex-d-c ov-hidden">
           <el-tabs v-model="activeName" @tab-click="handleClick" >
             <el-tab-pane label="竣工档案目录" name="first"  >
@@ -42,13 +42,10 @@
 
                   >
                     <!-- <span style="text-overflow: ellipsis;width:101%;">{{ data.title }}</span> -->
-                    <span v-if="data.title&&data.title.length<=30">{{data.title | ellipsis}}</span>
-
-                    <el-tooltip v-if="data.title&&data.title.length>30" :content="data.title" raw-content placement="top-start"  effect="light">
-                      <span v-if="data.title &&data.title.length <=30">{{ data.title }}</span>
-                      <span v-if="data.title && data.title.length > 30"> {{data.title | ellipsis}}</span>
-                    </el-tooltip>
+                 
 
+                   
+                    {{ data.title }}
                     <span
                       class="marleft10"
                       v-show="data.moreShow"
@@ -105,12 +102,7 @@
 
                         >
                             <!-- <span style="text-overflow: ellipsis;width:101%;">{{ data.title }}</span> -->
-                            <span v-if="data.title&&data.title.length<=30">{{data.title | ellipsis}}</span>
-
-                              <el-tooltip v-if="data.title&&data.title.length>30" :content="data.title" raw-content placement="top-start"  effect="light">
-                                <span v-if="data.title &&data.title.length <=30">{{ data.title }}</span>
-                                <span v-if="data.title && data.title.length > 30"> {{data.title | ellipsis}}</span>
-                              </el-tooltip>
+                            {{ data.title }}
 
                             <span
                               class="marleft10"
@@ -152,112 +144,7 @@
 
         </div>
       </el-col>
-      <el-col :span="12" class="h-100p">
-        <basic-container  class=" h-100p ">
-          <div class="peizhi h-100p ov-hidden"  v-loading="rightTreeLoading">
-            <el-tabs v-model="activetabName" @tab-click="handletabClick">
-              <el-tab-pane label="立卷规则" name="second">
-                <el-row style="margin-bottom:15px">
-                  <el-button type="primary" plain @click="setHigh">设置为最高并卷层级</el-button>
-                  <el-button type="primary" plain @click="setType">设置为分类卷并卷</el-button>
-                  <el-button type="primary" plain @click="setAlone">设置为独立组卷</el-button>
-                </el-row>
-                <div style="display: flex;justify-content: space-between;">
-                  <el-select v-model="publictreevalue" clearable placeholder="请选择公有质检化分树" @change="treeIdChange" style="  margin-bottom:15px;  width:45%;">
-                    <el-option
-                      v-for="item in publictreeoptions"
-                      :key="item.id"
-                      :label="item.wbsName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                  <el-select v-model="testtreevalue" clearable placeholder="请选择公有试验化分树" @change="treeIdChange"  style="    width: 45%;">
-                    <el-option
-                      v-for="item in testtreeoptions"
-                      :key="item.id"
-                      :label="item.wbsName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-              </el-tab-pane>
-              <el-tab-pane label="工程文件入口配置" name="first"></el-tab-pane>
-            </el-tabs>
-
-            <div class="scrollClass "  v-if="activetabName==='second'" style="height:100%">
-              <el-scrollbar style="height:80%">
-                <el-tree
-                  :props="Rightprops"
-                  :data="rightData"
-                  node-key="id"
-                  ref="settree"
-                  class="filter-tree"
-                  show-checkbox :check-strictly="true"
-                  @check="handleCheckChange"
-                  :default-expanded-keys="defaultExpandedKeys1"
-                  :current-node-key="curreenttid1"
-                >
-                  <div class="custom-tree-node" slot-scope="{ node, data }"   @mouseover="mouseOver(data)"    style="flex: 1;width: 100%;justify-content: flex-start;"
-                       @mouseleave="mouseLeave(data)">
-                    <!-- <span>{{ node.label }}</span> -->
-                    <span v-if="node.label&&node.label.length<=25">{{node.label | ellipsis1}}</span>
-
-                    <el-tooltip v-if="node.label&&node.label.length>25" :content="node.label" raw-content placement="top-start"  effect="light">
-                      <span v-if="node.label &&node.label.length <=25">{{node.label}}</span>
-                      <span v-if="node.label && node.label.length > 25"> {{node.label | ellipsis1}}</span>
-                    </el-tooltip>
-                    <span  class="marleft10"
-                           v-show="data.moreShow">
-                              <div class="config_type" v-if="data.archiveAutoType == 1&&data.archiveAutoGroupSelect == 1">最</div>
-                              <div class="config_type" v-if="data.archiveAutoType == 2&&data.archiveAutoGroupSelect == 1">分</div>
-                              <div  class="config_type" v-if="data.archiveAutoType == 3&&data.archiveAutoGroupSelect == 1">独</div>
-                          <el-button
-                            type="text"
-                            size="mini"
-                            @click.stop="() => viewConfig(data,node)">
-                            查看配置
-                          </el-button>
-                          <el-link @click.stop="removeArchive(data)" type="danger" :underline="false" class="marleft10"><i class="el-icon-delete"></i></el-link>
-                        </span>
-                  </div>
-                </el-tree>
-              </el-scrollbar>
-            </div>
-            <div class="flexEnd"  v-if="isentryTree&&activetabName==='first'">
-              <i
-                @click="rightPushTree"
-                class="el-icon-plus"
-                style="backgroundColor:#2A97DF;color:#fff;fontSize:20px;cursor: pointer;"
-              ></i>
-            </div>
-            <div class="scrollClass "  v-if="isentryTree&&activetabName==='first'" style="height:100%">
-              <el-scrollbar style="height:80%">
-                <el-tree
-                  :props="Rightprops"
-                  :data="rightData"
-                  node-key="id"
-                  ref="tree"
-                  class="filter-tree"
-
-                >
-                  <div class="custom-tree-node" slot-scope="{ node, data }"   @mouseover="mouseOver(data)"
-                       @mouseleave="mouseLeave(data)">
-                    <!-- <span>{{ node.label }}</span> -->
-                    <span v-if="node.label&&node.label.length<=25">{{node.label | ellipsis1}}</span>
-
-                    <el-tooltip v-if="node.label&&node.label.length>25" :content="node.label" raw-content placement="top-start"  effect="light">
-                      <span v-if="node.label &&node.label.length <=25">{{node.label}}</span>
-                      <span v-if="node.label && node.label.length > 25"> {{node.label | ellipsis1}}</span>
-                    </el-tooltip>
-
-                  </div>
-                </el-tree>
-              </el-scrollbar>
-            </div>
-          </div>
-        </basic-container>
-
-      </el-col>
+ 
     </el-row>
 
 
@@ -766,7 +653,7 @@ export default {
         storageType:'',//储存类型
         expDataType:[],//文件类型
         archiveAutoType:1,//并卷规则
-        storageTime:'3',//保管期限
+        storageTime:'',//保管期限
       },
       rules: {
         nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
@@ -1307,6 +1194,8 @@ export default {
         this.defaultExpanded = [data.id]
       }
       this.form.archiveAutoType=1
+      this.form.storageTime='3'
+     
       this.treeTap = true
     },
     async edittree (data,node) {//编辑树
@@ -1339,7 +1228,9 @@ export default {
           console.log(1111111);
           this.remove(node.id).then(()=>{
             _that.$refs.trees1.remove(node) //删除界面上的节点
+          if(this.filterText){
             this.archiveTreetree4()//全加载左侧树
+          }
           }).catch(()=>{
 
           })
@@ -1378,6 +1269,8 @@ export default {
 
         this.form.projectType = res.data.projectType   //工程类型
         this.form.storageType = res.data.storageType   //储存类型
+        this.form.archiveAutoType = res.data.archiveAutoType   //最高1  分类2  独立3
+        this.form.storageTime = res.data.storageTime 
 
         if(res.data.expDataType){
           this.form.expDataType = res.data.expDataType.split(',')   //文件类型
@@ -1490,6 +1383,8 @@ export default {
 
                     projectType:this.form.projectType, //工程类型
                     storageType:this.form.storageType, //储存类型
+                    archiveAutoType:this.form.archiveAutoType,//并卷规则
+                    storageTime:this.form.storageTime,//存储时间
                   })
                 } else {
                   this.baocun({
@@ -1504,6 +1399,8 @@ export default {
 
                     projectType:this.form.projectType, //工程类型
                     storageType:this.form.storageType, //储存类型
+                    archiveAutoType:this.form.archiveAutoType,//并卷规则
+                    storageTime:this.form.storageTime,//存储时间
                   })
                 }
               } else {
@@ -1516,6 +1413,8 @@ export default {
                   isStorageNode: this.form.isStorageNode,  //是否为存储节点
 
                   projectType:this.form.projectType, //工程类型
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               }
             } else if (this.form.nodeType == 1) {
@@ -1532,6 +1431,8 @@ export default {
 
                   projectType:this.form.projectType, //工程类型
                   storageType:this.form.storageType, //储存类型
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               }else if(this.form.associationType == 2){
                 //试验资料
@@ -1546,6 +1447,8 @@ export default {
                   expDataType:this.form.expDataType.join(','),//文件类型
                   projectType:this.form.projectType, //工程类型
                   storageType:this.form.storageType, //储存类型
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               }else {
                 this.baocun({
@@ -1558,6 +1461,8 @@ export default {
 
                   projectType:this.form.projectType, //工程类型
                   storageType:this.form.storageType, //储存类型
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               }
             }
@@ -1907,20 +1812,8 @@ export default {
     this.heights = this.$refs.container.$el.offsetHeight
   },
   filters:{
-    ellipsis(value) {
-      if (!value) return "";
-      if (value.length > 35) {
-        return value.slice(0, 35) + "...";
-      }
-      return value;
-    },
-    ellipsis1(value) {
-      if (!value) return "";
-      if (value.length > 25) {
-        return value.slice(0, 25) + "...";
-      }
-      return value;
-    },
+
+ 
 
   },
 }

src/views/manager/projectinfo/archivetreeRule.vue

@@ -58,7 +58,7 @@
                           <div class="normal-black ">
                                 <div >
                                     <el-link :underline="false">
-                                      <el-tooltip placement="right" effect="light" >
+                                      <el-tooltip placement="right" effect="light"  >
                                             <div slot="content">
                                               <ul
                                             class="contextmenu"
@@ -126,7 +126,8 @@
                           <div class="normal-black ">
                                 <div >
                                     <el-link :underline="false">
-                                      <el-tooltip placement="right" effect="light" >
+                                      <el-tooltip placement="right" effect="light"   :manual="true"
+                                     >
                                             <div slot="content">
                                               <ul
                                             class="contextmenu"
@@ -545,7 +546,7 @@ export default {
         storageType:'',//储存类型
         expDataTypes:[],//文件类型
         contractLogTypes: [],
-        storageTime:'3',
+        storageTime:'',
         archiveAutoType:1,//并卷规则
       },
       rules: {
@@ -784,6 +785,7 @@ export default {
       checkedKeys:[],//分类并卷 回显 勾选数组
 
       treeSelectId:'',//选中的划分树
+      tooltipVisible: false,
       menusData:[
         {icon: 'el-icon-plus', label: '新增', key: "add"},
         {icon: 'el-icon-s-promotion', label: '编辑', key: "edit"},
@@ -806,21 +808,7 @@ export default {
     }
   },
   computed:{
-    setName(){
-      let name = '';
-      switch (this.archiveAutoType) {
-        case 1:
-          name = '设置最高并卷层级';
-          break;
-        case 2:
-          name = '设置分类并卷层级';
-          break;
-        case 3:
-          name = '设置单独并卷层级';
-          break;
-      }
-      return name;
-    }
+
   },
   methods: {
     //切换tabs
@@ -995,6 +983,7 @@ export default {
       this.form.contractLogTypes = []
       this.form.expDataTypes = []
       this.form.archiveAutoType=1
+      this.form.storageTime='3'
       this.treeTap = true
     },
     async edittree (data,node) {//编辑树
@@ -1049,7 +1038,7 @@ export default {
     async archiveTreeDetail (data) {//详情接口
       console.log(data);
       const { data: res } = await archiveTreeDetail({ id: data.id })
-      console.log(res);
+      console.log(res.data.archiveAutoType,'archiveAutoType');
       if (res.code == 200) {
         this.form.nodeName = res.data.fullName  //节点名称
         this.form.nodeType = res.data.nodeType   // 节点类型  2 = 数字化上传文件
@@ -1064,6 +1053,8 @@ export default {
 
         this.form.projectType = res.data.projectType   //工程类型
         this.form.storageType = res.data.storageType   //储存类型
+        this.form.archiveAutoType = res.data.archiveAutoType   //最高1  分类2  独立3
+        this.form.storageTime = res.data.storageTime 
 
         if(res.data.contractTrialType){
           this.form.expDataTypes = res.data.contractTrialType.split(',')   //文件类型
@@ -1172,6 +1163,8 @@ export default {
                     projectType:this.form.projectType, //工程类型
                     storageType:this.form.storageType, //储存类型
                     projectId:this.projectId,//项目id
+                    archiveAutoType:this.form.archiveAutoType,//并卷规则
+                    storageTime:this.form.storageTime,//存储时间
                   })
                 } else {
                   this.baocun({
@@ -1187,6 +1180,8 @@ export default {
                     projectType:this.form.projectType, //工程类型
                     storageType:this.form.storageType, //储存类型
                     projectId:this.projectId,//项目id
+                    archiveAutoType:this.form.archiveAutoType,//并卷规则
+                    storageTime:this.form.storageTime,//存储时间
                   })
                 }
               } else {
@@ -1200,6 +1195,9 @@ export default {
 
                   projectType:this.form.projectType, //工程类型
                   projectId:this.projectId,//项目id
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
+               
                 })
               }
             } else if (this.form.nodeType == 1) {
@@ -1217,6 +1215,8 @@ export default {
                   projectType:this.form.projectType, //工程类型
                   storageType:this.form.storageType, //储存类型
                   projectId:this.projectId,//项目id
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               } else if(this.form.associationType == 2){
                 //试验资料
@@ -1232,6 +1232,8 @@ export default {
                   storageType: this.form.storageType, //储存类型
                   projectId: this.projectId,//项目id
                   contractLogType: this.form.contractLogTypes.join(','),
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               }else {
                 this.baocun({
@@ -1245,6 +1247,8 @@ export default {
                   storageType:this.form.storageType, //储存类型
                   projectId:this.projectId,//项目id
                   contractLogType: this.form.contractLogTypes.join(','),
+                  archiveAutoType:this.form.archiveAutoType,//并卷规则
+                  storageTime:this.form.storageTime,//存储时间
                 })
               }
             }
@@ -1427,6 +1431,7 @@ export default {
 
     },
     menuClick(e,item,data,node){
+  
       this.menuKey=''
       //获取节点展开路径
       this.getExpandedKeys(node);