Merge pull request 'master-dev' (#79) from master-dev into develop

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/79

src/api/emis/emisCustomerUser.js

@@ -93,3 +93,13 @@ export function batchImportEnterprise(data) {
     data: data
   })
 }
+
+
+// 查询快递客户用户列表
+export function listMonthUserAll(query) {
+  return request({
+    url: '/emis/emisCustomerUser/listMonthUserAll',
+    method: 'get',
+    params: query
+  })
+}

src/views/emis/emisWaybill/waybillGot.vue

@@ -838,7 +838,7 @@
 <script>
 import { realMatchWaybill,getTotalAvailablePag } from "@/api/emis/emisCommon";
 import { checkWaybillIsExists,getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
-import { listMonthUser } from "@/api/emis/emisCustomerUser";
+import { listMonthUser,listMonthUserAll } from "@/api/emis/emisCustomerUser";
 import { parseTime } from "@/utils/custom";
 import { debounce } from 'throttle-debounce'
 import { getDestSite } from "@/api/emis/emisDestination";
@@ -1718,13 +1718,22 @@ methods: {
           }
         // });
         // 获取企业税号
-        if(['2', '4', '5'].includes(this.form.paymentType)){ // 月结
+        if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2){ // 月结或者月结客户
-         const res = await listMonthUser({monthlyPayCode: this.form.custNo ,pageNum: 1,pageSize: 1,customerType:2});
+          let params = {
+            pageNum: 1, pageSize: 1, customerType: 2
+          }
+          if (['2', '4', '5'].includes(this.form.paymentType)) {
+            params.monthlyPayCode = this.form.custNo; // 支付类型为月结
+          } else {
+            params.customerCode = this.form.customerCode; // 月结客户下单的现金单
+          }
+
+         const res = await listMonthUserAll(params);
           if(res.rows.length > 0){
             this.form.sender.enterpriseName = res.rows[0].enterpriseName;
             this.form.sender.enterpriseTaxId = res.rows[0].enterpriseTaxId;
           }
-        }else{ // 非月结
+        }else{ // 非月结客户下的非月结单
           if (this.form.sender.id) {
             const res = await getEmisCustomerAddress(this.form.sender.id);
             if (res.data) {