更新

# Conflicts:
#	src/views/oilFinalStatement/oilFinalStatementListInfo.vue

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">
-              <autocomplete class="mr20" :params="page.params" :config="configAutocomplete" />
+              <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: {},
@@ -414,8 +416,10 @@ export default {
 
       let payRealAmountEnd = []
       let customerSettleAmountList = []
+      let endTime = ''
       this.selectedStaffList.forEach(item => {
         this.endT = item.createTime
+        endTime = item.createTime
         payRealAmountEnd.push(item.actAmount ? item.actAmount : '0')
 
         customerSettleAmountList.push(item.customerSettleAmount ? item.customerSettleAmount : '0')
@@ -438,14 +442,11 @@ export default {
       this.importData.confirmState = 0
       this.importData.settlementState = 0
       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.orderStartTime = this.selectedStaffList[0].createTime
+      this.importData.orderEndTime = endTime
+      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() {
@@ -458,10 +459,10 @@ export default {
         this.$message.warning('请输入时间')
         return
       }
-      if (!this.page.params.productType) {
-        this.$message.warning('请选择油品类型')
-        return
-      }
+      // if (!this.page.params.productType) {
+      //   this.$message.warning('请选择油品类型')
+      //   return
+      // }
       this.loading = true
       this.page.currentPage = 1
       this.getByPage()

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">