build

src/views/businessReportQuery/businessSaleReport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pagePadding">
-    <div v-if="powers.some((i) => i == '001')">
+    <div v-if="powers.some((i) => i == '001') && currentCompany">
       <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
       <el-tabs v-model="activeName">
         <el-tab-pane label="日报" name="table1"></el-tab-pane>
@@ -69,6 +69,12 @@
         </el-tab-pane>
       </el-tabs>
     </div>
+
+    <div class="company-error" v-else-if="!currentCompany">
+      <i class="el-icon-warning"></i>
+      <p>请选择一家业务公司</p>
+    </div>
+
     <div v-else>
       <no-auth></no-auth>
     </div>
@@ -185,4 +191,14 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.company-error{
+  top: 50%;
+  left: 50%;
+  display: flex;
+  position: fixed;
+  transform: translate(-50%, -50%);
+  align-items: center;
+  gap: 10px;
+}
+</style>

src/views/purchaseIn/purchaseDiffOrder/columns.js

@@ -31,7 +31,7 @@ export default [
     width: '155px'
   },
   {
-    prop: 'supplier_name',
+    prop: 'supplierName',
     label: '供应商名称',
     width: '155px'
   },

src/views/sellOut/sellAfterApply/columns.js

@@ -211,6 +211,12 @@ const sellshowColumns = [
     _slot_: 'supplier',
     span: 12
   },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    _slot_: 'customer',
+    span: 12
+  },
   {
     prop: 'total_num',
     label: '发货总数量',
@@ -243,13 +249,13 @@ const sellshowColumns = [
     prop: 'loop_total',
     _slot_: 'loop_total',
     label: '更改次数',
-    span: 6
+    span: 12
   },
   {
     prop: 'error_img',
     label: '异常图片',
     _slot_: 'error_img',
-    span: 18
+    span: 24
   },
   {
     prop: 'error_remark',

src/views/sellOut/sellAfterApply/detail.vue

@@ -23,6 +23,18 @@
                 </el-popover>
               </template>
 
+              <template slot="customer">
+                <span>{{ sitem.customer_name }}</span>
+                <el-popover placement="top" width="300" trigger="hover">
+                  <ul>
+                    <li>
+                      <span>客户公司编号：</span><span>{{ sitem.customer_code }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+
               <template slot="loop_total">
                 <span>供应商负责人共修改供应商审批结果 {{sitem.loop_total}} 次</span>
               </template>
@@ -32,7 +44,7 @@
                 <el-popover placement="top" width="300" trigger="hover">
                   <ul>
                     <li>
-                      <span>供应商编号：</span><span>{{ sitem.supplierName }}</span>
+                      <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
                     </li>
                   </ul>
                   <i slot="reference" class="el-icon-warning-outline fr" />