Merge branch 'master' into test-dev

src/views/manager/projectinfo/tree.vue

@@ -630,7 +630,7 @@
           </el-table-column>
           <el-table-column prop="nodeType" label="节点类型" v-if="wbsType == 5">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.nodeType" placeholder="请选择">
+              <el-select v-model="scope.row.nodeType" placeholder="请选择" >
                 <el-option
                   v-for="item in nodeTypelist"
                   :key="item.id"
@@ -663,7 +663,7 @@
       />
     </div>
 
-   
+
     <el-dialog
       title="调整排序"
       :visible.sync="sortTag"
@@ -798,6 +798,7 @@
             placeholder="请选择"
             class="w-100p"
             @change="nodeTypeChange"
+            clearable
           >
             <el-option
               v-for="item in nodeTypelist"
@@ -836,6 +837,7 @@
             v-model="nodeDetail.majorDataType"
             placeholder="请选择"
             class="w-100p"
+            clearable
           >
             <el-option
               v-for="item in majorDataTypeList"
@@ -851,6 +853,7 @@
             placeholder="请选择"
             class="w-100p"
             @change="changeStandType"
+            clearable
           >
             <el-option
               v-for="item in standardTypeOptions"
@@ -865,6 +868,7 @@
             v-model="nodeDetail.unitName"
             placeholder="请选择"
             class="w-100p"
+            clearable
           >
             <el-option
               v-for="item in unitOptions"
@@ -3389,7 +3393,10 @@ export default {
           element.dictKey = Number(element.dictKey);
     
         });
-        this.majorDataTypeList = res.data.data;
+        // this.majorDataTypeList = res.data.data;
+        this.majorDataTypeList = res.data.data.filter(
+          (item) => item.dictKey != 0
+        );
        
         
       });

src/views/manager/wbsinfo/edit.vue

@@ -522,6 +522,7 @@
             placeholder="请选择"
             class="w-100p"
             @change="nodeTypeChange"
+            clearable
           >
             <el-option
               v-for="item in nodeTypelist"
@@ -563,6 +564,7 @@
             v-model="nodeDetail.majorDataType"
             placeholder="请选择"
             class="w-100p"
+              clearable
           >
             <el-option
               v-for="item in majorDataTypeList"
@@ -604,6 +606,7 @@
             placeholder="请选择"
             class="w-100p"
             @change="changeStandType"
+              clearable
           >
             <el-option
               v-for="item in standardTypeOptions"
@@ -618,6 +621,7 @@
             v-model="nodeDetail.unitName"
             placeholder="请选择"
             class="w-100p"
+              clearable
           >
             <el-option
               v-for="item in unitOptions"