Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/components/Print/printModal.vue

@@ -2,7 +2,7 @@
     <div>
         <a-modal :footer="false" v-model:visible="visible" title="" width="1050px" :maskClosable="false">
             <div style="padding-bottom: 20px">
-                <div style="margin-bottom: 15px;margin-top: 10px;">
+                <div style="margin-bottom: 15px;padding-top: 15px;">
                     <a-button type="primary" size="small" @click="print">打印</a-button>
                     <a-button type="primary" size="small" @click="downLoad" style="margin: 0 10px">下载</a-button>
                     <a-button type="primary" size="small" @click="openMail" >发送邮件</a-button>

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -876,8 +876,8 @@
         .catch(async (err) => {
           let clientTagData: any = ''
           let SaleData: any = ''
-          if (rowId.value) {
+          if (err.clientId) {
-            const clientRes = await getCodeGoodsTypeInfo({ id: unref(rowId) })
+            const clientRes = await getCodeGoodsTypeInfo({ id: err.clientId })
             if (clientRes.data.clientTag) {
               values.clientTag = {}
               let ClientTag = await getDictOption('infoclient-ArrclientTag')

src/views/bookingcabin/CabinManagement/columns.tsx

@@ -455,13 +455,13 @@ export const columns: BasicColumn[] = [
     title: '委托单位',
     align: 'center',
     width: 100,
-    dataIndex: 'customername',
+    dataIndex: 'customerName',
   },
   {
     title: '客服',
     align: 'center',
     width: 100,
-    dataIndex: 'custservice',
+    dataIndex: 'custService',
   },
   {
     title: '操作',
@@ -497,7 +497,7 @@ export const columns: BasicColumn[] = [
     title: '品名',
     align: 'center',
     width: 100,
-    dataIndex: 'goodsname',
+    dataIndex: 'goodsName',
   },
   {
     title: '卖价',
@@ -509,7 +509,7 @@ export const columns: BasicColumn[] = [
     title: '销售日期',
     align: 'center',
     width: 100,
-    dataIndex: 'salE_TIME',
+    dataIndex: 'saleTime',
   },
   {
     title: '是否拆合票',
@@ -648,7 +648,7 @@ export const columns: BasicColumn[] = [
     title: 'VGM回执',
     align: 'center',
     width: 100,
-    dataIndex: 'VGM_RLT_STAT',
+    dataIndex: 'vgmRltStat',
     customCell: sharedOnCell,
   },
   {

src/views/operation/invoiceApply/index.vue

@@ -49,10 +49,10 @@
               </a-tooltip>
             </div>
 
-            <a-button v-repeat type="link">
+            <!-- <a-button v-repeat type="link">
               <span class="iconfont icon-liebiao IconColor"></span>
               显示工作流
-            </a-button>
+            </a-button> -->
             <a-button @click="ExportExcel" v-repeat type="link">
               <span class="iconfont icon-a-17Btuichu IconColor"></span>
               导出EXCEL