md

src/views/emis/emisCommissionDtl/index.vue

@@ -52,6 +52,8 @@
            :data="emisCommissionDtlList"
            :showSearch.sync="showSearch"
 
+           ref="refTable"
+
             storageName="emisCommissionDtl_main_240702"
 
            :queryParams="queryParams"
@@ -108,16 +110,15 @@
                 >批量重算</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:emisCommissionDtl:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
@@ -137,18 +138,22 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('提成金额')" align="center" prop="money" min-width="100" />
-      <el-table-column :label="$t('提成备注')" align="center" prop="feeRemark" min-width="100" />
+      <el-table-column :label="$t('提成配置名称')" align="center" prop="quoteName" min-width="130" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+      <!-- <el-table-column :label="$t('计算表达式')" align="center" prop="calcExpr" min-width="100" :show-overflow-tooltip="true"/> -->
+      <el-table-column :label="$t('提成备注')" align="center" prop="feeRemark" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :show-overflow-tooltip="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.calcFeeType" width="80" :show-overflow-tooltip="true">
+      <!-- <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> -->
+      <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
      <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"/>
@@ -237,9 +242,12 @@ import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommission
 import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 export default {
-  name: "emisCommissionDtl",
+  name: "EmisCommissionDtl",
   components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0,PayeePicker },
-  dicts: ['emis_commission_fee_type'],
+  dicts: ['emis_commission_fee_type','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 {
       // 遮罩层
@@ -259,6 +267,8 @@ export default {
       // 员工提成明细表表格数据
       emisCommissionDtlList: [],
 
+      selectBillList:[],
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -316,7 +326,7 @@ export default {
     /** 查询员工提成明细表列表 */
     getList() {
       this.loading = true;
-      listEmisCommissionDtl(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisCommissionDtl(this.queryParams).then(response => {
         this.emisCommissionDtlList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -338,6 +348,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.selectBillList=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -435,49 +446,201 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
+   /** 导出按钮操作 */
-    handleExport() {
+   handleExport() {
-    //   this.download('emis/emisCommissionDtl/export', {
+      const loadingInstance = this.$loading({
-    //     ...this.queryParams
-    //   }, `emisCommissionDtl_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
             text: '正在导出...'
-        })
+      })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
 
-       listEmisCommissionDtl(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+      if(this.selectBillList&&this.selectBillList.length>0){
-        this.downloadLoading = false
+        this.exportData(this.selectBillList,loadingInstance);
-        if (response.code === 200) {
+      }
-                const curList = response.rows
+      else{
-                import('@/vendor/Export2Excel').then(excel => {
+          let qExportParam={...this.queryParams};
-                  const tHeader = ['id','提成费用类型','提成金额','月份','运单号','费用备注','员工编号','员工名称','财务确认状态','财务确认日期','财务确认备注','财务确认人','财务确认站点','站点确认状态','站点确认日期','站点确认人','网点确认备注','确认网点代码','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+          qExportParam.pageNum=1;
-                  const filterVal = ['id','feeType','money','billMonth','billCode','feeRemark','empCode','empName','blConfirmCenter','confirmCenterDate','confirmCenterNote','confirmCenterManCode','confirmCenterCode','blConfirmSite','confirmSiteDate','confirmSiteManCode','confirmSiteNote','confirmSiteCode','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+          qExportParam.pageSize=10000;
-                  const data = this.formatJson(filterVal, curList, response.rows)
+
-                  excel.export_json_to_excel({
+          listEmisCommissionDtl(qExportParam).then(response => {
-                    header: tHeader,
+            if (response.code === 200) {
-                    data,
+              this.exportData(response.rows,loadingInstance);
-                    filename: '员工提成明细表',
+            }
-                    autoWidth: true
+          });
-                  })
+      }
-                  loadingInstance.close()
+    },
-                })
+    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
       return jsonData.map(v => filterVal.map(j => {
+
+        console.log("===>1111===>",v);
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
+        if (j === 'kjlx') {
-          var statusStr='xxx'
+          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
-          if(v[j] == 10){
+        }
-              statusStr='xxx'
+        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 === '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]
       }))

src/views/emis/emisCommissionProfit/index.vue

@@ -1,19 +1,22 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"  size="mini" :maxShow="30"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"  size="mini" :maxShow="30"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="月份" prop="billMonth">
         <el-date-picker  size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="月份" value-format="yyyy-MM"></el-date-picker>
       </el-form-item>
-      <el-form-item label="员工名称" prop="empName">
+      <el-form-item label="提成员工" prop="empName">
-        <el-input
+        <PayeePicker :placeholder="$t('提成员工')" v-model="queryParams.empName"  ></PayeePicker>
-          v-model="queryParams.empName"
+
-          :placeholder="$t('员工名称')"
-          clearable
-        />
       </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="emisCommissionProfitList"
@@ -82,10 +85,11 @@
       <!-- <el-table-column :label="$t('提成编号')" align="center" prop="profitNo" min-width="100" /> -->
       <!-- <el-table-column :label="$t('提成名称')" align="center" prop="profitName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('提成类型')" align="center" prop="settleType" min-width="100" /> -->
-      <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
+      <el-table-column :label="$t('员工名称')" align="center" prop="empName" width="100" />
-      <el-table-column :label="$t('月份')" align="center" prop="billMonth" min-width="100" />
+      <el-table-column :label="$t('月份')" align="center" prop="billMonth" width="100" />
-      <el-table-column :label="$t('提成金额')" align="center" prop="money" min-width="100" />
+      <el-table-column :label="$t('提成金额')" align="center" prop="money" width="100" />
-      <el-table-column :label="$t('创建日期')" align="center" prop="createTime" min-width="170" />
+      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" />
+      <el-table-column :label="$t('更新时间')" align="center" prop="updateTime" width="170" />
 
       <!-- <el-table-column :label="$t('结算开始时间')" align="center" prop="startDate" min-width="100" /> -->
       <!-- <el-table-column :label="$t('结算结束时间')" align="center" prop="endDate" min-width="100" /> -->
@@ -125,7 +129,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -133,10 +137,12 @@ import { listEmisCommissionProfit, getEmisCommissionProfit, delEmisCommissionPro
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisCommissionProfitView from '@/views/emis/emisCommissionProfit/emisCommissionProfitView';
 import emisCommissionProfitForm from '@/views/emis/emisCommissionProfit/emisCommissionProfitForm';
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+
 
 export default {
   name: "emisCommissionProfit",
-  components: { elDateSimplePicker,emisCommissionProfitForm },
+  components: { elDateSimplePicker,emisCommissionProfitForm,PayeePicker },
   dicts: [
   ],
   data() {

src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue

@@ -86,8 +86,8 @@
               <el-col :span="24">
                   <el-form-item label="启用状态" prop="blOpen">
                   <el-radio-group v-model="form.blOpen">
-                    <el-radio :label="1">启用</el-radio>
+                    <el-radio :label="'1'">启用</el-radio>
-                    <el-radio :label="0">停用</el-radio>
+                    <el-radio :label="'0'">停用</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -299,7 +299,7 @@ export default {
           });
         }else{
             this.reset();
-            this.form.blOpen=1;
+            this.form.blOpen='1';
         }
     },
     handelSelectStaff(){

src/views/emis/emisCommissionQuote/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="21"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="21"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <!-- <el-form-item label="" prop="quoteCode">
         <el-input
@@ -86,7 +86,13 @@
     </SearchForm>
 
 
-    <XdTable v-loading="loading"
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border stripe
            size="mini"
            :data="emisCommissionQuoteList"
@@ -232,6 +238,14 @@
       <!-- <el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" /> -->
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
+
+      <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"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body>
@@ -239,7 +253,7 @@
     </el-dialog>
 
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>