lilei 1 rok temu
rodzic
commit
ebe66f49ed

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -26,7 +26,7 @@
             :disabled="detailData==null"
             key="2"
             type="primary"
-            class="button-error"
+            class="button-info"
             v-if="$hasPermissions('B_eRPrint')"
             id="expenseManagementDetail-print-btn"
             @click="handlePrint('print')">快捷打印</a-button>

+ 2 - 13
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="collectionDetail-wrap">
+    <a-card size="small" :bordered="false" class="searchBox">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -618,15 +618,4 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .collectionDetail-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
-  }
-</style>
+ 

+ 7 - 1
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -230,7 +230,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsReturnNo' }, width: '9%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplier.supplierName', align: 'center', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商名称', dataIndex: 'supplier.supplierName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'returnReasonDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -372,6 +372,12 @@ export default {
     }
   },
   watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
       this.setTableH()
     }

+ 1 - 1
src/views/salesManagement/salesCollection/list.vue

@@ -130,7 +130,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator" v-if="$hasPermissions('B_salesCollection_receipt')">
-        <a-button type="primary" @click="handlePlColle()" class="button-error">批量收款</a-button>
+        <a-button type="primary" @click="handlePlColle()">批量收款</a-button>
         <span style="margin-left: 8px">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
         </span>

+ 2 - 2
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -25,7 +25,7 @@
           <a-divider type="vertical" />
           <a-button
             key="1"
-            type="primary"
+            type="default"
             class="button-warning"
             v-if="$hasPermissions('B_exportPickUp')"
             id="billOfLadingDetail-export-btn"
@@ -336,7 +336,7 @@ export default {
       overflow: auto;
     }
     .billOfLadingDetail-header{
-      border-bottom: 8px solid #eee;
+      border-bottom: 6px solid #eee;
     }
     .affix{
       .ant-affix{

+ 1 - 7
src/views/salesReturnManagement/billOfLading/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="billOfLading-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -376,12 +376,6 @@ export default {
 </script>
 <style lang="less">
   .billOfLading-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
     .sTable{
       .badge-con-t{
         .ant-badge-count{

+ 7 - 7
src/views/salesReturnManagement/custConfirm/list.vue

@@ -20,16 +20,16 @@
             <a-input id="custConfirm-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
           </a-form-item>
           <a-form-item>
-            <a-button type="primary" class="button-info" @click="searchForm" :disabled="disabled" id="custConfirm-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="custConfirm-reset">重置</a-button>
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="custConfirm-refresh">查询</a-button>
+            <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="custConfirm-reset">重置</a-button>
           </a-form-item>
         </a-form>
         <div style="border-top:1px solid #eee;padding-top:10px;">
-          <a-button type="primary" :loading="loading" class="button-info" @click="openProductModal=true">新增产品</a-button>
-          <a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量设置退货单价</a-button>
-          <a-button style="margin-left:5px;" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
-          <span style="margin-left:10px;" v-if="selNums">已选{{ selNums }}项</span>
+          <a-button type="primary" :loading="loading" @click="openProductModal=true">新增产品</a-button>
           <a-button type="primary" :loading="loading" class="button-info" @click="setNewSalesRetrunOrder">生成新销退单</a-button>
+          <a-button type="primary" ghost style="margin-left:10px;" :loading="loading" @click="handlePlss">批量设置退货单价</a-button>
+          <a-button type="primary" ghost style="margin-left:5px;" class="button-info" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
+          <span style="margin-left:10px;" v-if="selNums">已选{{ selNums }}项</span>
           <div style="float:right;color:#999;margin-top:8px;">说明:红色行表示收货时新增的产品;黄色行表示客服确认时新增的产品;退货原因文字显示红色表示退货原因和退货类别不一致;</div>
         </div>
         <!-- 已选配件列表 -->
@@ -589,7 +589,7 @@ export default {
       text-align: center;
     }
     .custConfirm-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .sTable{
         margin-top: 10px;
       }

+ 2 - 19
src/views/salesReturnManagement/pickUp/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="pickUp-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -301,21 +301,4 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .pickUp-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
-    .sTable{
-      .badge-con-t{
-        .ant-badge-count{
-          transform: scale(0.8);
-          font-size: 13px;
-        }
-      }
-    }
-  }
-</style>
+ 

+ 5 - 5
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -20,14 +20,14 @@
             <a-input id="salesReturnCheck-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
           </a-form-item>
           <a-form-item>
-            <a-button type="primary" class="button-info" @click="searchForm" :disabled="disabled" id="salesReturnCheck-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnCheck-reset">重置</a-button>
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="salesReturnCheck-refresh">查询</a-button>
+            <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="salesReturnCheck-reset">重置</a-button>
           </a-form-item>
         </a-form>
         <div style="border-top:1px solid #eee;padding-top:10px;">
-          <a-button type="primary" :loading="loading" class="button-info" @click="plSetQty(1)">批量设置良品数量</a-button>
-          <a-button type="primary" :loading="loading" class="button-error" @click="plSetQty(2)">批量设置返库数量</a-button>
-          <a-button style="margin-left:5px;" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
+          <a-button type="primary" ghost class="button-info" :loading="loading" @click="plSetQty(1)">批量设置良品数量</a-button>
+          <a-button type="primary" ghost class="button-info" style="margin-left:5px;" :loading="loading" @click="plSetQty(2)">批量设置返库数量</a-button>
+          <a-button type="primary" ghost style="margin-left:5px;" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
           <span style="margin-left:10px;" v-if="selNums">已选{{ selNums }}项</span>
           <div style="float:right;color:#999;margin-top:8px;">说明:红色行表示收货时新增的产品</div>
         </div>

+ 2 - 19
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="receiveCheck-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -297,21 +297,4 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .receiveCheck-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
-    .sTable{
-      .badge-con-t{
-        .ant-badge-count{
-          transform: scale(0.8);
-          font-size: 13px;
-        }
-      }
-    }
-  }
-</style>
+ 

+ 5 - 7
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -20,21 +20,19 @@
             <a-input id="salesReturnReceive-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
           </a-form-item>
           <a-form-item>
-            <a-button type="primary" class="button-info" @click="searchForm" :disabled="disabled" id="salesReturnReceive-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReceive-reset">重置</a-button>
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="salesReturnReceive-refresh">查询</a-button>
+            <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReceive-reset">重置</a-button>
           </a-form-item>
         </a-form>
         <div style="border-top:1px solid #eee;padding-top:10px;">
-          <a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量实收</a-button>
-          <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
+          <a-button type="primary" :loading="loading" class="button-info" @click="openModal = true">新增产品</a-button>
           <a-button
             type="primary"
-            ghost
             :loading="loading"
             @click="openGuideModal=true"
-            style="margin:0 5px 0 10px;"
           >导入产品</a-button>
-          <a-button type="primary" :loading="loading" class="button-info" @click="openModal = true">新增产品</a-button>
+          <a-button style="margin-left:10px;" type="primary" ghost :loading="loading" @click="handlePlss">批量实收</a-button>
+          <span style="margin-left:10px;" v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
           <div style="float:right;color:#999;margin-top:8px;">说明:红色行表示收货时新增的产品</div>
         </div>
         <!-- 已选配件列表 -->

+ 2 - 12
src/views/salesReturnManagement/returnConfirmation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="returnConfirmationList-wrap">
+  <a-card size="small" :bordered="false" class="searchBox">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -311,14 +311,4 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .returnConfirmationList-wrap{
-     margin-bottom: 6px;
-     &:first-child{
-       .ant-card-body{
-         padding-bottom: 10px;
-       }
-     }
-  }
-</style>
+ 

+ 1 - 7
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="returnSchedule-wrap">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form-model
@@ -358,14 +358,8 @@ export default {
 
 <style lang="less">
   .returnSchedule-wrap{
-    margin-bottom:6px;
     .ant-tooltip{
       max-width:300px !important;
     }
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
   }
 </style>

+ 1 - 7
src/views/salesReturnManagement/salesReturn/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="salesReturn-wrap">
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -559,12 +559,6 @@ export default {
 </script>
 <style lang="less">
   .salesReturn-wrap{
-    margin-bottom: 6px;
-    &:first-child{
-      .ant-card-body{
-        padding-bottom: 0;
-      }
-    }
     .sTable{
       .badge-con-t{
         .ant-badge-count{