md

src/layout/index.vue

@@ -10,14 +10,14 @@
         <!-- <navbar /> -->
       </div>
       <app-main />
-      <div class="signfooter" style="position:relative;">
+      <!-- <div class="signfooter" style="position:relative;">
         <div class="auto clearfix">
             <div class="footer-signfooter">
                 <p>技术支持：南京睿达通商务咨询有限公司</p>
                 <p></p>
             </div>
         </div>
-      </div>
+      </div> -->
       <right-panel>
         <settings />
       </right-panel>

src/views/emis/emisCommissionDtl/index.vue

@@ -10,6 +10,9 @@
           clearable
         />
       </el-form-item>
+       <el-form-item label="发货时间" prop="">
+            <elDateAdvPicker  v-model="dateRange"  ></elDateAdvPicker>
+       </el-form-item>
       <el-form-item label="提成类型" prop="feeType">
         <el-select v-model="queryParams.feeType" placeholder="提成费用类型" clearable filterable >
                   <el-option
@@ -248,10 +251,12 @@ import { mapDtlList,listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissi
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
 import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+
 
 export default {
   name: "EmisCommissionDtl",
-  components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0,EmpNamePicker },
+  components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0,EmpNamePicker,elDateAdvPicker },
   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'
@@ -283,20 +288,13 @@ export default {
 
       titleBatch:"",
       openBatch: false,
+      dateRange:[],
 
 
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
-      // 更新站点时间范围
-      daterangeConfirmCenterDate: [],
-      // 更新站点时间范围
-      daterangeConfirmSiteDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -322,6 +320,9 @@ export default {
         confirmSiteCode: null,
         remark: null,
         delFlag: null,
+        params:{
+
+        }
       },
       formBatch:{
         billCode:null,
@@ -339,7 +340,8 @@ export default {
     /** 查询员工提成明细表列表 */
     getList() {
       this.loading = true;
-      mapDtlList(this.queryParams).then(response => {
+      let qParam=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
+      mapDtlList(qParam).then(response => {
         this.emisCommissionDtlList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -482,7 +484,12 @@ export default {
       }).catch(() => {});
     },
    /** 导出按钮操作 */
-   handleExport() {
+    // handleExport() {
+    //   this.download('emis/emisBaseInvoiceChInfo/export', {
+    //     ...this.queryParams
+    //   }, `emisBaseInvoiceChInfo_${new Date().getTime()}.xlsx`)
+    // },
+    handleExport() {
       const loadingInstance = this.$loading({
             text: '正在导出...'
       })
@@ -492,6 +499,7 @@ export default {
       }
       else{
           let qExportParam={...this.queryParams};
+          let qParam=this.addDateRange(qExportParam, this.dateRange,"sendDate");
           qExportParam.pageNum=1;
           qExportParam.pageSize=100000;
 

src/views/emis/emisSettleBill/PayBackStat/NoPayBackRecordList.vue

@@ -228,8 +228,7 @@ export default {
 
           this.getList();
 	      }
-
-	  }
+	    }
   },
   created() {
     console.log("====>queryInfo====>",this.queryInfo);

src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue

@@ -115,7 +115,11 @@
             </el-table-column>
             <el-table-column :label="$t('账单金额')" align="center" prop="recMoney" width="150" />
             <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
-
+            <el-table-column :label="$t('收款汇总')" align="center" prop="recdMoneyIn" width="180" >
+              <template slot-scope="scope">
+                <div  class="link-type" @click="handleShowPayList(scope.row,1)">{{ scope.row.recdMoneyIn }}</div>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('账期内收款金额(100%)')" align="center" prop="recdMoneyIn" width="180" >
               <template slot-scope="scope">
                 <div  class="link-type" @click="handleShowBillList(scope.row,1)">{{ scope.row.recdMoneyIn }}</div>

src/views/emis/emisSettlePayRecord/index.vue

@@ -133,7 +133,7 @@
                   v-hasPermi="['emis:emisSettlePayRecord:remove']"
                 >作废</el-button>
               </el-col> -->
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -142,7 +142,7 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisSettlePayRecord:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
@@ -253,21 +253,13 @@ export default {
       queryOrderType:null,
       queryDateType:null,
 
+      selectList:[],
+
 
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
-      // 更新站点时间范围
-      daterangeAuditDate: [],
-      // 更新站点时间范围
-      daterangeRefundDate: [],
-      // 更新站点时间范围
-      daterangeTradeDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -319,12 +311,35 @@ export default {
         }
       },
     };
+  },
+   watch: {
+      $route () {
+	      if(this.$route.query.action=='queryPayData'){
+          let tradeDay=this.$route.query.tradeDay;
+          this.queryDateType="2";
+
+          this.dateTimeRange[0]=tradeDay+' 00:00:00';
+          this.dateTimeRange[1]=tradeDay+' 23:59:59';
+
+          this.getList();
+	      }
+	    }
   },
   created() {
     this.queryOrderType="1";
-    this.queryDateType="1";
+    this.queryDateType="2";
+
+     if(this.$route.query.action=='queryPayData'){
+          let tradeDay=this.$route.query.tradeDay;
+          this.queryDateType="2";
+          this.dateTimeRange[0]=tradeDay+' 00:00:00';
+          this.dateTimeRange[1]=tradeDay+' 23:59:59';
+
+          this.getList();
+      }else{
+          this.getList();
+      }
 
-    this.getList();
   },
   methods: {
 
@@ -380,6 +395,7 @@ export default {
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
+      this.selectList=selection;
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -515,49 +531,237 @@ export default {
      return sums
    },
     /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisSettlePayRecord/export', {
-    //     ...this.queryParams
-    //   }, `emisSettlePayRecord_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
+     handleExport() {
+      const loadingInstance = this.$loading({
             text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
+      })
 
-       listEmisSettlePayRecord(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','支付序号','支付类型','收付类型','支付人名称','支付人编码','总账单号','审核状态','审核日期','审核人','审核站点','客户编码','客户名称','金额','支付状态','支付状态描述','break_type','break_reason','break_emp_code','收款人代码','结算类型','退款日期','退款人','退款序号','退款模式','退款金额','退款原因','退款备注','退款操作人','退款登记站点','退款登记人','理赔金额','理赔原因','allowance_money','allowance_reason','deduction_money','deduction_reason','other_money','other_reason','交易时间','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','payId','payType','recType','payMan','payManCode','settleBillNo','blAudit','auditDate','auditManCode','auditSiteCode','customerCode','customerName','payMoney','payStatus','payStatusDesc','breakType','breakReason','breakEmpCode','recManCode','settleType','refundDate','refundManCode','refundSeq','refundMode','refundMoney','refundReason','refundRemark','refundOpManCode','refundRegisterSiteCode','refundRegisterManCode','satisfyMoney','satisfyReason','allowanceMoney','allowanceReason','deductionMoney','deductionReason','otherMoney','otherReason','tradeDate','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.selectList&&this.selectList.length>0){
+        this.exportData(this.selectList,loadingInstance);
+      }
+      else{
+
+          let qExportParam={...this.queryParams};
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=20000;
+          queryPayBackRecordList(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
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
+
+        if (j === 'waybillDetail.parcelQty') {
+          return v['waybillDetail']['parcelQty'];
         }
+
+        if (j === 'waybillDetail.billWeight') {
+          return v['waybillDetail']['billWeight'];
+        }
+
+        if (j === 'waybillDetail.totalVolume') {
+          return v['waybillDetail']['totalVolume'];
+        }
+
+        if (j === 'waybillDetail.volumeWeight') {
+          return v['waybillDetail']['volumeWeight'];
+        }
+
+        if (j === 'waybillDetail.settlementWeight') {
+          return v['waybillDetail']['settlementWeight'];
+        }
+
+        if (j === 'waybillDetail.freight') {
+          return v['waybillDetail']['freight'];
+        }
+
+
+        if (j === 'waybillDetail.productTypeName') {
+          return v['waybillDetail']['productTypeName']+'('+v['waybillDetail']['timeType']+')';
+        }
+
+
+        if (j === 'waybillDetail.transLineTypeName') {
+          return v['waybillDetail']['transLineTypeName'];
+        }
+
+        if (j === 'waybillDetail.sendCompany') {
+          return v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.paymentType') {
+          let paymentType=v['waybillDetail']['paymentType'];
+          return this.selectDictLabel(this.dict.type.emis_payment_type,paymentType);
+        }
+
+
+
+        if (j === 'settleBillDetail.payee') {
+          return v['settleBillDetail']['payee'];
+        }
+
+        if (j === 'settleBillDetail.salesmen') {
+          return v['settleBillDetail']['salesmen'];
+        }
+
+        if (j === 'settleBillDetail.recMoney') {
+          return v['settleBillDetail']['recMoney'];
+        }
+
+        if (j === 'settleBillDetail.recMoney') {
+          return v['settleBillDetail']['recMoney'];
+        }
+
+        if (j === 'settleBillDetail.refundMoney') {
+          return v['settleBillDetail']['refundMoney'];
+        }
+
+        if (j === 'settleBillDetail.satisfyMoney') {
+          return v['settleBillDetail']['satisfyMoney'];
+        }
+
+
+        if (j === 'settleBillDetail.allowanceMoney') {
+          return v['settleBillDetail']['allowanceMoney'];
+        }
+
+        if (j === 'settleBillDetail.deductionMoney') {
+          return v['settleBillDetail']['deductionMoney'];
+        }
+
+        if (j === 'settleBillDetail.otherMoney') {
+          return v['settleBillDetail']['otherMoney'];
+        }
+
+        if (j === 'settlePayRecordDetail.remark') {
+          return v['settlePayRecordDetail']['remark'];
+        }
+
+        if (j === 'settlePayRecordDetail.tradeDate') {
+          return v['settlePayRecordDetail']['tradeDate'];
+        }
+
+        if (j === 'settleBillDetail.paymentDueDate') {
+          return v['settleBillDetail']['paymentDueDate'];
+        }
+
+        if (j === 'settlePayRecordDetail.payId') {
+          return v['settlePayRecordDetail']['payId'];
+        }
+
+        if (j === 'settlePayRecordDetail.recType') {
+          let recType=v['settlePayRecordDetail']['recType'];
+          if(recType == 1){
+            return '收款';
+          }
+          else if(recType == 2){
+            return '退款';
+          }
+        }
+        if (j === 'settlePayRecordDetail.createByName') {
+          return v['settlePayRecordDetail']['createByName'];
+        }
+        if (j === 'settlePayRecordDetail.createTime') {
+          return v['settlePayRecordDetail']['createTime'];
+        }
+
+        if (j === 'settleBillDetail.settleBillName') {
+          return v['settleBillDetail']['settleBillName'];
+        }
+        if (j === 'settleBillDetail.billMonth') {
+          return v['settleBillDetail']['billMonth'];
+        }
+        if (j === 'settleBillDetail.creditPeriod') {
+          return v['settleBillDetail']['creditPeriod'];
+        }
+        if (j === 'settleBillDetail.custName') {
+          return v['settleBillDetail']['custName'];
+        }
+        if (j === 'settleBillDetail.custName') {
+          let paymentType=v['waybillDetail']['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['settleBillDetail']['custName'];
+          }else{
+            return "";
+          }
+        }
+
+
+
+        if (j === 'settlePayRecordDetail.payType') {
+          let payType=v['settlePayRecordDetail']['payType'];
+          if(payType == 1){
+            return '微信支付';
+          }
+          else if(payType == 2){
+            return '支付宝支付';
+          }
+          else if(payType == 3){
+            return '企业微信收款';
+          }
+          else if(payType == 4){
+            return '对公付款';
+          }
+          else if(payType == 5){
+            return '其他';
+          }
+          else{
+            return '';
+          }
+        }
+        if (j === 'settleSubBill.openBillStatus') {
+          let openBillStatus=v['settleSubBill']['openBillStatus'];
+          if(openBillStatus== 0){
+            return '未开票';
+          }
+          else if(openBillStatus == 1){
+            return '已开票';
+          }
+          else if(openBillStatus == 2){
+            return '部分开票';
+          }
+          else if(openBillStatus == 3){
+            return '不开票';
+          }
+          else if(openBillStatus == 4){
+            return '已完成';
+          }
+          else{
+            return '';
+          }
+        }
+        if (j === 'settleSubBill.invoicedMoney') {
+          return v['settleSubBill']['invoicedMoney'];
+        }
+        if (j === 'settleSubBill.paymentStatus') {
+          let paymentStatus=v['settleSubBill']['paymentStatus'];
+          return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus);
+        }
+
         return v[j]
       }))
     },

src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue

@@ -79,7 +79,16 @@
             </el-form-item>
 
           </el-col>
-          <el-col :span="6" >
+          <el-col :span="6" v-if="form.settleType==2">
+            <el-form-item :label="$t('缴款客户')" prop="customerCode" >
+              <span slot="label">
+                <span style="color: red">缴款客户</span>
+              </span>
+
+              <AllMonthpayAccountPicker v-model="form.payManCode" @onChange="onMonthpayAccountSelect"></AllMonthpayAccountPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  v-if="form.settleType==1">
             <el-form-item :label="$t('缴款人')" prop="customerCode" >
               <span slot="label">
                 <span style="color: red">缴款人</span>
@@ -248,7 +257,7 @@ export default {
     }
   },
   components: { AllMonthpayAccountPicker,PayeePicker },
-  dicts: ['emis_settlebill_pay_type'],
+  dicts: ['emis_settlebill_pay_type','emis_payment_type'],
   data() {
     return {
       emisSettlePayRecordOptions: [],
@@ -313,6 +322,8 @@ export default {
           this.form.recType=1;
           this.form.payScope='1';
           this.form.payRelList=[];
+          this.form.settleType='1';
+
           console.log("===>initData2222===>",this.billList)
           if(this.billList&& this.billList.length>0){
               this.changePayScope();
@@ -396,6 +407,7 @@ export default {
 
 
     async changePayScope(){
+      let that=this;
       // 收/ 退款
       if(this.form.payScope==1){
 
@@ -451,6 +463,13 @@ export default {
                 relItem.payMoney=itemSubBill.money;
                 relItem.hasApplyFee=0;
                 console.log("===>=hasPayMap1111==>",hasPayMap[itemSubBill.billNo])
+
+                if(relItem.waybillDetail.paymentType == 2 || relItem.waybillDetail.paymentType == 4 || relItem.waybillDetail.paymentType == 5){
+                  that.form.settleType='2';
+                }else{
+                  that.form.settleType='1';
+                }
+
                 if(itemSubBill.billNo in hasPayMap){
                   this.isCanPay=false;
                   if(this.form.recType==1){
@@ -520,7 +539,7 @@ export default {
         breakReason: null,
         breakEmpCode: null,
         recManCode: null,
-        settleType: this.settleType,
+        settleType: null,
         refundDate: null,
         refundManCode: null,
         refundSeq: null,

src/views/emis/emisSettlePayRecord/panel/PayRecordInputByMerge.vue

@@ -52,7 +52,16 @@
             </el-form-item>
 
           </el-col>
-          <el-col :span="6" >
+          <el-col :span="6" v-if="form.settleType==2">
+            <el-form-item :label="$t('缴款客户')" prop="customerCode" >
+              <span slot="label">
+                <span style="color: red">缴款客户</span>
+              </span>
+
+              <AllMonthpayAccountPicker v-model="form.payManCode" @onChange="onMonthpayAccountSelect"></AllMonthpayAccountPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  v-if="form.settleType==1" >
             <el-form-item :label="$t('缴款人')" prop="customerCode" >
               <span slot="label">
                 <span style="color: red">缴款人</span>
@@ -275,6 +284,7 @@ export default {
           this.form.recType=1;
           this.form.payScope='1';
           this.form.payRelList=[];
+          this.form.settleType='1';
 
           console.log("===>initData2222===>",this.billList)
           if(this.billList&& this.billList.length>0){
@@ -421,7 +431,7 @@ export default {
         breakReason: null,
         breakEmpCode: null,
         recManCode: null,
-        settleType: this.settleType,
+        settleType: null,
         refundDate: null,
         refundManCode: null,
         refundSeq: null,