From 20c8aef9bd85c78e6e53bfa6c3615da4e88869ae Mon Sep 17 00:00:00 2001
From: ljx120 <10717296+ljx120@user.noreply.gitee.com>
Date: Tue, 14 Jan 2025 09:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/customOrder/list.vue        |  4 ++++
 pages/documentary/detail.vue      | 30 ++++++++++++++++++++++--------
 pages/documentary/documentary.vue | 13 ++++++++++---
 pages/documentary/ex-factory.vue  |  2 +-
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/pages/customOrder/list.vue b/pages/customOrder/list.vue
index 24486ae..194c832 100644
--- a/pages/customOrder/list.vue
+++ b/pages/customOrder/list.vue
@@ -206,6 +206,10 @@
 				align-items: center;
 				text-align: center;
 				justify-content: center;
+				word-break: break-all;
+				display: -webkit-box;             /*将对象转为弹性盒模型展示*/
+				-webkit-box-orient: vertical;     /*设置弹性盒模型子元素的排列方式*/
+				overflow: hidden;  
 			}
 		}
 
diff --git a/pages/documentary/detail.vue b/pages/documentary/detail.vue
index 354a5f7..bb6ca1a 100644
--- a/pages/documentary/detail.vue
+++ b/pages/documentary/detail.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 	import { onLoad } from '@dcloudio/uni-app';
 	import { showToast } from 'vant';
-	import { ref, watch } from 'vue';
+	import { ref } from 'vue';
 	import { getAction, postAction, uploadAction } from '../../common/http';
 	import { formatDate } from '../../utils/date';
 	// 定义 props
@@ -41,7 +41,7 @@
 						}
 					}
 				} else {
-					processes.value = JSON.parse(itemList.value.processes)
+					processes.value = itemList.value.processes
 				}
 				indexData.value = processes.value.processes.findIndex((l : any) => l.name == itemList.value.zt)
 				let nameZt = ''
@@ -52,7 +52,7 @@
 				} else {
 					nameZt = itemList.value.zt
 				}
-				let name = processes.value.processes.find((l : any) => l.name != nameZt && (l.necessary))
+				let name = processes.value.processes.find((l : any, j : any) => j > indexData.value && (l.necessary))
 				postAction('/process/getNext', [nameZt, name ? name.name : '0x7c00']).then((res : any) => {
 					if (res.code === 200) {
 						specialPro.value = res.data
@@ -60,13 +60,13 @@
 				})
 				getAction('/tracking/getLog?id=' + itemList.value.id).then((res : any) => {
 					if (res.code === 200) {
-						trackingLog.value=res.data
+						trackingLog.value = res.data
 						processes.value.processes.forEach((m : any) => {
 							if (!m.id) {
 								let a = res.data.find((l : any) => l.details.zt == m.name)
 								if (a) {
 									m.rq = a.details.form.czrq
-									res.data=res.data.concat(a.details.trackingLog)
+									res.data = res.data.concat(a.details.trackingLog)
 								}
 							}
 						})
@@ -165,6 +165,7 @@
 			processes.value.processes.forEach((l : any, j : any) => {
 				if (j > indexData.value && index > j) {
 					if (l.necessary) {
+						status.value = l.name
 						throw l.name + '不可跳过！'
 					}
 				} else {
@@ -190,13 +191,26 @@
 	const craftFlow = ref()
 	const craftFlowLc = ref()
 	const flowList = ref([] as any[])
+	const OrderAlert = ref()
 	//选择特殊工艺
 	const chooseSpecial = (item : any) => {
+		let a = specialPro.value.find((l : any) => l.name === item.name)
+		list.value = a.evidence
+		if (itemList.value.sd === '门店') {
+			OrderAlert.value = a.internalOrderAlert
+		} else {
+			OrderAlert.value = a.externalOrderAlert
+		}
+		let cs=0
+		processes.value.processes.forEach((l:any)=>{
+			if(l.name==item.name){
+				cs++
+			}
+		})
+		if(cs>=Number(OrderAlert.value)) return showToast('已超过系统限制，请联系管理员！')
 		special.value = item.name
 		specialItem.value = item
 		status.value = ''
-		let a = specialPro.value.find((l : any) => l.name === item.name)
-		list.value = a.evidence
 		showDialog.value = true
 		getAction('/flowBind').then((res : any) => {
 			if (res.code === 200) {
@@ -262,7 +276,7 @@
 				trackingLogId: itemList.value.id,
 				subId: itemList.value.subId,
 				details: {
-					trackingLog:trackingLog.value,
+					trackingLog: trackingLog.value,
 					zt: special.value,
 					list: list.value,
 					form: form.value,
diff --git a/pages/documentary/documentary.vue b/pages/documentary/documentary.vue
index 3eaeb6b..d7694fa 100644
--- a/pages/documentary/documentary.vue
+++ b/pages/documentary/documentary.vue
@@ -445,25 +445,32 @@
 		
 				.grid-container1 {
 					display: grid;
-					grid-template-columns: 1fr;
+					grid-template-columns: repeat(1, 1fr);;
 					width: 100%;
 					height: 100%;
 		
 					.grid-item2 {
 						display: flex;
+						white-space: pre-line; 
 						align-items: center;
-						text-align: center;
 						justify-content: center;
 						padding: 5rpx;
+						word-break: break-all;
+						display: -webkit-box;             /*将对象转为弹性盒模型展示*/
+						-webkit-box-orient: vertical;     /*设置弹性盒模型子元素的排列方式*/
+						overflow: hidden;                 /*超出隐藏*/
 					}
 		
 					.grid-item1 {
 						border-bottom: 1px solid #f2f2f2;
 						display: flex;
 						align-items: center;
-						text-align: center;
 						justify-content: center;
 						padding: 5rpx;
+						word-break: break-all;
+						display: -webkit-box;             /*将对象转为弹性盒模型展示*/
+						-webkit-box-orient: vertical;     /*设置弹性盒模型子元素的排列方式*/
+						overflow: hidden;                 /*超出隐藏*/
 					}
 				}
 			}
diff --git a/pages/documentary/ex-factory.vue b/pages/documentary/ex-factory.vue
index 4b90eec..4e74c95 100644
--- a/pages/documentary/ex-factory.vue
+++ b/pages/documentary/ex-factory.vue
@@ -36,7 +36,7 @@
 						}
 					}
 				} else {
-					processes.value = JSON.parse(itemList.value.processes)
+					processes.value = itemList.value.processes
 				}
 				getAction('/tracking/getLog?id='+itemList.value.id).then((res:any)=>{
 					if(res.code===200){