Ver código fonte

大订单交互按钮bug

@dongkboy 3 meses atrás
pai
commit
704c7b0a50
1 arquivos alterados com 29 adições e 6 exclusões
  1. 29 6
      pages/orders/orders1.vue

+ 29 - 6
pages/orders/orders1.vue

@@ -93,8 +93,8 @@
 							<view class="status-tag dis a-c j-c ml-1" :style="statusColorMatch(item.orderStatus).style">
 								{{statusColorMatch(item.orderStatus).label}}
 							</view>
-							<text class="company-sum"
-								v-if="['1','2','6','7'].includes(item.orderStatus)">12家保司可报价</text>
+							<!-- <text class="company-sum" -->
+							<!-- v-if="['1','2','6','7'].includes(item.orderStatus)">12家保司可报价</text> -->
 						</view>
 						<view class="content dis f-wrap">
 							<view class="item">
@@ -117,12 +117,12 @@
 					</view>
 					<view class="cardAll-btn dis a-c j-end ">
 						<view v-for="(cardAllitem,cardAllindex) in cardAllbtns(item.orderStatus)" :key="cardAllindex"
-							@click="cardAllbtnChange(cardAllitem.value,item.mainDetails[cardAllitem.value])">
+							@click="cardAllbtnChange(cardAllitem.value,item.mainDetails[cardAllitem.value],'ITEM')">
 							<text>{{cardAllitem.label}}</text>
 							<u-badge numberType="overflow" :max="99" :value="1" :absolute="true" bgColor="#FF4545"
 								:offset="[-5,-16]" style="font-size: 18rpx;"></u-badge>
 						</view>
-						<view @click="cardAllbtnChange(item.orderStatus)">查看全部</view>
+						<view @click="cardAllbtnChangeAll(item.mainDetails,'ALL')">查看全部</view>
 					</view>
 				</view>
 				<u-loadmore v-if="subPageResult.length!=0" :status="substatus" />
@@ -225,7 +225,8 @@
 			</template>
 			<template #content>
 				<view class="content">
-					<view class="status-card dis " v-if="cardAllbtnsIndex==item.statusCode || !cardAllbtnsIndex"
+					<view class="status-card dis "
+						v-if="bigOrderIndicator=='ITEM'? cardAllbtnsIndex==item.statusCode:item.companyOptions!=null"
 						:style="{borderColor:item.style.cardBorderColor}" v-for="item in subOrderStatusModalList"
 						:key="item.statusName">
 						<view class="left-title  dis a-c j-c"
@@ -313,6 +314,7 @@
 				cardAllbtnsIndex: "", //子订单指定状态
 				subOrderStatusModal: false, //子订单状态弹窗
 				orderTrackingShow: false, //订单轨迹弹窗
+				bigOrderIndicator: 'ITEM',
 				orderStatus: "1", //订单状态
 				AllorderStatus: "7",
 				statusCurrent: 0, //状态tabs切换
@@ -562,6 +564,12 @@
 					this.pageRequest.pages = page;
 					this.pageRequest.size = size;
 				}
+				if (this.statusCurrent == 0) {
+					this.pageRequest.parentId = '0';
+					this.pageRequest.isLargeOrder = '1';
+				} else {
+					this.pageRequest.parentId = '1';
+				}
 				let res = await this.$http.post('/supplementOrder/queryList', this.pageRequest);
 				if (res.code == '200') {
 					this.subPageResult = res.data.records;
@@ -785,9 +793,10 @@
 			 * @param {Object} value  当前按钮对应的订单状态
 			 * @param {Object} list   该状态下的所有报价记录
 			 */
-			cardAllbtnChange(value, list) {
+			cardAllbtnChange(value, list, identifier) {
 				console.log(value, list);
 				this.cardAllbtnsIndex = value;
+				this.bigOrderIndicator = identifier;
 				this.subOrderStatusModalList.map(val => {
 					if (val.statusCode == value) {
 						val.companyOptions = list;
@@ -796,6 +805,20 @@
 				})
 				this.subOrderStatusModal = true;
 			},
+			//查看全部
+			cardAllbtnChangeAll(item, identifier) {
+				this.bigOrderIndicator = identifier;
+				Object.keys(item).forEach(key => {
+					this.subOrderStatusModalList.map(val => {
+						if (val.statusCode == key) {
+							val.companyOptions = item[key];
+						}
+						return val;
+					})
+				})
+				this.subOrderStatusModal = true;
+
+			},
 			// 小订单主按钮过滤
 			primaryButton(orderStatus) {
 				const STATUS_BUTTONS = {