md

src/views/emis/emisCreditCustomer/index.vue

@@ -119,7 +119,7 @@
           <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="blOpen" width="100">
+      <!-- <el-table-column label="状态" align="center" prop="blOpen" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.blOpen"
@@ -128,7 +128,7 @@
             @change="switchChange(scope.row)">
           </el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('剩余额度')" align="center" prop="curMoney" min-width="100" >
         <template slot-scope="scope">
           {{ scope.row.creditMoney - scope.row.useMoney }}
@@ -280,7 +280,7 @@ export default {
         let item0=row;
         this.$router.push(
           {
-            path: '/d24/waybillManagement/SendWaybillList',
+            path: '/d24/customerManagement/CreditSendWaybillList',
             query: {
               action: "queryByCredit",
               custNo: item0.monthlyPayCode,

src/views/emis/emisCreditSalesmen/index.vue

@@ -108,7 +108,7 @@
           <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="blOpen" width="100">
+      <!-- <el-table-column label="状态" align="center" prop="blOpen" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.blOpen"
@@ -117,7 +117,7 @@
             @change="switchChange(scope.row)">
           </el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('剩余额度')" align="center" prop="curMoney" min-width="100" >
         <template slot-scope="scope">
           {{ scope.row.creditMoney - scope.row.useMoney }}
@@ -256,7 +256,7 @@ export default {
         let item0=row;
         this.$router.push(
           {
-            path: '/d24/waybillManagement/SendWaybillList',
+            path: '/d24/customerManagement/CreditSendWaybillList',
             query: {
               action: "queryByCredit",
               salesmen: item0.salesmen,

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -820,6 +820,7 @@ export default {
           queryTabType:"1",
           querySendType:"1",
           blUploadGoodsPic:null,
+          settleType:null,
         }
       },
     };
@@ -829,16 +830,21 @@ export default {
 	      if(this.$route.query.action=='queryByCredit'){
           if(this.$route.query.custNo!=null){
             this.queryParams.custNo=this.$route.query.custNo;
+            this.queryParams.paymentType='2,4,5';
           }
 
           if(this.$route.query.salesmen!=null){
             this.queryParams.salesmen=this.$route.query.salesmen;
+            this.queryParams.paymentType='1,3';
           }
 
-          this.queryParams.paymentStatus='0';
+          this.queryParams.transType=this.$route.query.transType;
+
+          this.queryParams.paymentStatus='0,2';
           this.queryParams.params.problemQueryType=2;
           this.queryParams.params.problemQueryIds="173,170,151";
 
+
           let startTime=this.$route.query.startDate;
           let endTime=this.$route.query.endDate;
           this.dateRange=[timeFormat(startTime), timeFormat(endTime)]
@@ -852,15 +858,20 @@ export default {
   },
   created() {
     if(this.$route.query.action=='queryByCredit'){
+
           if(this.$route.query.custNo!=null){
             this.queryParams.custNo=this.$route.query.custNo;
+            this.queryParams.paymentType='2,4,5';
           }
 
           if(this.$route.query.salesmen!=null){
             this.queryParams.salesmen=this.$route.query.salesmen;
+            this.queryParams.paymentType='1,3';
           }
 
-          this.queryParams.paymentStatus='0';
+          this.queryParams.transType=this.$route.query.transType;
+
+          this.queryParams.paymentStatus='0,2';
           this.queryParams.params.problemQueryType=2;
           this.queryParams.params.problemQueryIds="173,170,151";
 

src/views/emis/emisWaybill/waybillIsPrinted.vue

@@ -138,6 +138,28 @@
                   @click="handleDownPDF"
                 >下载pdf</el-button>
               </el-col>
+              <!-- v-hasPermi="['emis:emisWaybill:downCustBill']" -->
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDownCustBillPDF"
+                  v-hasPermi="['emis:emisWaybill:downCustBill']"
+                >下载客户账单(PDF)</el-button>
+              </el-col>
+              <!-- v-hasPermi="['emis:emisWaybill:downCustTaxBill']" -->
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDownCustTaxBillPDF"
+                  v-hasPermi="['emis:emisWaybill:downCustTaxBill']"
+                >下载税金账单(PDF)</el-button>
+              </el-col>
 
           <el-col :span="1.5">
             <TanexPrinterPanel ref="tanexPrinter" :isShowPinters="true" :isShowTpl="true"   :isShowSubBillRange="true" @onPrint="handleBatchPrint"></TanexPrinterPanel>
@@ -525,6 +547,27 @@ export default {
     rowKey (row) {
       return row.id;
     },
+    handleDownCustBillPDF() {
+      if(this.currentSelection&&this.currentSelection.length>0){
+        this.currentSelection.forEach(item=>{
+          this.download('emis/emisWaybill/exportCustBillTpl', {
+            billCode:item.billCode,
+            fileType:'pdf'
+          }, `${item.billCode}-custbill.pdf`)
+
+        });
+     }
+    },
+    handleDownCustTaxBillPDF() {
+      if(this.currentSelection&&this.currentSelection.length>0){
+        this.currentSelection.forEach(item=>{
+          this.download('emis/emisWaybill/exportCustTaxBillTpl', {
+            billCode:item.billCode,
+            fileType:'pdf'
+          }, `${item.billCode}-custTaxBill.pdf`)
+        });
+     }
+    },
     handleBatchPrint(printCnt){
       this.$confirm("确定打印?", "提示", {
           cancelButtonText: "不打印",