修改

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) {