no message

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -339,7 +339,7 @@
                       <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
                   </span>
                   <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
-                  <!-- <button class="normalBtn" @click="method5()">导出</button> -->
+                  <button class="normalBtn" @click="method5()">导出</button>
                   <button class="normalBtn" @click="GenerateDocuments()">生成财务单据</button>
               </li>
           </ul>
@@ -349,9 +349,9 @@
             <span>已选数据：</span>
             <template v-if="multipleSelection.length>0">
               <el-tag size="mini" closable
-              style="margin-right: 5px;"
+              style="margin-right: 5px;margin-bottom: 5px;"
               v-for="(x,index) in multipleSelection"
-              :key="x.FrID" @close="handleClose([multipleSelection[index]])">{{x.FrID}}</el-tag>
+              :key="x.FrID" @close="handleClose([multipleSelection[index]])">{{x.FrID}} 应付：{{x.Money}}</el-tag>
             </template>
             <template v-else>
               无
@@ -488,9 +488,9 @@
             label="金额"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              <p style="line-height:20px">{{scope.row.Type==1?'应收':'应付'}}：<span>{{scope.row.Money}}</span></p>
-              <p style="line-height:20px">{{scope.row.Type==1?'实收':'实付'}}：<span>{{scope.row.PayMoney}}</span></p>
-              <p v-if="scope.row.IsAdvanceFinance==1" style="line-height:20px">冲抵：<span>{{scope.row.MatchMoney}}</span></p>
+              <p style="line-height:20px" v-if="scope.row.Money>0">{{scope.row.Type==1?'应收':'应付'}}：<span>{{scope.row.Money}}</span></p>
+              <p style="line-height:20px" v-if="scope.row.PayMoney>0">{{scope.row.Type==1?'实收':'实付'}}：<span>{{scope.row.PayMoney}}</span></p>
+              <p v-if="scope.row.IsAdvanceFinance==1&&scope.row.MatchMoney>0" style="line-height:20px">冲抵：<span>{{scope.row.MatchMoney}}</span></p>
             </template>
             </el-table-column>
             <el-table-column
@@ -745,9 +745,7 @@ export default {
       this.DepartIDs = userInfo.RB_Department_Id;
       this.userId = userInfo.EmployeeId;
       this.msg.EmployeeId= userInfo.EmployeeId;
-      if(this.$route.query.FrID){
-        this.msg.FrID = this.$route.query.FrID
-      }
+      this.msg.FrID = this.$route.query.FrID?this.$route.query.FrID:0
       this.financeinfo_post_GetList();
       this.financeinfo_post_GetCostTypeList();
       this.FinancialFlowTemplate_post_GetList();
@@ -863,24 +861,26 @@ export default {
           },err=>{})
       },
       method5: function() {
-      if(!this.msg.ClientID)this.msg.ClientID=0;
-      if(!this.msg.ClientType)this.msg.ClientType=0;
-      if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
-      if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
-      if(!this.msg.TemplateIds)this.msg.TemplateIds=0;
-      if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
-      if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
-      if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
-      if(!this.msg.TCID)this.msg.TCID=0;
-      if(!this.msg.OrderID)this.msg.OrderID=0;
-      if(!this.msg.Status)this.msg.Status=0;
-      if(!this.msg.FrID)this.msg.FrID=0;
-      if(!this.msg.Conditon)this.msg.Conditon=1;
-      if(!this.msg.TradeWay)this.msg.TradeWay=0;
-      if(!this.msg.AccountType)this.msg.AccountType=0;
-      if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
-      if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
-      this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls");
+          if(!this.msg.ClientID)this.msg.ClientID=0;
+          if(!this.msg.ClientType)this.msg.ClientType=0;
+          if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
+          if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
+          if(this.msg.TemplateIds=='0')this.msg.TemplateIds='';
+          if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
+          if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
+          if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
+          if(!this.msg.TCID)this.msg.TCID=0;
+          if(!this.msg.OrderID)this.msg.OrderID=0;
+          if(!this.msg.Status)this.msg.Status=0;
+          if(!this.msg.FrID)this.msg.FrID=0;
+          if(!this.msg.Conditon)this.msg.Conditon=1;
+          if(!this.msg.TradeWay)this.msg.TradeWay=0;
+          if(!this.msg.AccountType)this.msg.AccountType=0;
+          if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
+          if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
+          let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
+          var fileName = `成本月结表${time}.xls`;
+          this.GetLocalFile("Financial_get_GetCostMonthALLExport", this.msg,fileName);
       } ,
       financeRemove(id){//作废
       this.$confirm('是否对申请单进行作废操作？作废后不可恢复！', '提示', {
@@ -1171,7 +1171,7 @@ export default {
               QStartDate:this.msg.QStartDate,
               OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
               Sort:this.msg.Sort,
-              EmployeeId:this.msg.EmployeeId?this.msg.EmployeeId:5,
+              EmployeeId:this.msg.EmployeeId,
               KJCostTypeId:this.msg.KJCostTypeId==0?'':this.msg.KJCostTypeId,
               IsSelectKJSetCostType:this.msg.IsSelectKJSetCostType==0?'':this.msg.IsSelectKJSetCostType,
           }

src/components/FinancialModule/RecPayQuery.vue

@@ -464,7 +464,7 @@
             </el-table-column>
             <el-table-column
             prop=""
-            label="交易方式" show-overflow-tooltip width="150">
+            label="交易方式" show-overflow-tooltip width="210">
             <template slot-scope="scope">
               <div>
                 <template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">