客户账单查询、公司开票主体排序

src/views/emis/emisBaseInvoiceInfo/emisBaseInvoiceInfoForm.vue

@@ -37,6 +37,12 @@
               <el-input v-model="form.bankAccNo" placeholder="" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="排序" prop="invoiceInfoSort">
+              <el-input v-model="form.invoiceInfoSort" placeholder="" />
+            </el-form-item>
+          </el-col>
+
           <!-- <el-col :span="24">
             <el-form-item label="开票类型" prop="invoiceType">
               <el-input v-model="form.invoiceType" placeholder="请输入开票类型" />
@@ -176,6 +182,7 @@ export default {
         phone: null,
         recieveAddress: null,
         email: null,
+        invoiceInfoSort: null,
         remark: null,
         delFlag: null,
         createBy: null,

src/views/emis/emisBaseInvoiceInfo/index.vue

@@ -121,6 +121,7 @@
       <!-- <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" /> -->
       <el-table-column :label="$t('开户行')" align="center" prop="bankName" min-width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('开户账号')" align="center" prop="bankAccNo" min-width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('排序')" align="center" prop="invoiceInfoSort" min-width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" />
       <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" />
       <!-- <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" /> -->

src/views/emis/emisSettleBill/CustSettleBillQueryList.vue

@@ -42,7 +42,7 @@
               </el-select>
             </el-form-item> -->
             <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
-              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
+              <el-select multiple clearable v-model="paymentStatus" placeholder="收款状态" style="width:100%">
                   <el-option key="0" label="未收款" value="0"></el-option>
                   <el-option key="1" label="已收款" value="1"></el-option>
                   <el-option key="2" label="部分收款" value="2"></el-option>
@@ -64,6 +64,12 @@
             <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
               <EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmpNamePicker2>
             </el-form-item>
+            <el-form-item label="账单类型" prop="settleType"> 
+              <el-select  clearable v-model="queryParams.settleType" placeholder="账单类型">
+                  <el-option key="1" label="现金账单" value="1"></el-option>
+                  <el-option key="2" label="月结账单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
 
           </SearchForm>
          <!-- 账单表 -->
@@ -233,7 +239,11 @@
             <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="80" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="80" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="80" :show-overflow-tooltip="true"/>
-
+            <el-table-column :label="$t('账单未收款')" align="center" prop="recUnPaid" width="120" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span  type="normal">{{ (scope.row.recMoney-scope.row.recedMoney+scope.row.refundMoney-scope.row.satisfyMoney-scope.row.allowanceMoney-scope.row.deductionMoney-scope.row.otherMoney ).toFixed(2) }}</span>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" width="100"  :show-overflow-tooltip="true" />
             <el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" width="100" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" width="100"  :show-overflow-tooltip="true"/>
@@ -353,6 +363,8 @@ export default {
       daterangeCreateTime: [],
       // 更新站点时间范围
       daterangeUpdateTime: [],
+      paymentStatus:[],
+      settleType:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -410,7 +422,7 @@ export default {
         params:{
           billCode:null,
         }
-      },
+      }
     };
   },
    watch: {
@@ -447,6 +459,11 @@ export default {
         this.queryParams.params.billCode=null;
         this.queryParams.settleBillNo=this.queryParams.queryCode;
       }
+      if(this.paymentStatus.length>0){
+       this.queryParams.paymentStatus=this.paymentStatus.join(',');
+      }else{
+        this.queryParams.paymentStatus=null;
+      }
 
     },
 
@@ -825,6 +842,21 @@ export default {
         if (j === 'paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
+        if (j === 'recUnPaid') {
+          return v['recMoney'] - v['recedMoney'] + v['refundMoney'] - v['satisfyMoney'] - v['allowanceMoney'] - v['deductionMoney'] - v['otherMoney'];
+        }
+        if (j ==='blConfirmSite') {
+          if(v[j] == 0){
+            return '未确认';
+          }else if(v[j] == 1){
+            return '已确认';
+          }else if(v[j] == 2){
+            return '确认不出账';
+          }else if(v[j] == 3){
+            return '账单异常';
+          }
+        }
+
         return v[j]
       }))
     },