From 9847e488f854785f41a10f01196a4e70465f43f8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 5 Jun 2024 13:05:54 +0800
Subject: [PATCH] md

---
 src/views/emis/emisCustomerUser/moneyUserForm.vue     |  2 +-
 src/views/emis/emisCustomerUser/moneyUserList.vue     |  8 ++++----
 .../emis/emisQuotePrice/specialQuotePriceList.vue     | 10 +++++++---
 src/views/emis/emisQuotePrice/transQuotePriceList.vue | 10 +++++++---
 .../emis/emisQuotePrice/vipSpecialQuotePriceList.vue  | 10 +++++++---
 .../emis/emisQuotePrice/vipTransQuotePriceList.vue    | 11 ++++++++---
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/views/emis/emisCustomerUser/moneyUserForm.vue b/src/views/emis/emisCustomerUser/moneyUserForm.vue
index 7c9d3fc2..c3a83546 100644
--- a/src/views/emis/emisCustomerUser/moneyUserForm.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div >
-        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
+        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px" disabled>
           <el-row :gutter="0"  style="display: flex;flex-wrap: wrap;">
 
           <el-col :span="8">
diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index ec2c393e..8c6f8537 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -71,7 +71,7 @@
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -80,7 +80,7 @@
                   @click="handleAdd"
                   v-hasPermi="['emis:emisCustomerUser:add']"
                 >新增客户</el-button>
-              </el-col>
+              </el-col> -->
               <!--
               <el-col :span="1.5">
                 <el-button
@@ -145,7 +145,7 @@
       <!-- <el-table-column :label="$t('月结卡号')" align="center"  prop="monthlyPayCode" min-width="100" /> -->
       <!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> -->
-      <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" />
+      <!-- <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" /> -->
       <el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
       <el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" >
@@ -156,7 +156,7 @@
          </template>
       </el-table-column>
 
-      <el-table-column :label="$t('主归属网点')" align="center" prop="ownerSiteName" min-width="100" />
+      <el-table-column :label="$t('初次登记网点')" align="center" prop="ownerSiteName" min-width="150" />
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
       <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
diff --git a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
index 3f5996b8..3222c68c 100644
--- a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -72,6 +72,10 @@
 
 
     <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -234,7 +238,7 @@
       <specialQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></specialQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisQuotePrice/transQuotePriceList.vue b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
index bbe918a8..d331ec9a 100644
--- a/src/views/emis/emisQuotePrice/transQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -72,6 +72,10 @@
 
 
     <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -235,7 +239,7 @@
       <emisQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue b/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
index a6dc1f20..c61a6877 100644
--- a/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -75,6 +75,10 @@
 
 
     <XdTable
+        slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -238,7 +242,7 @@
       <vipSpecialQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></vipSpecialQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue b/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
index 75e97c6b..dce40073 100644
--- a/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -75,6 +75,11 @@
 
 
     <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -240,7 +245,7 @@
       <vipTransQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></vipTransQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>