1.租户信息中选择企业不加权限控制。

2.单位信息中简称改为全称，并将输入框宽度设大。
3.推送账单起止时间保持有问题，有时为null。
4.推送账单样式改紧凑。

src/views/base/checkinInfo-detail.vue

@@ -61,6 +61,7 @@
         </el-form-item> -->
         <el-form-item label="联系人" prop="artificialPerson">
           <el-select-tree
+            filterable
             :props="personProps"
             :options="personResult"
             v-model="formModel.artificialPerson"
@@ -180,7 +181,7 @@ export default {
       this.paymentMethodList = jsonData.data;
     });
 
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.list({scope:"all"}).then(function(response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;

src/views/base/companyInfo-detail.vue

@@ -10,6 +10,7 @@
     :title="title"
     :modal-append-to-body="false"
     style="text-align: left"
+    width="80%"
     @close="closeDialog"
     :close-on-click-modal="false"
   >
@@ -27,9 +28,8 @@
                 :props="props"
                 :options="companyResult"
                 v-model="formModel.parentId"
-                height="200"
                 size="mediumn"
-                width="200"
+                width="400px"
               ></el-select-tree>
             </el-form-item>
           </el-col>
@@ -38,7 +38,7 @@
               <el-input
                 v-model="formModel.sortNo"
                 placeholder="请输入序号"
-                style="width: 200px"
+                style="width: 400px"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -49,16 +49,16 @@
               <el-input
                 v-model="formModel.name"
                 placeholder="请输入单位名称"
-                style="width: 200px"
+                style="width: 400px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="简称" prop="shortName">
+            <el-form-item label="全称" prop="shortName">
               <el-input
                 v-model="formModel.shortName"
-                placeholder="请输入单位名称"
-                style="width: 200px"
+                placeholder="请输入单位全称"
+                style="width: 400px"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -78,9 +78,8 @@
                 :props="props"
                 :options="regionData"
                 v-model="formModel.regionId"
-                height="200"
                 size="mediumn"
-                width="200"
+                width="400px"
               ></el-select-tree>
             </el-form-item>
           </el-col>
@@ -91,7 +90,7 @@
                 filterable
                 clearable
                 placeholder="请选择"
-                style="width: 200px"
+                style="width: 400px"
               >
                 <el-option
                   v-for="result in typeData"
@@ -111,7 +110,7 @@
                 filterable
                 clearable
                 placeholder="请选择"
-                style="width: 200px"
+                style="width: 400px"
               >
                 <el-option
                   v-for="result in sceneData"
@@ -129,7 +128,7 @@
                 filterable
                 clearable 
                 placeholder="请选择"
-                style="width: 200px"
+                style="width: 400px"
               >
                 <el-option
                   v-for="result in sceneData"
@@ -148,8 +147,8 @@
                 :props="props"
                 :options="companyResult"
                 v-model="formModel.relationCompanyId"
-                height="200"
-                width="200"
+                size="mediumn"
+                width="400px"
               ></el-select-tree>
             </el-form-item>
           </el-col>

src/views/base/companyInfo-list.vue

@@ -147,7 +147,7 @@
       ></el-table-column>
       <el-table-column
         prop="shortName"
-        label="简称"
+        label="全称"
         width="120"
       ></el-table-column>
       <el-table-column

src/views/base/companyPayment-detail.vue

@@ -29,63 +29,63 @@
                     :options="treeData"
                     v-model="formModel.companyId"
                     height="200"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-select-tree>
             </el-form-item>
             <el-form-item label="账户名称" prop="name">
                 <el-input
                     v-model="formModel.name"
                     placeholder="请输入账户名称"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="结算周期" prop="cycle">
                 <el-input
                     v-model="formModel.cycle"
                     placeholder="结算周期"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="微信mchId" prop="mchId">
                 <el-input
                     v-model="formModel.mchId"
                     placeholder="请输入微信mchId"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="微信subMchId" prop="subMchId">
                 <el-input
                     v-model="formModel.subMchId"
                     placeholder="请输入微信subMchId"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="支付宝appAuthToken" prop="appAuthToken">
                 <el-input
                     v-model="formModel.appAuthToken"
                     placeholder="请输入支付宝appAuthToken"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
             <el-form-item label="开户名称" prop="bankName">
                 <el-input
                     v-model="formModel.bankName"
                     placeholder="请输入开户名称"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
                         <el-form-item label="开户银行" prop="bank">
                 <el-input
                     v-model="formModel.bank"
                     placeholder="请输入开户银行"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
                         <el-form-item label="账号" prop="account">
                 <el-input
                     v-model="formModel.account"
                     placeholder="请输入账号"
-                    style="width: 500px"
+                    style="width: 400px"
                 ></el-input>
             </el-form-item>
 

src/views/business/billPush-detail.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :visible.sync="showDialog"
     :title="title"
-    width="85%"
+    width="90%"
     :modal-append-to-body="true"
     style="text-align:left;"
     @close="closeDialog"
@@ -57,13 +57,16 @@
         </el-form-item>
 
         <h3>账单信息</h3>
-        <el-table :data="formModel.billPushGoodsList" show-summary :summary-method="getSummaries">
+        <el-table 
+        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="goodsId" label="收费项目" width="150">
               <template slot-scope="scope">
                   <el-form-item>
                     <el-input v-model="scope.row.goodTypeId" style="display:none"></el-input>
-                    <el-select v-model="scope.row.goodsId" placeholder="请选择" style="width:150px;" @change="handGoodsChange(scope)">
+                    <el-select v-model="scope.row.goodsId" placeholder="请选择" style="width:150px;" @change="handGoodsChange(scope)" size="mini">
                         <el-option
                         v-for="result in goodsList"
                         :key="result.id"
@@ -74,7 +77,7 @@
                   </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column prop="beginEndTime" label="起止时间" width="400">
+            <el-table-column prop="beginEndTime" label="起止时间" width="380">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.beginEndTime'"
@@ -88,51 +91,52 @@
                             end-placeholder="结束时间"
                             placeholder="选择时间范围"
                             value-format="yyyy-MM-dd"
+                            size="mini"
                             >
                         </el-date-picker>
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="numStr" label="数量"  width="360">
+            <el-table-column prop="numStr" label="数量"  width="320">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.numStr'"
                     :rules="ruleValidate['numStr']"
                     >
                         <template v-if="scope.row.goodTypeId=='7'">
-                            <el-input style="width:100px" placeholder="起码" v-model.number="scope.row.numStr" @change="handStartChange(scope)"></el-input>
-                            -<el-input style="width:100px" placeholder="止码" v-model.number="scope.row.numStr2" @change="handStartChange(scope)"></el-input>
-                            =<el-input style="width:100px" v-model.number="scope.row.numStr3"  @change="handNumChange(scope)"></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" placeholder="止码" v-model.number="scope.row.numStr2" @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>
-                            <el-input placeholder="数量" v-model.number="scope.row.numStr3"  @change="handNumChange(scope)"></el-input>
+                            <el-input placeholder="数量" v-model.number="scope.row.numStr3"  @change="handNumChange(scope)" size="mini"></el-input>
                         </template>  
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="standard" label="收费标准" width="150">
+            <el-table-column prop="standard" label="收费标准" width="120">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.standard'"
                     :rules="ruleValidate['standard']"
                     >
                     <el-input v-model="scope.row.unit" style="display:none"></el-input>
-                    <el-input placeholder="收费标准" v-model="scope.row.standard" ></el-input>
+                    <el-input placeholder="收费标准" v-model="scope.row.standard" size="mini"></el-input>
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column prop="totalFee" label="合计金额" width="150">
+            <el-table-column prop="totalFee" label="合计金额" width="120">
                 <template slot-scope="scope">
                     <el-form-item
                     :prop="'billPushGoodsList.' + scope.$index + '.totalFee'"
                     :rules="ruleValidate['totalFee']"
                     >
-                    <el-input placeholder="合计金额" v-model="scope.row.totalFee" readonly="readonly"></el-input>
+                    <el-input placeholder="合计金额" v-model="scope.row.totalFee" readonly="readonly" size="mini"></el-input>
                     </el-form-item>
                 </template>
             </el-table-column>
 
-            <el-table-column label="操作" width="200" fixed="right">
+            <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="{row}">
                 <el-form-item>
                   <i class="el-icon-delete my-font" @click="handleDelete(row)"></i>
@@ -190,7 +194,7 @@ export default {
                 personId:0,
                 personName:""
             },
-            beginEndTime:"",
+            beginEndTime: null,
             personList:[],
             goodsList:[],
             collectionAccountList:[],
@@ -252,7 +256,7 @@ export default {
                 billPushGoodsList[i].sortNo = i+1;
                 billPushGoodsList[i].beginDate = billPushGoodsList[i].beginEndTime[0];
                 billPushGoodsList[i].endDate = billPushGoodsList[i].beginEndTime[1]
-                billPushGoodsList[i].beginEndTime="";
+                //billPushGoodsList[i].beginEndTime=null;
             }
 
             var removeBillPushGoodsList = this.formModel.removeBillPushGoodsList;
@@ -261,9 +265,11 @@ export default {
                 removeBillPushGoodsList[j].sortNo = j+1;
                 removeBillPushGoodsList[j].beginDate = removeBillPushGoodsList[j].beginEndTime[0];
                 removeBillPushGoodsList[j].endDate = removeBillPushGoodsList[j].beginEndTime[1]
-                removeBillPushGoodsList[j].beginEndTime="";
+                //removeBillPushGoodsList[j].beginEndTime="";
             }
 
+            console.log(self.formModel);
+
             this.$refs["form"].validate(valid => {
                 if (valid) {
                 (function() {
@@ -301,7 +307,7 @@ export default {
             this.formModel.billPushGoodsList.push({
                 sortNo: this.formModel.billPushGoodsList.length + 1,
                 goodsId: "",
-                beginEndTime: "",
+                beginEndTime: null,
                 numStr: "",
                 numStr2: "",
                 numStr3: "",
@@ -318,7 +324,7 @@ export default {
                 billPushGoodsList.splice(index+1,0,{
                     sortNo: index + 2,
                     goodsId: "",
-                    beginEndTime: "",
+                    beginEndTime: null,
                     numStr: "",
                     numStr2: "",
                     numStr3: "",
@@ -456,9 +462,9 @@ export default {
     }
 }
 </script>
-<style scoped>
+<style rel="stylesheet/scss" lang="scss" scoped>
 .input-form-main{
-    width: 300px;
+    width: 250px;
 }
 .link-span{
     margin-right: 20px;
@@ -474,4 +480,10 @@ export default {
 .user-panel {
   margin: 10px auto;
 }
+
+.compact-table{
+    .el-form-item {
+        margin-bottom: 5px;
+    }
+}
 </style>