1)账单推送界面中可以修改收费项单价，修改收费项单价后同步修改租户对应收费项单价。

2)电费起码自动读取该租户最后一次账单的止码。

.env.development

@@ -1,9 +1,9 @@
 OUT_PUT_DIR=dist/jp-housekeeper-portal
 
 #VUE_APP_BACKEND_URL=http://127.0.0.1:7070/xpgj
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
-VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
+#VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

src/routers/modules/base.js

@@ -566,7 +566,7 @@ var routers = [
                 component: () => import('@/views/base/companyPayment-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '物业公司收款账户管理'
+                        title: '收款账户管理'
                 }
         }, 
 ]

src/routers/modules/business.js

@@ -54,7 +54,7 @@ var routers = [
         {
                 //账单推送管理
                 path: '/business/billPush/list',
-                name: 'business-billPush-list',
+                name: 'businessBillPushList',
                 // route level code-splitting
                 // this generates a separate chunk (about.[hash].js) for this route
                 // which is lazy-loaded when the route is visited.

src/views/base/checkinInfo-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">园区管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/base/checkinInfo">租户管理</a>

src/views/base/companyPayment-list.vue

@@ -6,7 +6,7 @@
             <a href="#">系统管理</a>
         </el-breadcrumb-item>
         <el-breadcrumb-item>
-            <a href="#">物业公司收款账户管理</a>
+            <a href="#">园区管理</a>
         </el-breadcrumb-item>
         </el-breadcrumb>
         <el-divider></el-divider>

src/views/business/billPush-detail.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :visible.sync="showDialog"
     :title="title"
-    width="83%"
+    width="95%"
     :modal-append-to-body="true"
     style="text-align:left;"
     @close="closeDialog"
@@ -39,7 +39,7 @@
               ></el-option>
           </el-select>
         </el-form-item> 
-        <el-form-item label="推送用户：" prop="personId" >
+        <el-form-item label="推送用户：" prop="personName" >
         <!--
             <el-input v-model="formModel.personId" style="display:none"></el-input>
         -->
@@ -98,7 +98,6 @@
                     <el-select 
                     v-model="scope.row.goodsId" 
                     placeholder="请选择" 
-                    style="width:150px;" 
                     @change="handGoodsChange(scope)" size="mini">
                         <el-option
                         v-for="result in goodsList"
@@ -130,7 +129,7 @@
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="numStr" label="数量"  width="320">
+            <el-table-column prop="numStr" label="数量"  width="310">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.numStr3'"
@@ -147,24 +146,27 @@
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="standard" label="收费标准(元)" width="120">
+            <el-table-column prop="standard" label="收费标准" width="200">
                 <template slot-scope="scope">
                     <el-form-item
-                    :prop="'billPushGoodsList.' + scope.$index + '.standard'"
-                    :rules="ruleValidate['standard']"
+                    :prop="'billPushGoodsList.' + scope.$index + '.unitPrice'"
+                    :rules="ruleValidate['unitPrice']"
+                    size="mini"
                     >
-                    <el-input v-model="scope.row.unit" style="display:none"></el-input>
-                    <el-input placeholder="收费标准" v-model="scope.row.standard" size="mini"></el-input>
+                        <el-input placeholder="收费标准" v-model="scope.row.unitPrice" @change="handNumChange(scope)" size="mini">
+                            <template slot="append">{{scope.row.unit}}</template>
+                        </el-input>
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="totalFee" label="合计金额(元)" width="120">
+            <el-table-column prop="totalFee" label="合计金额(元)">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.totalFee'"
-                    :rules="ruleValidate['totalFee']"
+                    :rules="ruleValidate['totalFee']" size="mini"
                     >
-                    <el-input placeholder="合计金额" :value="scope.row.totalFee" readonly="readonly" size="mini"></el-input>
+                    <el-input placeholder="合计金额" :value="scope.row.totalFee" readonly="readonly" size="mini">
+                    </el-input>
                     </el-form-item>
                 </template>
             </el-table-column>
@@ -210,9 +212,10 @@ export default {
         return {
             ruleValidate: {
                 name: [{ required: true, message: "账单名称不能为空", trigger: "blur" }],
-                companyId: [{ required: true, message: "缴费单位不能为空", trigger: "blur" }],
-                payService: [{ required: true, message: "收费项目不能为空", trigger: "blur" }],
-                // personId: [{ required: true, message: "推送用户不能为空", trigger: "blur" }]
+                checkinInfoId: [{ required: true, message: "缴费单位不能为空", trigger: "blur" }],
+                // payService: [{ required: true, message: "收费项目不能为空", trigger: "blur" }],
+                invoiceType: [{ required: true, message: "开票类型不能为空", trigger: "blur" }],
+                personName: [{ required: true, message: "推送用户不能为空", trigger: "blur" }],
                 beginEndTime:[{ required: true, message: "起止时间不能为空", trigger: "blur" }],
                 numStr3:[{ required: true, message: "数量不能为空", trigger: "blur" }],                
                 goodsId:[{ required: true, message: "收费项目未选择", trigger: "blur" }]
@@ -221,7 +224,7 @@ export default {
                 name:"",
                 payee:"",
                 companyId:"",
-                payService:"",
+                // payService:"",
                 collectionAccountId:"",
                 collectionAccountName:"",
                 bak:"",
@@ -310,18 +313,26 @@ export default {
 
                     for(var i=0;i<billPushGoodsList.length;i++){
                         billPushGoodsList[i].sortNo = i+1;
-                        billPushGoodsList[i].beginDate = billPushGoodsList[i].beginEndTime[0];
-                        billPushGoodsList[i].endDate = billPushGoodsList[i].beginEndTime[1]
-                        billPushGoodsList[i].beginEndTime=null;
+
+                        if(billPushGoodsList[i].beginEndTime!=null){
+                            billPushGoodsList[i].beginDate = billPushGoodsList[i].beginEndTime[0];
+                            billPushGoodsList[i].endDate = billPushGoodsList[i].beginEndTime[1]
+                            billPushGoodsList[i].beginEndTime=null;
+                        }
+                        
+                        billPushGoodsList[i].standard = billPushGoodsList[i].unitPrice + billPushGoodsList[i].unit;
                     }
 
                     var removeBillPushGoodsList = requestData.removeBillPushGoodsList;
 
                     for(var j=0;j<removeBillPushGoodsList.length;j++){
                         removeBillPushGoodsList[j].sortNo = j+1;
-                        removeBillPushGoodsList[j].beginDate = removeBillPushGoodsList[j].beginEndTime[0];
-                        removeBillPushGoodsList[j].endDate = removeBillPushGoodsList[j].beginEndTime[1]
-                        removeBillPushGoodsList[j].beginEndTime=null;
+
+                        if(removeBillPushGoodsList[j].beginEndTime!=null){
+                            removeBillPushGoodsList[j].beginDate = removeBillPushGoodsList[j].beginEndTime[0];
+                            removeBillPushGoodsList[j].endDate = removeBillPushGoodsList[j].beginEndTime[1];
+                            removeBillPushGoodsList[j].beginEndTime=null;
+                        }
                     }
 
                     (function() {
@@ -450,8 +461,12 @@ export default {
                     // row.unit = data.unitPrice;
                     // row.goodTypeId = data.goodType;
                     this.$set(row,"standard",data.unitPriceStr);
-                    this.$set(row,"unit",data.unitPrice);
+                    this.$set(row,"unit",data.unit);
+                    this.$set(row,"unitPrice",data.unitPrice);
                     this.$set(row,"goodTypeId",data.goodType);
+
+                    //如果是电费会返回起码
+                    this.$set(row,"numStr", data.numStr);
                 }
             });
             // },100);
@@ -460,9 +475,8 @@ export default {
             var row = scope.row;
 
             var num = row.numStr3;
-            var unit = row.unit;
-
-            var totalFee = num*1*unit*1;
+            var unitPrice = row.unitPrice;
+            var totalFee = num*1*unitPrice*1;
 
             if(totalFee!=null){
                 this.formModel.billPushGoodsList[scope.$index].totalFee = totalFee.toFixed(2);
@@ -473,8 +487,7 @@ export default {
 
             var num1=row.numStr;
             var num2=row.numStr2;
-            var unit = row.unit;
-
+            var unitPrice = row.unitPrice;
 
             setTimeout(()=>{         
                 if(num1!=null&&num2!=null){
@@ -482,7 +495,7 @@ export default {
 
                     this.formModel.billPushGoodsList[scope.$index].numStr3 = num3;
 
-                    var totalFee = num3*1*unit*1;
+                    var totalFee = num3*1*unitPrice*1;
 
                     if(totalFee!=null){
                         this.formModel.billPushGoodsList[scope.$index].totalFee = totalFee.toFixed(2);
@@ -533,7 +546,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 .input-form-main{
-    width: 250px;
+    width: 300px;
 }
 .link-span{
     margin-right: 20px;

src/views/business/billPush-list.vue

@@ -3,7 +3,7 @@
         <el-breadcrumb separator=">">
             <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
             <el-breadcrumb-item>
-                <a href="#">系统管理</a>
+                <a href="#">园区管理</a>
             </el-breadcrumb-item>
             <el-breadcrumb-item>
                 <a href="#">账单推送管理</a>
@@ -213,7 +213,7 @@
                     </div>
                     <div v-if="row.status=='0'">
                         <span class="link-span"><el-link  type="warning" @click="handleClose(row)">作废账单</el-link></span>
-                        <!-- <el-link  type="danger" @click="handleDelete(row)">删除账单</el-link> -->
+                        <el-link  type="danger" @click="handleDelete(row)">删除账单</el-link>
                     </div>
                     <div v-if="row.payStatus=='10'">
                         <span class="link-span"><el-link  type="primary" @click="handlePayTime(row)">确认收款</el-link></span>