前端代码合并提交

src/views/noCar/hcInvoice.vue

@@ -5,9 +5,10 @@
           <el-col :span="24">
             <div class="top">
               <!-- <el-input  placeholder="客户" class="input-demo" v-model="formCondition.customerName"></el-input> -->
-              <el-input  placeholder="购方名称" class="input-demo" v-model="formCondition.companyName"></el-input>
+              <el-input  placeholder="购方名称" class="input-demo" v-model="formCondition.buyerName"></el-input>
               <el-date-picker v-model="formCondition.month" type="month" value-format="yyyy-MM" placeholder="选择月份"> </el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="updateData">更新</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
           </el-col>
@@ -103,6 +104,7 @@ import XLSX from "xlsx";
         },
         created() {
           this.heightt = tableHeight+100;
+          
         },
         filters: {
             rounding (value) {
@@ -112,7 +114,22 @@ import XLSX from "xlsx";
         methods:{
           // 列表展示
           async loadData() {
+            if(this.formCondition.month == null || this.formCondition.month==''){
+              this.$message({
+                              type: 'error',
+                              message:'请先选择需要查询的月份'
+                              });
+                              return
+            }
+            const loading = this.$loading({
+                               lock: true,
+                               text: '系统正在努力接收中...',
+                               spinner: 'el-icon-loading',
+                               background: 'rgba(0, 0, 0, 0.7)'
+                             });
             const response = await this.$http.post('noCarService/hCVoiceQuery', this.formCondition);
+
+            loading.close();
             if (response.data.code === 0) {
               this.invoiceTable = response.data.data.result;
             }else{
@@ -122,6 +139,32 @@ import XLSX from "xlsx";
                           });
             }
           },
+          // 列表展示
+          async updateData() {
+            if(this.formCondition.month == null || this.formCondition.month==''){
+              this.$message({
+                              type: 'error',
+                              message:'请先选择需要查询的月份'
+                              });
+                              return
+            }
+            const loading = this.$loading({
+                               lock: true,
+                               text: '系统正在努力更新...',
+                               spinner: 'el-icon-loading',
+                               background: 'rgba(0, 0, 0, 0.7)'
+                             });
+            const response = await this.$http.post('noCarService/hCVoiceUpdate', this.formCondition);
+            loading.close();
+            if (response.data.code === 0) {
+              this.$message.success('更新成功');
+            }else{
+              this.$message({
+                              type: 'error',
+                              message: ''+response.data.msg
+                          });
+            }
+          },
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;