合同付款需求修改

src/view/material-manege/pay/pay2.vue

@@ -38,25 +38,25 @@
 							h('span', '20-50万('),
 							h('span',{style:{color:'red'}}, salesVolumeCompanyTotal['20-50']),
 							h('span', ')')])
-					}" name="2"></TabPane>
+					}" name="3"></TabPane>
 					<TabPane :label="(h) => {
 						return h('div', [
 							h('span', '10-20万('),
 							h('span',{style:{color:'red'}}, salesVolumeCompanyTotal['10-20']),
 							h('span', ')')])
-					}" name="2"></TabPane>
+					}" name="4"></TabPane>
 					<TabPane :label="(h) => {
 						return h('div', [
 							h('span', '5-10万('),
 							h('span',{style:{color:'red'}}, salesVolumeCompanyTotal['5-10']),
 							h('span', ')')])
-					}" name="2"></TabPane>
+					}" name="5"></TabPane>
 					<TabPane :label="(h) => {
 						return h('div', [
 							h('span', '5万以下('),
 							h('span',{style:{color:'red'}}, salesVolumeCompanyTotal['5down']),
 							h('span', ')')])
-					}" name="2"></TabPane>
+					}" name="6"></TabPane>
 				</Tabs>
 				<div>
 					<Button style="margin:0 10px 5px 0" :type="params.companySelectId == null ? 'primary' : 'default'" @click="changeCompany(null,0)" >全部</Button>
@@ -73,38 +73,30 @@
 			</div>
 			<!-- 检索 -->
 			<div class="table-filter" @keyup.enter="search">
-				<div class="filter-item" style="border-right:1px solid #dcdcdc">
+				<div class="filter-item"  style="border-right:1px solid #dcdcdc">
 					<RadioGroup
-						v-model="params.cycleType"
-						@on-change="cycleTypeChange"
+						v-model="params.payBillStatus"
+						@on-change="statusChange"
 					>
 						<Radio :label="0">
 							<span>
 								全部
-								<span class="red">({{ cycle.currentPeriod + cycle.upperCycle + cycle.nextCycle }})</span>
+								<span class="red">({{ data.totalCount }})</span>
 							</span>
 						</Radio>
 						<Radio :label="1">
 							<span>
-								本周期
+								可发起
 								<span class="red"
-									>({{ cycle.currentPeriod }})</span
+									>({{ data.unApprovalCount }})</span
 								>
 							</span>
 						</Radio>
 						<Radio :label="2">
 							<span>
-								上周期顺延
-								<span class="red"
-									>({{ cycle.upperCycle }})</span
-								>
-							</span>
-						</Radio>
-						<Radio :label="3">
-							<span>
-								其他
+								待补齐
 								<span class="red"
-									>({{ cycle.nextCycle }})</span
+									>({{ data.unCompleteCount }})</span
 								>
 							</span>
 						</Radio>
@@ -112,33 +104,42 @@
 				</div>
 				<div class="filter-item">
 					<RadioGroup
-						v-model="params.payBillStatus"
-						@on-change="statusChange"
+						v-model="params.cycleType"
+						@on-change="cycleTypeChange"
 					>
 						<Radio :label="0">
 							<span>
 								全部
-								<span class="red">({{ data.totalCount }})</span>
+								<span class="red">({{ cycle.currentPeriod + cycle.upperCycle + cycle.nextCycle }})</span>
 							</span>
 						</Radio>
 						<Radio :label="1">
 							<span>
-								可发起
+								本周期
 								<span class="red"
-									>({{ data.unApprovalCount }})</span
+									>({{ cycle.currentPeriod }})</span
 								>
 							</span>
 						</Radio>
 						<Radio :label="2">
 							<span>
-								待补齐
+								上周期顺延
 								<span class="red"
-									>({{ data.unCompleteCount }})</span
+									>({{ cycle.upperCycle }})</span
+								>
+							</span>
+						</Radio>
+						<Radio :label="3">
+							<span>
+								其他
+								<span class="red"
+									>({{ cycle.nextCycle }})</span
 								>
 							</span>
 						</Radio>
 					</RadioGroup>
 				</div>
+				
 				<div class="filter-item">
 					<Input
 						v-model="keyWord"
@@ -721,10 +722,12 @@ export default {
 			console.log(list)
 			v.showList = JSON.parse(JSON.stringify(list)).slice((v.params.pageIndex - 1) * 10,v.params.pageIndex * 10)
 			v.params.total = list.length
+			this.$Spin.hide();
 			
 		},
 		getList() {
 			const v = this
+			this.$Spin.show();
 			GetPurContractPayBill({
 				pageIndex: 1,
 				pageSize: 1000000,
@@ -794,9 +797,9 @@ export default {
 					this.titleData = res.result
 					var dateDayNum = new Date().getDate();
 					if(dateDayNum > 15){
-						this.getContractPayment(this.titleData.curMonthPay.secAmount + this.titleData.curMonthPay.secPayAmount,this.titleData.curMonthPay.secAmount)
+						this.getContractPayment((this.titleData.curMonthPay.secAmount*1000 + this.titleData.curMonthPay.secPayAmount*1000) / 1000,this.titleData.curMonthPay.secAmount)
 					}else{
-						this.getContractPayment(this.titleData.curMonthPay.firAmount + this.titleData.curMonthPay.firPayAmount,this.titleData.curMonthPay.secAmount)
+						this.getContractPayment((this.titleData.curMonthPay.firAmount*1000 + this.titleData.curMonthPay.firPayAmount*1000) / 1000,this.titleData.curMonthPay.secAmount)
 					}
                     
                     v.columns3 = [
@@ -904,24 +907,44 @@ export default {
 						PayAmount:0,
 					}]
 				}
+				const msg = [{
+					PayAmount:0,
+				},{
+					PayAmount:0,
+				}]
+				for (let i = 0; i < res.data.result.paid.length; i++) {
+					const element = res.data.result.paid[i];
+					if(element.ApplyPayType == 0){
+						msg[0].ApplyPayType = element.ApplyPayType
+						msg[0].PayAmount = element.PayAmount
+						
+					}else if(element.ApplyPayType == 1){
+						msg[1].ApplyPayType = element.ApplyPayType
+						msg[1].PayAmount = element.PayAmount
+					}
+				}
+				console.log(msg)
+				res.data.result.paid = msg
                 v.data2 = [
+					
+					
                     {
                         name:'合计',
                         yinfu:_total,
                         yifu:res.data.result.paid[0].PayAmount + res.data.result.paid[1].PayAmount,
-                        weifu:_total - (res.data.result.paid[0].PayAmount + res.data.result.paid[1].PayAmount)
+                        weifu:(_total*1000 - (res.data.result.paid[0].PayAmount*1000 + res.data.result.paid[1].PayAmount*1000))/1000
                     },
                     {
                         name:'有账期',
                         yinfu:_total - res.data.result.currentAccountingPeriod,
                         yifu:res.data.result.paid[0].PayAmount,
-                        weifu:_total - res.data.result.currentAccountingPeriod - res.data.result.paid[0].PayAmount
+                        weifu:(_total *1000 - res.data.result.currentAccountingPeriod*1000 - res.data.result.paid[0].PayAmount*1000)/1000
                     },
                     {
                         name:'预付款',
                         yinfu:res.data.result.currentAccountingPeriod,
                         yifu:res.data.result.paid[1].PayAmount,
-                        weifu:res.data.result.currentAccountingPeriod - res.data.result.paid[1].PayAmount
+                        weifu:(res.data.result.currentAccountingPeriod*1000 - res.data.result.paid[1].PayAmount*1000)/1000
                     },
                 ]
 				console.log(v.data2)
@@ -1143,6 +1166,7 @@ export default {
 		//this.getList()
 		this.selectTime(1.5)
 		this.getContractPayTotal()
+		
 	},
 }
 </script>
@@ -1175,7 +1199,7 @@ export default {
     width:14%;
 }
 .container-wrap {
-	height: 100%;
+	
 	overflow: hidden;
 	display: flex;
 	flex-direction: column;