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

Reviewed-on: #25

src/views/oilFinalStatement/oilFinalStatementAddList.vue

@@ -416,10 +416,8 @@ 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')
@@ -442,8 +440,8 @@ export default {
       this.importData.confirmState = 0
       this.importData.settlementState = 0
       this.importData.createSource = 'XOIL_OMS_WEB'
-      this.importData.orderStartTime = this.selectedStaffList[0].createTime
+      this.importData.orderStartDate = this.createT
-      this.importData.orderEndTime = endTime
+      this.importData.orderEndDate = this.endT
       this.importData.settlementObjectName = this.selectedStaffList[0].customerName
       this.importData.settlementId = this.selectedStaffList[0].customerId
 
@@ -459,10 +457,10 @@ export default {
         this.$message.warning('请输入时间')
         return
       }
-      // if (!this.page.params.productType) {
+      if (!this.page.params.productType) {
-      //   this.$message.warning('请选择油品类型')
+        this.$message.warning('请选择油品类型')
-      //   return
+        return
-      // }
+      }
       this.loading = true
       this.page.currentPage = 1
       this.getByPage()