Merge branch 'master' of http://47.110.251.215:3000/web/saber

src/views/formula/edit.vue

@@ -35,7 +35,7 @@
         </div>
       </div>
       <div>
-        <!-- <el-button size="small" @click="handwrit">手写模式</el-button> -->
+        <el-button size="small" @click="handwrit">手写模式</el-button>
       </div>
     </div>
     <div class="box-dashed">

src/views/manager/archivetree.vue

@@ -1174,7 +1174,8 @@ export default {
     async lazyTree (parentId) {//树节点懒加载
       const { data: res } = await lazyTree({
         parentId,
-        token: this.token
+        token: this.token,
+        projectId:0
       })
       console.log(res);
       if (res.code == 200 && res.msg == '操作成功') {
@@ -1263,7 +1264,7 @@ export default {
     },
     async archiveTreeDetail (data) {//详情接口
       console.log(data);
-      const { data: res } = await archiveTreeDetail({ id: data.id })
+      const { data: res } = await archiveTreeDetail({ id: data.id ,projectId:0})
       console.log(res);
       if (res.code == 200) {
         this.form.nodeName = res.data.fullName  //节点名称
@@ -1289,7 +1290,8 @@ export default {
     },
     async archiveTreetree4 () {//全加载左侧树
       const { data: res } = await archiveTreetree({
-        token: this.token
+        token: this.token,
+        projectId:0
       })
       console.log(res);
       if (res.code == 200 && res.msg == "操作成功") {
@@ -1564,6 +1566,7 @@ export default {
           token: this.token,
           disPlayTree: 1,
           nodeType: 2,
+          projectId:0
         })
         this.pushfileTap = false
       }
@@ -1611,6 +1614,7 @@ export default {
       token: this.token,
       disPlayTree: 1,
       nodeType: 2,
+      projectId:0
     })
     this.archiveTreetree4()//全加载左侧树
   },

src/views/manager/projectinfo/archivetreeRule.vue

@@ -785,7 +785,7 @@
 
 <script>
 import ManualSorting from '@/components/WbsTree/ManualSorting'
-import { lazyTree, dictionary, remove, archiveTreeSave, archiveTreeUpdate, archiveTreeDetail, archiveTreetree, submitDisplayConfigTree, getSameGradeNode, submitArchiveTreeSort } from "@/api/manager/archivetreecontract";
+import { lazyTree, dictionary, remove, archiveTreeSave, archiveTreeUpdate, archiveTreeDetail, archiveTreetree, submitDisplayConfigTree, getSameGradeNode, submitArchiveTreeSort } from "@/api/manager/archivetree";
 import { getToken } from '@/util/auth';
 import { roletree } from "@/api/system/role.js";
 // import logoVue from '../../page/index/logo.vue';
@@ -977,7 +977,7 @@ export default {
         value: 6
       },
       ],//
-      
+
       fileTypeList:[
         {
           label: '配合比',
@@ -1335,7 +1335,7 @@ export default {
         associationType: '',  //关联类型
         majorDataType: [],  //内业资料类型
         displayHierarchy: '',  //显示层级
-        
+
         projectType:'',//工程类型
         storageType:'',//储存类型
         expDataType:[],//文件类型
@@ -1440,7 +1440,7 @@ export default {
                 nodeType: this.form.nodeType,  // 节点类型
                 postType: this.form.postType,  //岗位类型
                 associationType: this.form.associationType,  //关联类型
-                
+
                 expDataType:this.form.expDataType.join(','),//文件类型
                 projectType:this.form.projectType, //工程类型
                 storageType:this.form.storageType, //储存类型
@@ -1620,7 +1620,7 @@ export default {
   },
   created () {
     this.token = 'bearer ' + getToken()
-    
+
     this.projectId = this.$route.query.projectId;
 
     this.archiveTreetree({