1

src/views/app/business/logistics/logistics.vue

@@ -287,7 +287,8 @@
 						render: (h, params) => {
 							let re = "",
 								color = "";
-							if (this.getTimeDifference(params.row.mustFinishTime) > 15 && (params.row.orderStatus ==
+							if (this.getTimeDifference(params.row.mustFinishTime) > 15 && (params.row
+									.orderStatus ==
 									"0" || params.row.orderStatus == "1")) {
 								re = params.row.mustFinishTime;
 								color = "red";
@@ -340,34 +341,43 @@
 						align: "center",
 						fixed: "right",
 						render: (h, params) => {
-							return h("div", [
+							// 公共部分：订单详情链接
-								h(
+							const orderDetailLink = h(
-									"a", {
+								"a", {
-										on: {
+									on: {
-											click: () => {
+										click: () => {
-												this.orderDetail(params.row);
+											this.orderDetail(params.row);
-											},
 										},
 									},
-									"订单详情"
+								},
-								),
+								"订单详情"
-								h("Divider", {
+							);
-									props: {
+
-										type: "vertical",
+							// 根据 status == 10 决定是否渲染“改派订单”及分隔符
-									},
+							if (params.row.status != 3) {
-								}),
+								return h("div", [
-								h(
+									orderDetailLink,
-									"a", {
+									h("Divider", {
-										on: {
+										props: {
-											click: () => {
+											type: "vertical"
-												this.unbind(params.row);
+										}
+									}),
+									h(
+										"a", {
+											on: {
+												click: () => {
+													this.unbind(params.row);
+												},
 											},
 										},
-									},
+										"改派订单"
-									"改派订单"
+									),
-								),
+								]);
-							]);
+							} else {
-						},
+								// status 不为 10 时只显示订单详情（不加分隔符和改派订单）
+								return h("div", [orderDetailLink]);
+							}
+						}
 					},
 				],
 				chooseColumns: [],
@@ -398,8 +408,8 @@
 				runshOrder({
 					deliveryId: this.orderId,
 					newWorkerId: item.workerId,
-					newWorkerName:item.workerName,
+					newWorkerName: item.workerName,
-					newWorkerPhone:item.mobile,
+					newWorkerPhone: item.mobile,
 				}).then((res) => {
 					this.loading = false;
 					if (res.success) {
@@ -500,7 +510,7 @@
 				this.importColumns = [];
 				this.uploadfile = {};
 			},
-			
+
 			showDetail(v) {
 				// 转换null为""
 				for (let attr in v) {

src/views/app/business/problemFeedback/problemFeedback.vue

@@ -7,8 +7,12 @@
 			<Row>
 				<Form ref="searchForm" :model="searchForm" inline :label-width="100">
 					
-					<FormItem label="免单人数" prop="name">
+					<FormItem label="" prop="name">
-						<Input v-model="form.orderNumber"></Input>
+						<div style="display: flex;">
+							<div style="width: 40px;">完成</div>
+							<Input v-model="form.orderNumber" style="width: 60px;"></Input>
+							<div style="width: 180px;">&nbsp;&nbsp;单后免单</div>
+						</div>
 					</FormItem>
 					<FormItem label="免单金额" prop="name">
 						<Input v-model="form.freeAmount"></Input>