修改bug

src/styles/xiaoyu.scss

@@ -118,10 +118,4 @@
 
 .marleft30 {
     margin-left: 30px;
-}
-
-//树结构超长后产生滚动条
-.el-tree>.el-tree-node {
-    min-width: 100%;
-    display: inline-block;
 }

src/views/exctab/ElementIdentification/index.vue

@@ -208,12 +208,14 @@
                   <el-button
                     type="primary"
                     size="mini"
+                    style="margin:0px;"
                     @click="relationMD(scope.$index,'关联')"
                     v-show="!scope.row.checknd"
                   >选择关联</el-button>
                   <el-button
                     type="danger"
                     size="mini"
+                    style="margin:0px;"
                     @click="relationMD(scope.$index,'取消关联')"
                     v-show="scope.row.checknd"
                   >取消关联</el-button>
@@ -600,4 +602,9 @@ export default {
   bottom: 40px;
   right: 40px;
 }
+//树结构超长后产生滚动条
+.el-tree > .el-tree-node {
+  min-width: 100%;
+  display: inline-block;
+}
 </style>

src/views/manager/contractinfo/detail.vue

@@ -78,7 +78,6 @@
                 </el-col>
               </el-row>
               <el-form-item
-                v-if="contractForm.contractType==1"
                 label="是否开启电签"
                 prop="isElectronicSignature"
               >
@@ -89,7 +88,6 @@
               </el-form-item>
               <el-form-item
                 label="是否开启试验模块"
-                v-if="contractForm.contractType==1"
                 prop="isTestModule"
               >
                 <el-radio-group v-model="contractForm.isTestModule">
@@ -99,7 +97,6 @@
               </el-form-item>
               <el-form-item
                 label="是否引用编号"
-                v-if="contractForm.contractType==1"
                 prop="isReferenceNumber"
               >
                 <el-radio-group v-model="contractForm.isReferenceNumber">
@@ -109,7 +106,6 @@
               </el-form-item>
               <el-form-item
                 label="是否开启复制数据"
-                v-if="contractForm.contractType==1"
                 prop="isCopyData"
               >
                 <el-radio-group v-model="contractForm.isCopyData">
@@ -1022,7 +1018,7 @@ export default {
       });
       this.typeChang[this.activeType] = false;
       let num = Number(this.activeType);
-      if (this.$route.query.contractType == 1 || $route.query.contractType === undefined) {
+      if (this.$route.query.contractType == 1 || this.$route.query.contractType === undefined) {
         if (type == 'n') {
           num++;
         } else if (type == 'p') {

src/views/manager/projectinfo/editElement/editElement.vue

@@ -175,6 +175,7 @@
           <el-button @click="handleClose()">取 消</el-button>
           <el-button
             type="primary"
+            v-throttle='2000'
             :disabled="tableData.length===0"
             @click="pushNewElementField()"
           >确 定</el-button>
@@ -272,8 +273,14 @@ export default {
         tr,
         td
       }
-      this.top = window.event.clientY - 80
+
       this.left = window.event.clientX - 300
+      let Y = window.event.clientY
+      if (window.outerHeight - Y > 200) {
+        this.top = window.event.clientY - 80
+      } else {
+        this.top = window.event.clientY - 270
+      }
       this.cascaderPanel = true
       clearTimeout(this.setTimeout)
       this.setTimeout = setTimeout(() => {
@@ -452,7 +459,7 @@ export default {
           })
         } else {
           this.$message({
-            type: 'eroor',
+            type: 'error',
             message: '请填写所有字段'
           });
         }
@@ -462,7 +469,11 @@ export default {
       const { data: res } = await submitBatch(da)
       console.log(res);
       if (res.code == 200) {
-
+        this.$message({
+          type: 'success',
+          message: '添加成功'
+        })
+        this.AddNewElementField = ''
       }
     }
     //#endregion

src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -1,11 +1,14 @@
 <template>
   <div class="excelHtnl">
     <div class="header">
-      <div
-        class="GoBack"
-        @click="GoBack()"
-      >
-        返回上一级
+      <div class="flexStar">
+        <h2>编辑WBS库</h2>
+        <div
+          class="GoBack marleft20"
+          @click="GoBack()"
+        >
+          返回上一级
+        </div>
       </div>
       <div>
         <el-button
@@ -28,6 +31,11 @@
           size="small"
           @click="setUptype=3"
         >编辑默认信息</el-button>
+        <el-button
+          type="info"
+          size="small"
+          @click="setUptype=4"
+        >提示设置</el-button>
       </div>
     </div>
     <div class="excelBox">
@@ -49,6 +57,7 @@
         <electronicSignature v-if="setUptype===1" />
         <setFormula v-if="setUptype===2" />
         <editDefault v-if="setUptype===3" />
+        <promptSettings v-if="setUptype===4" />
       </div>
     </div>
   </div>
@@ -59,6 +68,7 @@ import setInputTPT from './template/setInputTPT.vue'
 import electronicSignature from './template/electronicSignature.vue'
 import setFormula from './template/setFormula.vue'
 import editDefault from './template/editDefault.vue'
+import promptSettings from './template/promptSettings.vue'
 import Vue from 'vue'
 // import dictVue from '../../../system/dict.vue'
 export default {
@@ -101,15 +111,17 @@ export default {
     async copss () {
       let _that = this
       var MyComponent = await Vue.extend({
+        template: localStorage.getItem('excelHtml'),
         data () {
           return {
             formData: {}
           }
         },
-        template: localStorage.getItem('excelHtml'),
-        getInformation (name, tr, td) {//鼠标右键事件
-          _that.getInformation(name, tr, td)
-        },
+        methods: {
+          getInformation (name, tr, td) {//鼠标右键事件
+            _that.getInformation(name, tr, td)
+          },
+        }
       })
       var component = new MyComponent().$mount()
       let na = document.getElementById('parent')
@@ -123,7 +135,6 @@ export default {
       this.copss()
     },
     getInformation (name, tr, td) {//鼠标点击事件
-      console.log(name, tr, td);
       this.htmlData = {
         name,
         tr,
@@ -135,7 +146,8 @@ export default {
     setInputTPT,
     electronicSignature,
     setFormula,
-    editDefault
+    editDefault,
+    promptSettings
   }
 }
 </script>
@@ -156,6 +168,8 @@ export default {
     .GoBack {
       color: rgba(0, 82, 216, 1);
       text-decoration: underline;
+      display: flex;
+      align-items: center;
       font-family: SourceHanSansSC;
       cursor: pointer;
     }

src/views/manager/projectinfo/treeTemplate/template/promptSettings.vue

@@ -0,0 +1,43 @@
+<template>
+  <div>
+    <el-select
+      style="width:300px;"
+      v-model="value"
+      placeholder="请选择元素字段"
+    >
+      <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      >
+      </el-option>
+    </el-select>
+
+    <el-input
+      class="martop25"
+      type="textarea"
+      :rows="6"
+      placeholder="请输入内容"
+      v-model="textarea"
+    >
+    </el-input>
+
+    <div class="flexEnd martop25">
+      <el-button
+        type="info"
+        size="small"
+        v-throttle='2000'
+      >保存设置</el-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      options: []
+    }
+  }
+}
+</script>

src/views/manager/wbsinfo/edit.vue

@@ -2505,6 +2505,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+//树结构超长后产生滚动条
+.el-tree > .el-tree-node {
+  min-width: 100%;
+  display: inline-block;
+}
 .font-s-12 /deep/ .iconfont {
   font-size: 12px;
 }

src/views/system/user.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-row>
+  <el-row class="user">
     <el-col :span="5">
       <div class="box">
         <el-scrollbar>
@@ -684,6 +684,7 @@ export default {
                 // multiple: true,
                 dicData: [],
                 value: '',
+                typeslot: true,
                 props: {
                   label: "title",
                   value: 'value',
@@ -1280,6 +1281,8 @@ export default {
         }, () => {
           loading();
         });
+      } else {
+        loading()
       }
     },
     rowUpdate (row, index, done, loading) {//修改按钮
@@ -1541,7 +1544,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss">
 .box {
   height: 800px;
 }