Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/cal/holiday/itemIndex.vue

@@ -63,7 +63,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange" max-height="500">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
       <el-table-column label="工作单元名称" align="center" prop="workunitName" />
@@ -84,6 +84,7 @@
     <pagination
       v-show="total>0"
       :total="total"
+      :page-sizes="[10, 50, 100, 1000, 2000]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"

src/views/mes/pro/productionSolution/components/ProogingBom.vue

@@ -48,8 +48,12 @@
 
     <el-table :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" prop="idx" />
+      <el-table-column label="组件编码" align="center" prop="sapItemCode">
+        <template slot-scope="scope">
+          {{ scope.row.sapItemCode ? Number(scope.row.sapItemCode) : "-" }}
+        </template>
+      </el-table-column>
       <el-table-column label="组件名称" align="center" prop="itemName" />
-      <el-table-column label="组件编码" align="center" prop="sapItemCode" />
       <el-table-column label="项目类别" align="center" prop="itemClass">
         <template slot-scope="scope">
           <dict-tag
@@ -58,7 +62,9 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="组件数量" align="center" prop="quantity" />
+      <el-table-column label="标准用量" align="center" prop="quantity" />
+      <el-table-column label="基本用量" align="center" prop="basicQuantity" />
+      <el-table-column label="BOM行备注" align="center" prop="bomItemRemark" />
       <el-table-column label="计量单位" align="center" prop="measureName" />
       <el-table-column
         label="成本核算"
@@ -112,7 +118,6 @@
         align="center"
         prop="alternativeProbability"
       />
-      <el-table-column label="BOM行备注" align="center" prop="bomItemRemark" />
       <el-table-column label="物料备注" align="center" prop="itemRemark" />
       <el-table-column label="固定数量" align="center" prop="isFixed">
         <template slot-scope="scope">
@@ -219,7 +224,7 @@
         </el-row>
         <el-row>
 
-       
+
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="报废百分比" prop="scrapPercentage">
               <el-input