前端代码合并提交

src/views/noCar/billwayHis.vue

@@ -19,7 +19,7 @@
 
               </div>
 
-              <div class="demo-input-suffix" style="margin-top: 5px;">
+              <div class="demo-input-suffix" style="margin-top: 5px;;margin-left: 10px;">
                 <el-input  placeholder="客户名称" class="input-demo" v-model="noCarWayBill.customerName"></el-input>
                <el-input  placeholder="公司名称" class="input-demo" v-model="noCarWayBill.companyName"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="noCarWayBill.taxplayerCode"></el-input>
@@ -39,6 +39,11 @@
 
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
             </div>
+            <div  class="demo-input-suffix" style="margin-top: 5px;margin-left: 20px;">
+              <el-date-picker v-model="migrateVo.startMounth" type="month" value-format="yyyy-MM" placeholder="迁移开始月份"> </el-date-picker>
+                  <el-date-picker v-model="migrateVo.endmounth" type="month" value-format="yyyy-MM" placeholder="迁移结束月份"> </el-date-picker>
+                   <el-button type="success"  @click="migrateData">数据迁移</el-button>
+            </div>
           </el-col>
         </el-row>
       </div>
@@ -210,6 +215,10 @@ import XLSX from 'xlsx';
             noCarWayBill: {
               billNum: ''
             },
+            migrateVo: {
+              startMounth: '',
+              endmounth: ''
+            },
              formUserList: {
             'file': ''
             },
@@ -267,6 +276,13 @@ import XLSX from 'xlsx';
               this.total = response.data.data.total;
             }
           },
+          async migrateData() {
+             this.$http.post(`noCarService/migrateData`, this.migrateVo);
+           this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+          },
     importExcel (content) {
     const file = content.file
     // let file = file.files[0] // 使用传统的input方法需要加上这一步