From 3729ae40541c3e0b2e49717b02c0a232f7f1cc05 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 15 Jan 2024 10:05:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E9=A6=96=E9=A1=B5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index_v1.vue                        | 19 +++++++++++++------
 .../report/scanOfflineRecordReport/index.vue  |  6 +++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index 543632c..48d4404 100644
--- a/src/views/index_v1.vue
+++ b/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="计划数">
diff --git a/src/views/report/scanOfflineRecordReport/index.vue b/src/views/report/scanOfflineRecordReport/index.vue
index 0142df6..4fc36e9 100644
--- a/src/views/report/scanOfflineRecordReport/index.vue
+++ b/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">