Merge pull request 'zyj' (#25) from zyj into master

Reviewed-on: #25

src/views/oilFinalStatement/oilFinalStatementAddList.vue

@@ -27,7 +27,9 @@
           <!-- 搜索部分开始 -->
           <el-form label-width="90px" :inline="true" :model="page" :size="$store.getters.size">
             <el-col :span="18">
+              <el-form-item>
                 <autocomplete class="mr20" :params="page.params" :config="configAutocomplete" />
+              </el-form-item>
 
               <el-form-item prop="createTimeRange">
                 <el-date-picker
@@ -231,7 +233,7 @@ export default {
       goIn: 0,
       importData: {},
       page: {
-        pageSize: 10, // 每页显示条数
+        pageSize: 10000, // 每页显示条数
         currentPage: 1, // 默认页
         totalCount: 0,
         params: {},
@@ -440,12 +442,9 @@ export default {
       this.importData.createSource = 'XOIL_OMS_WEB'
       this.importData.orderStartDate = this.createT
       this.importData.orderEndDate = this.endT
-      this.importData.settlementObjectName = this.$refs.changeName.selectedLabel
+      this.importData.settlementObjectName = this.selectedStaffList[0].customerName
       this.importData.settlementId = this.selectedStaffList[0].customerId
-      if (!this.importData.settlementObjectName) {
+
-        this.$message.error('企业名称为空，无法提交')
-        return
-      }
       this.submitDialog = true
     },
     search() {

src/views/oilFinalStatement/oilFinalStatementListInfo.vue

@@ -126,7 +126,9 @@
     <div class="button-style" :span="24">
       <el-divider style="width: 100%"></el-divider>
       <el-button @click="close(1)" style="margin-right: 10px">关闭</el-button>
-      <el-button v-if="importData.auditState == 0" type="primary" @click="submit" style="margin-right: 10px">结算单审核 </el-button>
+      <el-button v-permission="['oil:to:examine']" v-if="importData.auditState == 0" type="primary" @click="submit" style="margin-right: 10px"
+        >结算单审核
+      </el-button>
     </div>
     <el-dialog class="dialogInfo" append-to-body :visible.sync="submitDialog" v-if="submitDialog" width="500px">
       <el-form class="messageConfirm" ref="form" :model="importData" label-width="110px" size="mini">