fix

virgo.wzfrontend/workark/src/components/work/system/serveSet/processSet.vue

@@ -7,10 +7,11 @@
 				<i style="margin-left: 10px;" class="el-icon-edit-outline color-warning" v-if="operationType === 'edit'"
 					@click.stop="edits('update', item.id)">
 				</i>
-				<i class="el-icon-delete color-danger" v-if="operationType === 'edit'" @click.stop="edits('delete', item.id)">
+				<i class="el-icon-delete color-danger" v-if="operationType === 'edit'"
+					@click.stop="edits('delete', item.id)">
 				</i>
 			</div>
-			<div class="top-item" @click="edits('insert', -1)">
+			<div class="top-item" v-if="operationType === 'edit'" @click="edits('insert', -1)">
 				+新增
 			</div>
 		</div>
@@ -85,7 +86,11 @@
 					this.updateParentStatus(this.list);
 					if (this.list.length > 0) {
 						let arr = this.list.filter(node => node.status === 1 || node.status === 2 || node.status === 4);
-						if (!this.nowTitle.id) this.nowTitle = arr.length > 0 ? arr[0] : this.list[0];
+						if (!this.nowTitle.id) {
+							this.nowTitle = arr.length > 0 ? arr[0] : this.list[0];
+						} else {
+							this.nowTitle = this.list.find(node => node.id === this.nowTitle.id);
+						}
 					}
 				}
 				this.loading = false;

virgo.wzfrontend/workark/src/components/work/system/serveSet/processSetItem.vue

@@ -62,7 +62,8 @@
 							<div
 								v-else-if="(item.status === 2 || node.status === 2 || node.status == 3) && roleType === 2">
 								<upload v-model="node.attachmentContent"></upload>
-								<div class="operation-button" v-if="node.status !== 3 && node.status !== 4">
+								<div class="operation-button"
+									v-if="node.status !== 3 && node.status !== 4 && item.status === 3">
 									<div class="operation-button-item success" @click="updateStatus(node,3)">
 										<i class="el-icon-check"></i>
 									</div>
@@ -70,6 +71,9 @@
 										<i class="el-icon-close"></i>
 									</div>
 								</div>
+								<div class="operation-button" v-else-if="node.status !== 3 && node.status !== 4">
+									<el-checkbox v-model="nodeCheck" :label="node.id">&nbsp;</el-checkbox>
+								</div>
 								<div class="operation-button" v-else-if="node.status !== 4">
 									<el-button size="mini" type="warning" @click="updateStatus(node,1)">整改</el-button>
 								</div>
@@ -88,7 +92,9 @@
 					</div>
 					<div class="operation-button" v-else-if="item.status === 2 && roleType === 2">
 						<el-button size="mini" type="primary" @click="updateStatus(item,3)">通过</el-button>
-						<el-button size="mini" type="warning" @click="updateStatus(item,4)">整改</el-button>
+						<el-button size="mini" type="warning" @click="updateState" :disabled="nodeCheck.length === 0">
+							整改
+						</el-button>
 					</div>
 					<!-- 新增 -->
 					<div class="process-set-insert" @click="edit('insert', item.id)" v-if="type === 'edit'">
@@ -180,7 +186,8 @@
 				drawer: false,
 				detailId: '',
 				dialogType: 1,
-				dialogVisible: false
+				dialogVisible: false,
+				nodeCheck: []
 			}
 		},
 		mounted() {},
@@ -257,6 +264,13 @@
 					}
 				})
 			},
+			async updateState() {
+				for (let i = 0; i < this.nodeCheck.length; i++) {
+					await updateProcessStatus(4, this.nodeCheck[i])
+				}
+				this.$message.success('操作成功');
+				this.edit('reload');
+			},
 			updateStatus(item, status) {
 				for (let i = 0; i < item.children.length; i++) {
 					updateProcessStatus(status, item.children[i].id)

virgo.wzfrontend/workark/src/views/website/serveDetail.vue

@@ -17,6 +17,17 @@
 					<div class="home-detail-information">
 						<div class="house-name">{{detail.name}}</div>
 						<div class="sub-title">{{detail.subtitle}}</div>
+						<div class="product-list">
+							<div class="coupon-card" v-for="(item,index) in list" :key="index"
+								@click="checkProduct(item)">
+								<div class="coupon-card-box" :class="{active:detail.id === item.id}">
+									<div>{{item.name}}</div>
+									<div class="icon-check">
+										<i class="el-icon-check"></i>
+									</div>
+								</div>
+							</div>
+						</div>
 						<div class="house-price">
 							<div class="color-danger price">
 								<span class="average alibaba">{{detail.price}}</span><span class="unit">元/次</span>
@@ -92,7 +103,7 @@
 				dialogType: '',
 				chatVisible: false,
 				customerId: '',
-				customerTitle: ''
+				customerTitle: '',
 			};
 		},
 		mounted() {
@@ -142,6 +153,10 @@
 					})
 				})
 			},
+			checkProduct(item) {
+				let index = this.list.findIndex(node => node.id === item.id);
+				this.initDetail(index);
+			},
 			payItem() {
 				if (!this.$store.getters.user.userId) {
 					let index = this.$store.getters.loginVisible;
@@ -196,6 +211,55 @@
 			}
 		}
 
+		.product-list {
+			display: flex;
+		}
+
+		.coupon-card {
+			margin-top: 10px;
+			margin-right: 10px;
+
+			.coupon-card-box {
+				background: #fff;
+				padding: 7px 15px;
+				align-items: center;
+				display: flex;
+				position: relative;
+				cursor: pointer;
+				border: 1px solid $--border-color-lighter;
+				overflow: hidden;
+
+				&:hover {
+					border-color: $--color-primary;
+				}
+
+				&.active {
+					border-color: $--color-primary;
+
+					.icon-check {
+						display: flex;
+					}
+				}
+			}
+
+			.icon-check {
+				color: #fff;
+				white-space: nowrap;
+				transform: rotate(45deg);
+				position: absolute;
+				top: -8px;
+				right: -15px;
+				background: #165dff;
+				width: 36px;
+				text-align: center;
+				height: 22px;
+				display: none;
+				align-items: flex-end;
+				justify-content: center;
+				font-size: 13px;
+			}
+		}
+
 		.detail-item {
 			padding-top: 20px;
 			position: relative;

virgo.wzfrontend/workark/src/views/work/finance/contract.vue

@@ -59,7 +59,7 @@
 				</el-pagination>
 			</div>
 		</div>
-		<el-drawer title=" 订单详情" :visible.sync="drawer" :size="800" :append-to-body="true">
+		<el-drawer title=" 订单详情" :visible.sync="drawer" :size="1200" :append-to-body="true">
 			<detail v-if="drawer" :detailId="detailId" :type="nowTitle.id" detailType="orderNo"></detail>
 		</el-drawer>
 	</div>

virgo.wzfrontend/workark/src/views/work/finance/invoice.vue

@@ -51,7 +51,7 @@
 				</el-pagination>
 			</div>
 		</div>
-		<el-drawer title="订单详情" :visible.sync="drawer" :size="800" :append-to-body="true">
+		<el-drawer title="订单详情" :visible.sync="drawer" :size="1200" :append-to-body="true">
 			<detail v-if="drawer" :detailId="detailId" detailType="orderNo"></detail>
 		</el-drawer>
 		<el-drawer title="发票详情" :visible.sync="drawers" :size="400" :append-to-body="true">

virgo.wzfrontend/workark/src/views/work/serve/list.vue

@@ -87,7 +87,7 @@
 				</el-pagination>
 			</div>
 		</div>
-		<el-drawer title="订单详情" :visible.sync="drawer" :size="800" :append-to-body="true">
+		<el-drawer title="订单详情" :visible.sync="drawer" :size="1200" :append-to-body="true">
 			<detail v-if="drawer" :detailId="detailId" :type="nowTitle.id" @callback="callback"></detail>
 		</el-drawer>
 		<el-drawer title="发票详情" :visible.sync="drawers" :size="400" :append-to-body="true">