Ver código fonte

1)账单推送界面中可以修改收费项单价,修改收费项单价后同步修改租户对应收费项单价。
2)电费起码自动读取该租户最后一次账单的止码。

zhengqiang 5 anos atrás
pai
commit
a52e128e1d

+ 50 - 4
src/views/business/billPush-detail-list.vue

@@ -88,6 +88,19 @@
                         </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.invoiced"
+                                        active-color="#13ce66"
+                                        inactive-color="#ff4949"
+                                        @change="handleSwitchChange(formModel,'2')">
+                                    </el-switch>
+                                </span>
+                            </div>
+                        </el-col>
                         <el-col :span="8">
                             <div class="grid-content bg-purple" v-if="formModel.isMobilePayment">
                                 <span class="fontText">微信支付</span> 
@@ -96,7 +109,7 @@
                                         v-model="formModel.isOpenWechat"
                                         active-color="#13ce66"
                                         inactive-color="#ff4949"
-                                        @change="handlChange(row)">
+                                        @change="handleSwitchChange(formModel,'0')">
                                     </el-switch>
                                 </span>
                             </div>
@@ -108,7 +121,7 @@
                                     v-model="formModel.isOpenAlipay"
                                     active-color="#13ce66"
                                     inactive-color="#ff4949"
-                                    @change="handlChange(row)">
+                                    @change="handleSwitchChange(formModel,'1')">
                                 </el-switch>
                             </span>
                         </el-col>
@@ -118,7 +131,7 @@
             <el-divider></el-divider>
             <el-row class="button-group" >
                 <el-button type="success" size="small" v-if="formModel.status=='1'" @click="handleQucodePay(formModel.orderId)">付款码</el-button>
-                <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">导出数据</el-button>
+                <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">导出账单</el-button>
                 <el-button
                     type="primary"
                     size="small"
@@ -437,7 +450,40 @@ export default {
 
                 });
             });
-        },
+        },        
+        handleSwitchChange(record,type){
+            var self = this;
+
+            var formData = new FormData();
+            self.loading = true;
+
+            formData.append("id", self.businessKey);
+
+            if(type=="0"){
+                formData.append("isOpen", record.isOpenWechat);
+            }
+            else if(type=="1"){
+                formData.append("isOpen", record.isOpenAlipay);
+            }
+            else if(type=="2"){
+                formData.append("isOpen", record.invoiced);
+            }
+
+            formData.append("type", type);
+
+            billPushApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
+                var jsonData = response.data;
+                self.loading = false;
+                if (jsonData.result) {
+                    //self.changePage(self.pageIndex);
+                    self.modified = true;
+                }
+                else{
+                    self.$message.error(jsonData.message + "");
+                }
+            });
+
+        }
     },
     components: {
         "billPush-detail": billPushDetail,

+ 41 - 16
src/views/business/billPush-list.vue

@@ -62,6 +62,12 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="是否开票" prop="invoiced">
+                <el-select v-model="queryModel.invoiced"  size="mini" clearable>
+                    <el-option label="是" :value="true"></el-option>
+                    <el-option label="否" :value="false"></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="收款账户" prop="collectionAccount">
                 <el-select v-model="queryModel.collectionAccount"  size="mini"  >
                     <el-option
@@ -184,24 +190,34 @@
             </el-table-column>
             <el-table-column prop="payTime" label="缴费时间" width="180"></el-table-column>
             <el-table-column prop="payName" label="支付方式" ></el-table-column>
+            <el-table-column prop="invoiced"  label="是否开票">
+                <template slot-scope="{row}">
+                    <el-switch 
+                        v-model="row.invoiced"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        @change="handleSwitchChange(row,'2')">
+                    </el-switch>
+                </template>
+            </el-table-column>
             <el-table-column prop="payee" label="收款方" ></el-table-column>
-            <el-table-column prop="isOpenWechat"  label="微信支付" fixed="right">
+            <el-table-column prop="isOpenWechat"  label="微信支付">
                 <template slot-scope="{row}">
                     <el-switch v-if="row.isMobilePayment"
                         v-model="row.isOpenWechat"
                         active-color="#13ce66"
                         inactive-color="#ff4949"
-                        @change="handlChange(row,'0')">
+                        @change="handleSwitchChange(row,'0')">
                     </el-switch>
                 </template>
             </el-table-column>
-            <el-table-column prop="isOpenAlipay"  label="支付宝" fixed="right">
+            <el-table-column prop="isOpenAlipay"  label="支付宝">
                 <template slot-scope="{row}">
                     <el-switch v-if="row.isMobilePayment"
                         v-model="row.isOpenAlipay"
                         active-color="#13ce66"
                         inactive-color="#ff4949"
-                        @change="handlChange(row,'1')">
+                        @change="handleSwitchChange(row,'1')">
                     </el-switch>
                 </template>
             </el-table-column>
@@ -279,6 +295,7 @@ export default {
                 pushTimeRange: "",
                 payTimeRange:"",
                 payStatus:"",
+                invoiced: null
             },
             treeData: [],
             loading: false,
@@ -414,6 +431,9 @@ export default {
             formData.append("payTimeRange", self.queryModel.payTimeRange);
             formData.append("payStatus", self.queryModel.payStatus);
 
+            if(self.queryModel.invoiced!=null){
+                formData.append("invoiced", self.queryModel.invoiced);
+            }
 
             billPushApi.pageList(formData)
                 .then(function(response) {
@@ -490,18 +510,18 @@ export default {
         handleReset(name) {
             this.$refs[name].resetFields();
         },
-        handChange(selVal){
+        // handleChange(selVal){
 
-            this.queryModel.payService = "";
+        //     this.queryModel.payService = "";
 
-            var formData = new FormData();
-            formData.append("companyId", selVal);
+        //     var formData = new FormData();
+        //     formData.append("companyId", selVal);
 
-            billPushApi.payServiceList(formData).then((response)=>{
-                var jsonData = response.data;
-                this.payServiceList = jsonData.data;
-            });
-        },
+        //     billPushApi.payServiceList(formData).then((response)=>{
+        //         var jsonData = response.data;
+        //         this.payServiceList = jsonData.data;
+        //     });
+        // },
         handleDetailList(record){
             this.modalTitle2 = "账单推送详情";
             this.operation = "detail";
@@ -611,26 +631,31 @@ export default {
             this.businessKey = record.id;
             this.showModal3 = true;
         },
-        handlChange(record,type){
+        handleSwitchChange(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{
+            else if(type=="1"){
                 formData.append("isOpen", record.isOpenAlipay);
             }
+            else if(type=="2"){
+                formData.append("isOpen", record.invoiced);
+            }
+
             formData.append("type", type);
 
             billPushApi.updateIsOpenWechatOrAlipay(formData).then(function (response) {
                 var jsonData = response.data;
                 self.loading = false;
                 if (jsonData.result) {
-                    self.changePage(self.pageIndex);
+                    //self.changePage(self.pageIndex);
                 }
                 else{
                     self.$message.error(jsonData.message + "");