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

src/api/base/companyPayment.js

@@ -62,8 +62,14 @@ function findByCheckInId(formData) {
   return request.post(constant.serverUrl + "/base/companyPaymentInfo/findByCheckInId",formData);
 }
 
+function setIsDefault(formData) {
+  return request.post(constant.serverUrl + "/base/companyPaymentInfo/setIsDefault",formData);
+}
+
+
+
 
 
 export default {
-    create, edit, add, update, remove, batchRemove, pageList,list,updateIsOpenWechatOrAlipay,loadDetails,getCompanyList,findByCheckInId
+    create, edit, add, update, remove, batchRemove, pageList,list,updateIsOpenWechatOrAlipay,loadDetails,getCompanyList,findByCheckInId,setIsDefault
 }

src/views/base/companyPayment-list.vue

@@ -83,7 +83,17 @@
             <el-table-column prop="bank"  label="开户银行"  ></el-table-column>
             <el-table-column prop="account"  label="账号"  ></el-table-column>
             <el-table-column prop="createTime"  label="创建时间"  ></el-table-column>
-            <el-table-column prop="isOpenWechat"  label="支持微信支付"  >
+            <el-table-column prop="isDefault"  label="是否默认账户"  >
+                <template slot-scope="{row}">
+                    <el-switch
+                        v-model="row.isDefault"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handlChange(row)">
+                    </el-switch>
+                </template>
+            </el-table-column>
+            <!-- <el-table-column prop="isOpenWechat"  label="支持微信支付"  >
                 <template slot-scope="{row}">
                     <el-switch
                         v-model="row.isOpenWechat"
@@ -102,7 +112,7 @@
                         @change="handlChange(row)">
                     </el-switch>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="操作" fixed="right" width="130px">
                 <template slot-scope="{row}">
                 <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
@@ -282,10 +292,9 @@ export default {
             self.loading = true;
 
             formData.append("id", record.id);
-            formData.append("isOpenWechat", record.isOpenWechat);
-            formData.append("isOpenAlipay", record.isOpenAlipay);
+            formData.append("isDefault", record.isDefault);
 
-            companyPaymentApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
+            companyPaymentApi.setIsDefault(formData).then(function (response) {
                 var jsonData = response.data;
                 self.loading = false;
                 if (jsonData.result) {

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

@@ -87,7 +87,7 @@
                  </el-form>
             </div>
             <el-divider></el-divider>
-            <el-row class="button-group">
+            <el-row class="button-group" >
                 <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">导出数据</el-button>
                 <el-button
                     type="primary"
@@ -106,6 +106,15 @@
                     @click="handleEdit" v-else
                     >修改账单</el-button
                 >
+
+                <el-button
+                    type="warning"
+                    size="small"
+                    plain
+                    icon="el-icon-s-promotion"
+                    @click="handlePush(row)"
+                    >推送账单</el-button
+                >
             </el-row>
             <el-table :data="tableData" v-loading="loading" stripe  show-summary :summary-method="getSummaries">
                 <el-table-column type="index" label="序号" width="80"></el-table-column>
@@ -343,7 +352,25 @@ export default {
             this.operation = "detail";
             this.businessKey = billPushId;
             this.showModal2 = true;
-        }
+        },
+        handlePush(){
+            var self = this;
+            
+            var formData = new FormData();
+            formData.append("id", self.businessKey);
+
+            billPushApi.pushBill(formData).then((response)=>{
+                var jsonData = response.data;
+
+                if (jsonData.result) {
+                    this.changePage(this.pageIndex);
+                    this.$message.success("账单消息推送成功！");
+                } else {
+                    this.$message.error(jsonData.message + "");
+                }
+
+            });
+        },
     },
     components: {
         "billPush-detail": billPushDetail,

src/views/business/billPush-detail.vue

@@ -18,16 +18,16 @@
           <el-input v-model="formModel.payee" placeholder="请输入收款方" class="input-form-main"></el-input>
         </el-form-item>
         <el-form-item label="收款账户：" prop="collectionAccountId">
-            <el-input v-model="formModel.collectionAccountId" style="display:none"></el-input>
-            <el-input v-model="formModel.collectionAccountName" placeholder="请输入收款方" class="input-form-main" readonly="readonly"></el-input>
-            <!-- <el-select v-model="formModel.collectionAccountId"   class="input-form-main" >
+            <!-- <el-input v-model="formModel.collectionAccountId" style="display:none"></el-input>
+            <el-input v-model="formModel.collectionAccountName" placeholder="请输入收款方" class="input-form-main" readonly="readonly"></el-input> -->
+            <el-select v-model="formModel.collectionAccountId"   class="input-form-main" >
                 <el-option
                     v-for="collectionAccount in collectionAccountList"
                     :key="collectionAccount.id"
                     :label="collectionAccount.name"
                     :value="collectionAccount.id"
                 ></el-option>
-            </el-select> -->
+            </el-select>
         </el-form-item>
         <el-form-item label="缴费单位：" prop="companyId">
           <el-select v-model="formModel.companyId" filterable class="input-form-main" @change="handleCompanyChange">
@@ -61,7 +61,8 @@
         class="compact-table"
         :data="formModel.billPushGoodsList" 
         show-summary :summary-method="getSummaries">
-            <el-table-column type="index" label="序号" width="50"></el-table-column>
+            <el-table-column prop="sort" type="index" label="序号" width="50"></el-table-column>
+
             <el-table-column prop="goodsId" label="收费项目" width="150">
               <template slot-scope="scope">
                   <el-form-item>