提交代码

src/components/FinancialModule/HelpBranch/index.vue

@@ -22,11 +22,7 @@
                       </el-form-item>
                   </el-col>
 
-                  <el-col :span="4">
-                      <el-form-item label="团队编号：">
-                          <el-input v-model="msg.TCNUM" class=""></el-input>
-                      </el-form-item>
-                  </el-col>
+               
                   <el-col :span="4">
                     <el-form-item label="结算状态：">
                         <el-select v-model='msg.IsSelectAduiting'>
@@ -93,6 +89,31 @@
                     </el-form-item>
                   </el-col>
                  
+
+                 
+                  <el-col :span="6">
+                    <el-form-item label="制单日期：">
+                      <el-date-picker class="h34"
+                                      @change="timeAdd(1)"
+                                      v-model="productionDate"
+                                      type="daterange"
+                                      value-format="yyyy-MM-dd">
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+              <el-form-item label="交易日期：">
+                <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
+                  value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+                  <template v-if="heightQueryBox">
+                    <el-col :span="4">
+                      <el-form-item label="团队编号：">
+                          <el-input v-model="msg.TCNUM" class=""></el-input>
+                      </el-form-item>
+                  </el-col>
                   <el-col :span="4">
                     <el-form-item label="付款对象：">
                         <el-select
@@ -101,8 +122,7 @@
     remote
     reserve-keyword
     placeholder="请输入关键词"
-    :remote-method="GetClientAccountListByKeyWord"
-    >
+    :remote-method="GetClientAccountListByKeyWord">
     <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
     <el-option v-for='item in ClientAccountList'
                                     :label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
@@ -118,18 +138,6 @@
   </el-select>
                     </el-form-item>
                   </el-col>
-                 
-                  <el-col :span="6">
-                    <el-form-item label="制单日期：">
-                      <el-date-picker class="h34"
-                                      @change="timeAdd(1)"
-                                      v-model="productionDate"
-                                      type="daterange"
-                                      value-format="yyyy-MM-dd">
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                  <template v-if="heightQueryBox">
                     <el-col :span="4">
                       <el-form-item label="费用部门：">
                           <el-select  filterable  v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
@@ -231,26 +239,27 @@
         <div style="display: flex;flex-wrap: wrap;color:red;" >
             <span>财务单据信息：</span>
             <template >
-              <p size="mini" closable
-              style="margin-right: 5px;margin-bottom: 5px;"
+              <p  size="mini" closable
+              style="margin-right: 5px;margin-bottom: 5px;width:99%;"
               v-for="(x,index) in financeDataList"
               :key="x.FrID" 
               :type="danger">
-              （{{x.CurrencyName}}） 总收入： {{x.totalMoneyI}}  总支出：{{x.totalMoneyO}} ，关联调拨单总金额：{{x.totalMoneyA}} 已冲抵金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
+             （{{x.CurrencyName}}） 总收入： {{x.totalMoneyI}}  总支出：{{x.totalMoneyO}} ，关联调拨单总金额：{{x.totalMoneyA}} 已冲抵金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
             </p>
             </template>
           </div>
           
       </div>
-      <div style="display: flex;flex-wrap: nowrap; padding: 10px;" v-if="allotDataList.length>0"><div style="display: flex;flex-wrap: wrap;color:red;" >
+      <div style="display: flex;flex-wrap: nowrap; padding: 10px;" v-if="allotDataList.length>0">
+        <div style="display: flex;flex-wrap: wrap;color:red;" >
             <span>资金调拨信息：</span>
             <template >
               <p size="mini" closable
-              style="margin-right: 5px;margin-bottom: 5px;"
+              style="margin-right: 5px;margin-bottom: 5px;width:99%;"
               v-for="(x,index) in allotDataList"
               :key="x.FrID" 
               :type="success">
-              （{{x.CurrencyName}}） 总收款：{{x.totalMoneyA}} 总支出金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
+              （{{x.CurrencyName}}） 总收款：{{x.totalMoneyA}} 总支出金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}<br/>
             </p>
             </template>
           </div></div>
@@ -675,6 +684,9 @@ export default {
           this.msg.sTradeDate=this.$route.query.StartDate;
           this.msg.eTradeDate=this.$route.query.StartDate;
 
+        
+
+
           if(this.$route.query.BankID==''){
               // 费用类型：机票折让费
               this.msg.CostTypeID=197;
@@ -698,6 +710,13 @@ export default {
       if(this.$route.query.NewFinanceId){
           this.msg.NewFinanceId = this.$route.query.NewFinanceId;
       }
+      let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
+    let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
+    if(!this.msg.startDate){
+        this.productionDate = [STime,ETime]
+        this.msg.sDate = this.productionDate[0];
+        this.msg.eDate = this.productionDate[1];
+    }
       //this.financeinfo_post_GetClientAccountList()
       this.financeinfo_post_GetList();
       this.financeinfo_post_GetCostTypeList();
@@ -1145,7 +1164,17 @@ export default {
               }
               this.msg.sDate = this.productionDate[0];
               this.msg.eDate = this.productionDate[1];
-          }if(t==4){             //发团日期
+          }
+          if (t == 3) { //交易日期
+          if (!this.transactionDate) {
+            this.msg.sTradeDate = '';
+            this.msg.eTradeDate = '';
+            return
+          }
+          this.msg.sTradeDate = this.transactionDate[0];
+          this.msg.eTradeDate = this.transactionDate[1];
+        }
+          if(t==4){             //发团日期
               if(!this.missionDate){
                   this.dateStart = '';
                   this.dateEnd = '';