优化手配费单据列表

src/components/FinancialModule/HandFee/HandFeeStatistics.vue

@@ -168,7 +168,7 @@
                       </el-col>
                       </el-col>
                       
-                      <template v-if="heightQueryBox">
+                      <template v-if="heightQueryBox"></template>
                         <el-col :span="6">
                             <el-form-item label="制单日期：">
                               <el-date-picker class="h34"
@@ -199,14 +199,14 @@
                           </el-date-picker>
                         </el-form-item>
                       </el-col>
-                    </template>
+                    
                 </el-row>
             </el-form>
             <ul class="clearfix">
                 <li class="hight_query">
-                    <span>
+                    <!-- <span>
                         <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
-                    </span>
+                    </span> -->
                     <button class="hollowFixedBtn" @click="getPageList()">{{$t('pub.searchBtn')}}</button>
                     <button class="normalBtn" @click="DocumentMaking">制单</button>
                     <button class="normalBtn" @click="method5()">导出</button>
@@ -218,7 +218,10 @@
             <span>本位币总金额：
                 {{total.toFixed(2)}}
                 </span>
-                <span style="margin-left: 15px;">原币总金额：
+                <span style="margin-left: 15px;">待制单总金额：
+                    {{totalBW2.toFixed(2)}}
+                    </span>
+                <span style="margin-left: 15px;">已制单总金额：
                 {{totalBW.toFixed(2)}}
                 </span>
           </div>
@@ -337,11 +340,9 @@
         <el-dialog custom-class='w400' title="手配费制单" :visible.sync="iszhidanBox" center>
             <template>
                 <div style="color: black;font-size: 17px;padding: 0 0 10px 10px;border-bottom: 1px solid #EBEEF5;">
-                    <p>本位币总金额：
-                    {{totalZD.toFixed(2)}}
-                    </p>
+                    <p>已选中{{multipleSelection.length}}调数据</p>
                     <p style="margin-top: 15px;">原币总金额：
-                    {{totalBWZD.toFixed(2)}}
+                    {{totalZD.toFixed(2)}}
                     </p>
                 </div>
                 <div slot="footer" class="dialog-footer">
@@ -434,6 +435,7 @@ export default {
             currentPage:1,
             total:0,
             totalBW:0,
+            totalBW2:0,
             totalZD:0,
             totalBWZD:0,
             ChineseStr:'',
@@ -454,6 +456,12 @@ export default {
         }
         if(this.$route.query.HandFeeFrId){
             this.msg.HandFeeFrId = this.$route.query.HandFeeFrId
+        }else{
+            let sDate= this.FormartDate(new Date(this.getBeforeDate(31)));
+            let eDate= this.FormartDate(new Date(this.getBeforeDate(0)));
+            this.productionDate = [sDate,eDate]
+            this.msg.sDate= sDate;
+            this.msg.eDate= eDate;
         }
     },
     components: {
@@ -472,11 +480,7 @@ export default {
         
         
 
-        let sDate= this.FormartDate(new Date(this.getBeforeDate(31)));
-        let eDate= this.FormartDate(new Date(this.getBeforeDate(0)));
-        this.productionDate = [sDate,eDate]
-        this.msg.sDate= sDate;
-        this.msg.eDate= eDate;
+        
 
         this.financeinfo_post_GetCostTypeList();
         this.getCompanyList();//获取公司列表
@@ -600,10 +604,16 @@ export default {
                     let data = res.data.data
                     this.total = 0;
                     this.totalBW = 0
+                    this.totalBW2 = 0
                     this.DataList = data;
                     this.DataList.forEach(x=>{
-                        this.total+=x.OriginalMoney
-                        this.totalBW+=x.Money
+                        // this.total+=x.OriginalMoney
+                        if(x.HandFeeIncomeFrId){
+                            this.totalBW+=x.Money
+                        }else{
+                            this.totalBW2+=x.Money
+                        }
+                        this.total+=x.Money
                     })
                     this.loading=false;
                 }else{

src/components/FinancialModule/addFinancialDocumentsSPF.vue

@@ -805,7 +805,7 @@ export default {
                 this.chooseHandFee()
             }else{
                 this.msg.HandFeeList = null
-                this.msg.KingdeeBranchId = null
+                this.msg.KingdeeBranchId = 0
             }
         },
         // 获取当前手配费选项
@@ -815,7 +815,7 @@ export default {
             let HandFeeObj = this.HandFeeList.map(item=>{if(item.BranchId==this.HandFee.BranchId) return item})
             
             this.HandFeeDetail = HandFeeObj[0]
-            this.HandFeeDetail.DetailList.forEach(x=>{x.show = false})
+            this.HandFeeDetail&&this.HandFeeDetail.DetailList.forEach(x=>{x.show = false})
             let numToFANG = 0
             let numToCAN = 0
             let numToCE = 0