From da3de18d73228aa844fa6a30f0fa20dc876a7aad Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 30 Aug 2023 16:49:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/business/stockOrder.vue     |  4 ++--
 src/views/inout/DialogCreateOrderSelect.vue | 23 +++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 8e544859..7bd21122 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -42,8 +42,8 @@
                 <el-option label="草稿" :value=1>草稿</el-option>
                 <el-option label="待校验" :value=3>待校验</el-option>
                 <el-option label="待核对" :value=5>待核对</el-option>
-                <!--<el-option label="待审核" :value=10>待审核</el-option>-->
-                <!--<el-option label="已审核" :value=7>已审核</el-option>-->
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index f0ae3ab1..9316c700 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -120,15 +120,22 @@
           width="55"
         ></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
+
         <el-table-column
-          label="扫码单据类型"
-          prop="billTypeName"
-        ></el-table-column>
-        <el-table-column
-          label="订单号"
+          label="单据号"
           prop="billNo"
           show-overflow-tooltip
         ></el-table-column>
+        <el-table-column
+          label="单据类型"
+          prop="billTypeName"
+        ></el-table-column>
+        <el-table-column label="往来单位" prop="fromName" width="220">
+        </el-table-column>
+        <el-table-column label="所属部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="所属仓库" prop="invName" width="120">
+        </el-table-column>
         <el-table-column
           label="来源订单号"
           prop="corpOrderId"
@@ -139,12 +146,6 @@
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromName" width="220">
-        </el-table-column>
-        <el-table-column label="当前部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
-        </el-table-column>
         <el-table-column
           label="所属科室"
           prop="deptName"