lilei 2 lat temu
rodzic
commit
69756af521
50 zmienionych plików z 73 dodań i 72 usunięć
  1. 2 2
      src/layouts/PageView.vue
  2. 2 2
      src/utils/request.js
  3. 1 1
      src/views/allocationManagement/matchSendOutOrder/list.vue
  4. 1 1
      src/views/allocationManagement/transferOut/list.vue
  5. 1 1
      src/views/allocationManagement/transferReturn/list.vue
  6. 1 1
      src/views/allocationManagement/transfersPrint/list.vue
  7. 1 1
      src/views/basicData/warehouse/list.vue
  8. 1 1
      src/views/basicData/warehouse/storingLocation/list.vue
  9. 2 2
      src/views/expenseManagement/expenseReimbursement/list.vue
  10. 1 1
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  11. 1 1
      src/views/financialManagement/allocateReturnConfirmation/list.vue
  12. 2 2
      src/views/financialManagement/collectionDetailStatic/list.vue
  13. 2 2
      src/views/financialManagement/financialCollection/list.vue
  14. 1 1
      src/views/financialManagement/returnConfirmation/list.vue
  15. 1 1
      src/views/financialManagement/warehousingConfirmation/list.vue
  16. 1 1
      src/views/inventoryManagement/intelligentReplenishment/import.vue
  17. 1 1
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  18. 1 1
      src/views/inventoryManagement/inventoryCheck/list.vue
  19. 1 1
      src/views/inventoryManagement/inventoryQuery/list.vue
  20. 1 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  21. 1 1
      src/views/inventoryManagement/inventoryWarning/list.vue
  22. 1 1
      src/views/inventoryManagement/makeInventory/list.vue
  23. 1 1
      src/views/inventoryManagement/supervisionDisk/list.vue
  24. 1 1
      src/views/power/OperateJournal/OperateJournal.vue
  25. 1 1
      src/views/power/role/roleList.vue
  26. 1 1
      src/views/power/user/userList.vue
  27. 1 1
      src/views/promotionRulesManagement/orderStatistics/list.vue
  28. 1 1
      src/views/promotionRulesManagement/productStatistics/list.vue
  29. 1 1
      src/views/promotionRulesManagement/promotionRules/list.vue
  30. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  31. 1 1
      src/views/purchasingManagement/purchaseReturn/list.vue
  32. 1 1
      src/views/reportData/productRebateReport/detailList.vue
  33. 1 1
      src/views/reportData/productRebateReport/list.vue
  34. 1 1
      src/views/salesManagement/backorder/list.vue
  35. 2 2
      src/views/salesManagement/examineVerify/list.vue
  36. 2 2
      src/views/salesManagement/outboundOrder/list.vue
  37. 1 1
      src/views/salesManagement/pushOrderManagement/list.vue
  38. 2 2
      src/views/salesManagement/salesCollection/list.vue
  39. 1 1
      src/views/salesManagement/salesQuery/edit.vue
  40. 2 2
      src/views/salesManagement/salesQuery/list.vue
  41. 2 2
      src/views/salesManagement/sendOutOrder/list.vue
  42. 2 2
      src/views/salesManagement/shortageStatisticsC/list.vue
  43. 1 1
      src/views/salesManagement/shortageStatisticsP/list.vue
  44. 2 2
      src/views/salesManagement/stockPrint/list.vue
  45. 12 11
      src/views/salesReturnManagement/billOfLading/list.vue
  46. 1 1
      src/views/salesReturnManagement/pickUp/list.vue
  47. 1 1
      src/views/salesReturnManagement/receiveCheck/list.vue
  48. 1 1
      src/views/salesReturnManagement/salesReturn/list.vue
  49. 1 1
      src/views/setting/notice/list.vue
  50. 1 1
      src/views/setting/noticeManagement/list.vue

+ 2 - 2
src/layouts/PageView.vue

@@ -70,7 +70,7 @@ export default {
     setpageH () {
       this.$nextTick(() => {
         this.$store.dispatch('SetWinHeight', window.innerHeight)
-        this.pageHeight = window.innerHeight - 85
+        this.pageHeight = window.innerHeight - 80
       })
     }
   }
@@ -79,7 +79,7 @@ export default {
 
 <style lang="less" scoped>
   .content {
-    margin: 8px 12px 0;
+    margin: 12px 12px 0;
     .page-header-index-wide{
       height: 100%;
       >div{

+ 2 - 2
src/utils/request.js

@@ -43,8 +43,8 @@ const err = (error) => {
   if (error.response) {
     const status = error.response.status
     const resData = error.response.data
-    console.log(resData)
-    if ((status == 503 || status == 500 || status == 404)) {
+    console.log(status,resData)
+    if ((status == 503 || status == 502 || status == 500 || status == 404)) {
       notification.destroy()
       if(resData instanceof Blob){
         resData.text().then(data => {

+ 1 - 1
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -232,7 +232,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 1 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -425,7 +425,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 238
+      this.tableHeight = window.innerHeight - tableSearchH - 242
     },
     handlePrint (item) {
       const obj = {

+ 1 - 1
src/views/allocationManagement/transferReturn/list.vue

@@ -326,7 +326,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 238
+      this.tableHeight = window.innerHeight - tableSearchH - 242
     }
   },
   watch: {

+ 1 - 1
src/views/allocationManagement/transfersPrint/list.vue

@@ -346,7 +346,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 246
     },
     // 状态打印弹窗
     editPrintStatus (item) {

+ 1 - 1
src/views/basicData/warehouse/list.vue

@@ -166,7 +166,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/basicData/warehouse/storingLocation/list.vue

@@ -176,7 +176,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 285
+      this.tableHeight = window.innerHeight - tableSearchH - 295
     }
   },
   watch: {

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -187,7 +187,7 @@ export default {
     return {
       locale,
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 审核进度弹框是否显示
       openBaseModal: false, // 基础信息新建
@@ -406,7 +406,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 220
+      this.tableHeight = window.innerHeight - tableSearchH - 228
     }
   },
   watch: {

+ 1 - 1
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -390,7 +390,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 226
     }
   },
   watch: {

+ 1 - 1
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -230,7 +230,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

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

@@ -45,8 +45,7 @@
                 <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24">
                 <a-form-item label="付款方类型">
                   <v-select
                     v-model="queryParam.payerType"
@@ -60,6 +59,7 @@
                   <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
                 </a-form-item>
               </a-col>
+            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务编码">
                   <a-input id="collectionDetail-kdMidCustomerFnumber" placeholder="请输入财务编码" v-model="queryParam.kdMidCustomerFnumber"></a-input>

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -195,7 +195,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       creatDate: [], //  创建时间
       auditDate: [], // 审核时间
-      advanced: false,
+      advanced: true,
       itemSn: null,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -357,7 +357,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 210
+      this.tableHeight = window.innerHeight - tableSearchH - 206
     }
   },
   watch: {

+ 1 - 1
src/views/financialManagement/returnConfirmation/list.vue

@@ -232,7 +232,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 1 - 1
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -247,7 +247,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/intelligentReplenishment/import.vue

@@ -14,7 +14,7 @@
         <ve-table
               border-y
               :border-around="false"
-              :max-height="tableHeight"
+              :max-height="tableHeight+'px'"
               :row-style-option="{clickHighlight: true}"
               :cellSelectionOption="{enable: false}"
               :virtual-scroll-option="{enable: true}"

+ 1 - 1
src/views/inventoryManagement/intelligentReplenishment/list.vue

@@ -193,7 +193,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 233
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -232,7 +232,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 338
+      this.tableHeight = window.innerHeight - 332
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -270,7 +270,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 233
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -287,7 +287,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230 - 62
+      this.tableHeight = window.innerHeight - tableSearchH - 295
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -343,7 +343,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 243
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/makeInventory/list.vue

@@ -109,7 +109,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 240
+      this.tableHeight = window.innerHeight - 246
     }
   },
   watch: {

+ 1 - 1
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -112,7 +112,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 240
+      this.tableHeight = window.innerHeight - 246
     }
   },
   watch: {

+ 1 - 1
src/views/power/OperateJournal/OperateJournal.vue

@@ -120,7 +120,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 203
     }
   },
   watch: {

+ 1 - 1
src/views/power/role/roleList.vue

@@ -265,7 +265,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {

+ 1 - 1
src/views/power/user/userList.vue

@@ -250,7 +250,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {

+ 1 - 1
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -236,7 +236,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 236
     }
   },
   watch: {

+ 1 - 1
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -215,7 +215,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 236
     }
   },
   watch: {

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -219,7 +219,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -362,7 +362,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

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

@@ -340,7 +340,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/reportData/productRebateReport/detailList.vue

@@ -315,7 +315,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 370
+      this.tableHeight = window.innerHeight - tableSearchH - 380
     }
   },
   mounted () {

+ 1 - 1
src/views/reportData/productRebateReport/list.vue

@@ -255,7 +255,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 270
+      this.tableHeight = window.innerHeight - tableSearchH - 280
     }
   },
   mounted () {

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

@@ -149,7 +149,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 203
     }
   },
   watch: {

+ 2 - 2
src/views/salesManagement/examineVerify/list.vue

@@ -171,7 +171,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       showDetailModal: false,
       detailType: 2,
@@ -359,7 +359,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/salesManagement/outboundOrder/list.vue

@@ -189,7 +189,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
@@ -462,7 +462,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {

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

@@ -376,7 +376,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

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

@@ -258,7 +258,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       auditDate: [], //  审核时间
       settleDate: [],
-      advanced: false,
+      advanced: true,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -476,7 +476,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -615,7 +615,7 @@ export default {
     }
     .p-title{
       font-weight: bold;
-      font-size: 16px;
+      font-size: 14px;
     }
     .p-notes{
       font-size: 14px;

+ 2 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -271,7 +271,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 选择客户弹框是否显示
       showTipModal: false, // 备货打印弹框
@@ -545,7 +545,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 285
+      this.tableHeight = window.innerHeight - tableSearchH - 290
     }
   },
   watch: {

+ 2 - 2
src/views/salesManagement/sendOutOrder/list.vue

@@ -86,7 +86,7 @@
           </a-row>
         </a-form>
         <!-- 操作按钮 -->
-        <div class="table-operator">
+        <div>
           <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
         </div>
       </div>
@@ -305,7 +305,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 205
+      this.tableHeight = window.innerHeight - tableSearchH - 208
     }
   },
   watch: {

+ 2 - 2
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -146,7 +146,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
@@ -348,7 +348,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {

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

@@ -238,7 +238,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {

+ 2 - 2
src/views/salesManagement/stockPrint/list.vue

@@ -84,7 +84,7 @@
                     </a-form-model-item>
                 </a-col>
               </template>
-              <a-col :md="6" :sm="24">
+              <a-col :md="5" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -420,7 +420,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 253
     }
   },
   watch: {

+ 12 - 11
src/views/salesReturnManagement/billOfLading/list.vue

@@ -20,17 +20,18 @@
                 <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="申请人">
-                <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
-              </a-form-item>
-            </a-col>
+           
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="物流点">
-                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+              <a-form-item label="申请人">
+                  <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                  <a-form-item label="物流点">
+                    <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+                  </a-form-item>
+                </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="发货方">
                   <dealerSubareaScopeList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
@@ -53,8 +54,8 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :offset="18" :sm="24">
-              <span class="table-page-search-submitButtons" style="float:right;">
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -157,7 +158,7 @@ export default {
     return {
       spinning: false,
       // 高级搜索 展开/关闭
-      advanced: false,
+      advanced: true,
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       createDate: [], //  创建时间
@@ -318,7 +319,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 220
     }
   },
   watch: {

+ 1 - 1
src/views/salesReturnManagement/pickUp/list.vue

@@ -244,7 +244,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 175
+      this.tableHeight = window.innerHeight - tableSearchH - 180
     }
   },
   watch: {

+ 1 - 1
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -219,7 +219,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 175
+      this.tableHeight = window.innerHeight - tableSearchH - 180
     },
     canselPrintView () {
       this.showTipModal = false

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

@@ -227,7 +227,7 @@ export default {
     return {
       spinning: false,
       // 高级搜索 展开/关闭
-      advanced: false,
+      advanced: true,
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       createDate: [

+ 1 - 1
src/views/setting/notice/list.vue

@@ -196,7 +196,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     }
   },
   watch: {

+ 1 - 1
src/views/setting/noticeManagement/list.vue

@@ -200,7 +200,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {