账单推送前台页面功能调整

src/api/business/billPush.js

@@ -98,11 +98,15 @@ function alipayCode(orderId){
   return request.get(constant.serverUrl + "/aliPay/tradePrecreatePay?orderId="+orderId);
 }
 
+function invoiceTypeList(){
+  return request.post(constant.serverUrl + "/business/billPush/invoiceTypeList");
+}
+
 
 
 
 
 export default {
     pageList,create,edit,add,update,remove,batchRemove,payServiceList,createGoods,detail,goodsPageList,pushBill,closeBill,updateOrder,createPayTime,editPayTime
-    ,updateIsOpenWechatOrAlipay,checkInBillpageList,wxQucode,alipayCode
+    ,updateIsOpenWechatOrAlipay,checkInBillpageList,wxQucode,alipayCode,invoiceTypeList
   }

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

@@ -84,7 +84,7 @@
                         </el-col>
                         <el-col :span="8">
                             <span class="fontText">开票类型</span> 
-                            <span class="data">{{formModel.invoiceType}}</span>
+                            <span class="data">{{formModel.invoiceTypeN}}</span>
                         </el-col>
                     </el-row>
                     <el-row :gutter="20" >
@@ -429,7 +429,7 @@ export default {
                     var jsonData = response.data;
 
                     if (jsonData.result) {
-                        this.changePage(this.pageIndex);
+                        this.formModel.status="1";
                         this.$message.success("账单消息推送成功！");
                     } else {
                         this.$message.error(jsonData.message + "");

src/views/business/billPush-detail.vue

@@ -29,13 +29,13 @@
                 ></el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="缴费单位：" prop="companyId">
-          <el-select v-model="formModel.companyId" filterable class="input-form-main" @change="handleCompanyChange">
+        <el-form-item label="缴费单位：" prop="checkinInfoId">
+          <el-select v-model="formModel.checkinInfoId" filterable class="input-form-main" @change="handleCompanyChange">
             <el-option
-                v-for="company in companyList"
-                :key="company.companyId"
-                :label="company.companyName"
-                :value="company.companyId"
+                v-for="checkinInfo in companyList"
+                :key="checkinInfo.id"
+                :label="checkinInfo.companyName"
+                :value="checkinInfo.id"
               ></el-option>
           </el-select>
         </el-form-item> 
@@ -56,13 +56,13 @@
         <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="companyId">
+        <el-form-item label="开票类型：" prop="invoiceType">
           <el-select v-model="formModel.invoiceType" filterable class="input-form-main">
             <el-option
                 v-for="company in invoiceTypeList"
-                :key="company.id"
+                :key="company.value"
                 :label="company.name"
-                :value="company.id"
+                :value="company.value"
               ></el-option>
           </el-select>
         </el-form-item> 
@@ -240,18 +240,7 @@ export default {
             payServiceList:[],
             tableData:[],
             companyList:[],
-            invoiceTypeList:[{
-                id:"0",
-                name:"不开发票"
-            },
-            {
-                id:"1",
-                name:"普通发票"
-            },
-            {
-                id:"2",
-                name:"增值税专用发票"
-            }],
+            invoiceTypeList:[],
             showDialog: true,
             loading: false,
             submitting: false,
@@ -273,6 +262,11 @@ export default {
             var jsonData = response.data;
             this.collectionAccountList = jsonData.data;
         });
+
+        billPushApi.invoiceTypeList().then((response)=>{
+            var jsonData = response.data;
+            this.invoiceTypeList = jsonData.data;
+        });
     },
     methods: {
         closeDialog() {
@@ -284,7 +278,7 @@ export default {
             var self = this;
 
             var formData = new FormData();
-            formData.append("companyId", newVal);
+            formData.append("checkinInfoId", newVal);
 
             companyGoodsInfoApi.findByCompanyId(formData).then((response)=>{
                 var jsonData = response.data;
@@ -524,8 +518,8 @@ export default {
                     billPushGoodsList[i].beginEndTime = beginEndTime;
                 }
 
-                if(jsonData.data.companyId!=null&&jsonData.data!=""){
-                    this.handleCompanyChange(jsonData.data.companyId);
+                if(jsonData.data.checkinInfoId!=null&&jsonData.data!=""){
+                    this.handleCompanyChange(jsonData.data.checkinInfoId);
                 }
             } else {
                 self.$message.error(jsonData.message + "");

src/views/business/billPush-list.vue

@@ -525,6 +525,8 @@ export default {
                 billPushApi.pushBill(formData).then((response)=>{
                     var jsonData = response.data;
 
+                    alert(jsonData.result)
+
                     if (jsonData.result) {
                         this.changePage(this.pageIndex);
                         this.$message.success("账单消息推送成功！");
@@ -538,7 +540,7 @@ export default {
         handleDelete(record) {
             var self = this;
 
-            self.$confirm("是否确认删除?", "提示", {
+            self.$confirm("是否确认作废账单?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -552,7 +554,7 @@ export default {
 
                     self.$message({
                         type: "success",
-                        message: "删除成功!"
+                        message: "账单作废成功!"
                     });
                     }
                 });