Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/attribute.vue

@@ -187,17 +187,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" label-width="100px">
-          <el-form-item label="单位" prop="name">
-            <DictSelection
-              dictName="计量单位"
-              v-model="attributeData.unit"
-            ></DictSelection>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
         <el-col :span="8" label-width="100px">
           <el-form-item label="物料库路径" prop="name">
             <el-input
@@ -208,6 +197,8 @@
         </el-col>
       </el-row>
 
+
+
       <el-row>
         <el-col :span="20" label-width="100px">
           <el-form-item label="备注" prop="name">

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -132,7 +132,6 @@
                   v-model="row.unitName"
                 >
                 </DictSelection>
-
                 <span v-if="row.textType == 5"> h(小时)</span>
               </div>
             </template>

src/views/material/BOMmanage/detailsPop.vue

@@ -15,8 +15,8 @@
             v-model="currentNodeData.bomType"
             @change="bomChange"
           >
-            <el-radio-button :label="4" v-if="clientEnvironmentId != 2">EBOM </el-radio-button>
-            <el-radio-button :label="1"  v-if="clientEnvironmentId != 2">PBOM </el-radio-button>
+            <el-radio-button :label="4" >EBOM </el-radio-button>
+            <el-radio-button :label="1"  >PBOM </el-radio-button>
 
             <!-- v-if="
                 searchObj.isProduct ||
@@ -29,7 +29,7 @@
             </el-radio-button>
             <el-radio-button
               :label="3"
-              v-if="clientEnvironmentId != 2"
+            
               >ABOM
             </el-radio-button>
           </el-radio-group>
@@ -393,7 +393,7 @@
         isFullscreen: true,
 
         currentNodeData: {
-          bomType: this.clientEnvironmentId == 2 ?  2:  1,
+          bomType:   1,
           children: []
         },
 
@@ -527,15 +527,13 @@
         if (id) {
           getBomGetById(id).then((res) => {
             this.currentNodeData = res.data;
-            if(this.clientEnvironmentId == 2) {
-              this.currentNodeData.bomType = 2;
-            }
+         
             this.searchObj.versions = this.currentNodeData.versions;
             this.$forceUpdate();
           });
         } else {
           this.currentNodeData = {
-            bomType: this.clientEnvironmentId == 2 ?  2:  1,
+            bomType:   1,
             children: []
           };
         }
@@ -760,6 +758,7 @@
     .treeData {
       height: 0 1 auto;
       overflow-y: auto;
+      height: calc(100vh - 125px);
     }
   }