1

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -103,7 +103,7 @@
                 </el-form-item>
               </el-col>
               <template v-if="!heightQueryBox">
-                <el-col :span="8">
+                <el-col :span="5">
                   <el-form-item label="发团日期：">
                     <el-date-picker class="h34"
                                     v-model="missionDate"
@@ -112,6 +112,16 @@
                                     value-format="yyyy-MM-dd">
                     </el-date-picker>
                   </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="交易日期：">
+                    <el-date-picker class="h34"
+                                    v-model="tradeDate"
+                                    @change="timeTradeAdd()"
+                                    type="daterange"
+                                    value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                  </el-form-item>
                 </el-col>
                       <el-col :span="4">
                         <el-form-item label="结算状态：">
@@ -125,7 +135,7 @@
                         </el-form-item>
                     </el-col>
               </template>
-              <el-col :span="12">
+              <el-col :span="8">
                         <span style="margin-left: 20px; font-size: 12px;">注：合并结算的单据需要币种一致，此处均验证原币金额</span>
                     </el-col>
                 </el-row>
@@ -318,6 +328,14 @@
                     </div>
                 </template>
                 </el-table-column>
+                <el-table-column
+              prop=""
+              label="交易日期"
+              show-overflow-tooltip width="100">
+              <template slot-scope="scope">
+                {{scope.row.TradeDate}}
+              </template>
+              </el-table-column>
               <el-table-column
               prop=""
               label="原币金额"
@@ -608,6 +626,8 @@
             QEndDate:'',
             Status:'-1',
             IsSelectNormal: '1',//0不限 1只看未计算 2只看已结算
+            sTradeDate:'',
+            eTradeDate:''
         },
         getCompanyMsg:{  // 公司
             RB_Group_Id:'0',
@@ -617,6 +637,7 @@
         accountList:[],            
         CompanyList:[],                   
         missionDate:[],   
+        tradeDate:[],
         GetAccountType:[],         
         loading:false,
         currentPage:1,
@@ -800,6 +821,16 @@
             this.msg.QStartDate = this.missionDate[0];
             this.msg.QEndDate = this.missionDate[1];
         },
+        timeTradeAdd(){  // 日期格式
+          //发团日期
+            if(!this.tradeDate){
+                this.msg.sTradeDate = '';
+                this.msg.eTradeDate = '';
+                return
+            }
+            this.msg.sTradeDate = this.tradeDate[0];
+            this.msg.eTradeDate = this.tradeDate[1];
+        },
         queryInfoInit(){  // 初始化msg
             let msg = {
                 pageIndex:this.msg.pageIndex,