From 2496b3e959903c5833105722619312e994fc2ac3 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 21 Nov 2024 19:43:58 +0800
Subject: [PATCH] md

---
 src/views/emis/emisCommissionDtl/index.vue    | 108 ++++++++++++++++--
 .../CustSettleBillQueryList.vue               |   2 +-
 2 files changed, 97 insertions(+), 13 deletions(-)

diff --git a/src/views/emis/emisCommissionDtl/index.vue b/src/views/emis/emisCommissionDtl/index.vue
index 39b6c956..9b6d3cf6 100644
--- a/src/views/emis/emisCommissionDtl/index.vue
+++ b/src/views/emis/emisCommissionDtl/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <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="billCode">
         <el-input
           type="textarea"
@@ -34,13 +34,19 @@
         />
       </el-form-item> -->
       <el-form-item label="员工名称" prop="empName">
-        <EmisUserSimplePicker0  :placeholder="$t('提成员工')"  v-model="queryParams.empCodeTmp" @onChange="onSelectUser" ></EmisUserSimplePicker0>
+        <PayeePicker :placeholder="$t('提成员工')" v-model="queryParams.empName"  ></PayeePicker>
       </el-form-item>
 
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+        slot="pageContent"
+         slot-scope="slotProps"
+         :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border stripe
            size="mini"
            :data="emisCommissionDtlList"
@@ -131,10 +137,58 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('提成金额')" align="center" prop="money" min-width="100" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
       <el-table-column :label="$t('提成备注')" align="center" prop="feeRemark" min-width="100" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+      <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
+          </template>
+      </el-table-column>
+     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true"    :show-overflow-tooltip="true"/>
+     <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" :sortable="true"   :show-overflow-tooltip="true"/>
+     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80"    :show-overflow-tooltip="true"/>
+       <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80"      />
+       <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80"    />
+       <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
+       <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
+       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
+       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.billFee" min-width="80"    >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
+                <span v-else>{{scope.row.waybillDetail.freight}}</span>
+            </template>
+        </el-table-column>
+        <el-table-column :label="$t('收款状态')" align="center" prop="waybillDetail.paymentStatus" width="100" >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.waybillDetail.paymentStatus=='0'" type="error">未收款</el-tag>
+            <el-tag v-if="scope.row.waybillDetail.paymentStatus=='1'" type="success">已收款</el-tag>
+            <el-tag v-if="scope.row.waybillDetail.paymentStatus=='2'" type="warning">部分收款</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
+       <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
+
+       <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true"  />
+       <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120"  :sortable="true" />
+       <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120"   :sortable="true" />
+
+
       <el-table-column :label="$t('创建日期')" align="center" prop="createTime" min-width="170" />
 
+
       <!-- <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="100" />
       <el-table-column :label="$t('财务确认日期')" align="center" prop="confirmCenterDate" min-width="100" />
       <el-table-column :label="$t('财务确认备注')" align="center" prop="confirmCenterNote" min-width="100" />
@@ -169,12 +223,14 @@
         </div>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
 import { batchReCalcProfitByBillCode  } from "@/api/emis/emisCommissionProfit";
 
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+
 import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
@@ -182,7 +238,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 
 export default {
   name: "emisCommissionDtl",
-  components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0 },
+  components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0,PayeePicker },
   dicts: ['emis_commission_fee_type'],
   data() {
     return {
@@ -286,12 +342,40 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+    getProperty(obj, str) {
+      str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+      let arr = str.split(".");
+      for (let i in arr) {
+        obj = obj[arr[i]] || "";
+      }
+      return obj;
     },
+   sortFun: function (attr, rev) {
+      //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
+      if (rev == undefined||rev==null) {
+          rev = 1;
+      } else {
+          rev = (rev) ? 1 : -1;
+      }
+      let that=this;
+      return function (a, b) {
+          a = that.getProperty(a,attr);
+          b = that.getProperty(b,attr);
+          if (a < b) {
+              return rev * -1;
+          }
+          if (a > b) {
+              return rev * 1;
+          }
+          return 0;
+      }
+    },
+   // 排序 查询字段是表格中字段名字 动态取值排序顺序
+   handleSortChange(column) {
+      this.emisCommissionDtlList = this.emisCommissionDtlList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+      );
+   },
     /** 新增按钮操作 */
     handleAdd(row) {
       this.currentId=null;
diff --git a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
index 84b7e308..3af1dfbd 100644
--- a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
+++ b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
@@ -238,7 +238,7 @@
             </el-table-column>
             <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
             <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
-            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
+            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" :show-overflow-tooltip="true"/>
 
             <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>