md

2024-08-07 09:00:41 +08:00 · 2024-08-07 09:00:41 +08:00 · 0061d27f46
commit 0061d27f46
parent 7b6505c098
12 changed files with 285 additions and 243 deletions
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
          <el-form-item label="" prop="billCode" label-width="80px">
                  <div slot="label">
                      <el-radio-group class="query-label" v-model="queryOrderType">
@ -51,6 +51,10 @@
          </SearchForm>
         <!-- 账单表 -->
          <XdTable
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                v-loading="loading"
                border stripe
                size="mini"
@ -195,7 +199,7 @@
        </el-dialog>


-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
          <el-form-item label="" prop="billCode" label-width="80px">
                  <div slot="label">
                      <el-radio-group class="query-label" v-model="queryOrderType">
@ -60,6 +60,11 @@
          </SearchForm>
         <!-- 账单表 -->
          <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
                v-loading="loading"
                border stripe
                size="mini"
@ -219,7 +224,7 @@
        </el-dialog>


-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader"   :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
            <el-form-item label="" prop="billCode" label-width="80px">
                  <div slot="label">
                      <el-radio-group class="query-label" v-model="queryOrderType">
@ -55,6 +55,11 @@
          </SearchForm>
         <!-- 账单表 -->
          <XdTable
+
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                v-loading="loading"
                border stripe
                size="mini"
@ -186,7 +191,7 @@
        </el-dialog>


-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader"    :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
          <el-form-item label="" prop="settleBillNo" label-width="80px">
                  <div slot="label">
                      <el-radio-group class="query-label" v-model="queryOrderType">
@ -55,6 +55,11 @@
          </SearchForm>
         <!-- 账单表 -->
          <XdTable
+
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                v-loading="loading"
                border stripe
                size="mini"
@ -181,7 +186,7 @@
        </el-dialog>


-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@ -1,6 +1,6 @@
 <template>
  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+        <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
            <el-form-item label="" prop="billCode" label-width="80px">
                  <div slot="label">
                      <el-radio-group class="query-label" v-model="queryOrderType">
@ -60,6 +60,10 @@
          </SearchForm>
         <!-- 账单表 -->
          <XdTable
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                v-loading="loading"
                border stripe
                size="mini"
--- a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
@ -21,10 +21,6 @@

        </el-descriptions>
      </div>
-
-
-
-
             <!-- 账单明细数据表 -->
          <XdTable
              v-loading="loading"
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-        <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+        <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
            <el-form-item label="" prop="billCode" label-width="80px">
                  <div slot="label">
                      <el-radio-group class="query-label" v-model="queryOrderType">
@ -29,6 +29,11 @@
          </SearchForm>
         <!-- 账单表 -->
          <XdTable
+
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
                v-loading="loading"
                border stripe
                size="mini"
@ -143,7 +148,7 @@
            <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
            <el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" min-width="170" :show-overflow-tooltip="true"/>
            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
-            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" :disabled="this.$store.getters.ownerSiteCode !='88888'"/>
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" :disabled="$store.getters.ownerSiteCode !='88888'"/>

            <!-- <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" min-width="100" /> -->
            <!-- <el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" min-width="100" /> -->
@ -171,7 +176,7 @@
        </el-dialog>


-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">

      <el-form-item label="申请序号" prop="applySeqNo">
        <el-input
@ -318,7 +318,12 @@
    </SearchForm>


-    <XdTable v-loading="loading"
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
           border stripe
           size="small"

@ -459,7 +464,7 @@
    </el-dialog>
    -->

-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@ -1,6 +1,6 @@
 <template>
-  <div >
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer >
+    <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">

      <el-form-item label="申请序号" prop="applySeqNo">
        <el-input
@ -317,7 +317,13 @@
    </SearchForm>


-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
           border stripe
           size="small"

@ -467,7 +473,7 @@
    </el-dialog>
    -->

-  </div>
+  </XdPageContainer>
 </template>

 <script>
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@ -1,6 +1,7 @@
 <template>
  <XdPageContainer class="app-container">
-    <el-tabs slot="pageHeader"   v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+    <div slot="pageHeader">
+        <el-tabs    v-model="activeTab" class="center-tabs" @tab-click="handleClick">
        <el-tab-pane label="全部" name="all" />
        <el-tab-pane label="未确认" name="waitConfirm" />
        <el-tab-pane label="已确认" name="hasConfirm" />
@ -10,7 +11,7 @@
      </el-tabs>


-   <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
+      <SearchForm :model="queryParams" ref="queryForm"
        size="mini" :maxShow="12"  label-width="100px"
        v-show="showSearch"
        @search="handleQuery"
@ -113,10 +114,12 @@

        </SearchForm>

+    </div>
+
   <XdTable
         slot="pageContent"
         slot-scope="slotProps"
-         :height="(slotProps.contentHeight-60)+'px'"
+         :height="(slotProps.contentHeight)+'px'"

         v-loading="loading"
          border
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@ -1,7 +1,7 @@
 <template>
  <XdPageContainer class="app-container">
    <!-- slot="pageTabs" -->
-   <SearchForm  :model="queryParams" ref="queryForm"
+   <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
     size="mini" :maxShow="8"  label-width="80px"
     v-show="showSearch"
     @search="handleQuery"
@ -92,6 +92,10 @@
         <!-- height="calc(100% - 0px)" -->
   <XdTable

+        slot="pageContent"
+         slot-scope="slotProps"
+         :height="(slotProps.contentHeight)+'px'"
+
         v-loading="loading"
          border
          size="mini"