duy hai 1 ano
pai
achega
37b95be37f

+ 1 - 0
src/views/manager/projectinfo/detail.vue

@@ -112,6 +112,7 @@
                       v-model="projectForm.meterTemplateId"
                       placeholder="请选择"
                       class="w-100p"
+                      clearable
                     >
                       <el-option
                         v-for="item in meterTemplateOption"

+ 2 - 2
src/views/manager/projectinfo/list.vue

@@ -63,12 +63,12 @@
         <div>
           <el-button
             size="small"
-            @click="splitTree"
+            @click="measureTree"
             style="background-color: #626aef;color: white;"
           >计量管理</el-button>
           <el-button
             size="small"
-            @click="measureTree"
+            @click="splitTree"
             type="success"
           >征拆划分</el-button>
           <el-button

+ 8 - 4
src/views/manager/wbsinfo/edit.vue

@@ -2618,6 +2618,7 @@ export default {
 
     getNodeTypelist () {
       const type = this.wbsType
+      console.log(this.nodeTypelist,'this.nodeTypelist');
       if (this.nodeTypelist.length > 1) {
         return;
       }
@@ -2628,11 +2629,14 @@ export default {
         code='trial_node_type'//试验
       }
       else if(type===3){
-        code='trial_node_type'//计量
-      }
-      {
-        code='wbs_node_type'//质检
+        code='meter_node_type'//计量
       }
+      else if(type===1){
+        {
+          code='wbs_node_type'//质检
+        }
+      } 
+     
       getDictionary({
         code
         // code: type === 2 ? 'trial_node_type':'wbs_node_type'