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

src/views/business/billPush-detail.vue

@@ -208,13 +208,6 @@ export default {
             },
         }
     },
-    watch:{
-        "formModel.companyId":function(newVal,oldVal){
-            console.log(newVal + "->" + oldVal);
-
-            
-        }
-    },
     created() {
         companyPaymentApi.getCompanyList().then((response)=>{
             var jsonData = response.data;
@@ -228,24 +221,27 @@ export default {
     },
     methods: {
         closeDialog() {
-        this.$emit("close", false);
+            this.$emit("close", false);
         },
         handleCompanyChange(newVal){
-            setTimeout(()=>{
-                var formData = new FormData();
-                formData.append("companyId", newVal);
+            // this.formModel.personName = newVal;
 
-                companyGoodsInfoApi.findByCompanyId(formData).then((response)=>{
-                    var jsonData = response.data;
-                    this.goodsList = jsonData.data;
-                });
+            var self = this;
 
-                companyPaymentApi.findByCheckInId(formData).then((response)=>{
-                    var jsonData = response.data;
-                    this.formModel.personId = jsonData.data.id;
-                    this.formModel.personName = jsonData.data.name;
-                });
-            },100);
+            var formData = new FormData();
+            formData.append("companyId", newVal);
+
+            companyGoodsInfoApi.findByCompanyId(formData).then((response)=>{
+                var jsonData = response.data;
+                this.goodsList = jsonData.data;
+            });
+
+            companyPaymentApi.findByCheckInId(formData).then((response)=>{
+                var jsonData = response.data;
+                this.formModel.personId = jsonData.data.id;
+                
+                self.$set(self.formModel, 'personName', jsonData.data.name);
+            });
         },
         handleSubmit() {
             var self = this;
@@ -283,18 +279,19 @@ export default {
                     var jsonData = response.data;
 
                     if (jsonData.result) {
-                    self.$message({
-                        message: "保存成功!",
-                        type: "success"
-                    });
+                        self.$message({
+                            message: "保存成功!",
+                            type: "success"
+                        });
 
-                    self.$emit("close", true);
+                        self.$emit("close", true);
                     } else {
-                    self.$message({
-                        message: jsonData.message + "",
-                        type: "warning"
-                    });
-                    self.$emit("close", false);
+                        self.$message({
+                            message: jsonData.message + "",
+                            type: "warning"
+                        });
+
+                        self.$emit("close", false);
                     }
                 });
                 }
@@ -367,22 +364,25 @@ export default {
         handGoodsChange(scope){
             var row = scope.row;
             
-            setTimeout(()=>{                
-                var formData = new FormData();
-                formData.append("id", row.goodsId);
-
-                companyPaymentApi.loadDetails(formData).then((response)=>{
-                    var jsonData = response.data;
-
-                    if(jsonData.result){
-                        var data = jsonData.data;
-
-                        row.standard = data.unitPriceStr;
-                        row.unit = data.unitPrice;
-                        row.goodTypeId = data.goodType;
-                    }
-                });
-            },100);
+            // setTimeout(()=>{                
+            var formData = new FormData();
+            formData.append("id", row.goodsId);
+
+            companyPaymentApi.loadDetails(formData).then((response)=>{
+                var jsonData = response.data;
+
+                if(jsonData.result){
+                    var data = jsonData.data;
+
+                    // row.standard = data.unitPriceStr;
+                    // row.unit = data.unitPrice;
+                    // row.goodTypeId = data.goodType;
+                    this.$set(row,"standard",data.unitPriceStr);
+                    this.$set(row,"unit",data.unitPrice);
+                    this.$set(row,"goodTypeId",data.goodType);
+                }
+            });
+            // },100);
         },
         handNumChange(scope){
             var row = scope.row;
@@ -457,7 +457,7 @@ export default {
 </script>
 <style scoped>
 .input-form-main{
-    width: 500px;
+    width: 300px;
 }
 .link-span{
     margin-right: 20px;

src/views/business/billPush-list.vue

@@ -133,7 +133,11 @@
                 >创建账单</el-button
             >
         </el-row>
-        <el-table :data="tableData" style="min-height:400px;" v-loading="loading" stripe>
+        <el-table 
+        ref="formTable"
+        :data="tableData" 
+        :height="tableHeight"
+        v-loading="loading" stripe>
             <el-table-column type="index" label="序号" width="50"></el-table-column>
             <el-table-column prop="name" label="账单名称" width="180"></el-table-column>
             <el-table-column prop="companyName" label="缴费单位" width="180"></el-table-column>
@@ -224,6 +228,7 @@ import pageUtil from "@/utils/page";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
+
 export default {
     name: "businessBillPushList",
     data() {
@@ -313,6 +318,7 @@ export default {
                 label: "name",
                 children: "children"
             },
+            tableHeight: 400
         }
     },
     created() {
@@ -330,6 +336,9 @@ export default {
             this.collectionAccountList = jsonData.data;
         });
 
+        setTimeout(()=>{
+            this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+        },1000);
     },
     methods: {
         changePage(pageIndex) {
@@ -404,9 +413,9 @@ export default {
             //保存成功后回调
             this.showModal = false;
 
-            this.changePage(this.pageIndex);
-
-            
+            if(retObj){
+                this.changePage(this.pageIndex);
+            }         
         },
         onDetailModalClose2(retObj) {
             //保存成功后回调