Преглед на файлове

1.修复大中型结算项目重置搜索条件后时间条件不对
2.大中型实收款统计布局优化
3.修复开票审核通过后状态不更新

GouGengquan преди 1 година
родител
ревизия
93f14cd75e
променени са 3 файла, в които са добавени 9 реда и са изтрити 8 реда
  1. 1 0
      src/views/finance/invoiceCheck.vue
  2. 5 5
      src/views/finance/realFundStat.vue
  3. 3 3
      src/views/finance/settleMajor.vue

+ 1 - 0
src/views/finance/invoiceCheck.vue

@@ -493,6 +493,7 @@ export default {
                 });
                 return;
             }
+            this.invoice.state = '已开票';
             this.$api.financeInvoice.edit(this.invoice).then(res=>{
               if (res.code === 200 && res.data){
                 this.$notify({

+ 5 - 5
src/views/finance/realFundStat.vue

@@ -23,17 +23,17 @@
                   <el-option :value="false" label="未归档">未归档</el-option>
                   <el-option :value="true" label="已归档">已归档</el-option>
               </el-select>
-              <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 200px;float: left; margin-top: 10px;">
+              <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 200px;float: left;margin-left:20px;">
                   <el-option :value="true" label="金融">金融</el-option>
                   <el-option :value="false" label="非金融">非金融</el-option>
               </el-select>
-              <el-input v-model="listQuery1.claimUser" placeholder="认领人" clearable style="margin-left: 20px;width: 200px;float: left; margin-top: 10px;">
+              <el-input v-model="listQuery1.claimUser" placeholder="认领人" clearable style="margin-left: 20px;width: 200px;float: left;">
               </el-input>
-              <el-button class="filter-item" style="margin-left:20px;margin-top: 10px;float: left;" type="primary" @click="searchList1" round>搜索
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList1" round>搜索
               </el-button>
-              <el-button class="filter-item" style="margin-top: 10px;float: left;" round type="success" @click="resetSearch1()">重置
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
               </el-button>
-              <el-button class="filter-item" style="margin-top: 10px;float: left;" round type="info" @click="exportMajorStat()">导出
+              <el-button class="filter-item" style="float: left;" round type="info" @click="exportMajorStat()">导出
               </el-button>
             </template>
             <el-table

+ 3 - 3
src/views/finance/settleMajor.vue

@@ -359,7 +359,7 @@
         
     resetSearch1() {
       this.$router.push({ query: {} });
-      this.findDate = '';
+      this.findDate = [this.getDefaultStartDate(),this.getDefaultEndDate()];;
       this.listQuery1 = {
         current: 1,
         size: 10,
@@ -383,7 +383,7 @@
 
     resetSearch2() {
       this.$router.push({ query: {} });
-      this.findDate2 = '';
+      this.findDate1 = [this.getDefaultStartDate(),this.getDefaultEndDate()];
       this.listQuery2 = {
         current: 1,
         size: 10,
@@ -398,7 +398,7 @@
       // 重置分页
       this.listQuery2.page = 1
       this.listQuery2.size = 10
-      if (this.findDate){
+      if (this.findDate1){
         this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
       }