From fffb035819a57d5a7fb0d9ffb680be811812db29 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 14 Nov 2023 14:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 984250d..0912b3f 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -153,22 +153,27 @@
         </template>
       </el-table-column>
       <el-table-column width="100" align="center" label="计划工厂编码" prop="planFactoryCode"/>
-      <el-table-column label="订单类型" align="center" prop="orderType"/>
+      <el-table-column label="订单类型" align="center" prop="orderType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="产品类型" align="center" prop="prodType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="创建时间" align="center" prop="createTime">
+      <el-table-column width="150" label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planComplete, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <!--
       <el-table-column width="120" label="更新时间" align="center" prop="updateTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planComplete, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width " fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -509,7 +514,7 @@ import {getToken} from "@/utils/auth"
 
 export default {
   name: 'Order',
-  dicts: ['product_type', 'order_status'],
+  dicts: ['product_type', 'order_status','order_type'],
   components: {
     Treeselect
   },
@@ -1297,7 +1302,7 @@ export default {
       this.$modal.confirm('是否确认SAP同步操作步骤？执行后，需要一分钟后查看同步结果').then(function () {
         _this.loading = false;
         syncSAP()
-        
+
       }).then(() => {
         //this.getList()
         _this.loading = false;