md

src/views/emis/emisCustomerUser/monthUserForm.vue

@@ -90,6 +90,7 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8">
             <el-form-item label="所属国家" prop="country">
                 <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
@@ -112,6 +113,16 @@
               <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="账期(天)" prop="creditPeriod">
+              <el-input-number  v-model="form.creditPeriod"  placeholder="账期(天)" :min="0" :max="365" :controls="false" :precision="0"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="账单日" prop="settleDay">
+              <el-input-number  v-model="form.settleDay"  placeholder="账单日" :min="1" :max="31" :controls="false" :precision="0"></el-input-number>
+            </el-form-item>
+          </el-col>
 
           <!-- <el-col :span="8">
             <el-form-item label="专属业务员" prop="opEmpCode" >
@@ -306,6 +317,12 @@ export default {
         opEmpCode: [
           { required: true, message: "专属业务员不能为空", trigger: ["blur",'change'] }
         ],
+        creditPeriod: [
+          { required: true, message: "账期不能为空", trigger: ["blur",'change'] }
+        ],
+        settleDay: [
+          { required: true, message: "账单日不能为空", trigger: ["blur",'change'] }
+        ],
       }
     };
   },
@@ -365,12 +382,14 @@ export default {
         customerName: null,
         customerNameEn: null,
         simpleName: null,
+        contact: null,
         phone: null,
         mobile: null,
-        customerType: '2',
+        customerType: null,
-        settledType: '2',
+        settledType: null,
-        userType: '2',
+        userType: null,
         company: null,
+        licNo: null,
         deptId: null,
         avatar: null,
         sex: null,
@@ -393,21 +412,24 @@ export default {
         town: null,
         address: null,
         email: null,
-        sendCountry: null,
-        sendProvince: null,
-        sendCity: null,
-        sendCounty: null,
-        sendTown: null,
         postCode: null,
-        status: null,
         realName: null,
         idNo: null,
+        idType: null,
+        idPic1: null,
+        idPic2: null,
+        idVerifyStatus: null,
         payee: null,
         salesmen: null,
         dataFrom: null,
         blOpenOms: null,
         blSms: null,
         opEmpCode: null,
+        firstSigningDay: null,
+        creditPeriodType: null,
+        creditPeriod: null,
+        settleDay: null,
+        status: null,
         orderNum: null,
         remark: null,
         delFlag: null,

src/views/emis/emisCustomerUser/monthUserList.vue

@@ -231,7 +231,8 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('首次签约日期')" align="center" prop="firstSigningDay" min-width="100" />
-
+        <el-table-column :label="$t('账期(天)')" align="center" prop="creditPeriod" min-width="100" />
+        <el-table-column :label="$t('账单日')" align="center" prop="settleDay" min-width="100" />
       <!-- <el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('微信昵称')" align="center" prop="nickName" min-width="120" /> -->
       <!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" /> -->

src/views/emis/emisSettleBill/EmisSettleBillQuery.vue

@@ -294,6 +294,7 @@ export default {
      emisSettleSubBillList: [],
 
      currentSettleBillNo:null,
+     selectList: [],
 
      queryOrderType:null,
 
@@ -536,10 +537,13 @@ export default {
 
     },
     handleExportToBill() {
-    this.download('emis/emisSettleBill/exportBill', {
+      if(this.selectList&&this.selectList.length>0){
-      settleBillNo:this.currentSettleBillNo
+        this.selectList.forEach(item=>{
-    }, `账单${new Date().getTime()}.xlsx`)
+          this.download('emis/emisSettleBill/exportBill', {
-
+            settleBillNo:item.settleBillNo
+          }, `账单${item.settleBillName}.xlsx`)
+        });
+      }
    },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -554,11 +558,14 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
 
+
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
 
-      if(selection&&selection.length>0){
+      this.selectList=selection;
+
+      if(this.selectList&&this.selectList.length>0){
         this.currentSettleBillNo=selection[0].settleBillNo;
       }
 

src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue

@@ -301,6 +301,8 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      selectList: [],
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -558,11 +560,14 @@ export default {
    handleRemovceBillCode(){
 
     },
-    handleExportToBill() {
+   handleExportToBill() {
-    this.download('emis/emisSettleBill/exportBill', {
+      if(this.selectList&&this.selectList.length>0){
-      settleBillNo:this.currentSettleBillNo
+        this.selectList.forEach(item=>{
-    }, `账单${new Date().getTime()}.xlsx`)
+          this.download('emis/emisSettleBill/exportBill', {
-
+            settleBillNo:item.settleBillNo
+          }, `${item.settleBillName}.xlsx`)
+        });
+      }
    },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -579,9 +584,11 @@ export default {
 
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
 
-      if(selection&&selection.length>0){
+      this.selectList=selection;
+
+      if(this.selectList&&this.selectList.length>0){
         this.currentSettleBillNo=selection[0].settleBillNo;
         this.settleType==selection[0].settleType;
       }

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -1033,6 +1033,15 @@ export default {
         if (j === 'fjr') {
           return v['sendName']+'--'+v['receiveName'];
         }
+        if (j === 'custName') {
+          let paymentType=v['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['custName'];
+          }else{
+            return "";
+          }
+        }
+
         if (j === 'sendMobile') {
           return "";
         }