55

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

@@ -760,6 +760,7 @@
     .treeData {
       height: 0 1 auto;
       overflow-y: auto;
+      height: calc(100vh - 125px);
     }
   }