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

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

@@ -26,7 +26,7 @@
     <el-table :data="tableData" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55"  align="center" /> -->
       <el-table-column label="物料名称" align="center" prop="itemName" />
-      <el-table-column label="物料名称" align="center" prop="sapItemCode" />
+      <el-table-column label="物料编号" align="center" prop="sapItemCode" />
       <el-table-column
         label="组件数量"
         align="center"

src/views/mes/pro/workorder/proofingInfo.vue

@@ -221,7 +221,11 @@
               <el-input v-model="form.rowNum" :disabled="mode == 'make'" placeholder="请输入排版行数" />
             </el-form-item>
           </el-col>
-
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="模数" :disabled="mode == 'make'" prop="moduleNum">
+              <el-input v-model="form.moduleNum" :disabled="mode == 'make'" placeholder="请输入模数" />
+            </el-form-item>
+          </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="单重" prop="singleWeight">
               <el-input v-model="form.singleWeight" :disabled="mode == 'make'" placeholder="请输入单重" />