From e055116aaf6a3d61244c728d054173d604806a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com>
Date: Thu, 13 Jan 2022 17:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataInput/hq_f_outorder_chickout/detail.vue   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
index c3895aae..04d2178a 100644
--- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
@@ -102,7 +102,7 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
-      </el-table-column>
+     
       <el-table-column
         prop="state"
         :formatter="fieldFormatter"
@@ -249,15 +249,9 @@ export default {
         version: "",
         guids: "",
         billNum: "",
-<<<<<<< .mine
         accountDate:"",
         branchId:"",
         outPutQty:"",
-=======
-        accountDate: "",
-
-
->>>>>>> .theirs
       },
       listDeleteQuery: {
         billNum: "",
@@ -535,12 +529,7 @@ export default {
               this.getList();
             });
           });
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
+       
     },
     /** 刷新列表 */
     handleHandle(data) {