From 695723fcf4c181009f6f6ca0574b87bc71369b30 Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Wed, 21 Feb 2024 17:31:21 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue      |  2 +-
 src/views/inout/IoCreateBusOrder.vue     |  2 +-
 src/views/inout/IoEditOrder.vue          | 45 ++++++++++++------------
 src/views/purchase/cert/supCertAudit.vue |  6 ++--
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 0232c847..92f90111 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -572,7 +572,7 @@
                 :label="item.columnDesc"
                 :width="isChoose?50:280"
                 :key="item.columnName"
-                fixed="right"1
+                fixed="right"
               >
                 <template slot-scope="scope">
                   <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 2dcbea8f..19a44b9c 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -635,7 +635,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.billNo = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
 
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 36f35cee..b7d72ca7 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -72,15 +72,15 @@
                 ></el-date-picker>
               </el-form-item>
             </template>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+                <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+                <el-button type="primary" icon="el-icon-delete" @click="deleteAllOrder">全部删除</el-button>
+                <el-button type="primary" icon="el-icon-edit" @click="editOrders">编辑</el-button>
+              </el-button-group>
+            </el-form-item>
           </el-row>
-          <el-form-item>
-            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
-              <el-button type="primary" icon="el-icon-delete" @click="deleteAllOrder">全部删除</el-button>
-              <el-button type="primary" icon="el-icon-edit" @click="editOrders">编辑</el-button>
-            </el-button-group>
-          </el-form-item>
         </el-row>
       </el-form>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@@ -305,21 +305,22 @@
                 ></el-date-picker>
               </el-form-item>
             </template>
+            <el-form-item>
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  @click="onBizReset"
+                >重置
+                </el-button>
+                <el-button type="primary" @click="onBizSubmit"
+                           icon="el-icon-search"
+                >查询
+                </el-button>
+              </el-button-group>
+            </el-form-item>
           </el-row>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onBizReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="onBizSubmit"
-                         icon="el-icon-search"
-              >查询
-              </el-button>
-            </el-button-group>
-          </el-form-item>
+
         </el-form>
 
         <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 60cd5e88..e09d5895 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -183,7 +183,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'failCout'" label="生产企业证书" prop="auditStatus" width="120">
+          <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
             <template slot-scope="scope">
 
               <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
@@ -198,7 +198,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'productFailCout'" label="配送产品证书" prop="auditStatus" width="120">
+          <el-table-column v-if="item.columnName == 'productFailCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
             <template slot-scope="scope">
               <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
                 未添加证书
@@ -538,7 +538,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'failCout'" label="配送产品证书" prop="auditStatus" width="120">
+          <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
               <template slot-scope="scope">
 
                 <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">