diff --git a/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue b/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
index a98cddd1..67c40bfb 100644
--- a/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
+++ b/src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
@@ -1,76 +1,103 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item label="运单号" prop="billCode">
+              <XdTextareaInput
+                v-model="queryParams.billCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="1"
+              />
+            </el-form-item>
+          <el-form-item label="寄件日期" prop="sendDate">
+              <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
+          </el-form-item>
+          <el-form-item label="寄件网点" prop="params.sendSiteCode">
+          <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
+        </el-form-item>
+        <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
+          <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+        </el-form-item>
+        <el-form-item :label="$t('回款联系人')" prop="params.payee">
+          <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
+        </el-form-item>
+        <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
+          <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen"    ></SalemanPicker>
+        </el-form-item>
 
-      <el-form-item :label="$t('运单号')" prop="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="" prop="standardFee">
-        <el-input
-          v-model="queryParams.standardFee"
-          :placeholder="$t('标准费')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billFee">
-        <el-input
-          v-model="queryParams.billFee"
-          :placeholder="$t('账单费用')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="costFee">
-        <el-input
-          v-model="queryParams.costFee"
-          :placeholder="$t('运输成本')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billProfit">
-        <el-input
-          v-model="queryParams.billProfit"
-          :placeholder="$t('运单利润')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+        <el-form-item label="是否特殊报价"  prop="params.blSpecialQuote">
+          <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
+              <el-option key="1" label="是" value="1"></el-option>
+              <el-option key="0" label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+
+      <el-form-item label="线路" prop="params.transLineType">
+                  <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true" ></TransLinePicker>
+        </el-form-item>
+        <el-form-item label="产品类型" prop="productType">
+          <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
+        </el-form-item>
+        <el-form-item label="计费方式"  prop="params.calcFeeType">
+            <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
+              <el-option
+                v-for="dict in dict.type.emis_calc_fee_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+        </el-form-item>
+
+        <el-form-item label="月结客户" prop="params.custNo">
+          <AllMonthpayAccountPicker v-model="queryParams.params.custNo" ></AllMonthpayAccountPicker>
+        </el-form-item>
+        <el-form-item label="付款方式" prop="params.paymentType" >
+          <el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
+            <el-option
+              v-for="dict in dict.type.emis_payment_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+      <el-form-item label="寄件公司" prop="params.sendCompany">
+            <el-input
+              v-model="queryParams.params.sendCompany"
+              :placeholder="$t('寄件公司')"
+              clearable
+            />
+          </el-form-item>
+
+        <el-form-item label="收件公司" prop="params.receiveCompany">
+              <el-input
+                v-model="queryParams.params.receiveCompany"
+                :placeholder="$t('收件公司')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
     </SearchForm>
-
-
     <XdTable v-loading="loading"
            border stripe
+
+           ref="refTable"
+
            size="small"
            :data="emisTmsCostProfitList"
+
+           storageName="emisTmsCostProfitList_main1"
+
+
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
            :total="total"
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+           @row-dblclick="handleShowTraceInfo"
            >
 
       <div slot="toolbar">
@@ -85,56 +112,161 @@
                   v-hasPermi="['emis:emisTmsCostProfit:edit']"
                 >利润重算</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  v-hasPermi="['emis:emisTmsCostProfit:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-
-
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('标准费')" align="center" prop="standardFee" min-width="100" />
-      <el-table-column :label="$t('账单费用')" align="center" prop="billFee" min-width="100" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
+      <!-- <el-table-column :label="$t('标准费')" align="center" prop="standardFee" min-width="100" /> -->
+      <el-table-column :label="$t('运单费用')" align="center" prop="billFee" min-width="100" />
       <el-table-column :label="$t('运输成本')" align="center" prop="costFee" min-width="100" />
       <el-table-column :label="$t('运单利润')" align="center" prop="billProfit" min-width="100" />
-      <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+     <!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  /> -->
+     <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.paymentType" min-width="80" :show-overflow-tooltip="true"   >
+         <template slot-scope="scope">
+           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
+         </template>
+       </el-table-column>
+      <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
+       <template slot-scope="scope">
+           <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
+         </template>
+      </el-table-column>
 
+      <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
+            <span v-else>否</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.freight" 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="blSpecialQuote" min-width="120"   >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
+                  <el-tag v-if="scope.row.waybillDetail.blSpecialQuote=='1'" type="error">是</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="blMerge" min-width="120"   >
+         <template slot-scope="scope">
+           <span v-if="scope.row.blMerge=='0'" >否</span>
+           <el-tag v-if="scope.row.blMerge=='1'" type="success">是</el-tag>
+         </template>
+     </el-table-column>
+       <el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150"  >
+           <template slot-scope="scope">
+               <el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
+               <span v-else >/</span>
+           </template>
+         </el-table-column>
+       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="true"  />
+       <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"   />
     </XdTable>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisTmsCostProfitForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsCostProfitForm>
-    </el-dialog>
-
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisTmsCostProfitView :id="id" ></EmisTmsCostProfitView>
-    </el-dialog>
-    -->
+    <el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="95%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+     <TmsCostProfitDetail  :key="currentId" :id="currentId" ></TmsCostProfitDetail>
+   </el-dialog>
 
   </div>
 </template>
 
 <script>
 import { listEmisTmsCostProfit, getEmisTmsCostProfit, delEmisTmsCostProfit, addEmisTmsCostProfit, updateEmisTmsCostProfit } from "@/api/emis/emisTmsCostProfit";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisTmsCostProfitView from '@/views/emis/emisTmsCostProfit/emisTmsCostProfitView';
-import emisTmsCostProfitForm from '@/views/emis/emisTmsCostProfit/emisTmsCostProfitForm';
+
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+
+import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
+
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
+import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
+import TmsCostProfitDetail from '@/views/emis/emisTmsCostProfit/TmsCostProfitDetail.vue';
 
 export default {
-  name: "emisTmsCostProfit",
-  components: { elDateSimplePicker,emisTmsCostProfitForm },
-  dicts: [
-  ],
+  name: "EmisTmsCostProfit",
+  components: {
+    elDateAdvPicker,
+    CountryPicker1,
+    CountryPicker2,ProvincePicker2,
+    TransLinePicker,TransProductPicker,
+    PayeePicker,
+    SalemanPicker,
+    EmisUserSimplePicker0,
+    EmisUserSimplePicker1,
+    EmisUserSimplePicker2,
+
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    ProblemTypeMultiplePicker,
+
+    TmsCostProfitDetail,
+    AllMonthpayAccountPicker
+  },
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+       'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+       'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+ ],
   data() {
     return {
       // 遮罩层
@@ -154,10 +286,18 @@ export default {
       // 运输运单利润统计表表格数据
       emisTmsCostProfitList: [],
 
+      selectBillList:[],
+
       currentId:null,
       openForm: false,
       titleForm: "",
 
+      openTraceInfoTitle:"",
+      openTraceInfo:false,
+      currentTraceBillCode:null,
+      currentTraceBillItem:null,
+
+
       // 弹出展示层
       id:null,
       titleView:"",
@@ -177,6 +317,154 @@ export default {
         billProfit: null,
         remark: null,
         delFlag: null,
+        params:{
+             customerCode: null,
+             customerName: null,
+             receiveCustomerCode: null,
+             receiveCustomerName: null,
+             thirdCustomerCode: null,
+             thirdCustomerName: null,
+             receiveName: null,
+             receiveCompany: null,
+             receiveMobile: null,
+             receiveTel: null,
+             receiveCountry: null,
+             receiveProvince: null,
+             receiveCity: null,
+             receiveCounty: null,
+             receiveTown: null,
+             receiveAddress: null,
+             receivePostcode: null,
+             receivePcd: null,
+             sendName: null,
+             sendCompany: null,
+             sendMobile: null,
+             sendTel: null,
+             sendCountry: null,
+             sendProvince: null,
+             sendCity: null,
+             sendCounty: null,
+             sendTown: null,
+             sendAddress: null,
+             sendPostcode: null,
+             sendPcd: null,
+             paymentType: null,
+             calcFeeType: null,
+             custNo: null,
+             transLineType: null,
+             productType: null,
+             timeType: null,
+             meterType: null,
+             customsClear: null,
+             customsEclaration: null,
+             estimateDate: null,
+             packType: null,
+             dispatchMethod: null,
+             pickupMethod: null,
+             pickStartDate: null,
+             pickFinishDate: null,
+             pickFailReason: null,
+             intoWarehouseCode: null,
+             intoWarehouseName: null,
+             intoWarehouseAddress: null,
+             intoWarehouseContact: null,
+             intoWarehousePhone: null,
+             intoWarehouseBillCode: null,
+             warehouseInNo: null,
+             customerDeliveryBeginTime: null,
+             customerDeliveryEndTime: null,
+             goodsType: null,
+             goodsInfo: null,
+             goodsPics: null,
+             blPrepareInFreight: null,
+             prepareInEstFee: null,
+             prepareInRealFee: null,
+             prepareInExpress: null,
+             prepareInBillCode: null,
+             prepareInRemark: null,
+             prepareInSupplier: null,
+             totalWeight: null,
+             totalVolume: null,
+             parcelQty: null,
+             billWeight: null,
+             volumeWeight: null,
+             currency: null,
+             settlementWeight: null,
+             feeWeight: null,
+             freight: null,
+             blOverLong: null,
+             blBill: null,
+             blOverWeight: null,
+             overWeightNumber: null,
+             feeRemark: null,
+             thirdCode: null,
+             realValue: null,
+             blInsure: null,
+             insureValue: null,
+             insureValueCurrency: null,
+             insureFeeCurrency: null,
+             insureFee: null,
+             insureRemark: null,
+             insureSiteCode: null,
+             insureDate: null,
+             blPrint: null,
+             printManCode: null,
+             printSite: null,
+             printDate: null,
+             printCount: null,
+             blDispFd: null,
+             transferCode: null,
+             transferBillcode: null,
+             dispFdDate: null,
+             dispFdReason: null,
+             currentSiteCode: null,
+             lastSiteCode: null,
+             registerSiteCode: null,
+             registerDate: null,
+             registerManCode: null,
+             takePieceEmployeeCode: null,
+             sendSiteCode: null,
+             sendDate: null,
+             dispatchManCode: null,
+             dispatchDate: null,
+             dispatchSiteCode: null,
+             produceBillDate: null,
+             produceBillSiteCode: null,
+             produceBillManCode: null,
+             destinationCode: null,
+             destinationProvince: null,
+             destinationCity: null,
+             destinationCounty: null,
+             dispatchUnderlingSiteCode: null,
+             destinationCenterCode: null,
+             marketManCode: null,
+             payee: null,
+             salesmen: null,
+             operateEmployeeCode: null,
+             blIsQuestion: null,
+             problemType: null,
+             problemCause: null,
+             problemDelayDays: null,
+             blMessage: null,
+             blAcceptMessage: null,
+             blGenSubbill: null,
+             signMan: null,
+             signManCode: null,
+             signSiteCode: null,
+             signDate: null,
+             billPicSendRmk: null,
+             billPicDispatchRmk: null,
+             timezoneOffset: null,
+             delFlag: null,
+             remark: null,
+             blSign:null,
+
+             mergeStatus:null,
+
+             problemQueryType:null,
+             problemQueryIds:null,
+
+       }
       },
     };
   },
@@ -184,16 +472,26 @@ export default {
     this.getList();
   },
   methods: {
+    initQueryParams(){
+      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
+      return this.queryParams;
+    },
     /** 查询运输运单利润统计表列表 */
     getList() {
       this.loading = true;
-
       listEmisTmsCostProfit(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisTmsCostProfitList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    handleShowTraceInfo(row){
+       this.openTraceInfoTitle="查看【"+row.billCode+"】";
+      //  this.currentTraceBillCode=row.billCode;
+      //  this.currentTraceBillItem=row.waybillDetail;
+      this.currentId=row.id;
+       this.openTraceInfo=true;
+   },
     handleReCalcProfit(){
     },
 
@@ -209,6 +507,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.selectBillList=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -257,36 +556,42 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisTmsCostProfit/export', {
-    //     ...this.queryParams
-    //   }, `emisTmsCostProfit_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
+   /** 导出按钮操作 */
+   handleExport() {
+      const loadingInstance = this.$loading({
             text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
+      })
 
-       listEmisTmsCostProfit(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','运单号','标准费','账单费用','运输成本','运单利润','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
-                  const filterVal = ['id','billCode','standardFee','billFee','costFee','billProfit','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '运输运单利润统计表',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
+      if(this.selectBillList&&this.selectBillList.length>0){
+        this.exportData(this.selectBillList,loadingInstance);
+      }
+      else{
+          let qExportParam=this.initQueryParams();
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=5000;
+
+          listEmisSettleSubBill(qExportParam).then(response => {
+            if (response.code === 200) {
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '运单成本利润列表',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
@@ -294,16 +599,303 @@ export default {
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
+        if (j === 'kjlx') {
+          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
+        }
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+
+        if (j === 'waybillDetail.sendSiteName') {
+          return  v['waybillDetail']['sendSiteName'];
+        }
+
+
+        if (j === 'waybillDetail.sendDate') {
+          return  v['waybillDetail']['sendDate'];
+        }
+
+        if (j === 'waybillDetail.sendCompany') {
+          return  v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.transLineTypeName') {
+          return  v['waybillDetail']['transLineTypeName'];
+        }
+
+        if (j === 'waybillDetail.productTypeName') {
+          return  v['waybillDetail']['productTypeName'];
+        }
+
+
+        if (j === 'waybillDetail.sendName') {
+          return  v['waybillDetail']['sendName'];
+        }
+
+        if (j === 'waybillDetail.parcelQty') {
+          return  v['waybillDetail']['parcelQty'];
+        }
+
+        if (j === 'waybillDetail.billWeight') {
+          return  v['waybillDetail']['billWeight'];
+        }
+
+        if (j === 'waybillDetail.volumeWeight') {
+          return  v['waybillDetail']['volumeWeight'];
+        }
+
+        if (j === 'waybillDetail.totalVolume') {
+          return  v['waybillDetail']['totalVolume'];
+        }
+
+        if (j === 'waybillDetail.settlementWeight') {
+          return  v['waybillDetail']['settlementWeight'];
+        }
+
+        if (j === 'waybillDetail.freight') {
+          return  v['waybillDetail']['freight'];
+        }
+
+        if (j === 'waybillDetail.realFee') {
+          return  v['waybillDetail']['realFee'];
+        }
+
+        if (j === 'waybillDetail.remark') {
+          return  v['waybillDetail']['remark'];
+        }
+
+        if (j === 'waybillDetail.feeRemark') {
+          return  v['waybillDetail']['feeRemark'];
+        }
+
+        if (j === 'waybillDetail.salesmen') {
+          return  v['waybillDetail']['salesmen'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.problemTypeName') {
+          return  v['waybillDetail']['problemTypeName'];
+        }
+
+        if (j === 'waybillDetail.problemCause') {
+          return  v['waybillDetail']['problemCause'];
+        }
+
+        if (j === 'waybillDetail.sendMobile') {
+          return "";
+        }
+
+        if (j === 'waybillDetail.calcFeeType') {
+          return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
+        }
+
+        if (j === 'waybillDetail.paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
+        }
+
+        if (j === 'waybillDetail.pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
+        }
+        if (j === 'waybillDetail.customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
+        }
+        if (j === 'waybillDetail.customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
+        }
+        if (j === 'waybillDetail.packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
+        }
+
+        if (j === 'waybillDetail.dispatchMethod') {
+          if(v['waybillDetail']['dispatchMethod'] == 1){
+            return '派送';
+          }else{
+            return '自提';
           }
-          return statusStr;
+        }
+
+
+        if (j === 'paymentStatus') {
+          if(v['paymentStatus'] == 0){
+            return '未收款';
+          }
+          else if(v['paymentStatus'] == 1){
+            return '已收款';
+          }
+          else if(v['paymentStatus'] == 2){
+            return '部分收款';
+          }
+        }
+
+        if (j === 'openBillStatus') {
+          if(v['openBillStatus'] == 0){
+            return '未开票';
+          }
+          else if(v['openBillStatus'] == 1){
+            return '已开票';
+          }
+          else if(v['openBillStatus'] == 2){
+            return '部分开票';
+          }
+          else if(v['openBillStatus'] == 3){
+            return '不开票';
+          }
+          else if(v['openBillStatus'] == 4){
+            return '已完成';
+          }
+        }
+
+        if (j === 'blSpecialQuote') {
+          if(v['blSpecialQuote'] == 0){
+            return '否';
+          }
+          else if(v['paymentStatus'] == 1){
+            return '是';
+          }
+        }
+
+        if (j === 'blMerge') {
+          if(v['blMerge'] == 0){
+            return '否';
+          }
+          else if(v['blMerge'] == 1){
+            return '是';
+          }
+        }
+
+
+        if (j === 'blConfirmCenter') {
+          if(v['blConfirmCenter'] == 0){
+            return '未确认';
+          }
+          else if(v['blConfirmCenter'] == 1){
+            return '已确认';
+          }
+          else if(v['blConfirmCenter'] == 2){
+            return '确认不出账';
+          }
+          else if(v['blConfirmCenter'] == 3){
+            return '账单异常';
+          }
+        }
+
+        if (j === 'blConfirmSite') {
+          if(v['blConfirmSite'] == 0){
+            return '未确认';
+          }
+          else if(v['blConfirmSite'] == 1){
+            return '已确认';
+          }
+          else if(v['blConfirmSite'] == 2){
+            return '确认不出账';
+          }
+          else if(v['blConfirmSite'] == 3){
+            return '账单异常';
+          }
+        }
+
+
+        if (j === 'waybillDetail.blIsQuestion') {
+          if(v['waybillDetail']['blIsQuestion']  == 1){
+            return '是';
+          }else{
+            return '否';
+          }
+        }
+
+        if (j === 'waybillDetail.blMessage') {
+          if(v['waybillDetail']['blMessage']  == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'waybillDetail.blAcceptMessage') {
+          if(v['waybillDetail']['blAcceptMessage']   == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'waybillDetail.blSign') {
+          if(v['waybillDetail']['blSign'] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'waybillDetail.paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
         return v[j]
       }))
     },
+    //指定列求和
+   getSummaries(param) {
+       const { columns, data } = param;
+      //  console.log("===>getSummaries==>",param)
+       const sums = [];
+       columns.forEach((column, index) => {
+             if (index === 0) {
+               sums[index] = '合计';
+               return;
+             }
+
+
+             if (
+               column.property === 'billFee'
+               ) {
+                 const values = data.map(item => Number(item.billFee));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+             else if (
+               column.property === 'costFee'
+               ) {
+                 const values = data.map(item => Number(item.costFee));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+             else if (
+               column.property === 'billProfit'
+               ) {
+                 const values = data.map(item => Number(item.billProfit));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+
+       });
+    //  console.log(sums);
+     return sums
+   },
     /** 列索引函数  */
     getIndex($index) {
           return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1