Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/personInfo.js

@@ -148,9 +148,13 @@ function findByCompanyId(formData) {
   return request.post(constant.serverUrl + "/base/personInfo/findByCompanyId", formData);
 }
 
+function findByCompanyCode() {
+  return request.post(constant.serverUrl + "/base/personInfo/findByCompanyCode");
+}
+
 export default {
   pageList, create, edit, add, update, remove, batchRemove, exportXls,
   enabledFace, enabledCard, enabledApp, enabledGuest, dataSync, enabledFaceList,
   enabledWechatNotice, unbindWechat, lifeRecordList, clearFaceImg, batchClearFaceImg,
-  enabledSync, enabledSyncList, bindWechat,findByCompanyId
+  enabledSync, enabledSyncList, bindWechat,findByCompanyId,findByCompanyCode
 }

src/api/business/billPush.js

@@ -82,8 +82,15 @@ function editPayTime(id){
   return request.get(constant.serverUrl + "/business/billPush/editPayTime/" + id);
 }
 
+function updateIsOpenWechatOrAlipay(formData){
+  return request.post(constant.serverUrl + "/business/billPush/updateIsOpenWechatOrAlipay/",formData);
+}
+
+
+
 
 
 export default {
     pageList,create,edit,add,update,remove,batchRemove,payServiceList,createGoods,detail,goodsPageList,pushBill,closeBill,updateOrder,createPayTime,editPayTime
+    ,updateIsOpenWechatOrAlipay
   }

src/views/base/checkinInfo-detail.vue

@@ -71,7 +71,7 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="面积" prop="area">
+        <el-form-item label="面积（㎡）" prop="area">
           <el-input
             v-model="formModel.area"
             placeholder="请输入面积"
@@ -142,12 +142,6 @@ export default {
         artificialPerson: [
           { required: true, message: "联系人不能为空", trigger: "blur" },
         ],
-        feeExpirationTime: [
-          { required: true, message: "费用到期时间不能为空", trigger: "blur" },
-        ],
-        contractExpirationTime: [
-          { required: true, message: "合同到期时间不能为空", trigger: "blur" },
-        ],
       },
       showDialog: true,
       loading: false,

src/views/base/checkinInfo-list.vue

@@ -26,9 +26,9 @@
           v-model="queryModel.building"
         ></el-input>
       </el-form-item>
-      <!-- <el-form-item label="企业名称" prop="name">
+      <el-form-item label="企业名称" prop="name">
         <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="费用到期" prop="feeExpirationTime">
         <el-date-picker v-model="queryModel.feeExpirationTime" value-format="yyyy-MM-dd" type="date" size="mini" placeholder="选择日期"></el-date-picker>
       </el-form-item>
@@ -91,16 +91,17 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
-        prop="building"
-        label="楼栋"
+        prop="companyName"
+        label="企业名称"
         width="180"
+        fixed="left"
       ></el-table-column>
-      <el-table-column prop="room" label="房号" width="180"></el-table-column>
       <el-table-column
-        prop="companyName"
-        label="企业名称"
+        prop="building"
+        label="楼栋"
         width="180"
       ></el-table-column>
+      <el-table-column prop="room" label="房号" width="180"></el-table-column>
       <el-table-column
         prop="boss"
         label="法人"
@@ -116,7 +117,7 @@
         label="联系电话"
         width="180"
       ></el-table-column>
-      <el-table-column prop="area" label="面积" width="180"></el-table-column>
+      <el-table-column prop="area" label="面积（㎡）" width="180"></el-table-column>
       <el-table-column
         prop="checkinTime"
         label="入驻时间"
@@ -137,26 +138,26 @@
         label="租赁期限"
         width="180"
       ></el-table-column>
-      <el-table-column prop="wechatPay"  label="微信支付" width="120">
-                <template slot-scope="{row}">
-                    <el-switch
-                        v-model="row.wechatPay"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949"
-                        @change="handlChange(row)">
-                    </el-switch>
-                </template>
-            </el-table-column>
-            <el-table-column prop="aliPay"  label="支付宝支付" width="120">
-                <template slot-scope="{row}">
-                    <el-switch
-                        v-model="row.aliPay"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949"
-                        @change="handlChange(row)">
-                    </el-switch>
-                </template>
-            </el-table-column>
+      <!-- <el-table-column prop="wechatPay" fixed="right" label="微信支付" width="80">
+          <template slot-scope="{row}">
+              <el-switch
+                  v-model="row.wechatPay"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  @change="handlChange(row)">
+              </el-switch>
+          </template>
+      </el-table-column>
+      <el-table-column prop="aliPay" fixed="right" label="支付宝支付" width="90">
+          <template slot-scope="{row}">
+              <el-switch
+                  v-model="row.aliPay"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  @change="handlChange(row)">
+              </el-switch>
+          </template>
+      </el-table-column> -->
       <el-table-column label="操作" fixed="right" width="220">
         <template slot-scope="{ row }">
           <el-button size="mini" type="primary" @click="handlePayment(row)"

src/views/base/companyPayment-detail.vue

@@ -81,13 +81,23 @@
                     style="width: 400px"
                 ></el-input>
             </el-form-item>
-                        <el-form-item label="账号" prop="account">
+            <el-form-item label="账号" prop="account">
                 <el-input
                     v-model="formModel.account"
                     placeholder="请输入账号"
                     style="width: 400px"
                 ></el-input>
             </el-form-item>
+            <el-form-item label="财务人员" prop="financePersonId">
+                <el-select v-model="formModel.financePersonId" filterable style="width: 400px">
+                    <el-option
+                        v-for="result in personList"
+                        :key="result.id"
+                        :label="result.name"
+                        :value="result.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
         </el-form>
       </div>
@@ -108,6 +118,7 @@ import pageUtil from "@/utils/page";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
+import personInfoApi from "@/api/base/personInfo";
 export default {
     props: ["businessKey", "title"],
     data() {
@@ -119,13 +130,15 @@ export default {
 
             },
             formModel:{
-                companyId:"",
+                companyId:"", 
                 name:"",
                 mchId:"",
                 subMchId:"",
                 appAuthToken:"",
+                financePersonId:"",
             },
             treeData: [],
+            personList:[],
             companyList:[],
             showDialog: true,
             loading: false,
@@ -140,6 +153,11 @@ export default {
     },
     created() {
         this.loadTree();
+
+        personInfoApi.findByCompanyCode().then(response => {
+            var jsonData = response.data;
+            this.personList = jsonData.data;
+        });
     },
     methods: {
         closeDialog() {

src/views/business/billPush-detail-list.vue

@@ -75,15 +75,37 @@
                                 <span class="data">{{formModel.payTime}}</span>
                             </div>
                         </el-col>
-                        <el-col :span="8">
-                            <span class="fontText" >收款人</span> 
-                            <span class="data">{{formModel.payeePerson}}</span>
-                        </el-col>
                         <el-col :span="8">
                             <span class="fontText">账单备注</span> 
                             <span class="data">{{formModel.bak}}</span>
                         </el-col>
                     </el-row>
+                    <el-row :gutter="20" >
+                        <el-col :span="8">
+                            <div class="grid-content bg-purple">
+                                <span class="fontText">微信支付</span> 
+                                <span class="data">
+                                    <el-switch
+                                        v-model="formModel.isOpenWechat"
+                                        active-color="#13ce66"
+                                        inactive-color="#ff4949"
+                                        @change="handlChange(row)">
+                                    </el-switch>
+                                </span>
+                            </div>
+                        </el-col>
+                        <el-col :span="8">
+                            <span class="fontText">支付宝支付</span> 
+                            <span class="data">
+                                <el-switch
+                                    v-model="formModel.isOpenAlipay"
+                                    active-color="#13ce66"
+                                    inactive-color="#ff4949"
+                                    @change="handlChange(row)">
+                                </el-switch>
+                            </span>
+                        </el-col>
+                    </el-row>
                  </el-form>
             </div>
             <el-divider></el-divider>

src/views/business/billPush-detail.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :visible.sync="showDialog"
     :title="title"
-    width="90%"
+    width="83%"
     :modal-append-to-body="true"
     style="text-align:left;"
     @close="closeDialog"
@@ -55,6 +55,22 @@
         <el-form-item label="备注：" prop="bak">
           <el-input type="textarea" v-model="formModel.bak" placeholder="请输入备注"  class="input-form-main"></el-input>
         </el-form-item>
+        <el-form-item label="微信支付：" prop="isOpenWechat">
+            <el-switch
+                v-model="formModel.isOpenWechat"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="handlChange(row)">
+            </el-switch>
+        </el-form-item>
+        <el-form-item label="支付宝支付：" prop="isOpenAlipay">
+            <el-switch
+                v-model="formModel.isOpenAlipay"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="handlChange(row)">
+            </el-switch>
+        </el-form-item>
 
         <h3>账单信息</h3>
         <el-table 
@@ -110,8 +126,8 @@
                     :rules="ruleValidate['numStr3']"
                     >
                         <template v-if="scope.row.goodTypeId=='7'">
-                            <el-input style="width:85px" placeholder="起码" v-model.number="scope.row.numStr" @change="handStartChange(scope)" size="mini"></el-input>
-                            -<el-input style="width:85px" placeholder="止码" v-model.number="scope.row.numStr2" @change="handStartChange(scope)" size="mini"></el-input>
+                            <el-input style="width:85px" placeholder="止码" v-model.number="scope.row.numStr2" @change="handStartChange(scope)" size="mini"></el-input>
+                            -<el-input style="width:85px" placeholder="起码" v-model.number="scope.row.numStr" @change="handStartChange(scope)" size="mini"></el-input>
                             =<el-input style="width:85px" v-model.number="scope.row.numStr3"  @change="handNumChange(scope)" size="mini"></el-input>
                         </template>
                         <template v-else>
@@ -203,6 +219,8 @@ export default {
                 personId:0,
                 personName:"",
                 checkinInfoId:"",
+                isOpenWechat:false,
+                isOpenAlipay:false,
             },
             beginEndTime: null,
             personList:[],

src/views/business/billPush-list.vue

@@ -11,6 +11,9 @@
             </el-breadcrumb>
         <el-divider></el-divider>
         <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+            <el-form-item label="账单名称" prop="name">
+                <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+            </el-form-item>
             <el-form-item label="缴费单位" prop="companyId">
                 <!-- <el-select v-model="queryModel.companyId"  size="mini" filterable focus="" >
                     <el-option
@@ -170,6 +173,26 @@
             <el-table-column prop="payTime" label="缴费时间" width="180"></el-table-column>
             <el-table-column prop="payName" label="支付方式" ></el-table-column>
             <el-table-column prop="payee" label="收款方" ></el-table-column>
+            <el-table-column prop="isOpenWechat"  label="支持微信支付"  >
+                <template slot-scope="{row}">
+                    <el-switch
+                        v-model="row.isOpenWechat"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handlChange(row,'0')">
+                    </el-switch>
+                </template>
+            </el-table-column>
+            <el-table-column prop="isOpenAlipay"  label="支持支付宝支付"  >
+                <template slot-scope="{row}">
+                    <el-switch
+                        v-model="row.isOpenAlipay"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handlChange(row,'1')">
+                    </el-switch>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" width="180" fixed="right">
                 <template slot-scope="{row}">
 
@@ -181,7 +204,7 @@
                         <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>
+                        <span class="link-span"><el-link  type="primary" @click="handlePayTime(row)">确认收款</el-link></span>
                     </div>
                 </template>
             </el-table-column>
@@ -236,6 +259,7 @@ export default {
 
         return {
             queryModel: {
+                name:"",
                 companyId:"",
                 status: "",
                 payName:"",
@@ -356,7 +380,7 @@ export default {
                 formData.append("companyId", self.queryModel.companyId);
             }
 
-            
+            formData.append("name", self.queryModel.name);
             formData.append("status", self.queryModel.status);
             formData.append("payName", self.queryModel.payName);
 
@@ -559,6 +583,33 @@ export default {
             this.operation = "detail";
             this.businessKey = record.id;
             this.showModal3 = true;
+        },
+        handlChange(record,type){
+            var self = this;
+
+            var formData = new FormData();
+            self.loading = true;
+
+            formData.append("id", record.id);
+            if(type=="0"){
+                formData.append("isOpen", record.isOpenWechat);
+            }
+            else{
+                formData.append("isOpen", record.isOpenAlipay);
+            }
+            formData.append("type", type);
+
+            billPushApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
+                var jsonData = response.data;
+                self.loading = false;
+                if (jsonData.result) {
+                    self.changePage(self.pageIndex);
+                }
+                else{
+                    self.$message.error(jsonData.message + "");
+                }
+            });
+
         }
     },
     mounted: function() {

src/views/business/billPush-order-payTime.vue

@@ -63,6 +63,10 @@ export default {
                 {
                     id:"cash",
                     name:"现金支付"
+                },
+                {
+                    id:"individual",
+                    name:"个人账户"
                 }
             ],
         }