提交代码

package-lock.json

@@ -8,6 +8,7 @@
       "name": "saber-admin",
       "version": "2.9.1",
       "dependencies": {
+        "@johmun/vue-tags-input": "^2.1.0",
         "avue-plugin-ueditor": "^0.1.4",
         "axios": "^0.18.0",
         "babel-polyfill": "^6.26.0",
@@ -1245,6 +1246,17 @@
         "webpack": "^4.0.0"
       }
     },
+    "node_modules/@johmun/vue-tags-input": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@johmun/vue-tags-input/-/vue-tags-input-2.1.0.tgz",
+      "integrity": "sha512-Fdwfss/TqCqMJbGAkmlzKbcG/ia1MstYjhqPBj+zG7h/166tIcE1TIftUxhT9LZ+RWjRSG0EFA1UyaHQSr3k3Q==",
+      "dependencies": {
+        "vue": "^2.6.10"
+      },
+      "peerDependencies": {
+        "vue": "2.x"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.0.6",
       "dev": true,
@@ -16136,6 +16148,14 @@
         "postcss": "^7.0.0"
       }
     },
+    "@johmun/vue-tags-input": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@johmun/vue-tags-input/-/vue-tags-input-2.1.0.tgz",
+      "integrity": "sha512-Fdwfss/TqCqMJbGAkmlzKbcG/ia1MstYjhqPBj+zG7h/166tIcE1TIftUxhT9LZ+RWjRSG0EFA1UyaHQSr3k3Q==",
+      "requires": {
+        "vue": "^2.6.10"
+      }
+    },
     "@jridgewell/resolve-uri": {
       "version": "3.0.6",
       "dev": true

src/api/manager/wbstree.js

@@ -250,4 +250,12 @@ export const updateBatchNodeTableInfo2 = (data) => {
         method: 'post',
         data
     })
+}
+
+export const updateStatus = (params) => {
+    return request({
+        url: '/api/blade-manager/wbsPrivate/updateStatus',
+        method: 'get',
+        params
+    })
 }

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

@@ -23,56 +23,53 @@
 
         </el-col>
         <el-col
-          :span="8"
-          v-show="AddNewElementField == '替换元素'"
+          :span="7"
+          style="position: fixed;right: 13px;"
         >
-          <el-select
-            style="width:400px;"
-            v-model="value"
-            filterable
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.eName"
-              :value="item.id"
+          <div v-show="AddNewElementField == '替换元素'">
+            <el-select
+              style="width:300px;"
+              v-model="value"
+              filterable
+              placeholder="请选择"
             >
-            </el-option>
-          </el-select>
-          <div class="tihuan">替换为：</div>
-          <el-input
-            :disabled="true"
-            type="textarea"
-            :rows="4"
-            placeholder="请输入内容"
-            v-model="names"
-          >
-          </el-input>
-          <div class="martop20">
-            <el-button
-              type="info"
-              @click="cancelReplace()"
-            >取消</el-button>
-            <el-button
-              type="primary"
-              :disabled="tag"
-              @click="saveReplace()"
-            >保存</el-button>
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.eName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+            <div class="tihuan">替换为：</div>
+            <el-input
+              style="width:95%;"
+              :disabled="true"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入内容"
+              v-model="names"
+            >
+            </el-input>
+            <div class="martop20">
+              <el-button
+                type="info"
+                @click="cancelReplace()"
+              >取消</el-button>
+              <el-button
+                type="primary"
+                :disabled="tag"
+                @click="saveReplace()"
+              >保存</el-button>
+            </div>
           </div>
-        </el-col>
-        <el-col
-          :span="8"
-          v-show="AddNewElementField == ''"
-        >
-          <div style="position: absolute;bottom: 0px;right:0px;">
-            <el-button
-              type="info"
-              @click="returns()"
-            >返回</el-button>
+          <div
+            v-show="AddNewElementField ==''"
+            style="width:160px;position: fixed;bottom: 20px; right:20px;"
+          >
+            <el-button type="info">取消</el-button>
             <el-button type="primary">保存</el-button>
           </div>
-
         </el-col>
       </el-row>
       <!-- 弹框 -->

src/views/manager/projectinfo/tree.vue

@@ -249,7 +249,10 @@
               :formatter="formatOwner"
               label="所属方"
             ></el-table-column>
-            <el-table-column label="操作">
+            <el-table-column
+              label="操作"
+              min-width="120"
+            >
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -260,6 +263,13 @@
                   type="danger"
                   @click="handleDelete(scope.$index, scope.row)"
                 >删除</el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  v-throttle='2000'
+                  :disabled="scope.row.status==0"
+                  @click="hideMD(scope.row)"
+                >隐藏</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1277,7 +1287,7 @@ import ManualSorting from '@/components/WbsTree/ManualSorting'
 import dynamicExcel from "./treeTemplate/dynamicExcel.vue";
 import {
   saveFormAndElement, selectFormElements,
-  importWbsTree, findWbsTreePrivateSameLevel, wbsTreePrivateSort, parameters, saveOrUpdateBatch, keymap, updateBatchNodeTableInfo2
+  importWbsTree, findWbsTreePrivateSameLevel, wbsTreePrivateSort, parameters, saveOrUpdateBatch, keymap, updateBatchNodeTableInfo2, updateStatus
 } from "@/api/manager/wbstree";
 import {
   saveElement, remove as removeElement, updateBatchElements, getTemplate,
@@ -1468,7 +1478,6 @@ export default {
       })
     },
     getNodeDetail (data, node) {
-      console.log(111);
       let parentName = '';
       if (node.parent.data) {
         parentName = node.parent.data.title;
@@ -1682,7 +1691,22 @@ export default {
         })
       })
     },
-
+    async hideMD (row) {//隐藏按钮
+      const code = await this.updateStatus(row.pkeyId)
+      if (code == 200) {
+        row.status == 1
+      }
+    },
+    async updateStatus (pKeyId) {//隐藏功能
+      const { data: res } = await updateStatus({ pKeyId })
+      if (res.code == 200) {
+        this.$message({
+          type: 'success',
+          message: '隐藏成功'
+        })
+      }
+      return res.code
+    },
     handleEditFormula (index, row) {
       this.curEleTable = row;
       selectFormElements(this.curEleTable.id).then((res) => {

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

@@ -1,6 +1,9 @@
 <template>
   <div class="excelHtnl">
-    <div class="header">
+    <div
+      class="header"
+      style=" position: absolute;"
+    >
       <div class="flexStar">
         <h2>编辑WBS库</h2>
         <div
@@ -33,12 +36,16 @@
         >编辑默认信息</el-button>
         <el-button
           type="info"
+          class="marright25"
           size="small"
           @click="setUptype=4"
         >提示设置</el-button>
       </div>
     </div>
-    <div class="excelBox">
+    <div
+      class="excelBox"
+      style="margin-top:40px;"
+    >
       <div
         style="width:60%;"
         class='parent'
@@ -49,15 +56,28 @@
         style="width:30%;margin-left:6%;"
       >
         <setInputTPT
+          style=" position: absolute;"
           v-if="setUptype===0"
           :pkeyId='pkeyId'
           @cop='domss'
           :htmlData="htmlData"
         />
-        <electronicSignature v-if="setUptype===1" />
-        <setFormula v-if="setUptype===2" />
-        <editDefault v-if="setUptype===3" />
-        <promptSettings v-if="setUptype===4" />
+        <electronicSignature
+          v-if="setUptype===1"
+          style=" position: absolute;"
+        />
+        <setFormula
+          v-if="setUptype===2"
+          style=" position: absolute;"
+        />
+        <editDefault
+          v-if="setUptype===3"
+          style=" position: absolute;"
+        />
+        <promptSettings
+          v-if="setUptype===4"
+          style=" position: absolute;"
+        />
       </div>
     </div>
   </div>
@@ -161,8 +181,13 @@ export default {
   height: 100%;
   overflow: scroll;
   .header {
+    border-radius: 4px;
+    box-sizing: border-box;
+    width: calc(100% - 20px);
+    background-color: #fff;
     display: flex;
     justify-content: space-between;
+    z-index: 99;
     height: 50px;
     align-items: center;
     .GoBack {

vue.config.js

@@ -28,9 +28,9 @@ module.exports = {
                 //本地服务接口地址
                 // target: 'http://localhost',
                 // target: 'http://192.168.4.6',
-                target: 'http://47.110.251.215:8090',
+                // target: 'http://47.110.251.215:8090',
                 // target: 'http://192.168.4.12',
-                // target: 'http://192.168.4.44',
+                target: 'http://192.168.4.44',
                 //远程演示服务地址,可用于直接启动项目
                 //target: 'https://saber.bladex.vip/api',
                 ws: true,