diff --git a/pages.json b/pages.json
index 4f0ecb9..5234d2a 100644
--- a/pages.json
+++ b/pages.json
@@ -339,6 +339,18 @@
 					"bounce": "none"
 				}
 			}
+		},
+		{
+			"path" : "pages/documentary/ex-factory",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/documentary/detail.vue b/pages/documentary/detail.vue
index 4940a18..f394577 100644
--- a/pages/documentary/detail.vue
+++ b/pages/documentary/detail.vue
@@ -3,7 +3,7 @@
 	import { showToast } from 'vant';
 	import { ref, watch } from 'vue';
 	import { getAction, postAction, uploadAction } from '../../common/http';
-import { formatDate } from '../../utils/date';
+	import { formatDate } from '../../utils/date';
 	// 定义 props
 	defineProps<{
 		item ?: string;
@@ -16,26 +16,68 @@ import { formatDate } from '../../utils/date';
 	const specialPro = ref([] as any[])
 	const list = ref([] as any[])
 	const special = ref('' as any)
-	const content = ref([] as any[])
-	const form = ref({czrq:formatDate(new Date())} as any)
+	const getLog = ref([] as any[])
+	const form = ref({ czrq: formatDate(new Date()), yjxybrq: formatDate(new Date()) } as any)
 
 	onLoad(async (option : any) => {
 		if (option) {
 			try {
 				itemList.value = JSON.parse(option.item)
-				if (itemList.value.sd === '门店') {
-					processes.value = {}
+				if (itemList.value.sd === '门店' && !itemList.value.processes) {
+					let res : any = await getAction('/flowBind')
+					if (res.code === 200) {
+						let item = res.data.find((l : any) => l.craftName === itemList.value.craft)
+						let item2 = item.flows.find((l : any) => l.bind === "仅现货")
+						if (item2) {
+							let url = '/craftFlows/byName?name=' + item2.name
+							let res1 : any = await getAction(url)
+							if (res1.code === 200) {
+								processes.value = res1.data
+							} else {
+								showToast('暂无此工艺！')
+							}
+						} else {
+							showToast('暂无此工艺！')
+						}
+					}
 				} else {
 					processes.value = JSON.parse(itemList.value.processes)
 				}
-				console.log(itemList.value);
 				indexData.value = processes.value.processes.findIndex((l : any) => l.name == itemList.value.zt)
-				let name=processes.value.processes.find((l:any)=>l.name!=itemList.value.zt&&(l.necessary))
-				postAction('/process/getNext',[itemList.value.zt,name.name]).then((res:any)=>{
-					if(res.code===200){
-						specialPro.value=res.data
+				let nameZt = ''
+				if (indexData.value > 0 && !processes.value.processes[indexData.value].id) {
+					nameZt = processes.value.processes[indexData.value - 1].name
+				} else if (indexData.value == 0 && !processes.value.processes[indexData.value].id) {
+					nameZt = '待进厂'
+				} else {
+					nameZt = itemList.value.zt
+				}
+				let name = processes.value.processes.find((l : any) => l.name != nameZt && (l.necessary))
+				postAction('/process/getNext', [nameZt, name ? name.name : '0x7c00']).then((res : any) => {
+					if (res.code === 200) {
+						specialPro.value = res.data
 					}
 				})
+				getAction('/tracking/getLog?id=' + itemList.value.subId).then((res : any) => {
+					if (res.code === 200) {
+						let index=false
+						processes.value.processes.forEach((m : any) => {
+							if (!m.id||!index) {
+								let a = res.data.find((l : any) => l.details.zt == m.name)
+								if (a) {
+									m.rq = a.details.form.czrq
+								}
+							} else {
+								index=true
+								let a = res.data.find((l : any) => l.details.zt == m.name && l.trackingLogId == itemList.value.id)
+								if (a) {
+									m.rq = a.details.form.czrq
+								}
+							}
+						})
+					}
+				})
+				console.log(processes.value);
 			} catch (error) {
 				console.error('Failed to parse item JSON:', error);
 				// 可以选择在这里显示错误消息给用户
@@ -43,27 +85,15 @@ import { formatDate } from '../../utils/date';
 		}
 	})
 
-	watch(status, () => {
-		if (status.value === '出厂') {
-		postAction('/craftComment/getByIds', itemList.value.craftCmt.value).then((res : any) => {
-			if (res.code === 200) {
-				res.data.forEach((l : any) => {
-					content.value = content.value.concat(l.content)
-				})
-			}
-		})
-		}
-	})
-
 	const onClickLeft = () => {
 		history.back()
 	}
-	
+
 	//选择框事件
 	const show = ref(false)
 	const dataType = ref()
-	const chooseDate = (val:any) => {
-		dataType.value=val
+	const chooseDate = (val : any) => {
+		dataType.value = val
 		show.value = true
 	}
 	//日期选择
@@ -71,18 +101,32 @@ import { formatDate } from '../../utils/date';
 		form.value[dataType.value] = formatDate(val)
 		show.value = false
 	}
-	
+
 	const showPicker = ref(false)
 	const popuList = ref([] as any[])
 	const indexType = ref()
 	//选择框事件
-	const choosePic = (index:any) => {
-		indexType.value=index
+	const choosePic = (index : any) => {
+		indexType.value = index
 		showPicker.value = true
 	}
 	//选择框确认
 	const pickerConfirm = (val : any) => {
-		list.value[indexType.value].value = val.selectedValues[0]
+		if (indexType.value === 'craftFlow') {
+			let url = '/craftFlows/byName?name=' + val.selectedValues[0]
+			getAction(url).then((res : any) => {
+				if (res.code === 200) {
+					craftFlowLc.value = JSON.stringify(res.data)
+					craftFlowLc.value.unshift({ name: special.value })
+					craftFlow.value = val.selectedValues[0]
+				} else {
+					showToast('请重新选择工艺流程！')
+					craftFlow.value = ''
+				}
+			})
+		} else {
+			list.value[indexType.value].value = val.selectedValues[0]
+		}
 		showPickerCancel()
 	}
 	//取消
@@ -91,10 +135,31 @@ import { formatDate } from '../../utils/date';
 	}
 	//弹窗开启事件
 	const handleOpen = () => {
-		popuList.value = list.value[indexType.value].chooses.map((l:any)=>({text:l.value,value:l.value}))
+		if (indexType.value === 'craftFlow') {
+			popuList.value = flowList.value
+			let item = {} as any
+			flowList.value.forEach((l : any) => {
+				if (l.craftName === itemList.value.craft) {
+					item = l;
+				}
+			})
+			popuList.value = []
+			if (item.flows) {
+				item.flows.forEach((l : any) => {
+					if (itemList.value.sd === '门店' && l.bind === '仅现货') {
+						popuList.value.push({ value: l.name, text: l.name })
+					} else if (l.bind === '通用') {
+						popuList.value.push({ value: l.name, text: l.name })
+					}
+				})
+			}
+		} else {
+			popuList.value = list.value[indexType.value].chooses.map((l : any) => ({ text: l.value, value: l.value }))
+		}
 	}
 
 	const chooseStatus = (item : any, index : any) => {
+		if (indexData.value >= index) return
 		try {
 			special.value = ''
 			processes.value.processes.forEach((l : any, j : any) => {
@@ -106,9 +171,9 @@ import { formatDate } from '../../utils/date';
 					status.value = item.name
 				}
 			})
-			getAction('/process/byName?name='+status.value).then((res:any)=>{
-				if(res.code===200){
-					list.value=res.data.evidence
+			getAction('/process/byName?name=' + status.value).then((res : any) => {
+				if (res.code === 200) {
+					list.value = res.data.evidence
 				}
 			})
 		} catch (err) {
@@ -118,47 +183,115 @@ import { formatDate } from '../../utils/date';
 	const showDialog = ref(false)
 	const contentType = ref([])
 	const bhList = ref([] as any[])
+	const czyy = ref()
+	const mls1 = ref([] as any[])
+	const mls2 = ref([] as any[])
+	const specialItem = ref()
+	const craftFlow = ref()
+	const craftFlowLc = ref()
+	const flowList = ref([] as any[])
 	//选择特殊工艺
-	const chooseSpecial = (item:any) =>{
+	const chooseSpecial = (item : any) => {
 		special.value = item.name
-		status.value=''
-		let a=specialPro.value.find((l:any)=>l.name===item.name)
-		list.value=a.evidence
-		showDialog.value=true
+		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) {
+				flowList.value = res.data
+			}
+		})
 	}
-	
-	const addBh = (item:any) =>{
-		let index=bhList.value.findIndex((l:any)=>l===item.bh)
-		if(index>=0){
-			bhList.value.splice(index,1)
-		}else{
-			bhList.value.push(item.bh)
+
+	const addBh = (item : any, itemz : any) => {
+		let index = bhList.value.findIndex((l : any) => l.bh === item.bh && l.ms === item.ms)
+		if (index >= 0) {
+			bhList.value.splice(index, 1)
+		} else {
+			bhList.value.push({ ...item, mz: itemz.mz, sh: itemz.sh })
 		}
 	}
-	const confirmSecond = () =>{
-		
+	const confirmSecond = () => {
+		mls1.value = []
+		mls2.value = []
+		itemList.value.mls.forEach((l : any) => {
+			l.xxs.forEach((j : any) => {
+				let item = bhList.value.find((m : any) => m.mz == l.mz && m.sh == l.sh && m.bh == j.bh && m.ms == j.ms)
+				if (item) {
+					let item1 = mls2.value.find((k : any) => k.mz == item.mz && k.sh == item.sh)
+					if (item1) {
+						item1.xxs.push({ bh: item.bh, index: item.index, ms: item.ms })
+					} else {
+						mls2.value.push({ mz: item.mz, sh: item.sh, xxs: [{ bh: item.bh, index: item.index, ms: item.ms }] })
+					}
+				} else {
+					let item1 = mls1.value.find((k : any) => k.mz == l.mz && k.sh == l.sh)
+					if (item1) {
+						item1.xxs.push({ bh: j.bh, index: j.index, ms: j.ms })
+					} else {
+						mls1.value.push({ mz: l.mz, sh: l.sh, xxs: [{ bh: j.bh, index: j.index, ms: j.ms }] })
+					}
+				}
+			})
+		})
+		if (indexData.value == -1) {
+			if (!processes.value.processes[0].id) {
+				processes.value.processes[0] = { name: special.value, }
+			} else {
+				processes.value.processes.unshift({ name: special.value, })
+			}
+		} else {
+			if (!processes.value.processes[indexData.value + 1].id) {
+				processes.value.processes[indexData.value + 1] = { name: special.value, }
+			} else {
+				processes.value.processes.splice(indexData.value + 1, 0, { name: special.value, })
+			}
+		}
+		showDialog.value = false
 	}
-	
+
 	//提交
-	const onSubmit = () =>{
-		console.log(list.value);
-		if(!status.value&&!special.value) return showToast('请选择工序！')
-		let data={
-			trackingLogId:itemList.value.id,
-			details:{
-				zt:status.value,
-				list:list.value,
-				form:form.value,
-			},
+	const onSubmit = () => {
+		if (!status.value && !special.value) return showToast('请选择工序！')
+		let data = {}
+		if (special.value) {
+			if (mls2.value.length == 0) return showToast(specialItem.value.nextStep + '未选择面料！')
+			data = {
+				trackingLogId: itemList.value.id,
+				subId: itemList.value.subId,
+				details: {
+					zt: special.value,
+					list: list.value,
+					form: form.value,
+					type: specialItem.value.nextStep,
+					mls1: mls1.value.length == 0 ? [] : mls1.value,
+					mls2: mls1.value.length == 0 ? [] : mls2.value,
+					craftFlow: craftFlow.value ? craftFlow.value : null,
+					processes: specialItem.value.nextStep == 'ChangeCraft' ? craftFlowLc.value : processes.value,
+					czyy: czyy.value,
+				},
+			}
+		} else if (status.value) {
+			data = {
+				subId: itemList.value.subId,
+				trackingLogId: itemList.value.id,
+				details: {
+					zt: indexData.value + 2 === processes.value.processes.length ? '待出厂' : status.value,
+					list: list.value,
+					form: form.value,
+				},
+			}
 		}
-		postAction('/tracking',data).then((res:any)=>{
-			if(res.code===200){
+		postAction('/tracking', data).then((res : any) => {
+			if (res.code === 200) {
 				showToast('提交成功！')
 				window.history.back()
 			}
 		})
 	}
-	
+
 	const fileList = ref([] as any[])
 	const afterRead = (file : any) => {
 		file.status = 'uploading';
@@ -167,7 +300,7 @@ import { formatDate } from '../../utils/date';
 			if (res.code === 200) {
 				file.status = 'success';
 				file.message = '成功！';
-				list.value[indexType.value].pic=res.data
+				list.value[indexType.value].pic = res.data
 			}
 		})
 	};
@@ -181,18 +314,18 @@ import { formatDate } from '../../utils/date';
 				<van-field v-model="itemList.craft" name="工艺名称" label="工艺名称" colon label-width="5em" readonly />
 				<van-field v-model="itemList.craftCmt.name" name="工艺要求" label="工艺要求" colon label-width="5em" readonly />
 				<van-field v-model="itemList.innerComment" name="内部备注" label="内部备注" colon label-width="5em" readonly />
-				<van-field name="工艺流程" label="工艺流程" colon label-width="5em" readonly/>
+				<van-field name="工艺流程" label="工艺流程" colon label-width="5em" readonly />
 				<view class="grid-container">
 					<view class="grid-item" v-for="(item,index) in processes.processes" :key="index">
-						<view :class="(indexData>=index)||(status==item.name)?'btn1':'btn'"
+						<view :class="(indexData>=index)||(status==item.name)?item.id?'btn1':'btn2':'btn'"
 							@click="chooseStatus(item,index)">{{item.name}}</view>
+						<p>{{item.rq}}</p>
 					</view>
 				</view>
-				<van-field name="特殊工序" label="特殊工序" colon label-width="5em" readonly/>
+				<van-field name="特殊工序" label="特殊工序" colon label-width="5em" readonly />
 				<view class="grid-container">
 					<view class="grid-item" v-for="(item,index) in specialPro" :key="index">
-						<view :class="special==item.name?'btn1':'btn'"
-							@click="chooseSpecial(item)">{{item.name}}</view>
+						<view :class="special==item.name?'btn1':'btn'" @click="chooseSpecial(item)">{{item.name}}</view>
 					</view>
 				</view>
 			</van-cell-group>
@@ -200,26 +333,30 @@ import { formatDate } from '../../utils/date';
 				<van-cell-group inset>
 					<view v-for="(item,index) in list" :key="index">
 						<template v-if="item.type==='Select'">
-							<van-field v-model="item.value" :name="item.name" :label="item.name" colon class="bor" label-width="5em"
-								readonly :rules="item.necessary?[{ required: true, message: '请选择' }]:[]" @click="choosePic(index)"/>
+							<van-field v-model="item.value" :name="item.name" :label="item.name" colon class="bor"
+								label-width="5em" readonly
+								:rules="item.necessary?[{ required: true, message: '请选择' }]:[]"
+								@click="choosePic(index)" />
 						</template>
 						<template v-if="item.type==='Input'">
-							<van-field v-model="item.value" v-if="item.contentType.find(l=>l=='Text')" :name="item.name" :label="item.name" colon class="bor-n" label-width="5em"
-								 :rules="item.necessary?[{ required: true, message: '请填写' }]:[]" />
-							 <van-field name="uploader"  v-if="item.contentType.find(l=>l=='File')" :label="item.name" label-width="5em" colon
-							 :rules="item.necessary?[{ required: true, message: '请上传' }]:[]">
+							<van-field v-model="item.value" v-if="item.contentType.find(l=>l=='Text')" :name="item.name"
+								:label="item.name" colon class="bor-n" label-width="5em"
+								:rules="item.necessary?[{ required: true, message: '请填写' }]:[]" />
+							<van-field name="uploader" v-if="item.contentType.find(l=>l=='File')" :label="item.name"
+								label-width="5em" colon :rules="item.necessary?[{ required: true, message: '请上传' }]:[]">
 								<template #input>
-									<van-uploader v-model="fileList" multiple :max-count="1" :after-read="afterRead" @click="indexType=index"/>
+									<van-uploader v-model="fileList" multiple :max-count="1" :after-read="afterRead"
+										@click="indexType=index" />
 								</template>
-							 </van-field>
+							</van-field>
 						</template>
 					</view>
 					<van-field v-model="form.czrq" name="操作日期" label="操作日期" colon label-width="5em"
 						:rules="[{ required: true, message: '请填写' }]" readonly class="bor"
 						@click="chooseDate('czrq')" />
-						<van-field v-model="form.yjxybrq" name="预计下一步日期" label="预计下一步日期" colon label-width="8em"
-							:rules="[{ required: true, message: '请填写' }]" readonly class="bor"
-							@click="chooseDate('yjxybrq')" />
+					<van-field v-model="form.yjxybrq" name="预计下一步日期" label="预计下一步日期" colon label-width="8em"
+						:rules="[{ required: true, message: '请填写' }]" readonly class="bor"
+						@click="chooseDate('yjxybrq')" />
 				</van-cell-group>
 				<view style="margin: 32rpx;">
 					<van-button round block type="primary" native-type="submit">
@@ -229,44 +366,53 @@ import { formatDate } from '../../utils/date';
 			</van-form>
 		</view>
 	</view>
-	
-	<van-dialog v-model:show="showDialog">
-		<view style="padding: 10rpx 15rpx;">
-			<van-field name="请选择面料" label="请选择面料" label-width="6em">
-				<template #input>
-					<van-checkbox-group v-model="contentType" direction="horizontal">
-						<van-checkbox name="All">全部</van-checkbox>
-					</van-checkbox-group>
-				</template>
-			</van-field>
-			<p style="color: #7f7f7f;">如果无法辨认，请选择米数相近的面料</p>
-			<view class="grid-container1">
-				<view class="grid-item" v-for="(item,index) in itemList.mls" :key="index">
-					<view v-for="(itemSecond,indexSecond) in item.xxs" :key="indexSecond">
-						<view :class="contentType[0]||bhList.find(l=>l===itemSecond.bh)?'btn1':'btn'" @click="addBh(itemSecond)">{{item.mz}}<br>{{itemSecond.ms}}米/{{itemSecond.bh}}</view>
+
+	<van-dialog v-model:show="showDialog" :showConfirmButton="false" width="90vw">
+		<van-form @submit="confirmSecond">
+			<van-cell-group inset>
+				<view style="padding: 10rpx 15rpx;">
+					<van-field name="请选择面料" label="请选择面料" label-width="6em">
+						<template #input>
+							<van-checkbox-group v-model="contentType" direction="horizontal">
+								<van-checkbox name="All">全部</van-checkbox>
+							</van-checkbox-group>
+						</template>
+					</van-field>
+					<p style="color: #7f7f7f;">如果无法辨认，请选择米数相近的面料</p>
+					<view class="grid-container1">
+						<view v-for="(item,index) in itemList.mls" :key="index">
+							<view class="grid-item" v-for="(itemSecond,indexSecond) in item.xxs" :key="indexSecond">
+								<view
+									:class="contentType[0]||bhList.find(l=>(l.bh===itemSecond.bh&&l.ms==itemSecond.ms))?'btn1':'btn'"
+									@click="addBh(itemSecond,item)">{{item.mz}}<br>{{itemSecond.ms}}米/{{itemSecond.bh}}
+								</view>
+							</view>
+						</view>
 					</view>
+					<van-field v-if="specialItem.nextStep=='ChangeCraft'" v-model="craftFlow" name="工艺流程" colon
+						label="工艺流程"
+						:rules="specialItem.nextStep=='ChangeCraft'?[{ required: true, message: '请填写' }]:[]"
+						label-width="5em" readonly class="bor" @click="choosePic('craftFlow')" />
+					<van-field v-model="czyy" name="操作原因" colon label="操作原因" label-width="5em" class="bor-n" />
 				</view>
-			</view>
-		</view>
-		<template #footer>
-			<view class="footer-button">
-				<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
-					取消
-				</van-button>
-				<van-button size="small" type="success" native-type="submit" style="width: 25vw;"
-					@click="confirmSecond">
-					确认
-				</van-button>
-			</view>
-		</template>
+				<view class="footer-button">
+					<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
+						取消
+					</van-button>
+					<van-button size="small" type="success" native-type="submit" style="width: 25vw;">
+						确认
+					</van-button>
+				</view>
+			</van-cell-group>
+		</van-form>
 	</van-dialog>
-	
+
 	<!--选择框-->
 	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
 		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
 			ref="pickerRef" />
 	</van-popup>
-	
+
 	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2025, 0, 1)" />
 </template>
 
@@ -292,7 +438,7 @@ import { formatDate } from '../../utils/date';
 				flex-direction: column;
 				text-align: center;
 				align-items: center;
-				justify-content: center;
+				margin-top: 10rpx;
 
 				.btn {
 					border: 1rpx solid #d7d7d7;
@@ -300,6 +446,14 @@ import { formatDate } from '../../utils/date';
 					border-radius: 10rpx;
 				}
 
+				.btn2 {
+					border: 1rpx solid red;
+					padding: 10rpx 30rpx;
+					border-radius: 10rpx;
+					background-color: red;
+					color: #fff;
+				}
+
 				.btn1 {
 					border: 1rpx solid #169bd5;
 					padding: 10rpx 30rpx;
@@ -309,32 +463,33 @@ import { formatDate } from '../../utils/date';
 				}
 			}
 		}
-		
+
 		.content {
 			flex: 1;
 			overflow-y: scroll;
 			font-size: 16px;
 		}
 	}
-	
+
 	.grid-container1 {
 		display: grid;
 		grid-template-columns: 1fr 1fr;
 		padding: 10rpx 15rpx;
-	
+
 		.grid-item {
 			display: flex;
 			flex-direction: column;
 			text-align: center;
 			align-items: center;
 			justify-content: center;
-	
+			margin-top: 10rpx;
+
 			.btn {
 				border: 1rpx solid #d7d7d7;
 				padding: 10rpx 30rpx;
 				border-radius: 10rpx;
 			}
-	
+
 			.btn1 {
 				border: 1rpx solid #169bd5;
 				padding: 10rpx 30rpx;
@@ -344,14 +499,15 @@ import { formatDate } from '../../utils/date';
 			}
 		}
 	}
-	
+
 	.bor {
 		::v-deep .van-field__control {
 			border: 1px solid #d7d7d7;
 			text-align: center;
 		}
 	}
-	.bor-n{
+
+	.bor-n {
 		::v-deep .van-field__control {
 			border-bottom: 1px solid #d7d7d7;
 			text-align: center;
@@ -369,6 +525,7 @@ import { formatDate } from '../../utils/date';
 	::v-deep .van-field__control {
 		font-size: 16px;
 	}
+
 	.footer-button {
 		margin: 20px;
 		display: flex;
diff --git a/pages/documentary/documentary.vue b/pages/documentary/documentary.vue
index 75cc676..3eaeb6b 100644
--- a/pages/documentary/documentary.vue
+++ b/pages/documentary/documentary.vue
@@ -279,9 +279,15 @@
 	}
 	//工序详情
 	const toDetile = (item:any) =>{
-		uni.navigateTo({
-			url:'./detail?item='+JSON.stringify(item)
-		})
+		if(item.zt==='待出厂'){
+			uni.navigateTo({
+				url:'./ex-factory?item='+JSON.stringify(item)
+			})
+		}else{
+			uni.navigateTo({
+				url:'./detail?item='+JSON.stringify(item)
+			})
+		}
 	}
 </script>
 
diff --git a/pages/documentary/ex-factory.vue b/pages/documentary/ex-factory.vue
new file mode 100644
index 0000000..4da982b
--- /dev/null
+++ b/pages/documentary/ex-factory.vue
@@ -0,0 +1,299 @@
+<script setup lang="ts">
+	import { onLoad } from '@dcloudio/uni-app';
+	import { showToast } from 'vant';
+	import { ref } from 'vue';
+	import { getAction, uploadAction } from '../../common/http';
+	import { formatDate } from '../../utils/date';
+	// 定义 props
+	defineProps<{
+		item ?: string;
+	}>();
+
+	const itemList = ref()
+	const processes = ref({} as any)
+	const list = ref([] as any[])
+	const form = ref({ czrq: formatDate(new Date()), yjxybrq: formatDate(new Date()) } as any)
+
+	onLoad(async (option : any) => {
+		if (option) {
+			try {
+				itemList.value = JSON.parse(option.item)
+				if (itemList.value.sd === '门店' && !itemList.value.processes) {
+					let res : any = await getAction('/flowBind')
+					if (res.code === 200) {
+						let item = res.data.find((l : any) => l.craftName === itemList.value.craft)
+						let item2 = item.flows.find((l : any) => l.bind === "仅现货")
+						if (item2) {
+							let url = '/craftFlows/byName?name=' + item2.name
+							let res1 : any = await getAction(url)
+							if (res1.code === 200) {
+								processes.value = res1.data
+							} else {
+								showToast('暂无此工艺！')
+							}
+						} else {
+							showToast('暂无此工艺！')
+						}
+					}
+				} else {
+					processes.value = JSON.parse(itemList.value.processes)
+				}
+				getAction('/tracking/getLog?id='+itemList.value.subId).then((res:any)=>{
+					if(res.code===200){
+						let index=''
+						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
+								}
+							} else {
+								let a = res.data.find((l : any) => l.details.zt == m.name && l.trackingLogId == itemList.value.id)
+								if (a) {
+									m.rq = a.details.form.czrq
+								}
+							}
+						})
+						let b=res.data.find((l:any)=>l.trackingLogId==itemList.value.id&&l.details.zt==='待出厂')
+						processes.value.processes[processes.value.processes.length-1].rq=b.details.form.czrq
+					}
+				})
+				console.log(processes.value);
+			} catch (error) {
+				console.error('Failed to parse item JSON:', error);
+				// 可以选择在这里显示错误消息给用户
+			}
+		}
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+
+	//选择框事件
+	const show = ref(false)
+	const dataType = ref()
+	const chooseDate = (val : any) => {
+		dataType.value = val
+		show.value = true
+	}
+	//日期选择
+	const onConfirmDate = (val : any) => {
+		form.value[dataType.value] = formatDate(val)
+		show.value = false
+	}
+
+	const showPicker = ref(false)
+	const popuList = ref([] as any[])
+	const indexType = ref()
+	//选择框事件
+	const choosePic = (index : any) => {
+		indexType.value = index
+		showPicker.value = true
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		list.value[indexType.value].value = val.selectedValues[0]
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		popuList.value = list.value[indexType.value].chooses.map((l : any) => ({ text: l.value, value: l.value }))
+	}
+
+	//提交
+	const onSubmit = () => {
+
+	}
+
+	const fileList = ref([] as any[])
+	const afterRead = (file : any) => {
+		file.status = 'uploading';
+		file.message = '上传中...';
+		uploadAction('/upload', file.file).then((res : any) => {
+			if (res.code === 200) {
+				file.status = 'success';
+				file.message = '成功！';
+				list.value[indexType.value].pic = res.data
+			}
+		})
+	};
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="工序详情" left-text="返回" left-arrow @click-left="onClickLeft" />
+		<view class="content">
+			<van-cell-group inset>
+				<van-field v-model="itemList.craft" name="工艺名称" label="工艺名称" colon label-width="5em" readonly />
+				<van-field v-model="itemList.craftCmt.name" name="工艺要求" label="工艺要求" colon label-width="5em" readonly />
+				<van-field v-model="itemList.innerComment" name="内部备注" label="内部备注" colon label-width="5em" readonly />
+				<van-field name="工艺流程" label="工艺流程" colon label-width="5em" readonly />
+				<view class="grid-container">
+					<view class="grid-item" v-for="(item,index) in processes.processes" :key="index">
+						<view class="btn1">{{item.name}}</view>
+						<p>{{item.rq}}</p>
+					</view>
+				</view>
+			</van-cell-group>
+			<van-form @submit="onSubmit">
+				<van-cell-group inset>
+					<view v-for="(item,index) in list" :key="index">
+						<template v-if="item.type==='Select'">
+							<van-field v-model="item.value" :name="item.name" :label="item.name" colon class="bor"
+								label-width="5em" readonly
+								:rules="item.necessary?[{ required: true, message: '请选择' }]:[]"
+								@click="choosePic(index)" />
+						</template>
+						<template v-if="item.type==='Input'">
+							<van-field v-model="item.value" v-if="item.contentType.find(l=>l=='Text')" :name="item.name"
+								:label="item.name" colon class="bor-n" label-width="5em"
+								:rules="item.necessary?[{ required: true, message: '请填写' }]:[]" />
+							<van-field name="uploader" v-if="item.contentType.find(l=>l=='File')" :label="item.name"
+								label-width="5em" colon :rules="item.necessary?[{ required: true, message: '请上传' }]:[]">
+								<template #input>
+									<van-uploader v-model="fileList" multiple :max-count="1" :after-read="afterRead"
+										@click="indexType=index" />
+								</template>
+							</van-field>
+						</template>
+					</view>
+					<van-field v-model="form.czrq" name="操作日期" label="操作日期" colon label-width="5em"
+						:rules="[{ required: true, message: '请填写' }]" readonly class="bor"
+						@click="chooseDate('czrq')" />
+					<van-field v-model="form.yjxybrq" name="预计下一步日期" label="预计下一步日期" colon label-width="8em"
+						:rules="[{ required: true, message: '请填写' }]" readonly class="bor"
+						@click="chooseDate('yjxybrq')" />
+				</van-cell-group>
+				<view style="margin: 32rpx;">
+					<van-button round block type="primary" native-type="submit">
+						出厂
+					</van-button>
+				</view>
+			</van-form>
+		</view>
+	</view>
+
+
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2025, 0, 1)" />
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+		overflow-y: hidden;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.grid-container {
+			display: grid;
+			align-items: top;
+			grid-template-columns: 1fr 1fr 1fr;
+			padding: 10rpx 15rpx;
+
+			.grid-item {
+				display: flex;
+				flex-direction: column;
+				text-align: center;
+				align-items: center;
+				margin-top: 10rpx;
+
+				.btn {
+					border: 1rpx solid #d7d7d7;
+					padding: 10rpx 30rpx;
+					border-radius: 10rpx;
+				}
+
+				.btn1 {
+					border: 1rpx solid #169bd5;
+					padding: 10rpx 30rpx;
+					border-radius: 10rpx;
+					background-color: #169bd5;
+					color: #fff;
+				}
+			}
+		}
+
+		.content {
+			flex: 1;
+			overflow-y: scroll;
+			font-size: 16px;
+		}
+	}
+
+	.grid-container1 {
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		padding: 10rpx 15rpx;
+
+		.grid-item {
+			display: flex;
+			flex-direction: column;
+			text-align: center;
+			align-items: center;
+			justify-content: center;
+			margin-top: 10rpx;
+
+			.btn {
+				border: 1rpx solid #d7d7d7;
+				padding: 10rpx 30rpx;
+				border-radius: 10rpx;
+			}
+
+			.btn1 {
+				border: 1rpx solid #169bd5;
+				padding: 10rpx 30rpx;
+				border-radius: 10rpx;
+				background-color: #169bd5;
+				color: #fff;
+			}
+		}
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+			text-align: center;
+		}
+	}
+
+	.bor-n {
+		::v-deep .van-field__control {
+			border-bottom: 1px solid #d7d7d7;
+			text-align: center;
+		}
+	}
+
+	::v-deep .van-cell {
+		padding: 5px !important;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	::v-deep .van-field__control {
+		font-size: 16px;
+	}
+
+	.footer-button {
+		margin: 20px;
+		display: flex;
+		justify-content: space-around;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/maintenance/p-details.vue b/pages/maintenance/p-details.vue
index 15cd7e2..1af2e5c 100644
--- a/pages/maintenance/p-details.vue
+++ b/pages/maintenance/p-details.vue
@@ -110,20 +110,20 @@
 											@click.stop="item.chooses.splice(index,1)" v-else />
 									</template>
 								</van-field>
-								<van-field name="是否必填" label="是否必填" colon label-width="6em">
-									<template #input>
-										<van-radio-group v-model="item.necessary" direction="horizontal">
-											<van-radio :name="true">是</van-radio>
-											<van-radio :name="false">否</van-radio>
-										</van-radio-group>
-									</template>
-								</van-field>
 							</view>
+							<van-field name="是否必填" label="是否必填" colon label-width="6em">
+								<template #input>
+									<van-radio-group v-model="item.necessary" direction="horizontal">
+										<van-radio :name="true">是</van-radio>
+										<van-radio :name="false">否</van-radio>
+									</van-radio-group>
+								</template>
+							</van-field>
 						</template>
 					</view>
 					<!-- 特殊 -->
 					<view v-if="form.type=='Special'">
-						<van-field name="后续操作" label="后续操作" colon label-width="6em">
+						<van-field name="后续操作" label="后续操作" colon label-width="6em" :rules="[{ required: true, message: '请选择' }]">
 							<template #input>
 								<van-radio-group v-model="form.nextStep" direction="horizontal">
 									<van-radio name="NeedFix">出厂质检</van-radio>