md

src/components/XdPageContainer/index.vue

@@ -4,8 +4,11 @@
       <slot name="pageHeader"></slot>
     </div>
 
+
+
     <!--表格内容 或者其他-->
     <div ref="pageContent">
+      <slot name="pageTabs"></slot>
       <slot name="pageContent" v-bind:contentHeight="contentHeight"></slot>
     </div>
     <slot> </slot>

src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+   <XdPageContainer class="app-container">
     <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
       size="mini" :maxShow="12"  label-width="100px"
       v-show="showSearch"
@@ -72,8 +72,7 @@
 
       </SearchForm>
 
-
-    <el-tabs v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+    <el-tabs slot="pageTabs"  v-if="actionType==1 || actionType==2 || actionType==3" 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" />
@@ -82,12 +81,17 @@
       <el-tab-pane label="业务置账单异常" name="siteBillError" />
     </el-tabs>
 
-    <el-tabs v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+    <el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
       <el-tab-pane label="待合账" name="waitMerge" />
       <el-tab-pane label="已合账" name="hasMerge" />
     </el-tabs>
 
-    <XdTable v-loading="loading"
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight-60)+'px'"
+
+          v-loading="loading"
            border
            size="mini"
 
@@ -206,7 +210,7 @@
                   plain
                   size="mini"
                   :disabled="multiple"
-                  @click="handleCancelConfirmByCenter"
+                  @click="handleCancelConfirmBySite"
                   v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
                 >取消确认</el-button>
               </el-col>
@@ -223,6 +227,7 @@
                   size="mini"
                   :disabled="multiple"
                   @click="handleMergeBill"
+                  v-hasPermi="['emis:emisSettleSubBill:mergeBillByCenter']"
                 >合账</el-button>
               </el-col>
 
@@ -273,6 +278,7 @@
                   >运单详情</el-button>
                 </div>
               </div>
+              <div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
                <div class="feeItem">
                   <ul class="th">
                     <li>费用名称</li>
@@ -303,9 +309,9 @@
       <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
 
-      <el-table-column v-if="settleType!=1"  :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
+      <el-table-column v-if="actionType!=1"  :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-            <span type="normal">{{ scope.row.customerName }}</span>
+            <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.customerName }}</span>
           </template>
       </el-table-column>
 
@@ -381,8 +387,7 @@
       <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 
-
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -726,26 +731,25 @@ export default {
           else if (tab.name == 'siteBillError') {
             this.queryParams.blSiteConfirm='3';
           }
-
         }
         else if(this.actionType==3){
             this.queryParams.blSiteConfirm=null;
             this.queryParams.blConfirm=1;
-              if (tab.name == 'all') {
-                this.queryParams.blSiteConfirm=null;
-              }
-              else if (tab.name == 'waitConfirm') {
-                this.queryParams.blSiteConfirm='0';
-              }
-              else if (tab.name == 'hasConfirm') {
-                this.queryParams.blSiteConfirm='1';
-              }
-              // else if (tab.name == 'confirmNotBill') {
-              //   this.queryParams.blSiteConfirm='2';
-              // }
-              else if (tab.name == 'billError') {
-                this.queryParams.blSiteConfirm='3';
-              }
+            if (tab.name == 'all') {
+              this.queryParams.blSiteConfirm=null;
+            }
+            else if (tab.name == 'waitConfirm') {
+              this.queryParams.blSiteConfirm='0';
+            }
+            else if (tab.name == 'hasConfirm') {
+              this.queryParams.blSiteConfirm='1';
+            }
+            // else if (tab.name == 'confirmNotBill') {
+            //   this.queryParams.blSiteConfirm='2';
+            // }
+            else if (tab.name == 'billError') {
+              this.queryParams.blSiteConfirm='3';
+            }
         }
         else if(this.actionType==4){
             this.queryParams.blConfirm=1;
@@ -763,18 +767,18 @@ export default {
 		},
 
     tableRowClassName({row, rowIndex}) {
-        // if (row.blConfirm=='0') {
-        //   return {"color": "black !important"}
-        // }
-        // else if (row.blConfirm=='1') {
-        //   return {};
-        // }
-        // else if (row.blConfirm=='2') {
-        //   return {"color": "black !important"}
-        // }
-        // else if (row.blConfirm=='3') {
-        //   return {"color": "black !important"}
-        // }
+        if (row.blConfirm=='0') {
+          return {};
+        }
+        else if (row.blConfirm=='1') {
+          return {};
+        }
+        else if (row.blConfirm=='2') {
+          return {"text-decoration":"line-through","color":"gray"};
+        }
+        else if (row.blConfirm=='3' || row.blSiteConfirm=='3') {
+          return {"color": "red !important"}
+        }
 
         return '';
     },
@@ -1118,6 +1122,7 @@ export default {
 .feeItem{
 
   border: 1px solid #dfe6ec;
+  margin-bottom:50px;
 
   ul{
     list-style: none;