Merge remote-tracking branch 'origin/master'

src/views/index_v1.vue

@@ -16,22 +16,29 @@
           width="80">
         </el-table-column>
         <el-table-column
-          prop="FACTORY_CODE"
+          prop="FACTORY_NAME"
           label="工厂"
-          width="80">
+          width="150">
         </el-table-column>
         <el-table-column
-          prop="ORDER_CODE"
-          label="订单编号">
+          prop="PRODUCT_LINE_NAME"
+          label="产线"
+          width="80">
         </el-table-column>
         <el-table-column
-          prop="MATERIAL_NAME"
-          label="物料名称">
+          prop="ORDER_CODE"
+          label="订单编号"
+          width="100">
         </el-table-column>
         <el-table-column
           prop="MATERIAL_CODE"
           label="物料编号">
         </el-table-column>
+        <el-table-column
+          prop="MATERIAL_NAME"
+          label="物料名称"
+          width="200">
+        </el-table-column>
         <el-table-column
           prop="ORDER_AMOUNT"
           label="计划数">

src/views/report/scanOfflineRecordReport/index.vue

@@ -85,9 +85,9 @@
 
       <el-table-column label="销售订单号" align="center" prop="PRODUCT_SALE_NO" v-if="columns[4].visible"/>
       <el-table-column label="销售订单行号" align="center" prop="PRODUCT_SALE_LINE_NO" v-if="columns[5].visible"/>
-      <el-table-column label="物料编码" align="center" prop="PRODUCT_CODE" v-if="columns[6].visible"/>
-      <el-table-column label="产品型号" align="center" prop="PRODUCT_MODEL" v-if="columns[7].visible"/>
-      <el-table-column label="物料描述" align="center" prop="PRODUCT_NAME" v-if="columns[8].visible"/>
+      <el-table-column label="物料编码" align="center" prop="PRODUCT_CODE" width="100" v-if="columns[6].visible"/>
+      <el-table-column label="产品型号" align="center" prop="PRODUCT_MODEL" width="190"  v-if="columns[7].visible"/>
+      <el-table-column label="物料描述" align="center" prop="PRODUCT_NAME" width="200" v-if="columns[8].visible"/>
       <el-table-column label="产品类型" align="center" prop="PRODUCT_TYPE" v-if="columns[9].visible"/>
       <el-table-column label="产品条码编码" align="center" prop="PRODUCT_BAR_NO" v-if="columns[10].visible"/>
       <el-table-column label="生成日期" align="center" prop="PRODUCT_CREATEDATE" v-if="columns[11].visible">