ERP_override.git

			@@ -21,6 +21,7 @@
			import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue"
			import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue"
			import PrintSheet5 from "@/components/sd/order/PrintSheet5.vue"
			import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";
			const { t } = useI18n()
			const orderInfo = useOrderInfoStore()
			const userStore = useUserInfoStore()
			@@ -459,12 +460,18 @@
			pageNum.value=1
			orderList.value = deepClone(res.data.data)
			xGrid.value.loadData(orderList.value)
			gridOptions.loading=false

			orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
			orderInfo.searchOrderFilter.data = filterData.value
			}else{
			ElMessage.warning(res.msg)
			}
			}).catch(e => {
			xGrid.value.clearFilter()
			orderInfo.searchOrderFilter.data = {}
			ElMessage.error(t('searchOrder.msgList.filterError'))
			}).finally(()=>{
			gridOptions.loading=false
			})
			}

			@@ -737,13 +744,15 @@
			<el-tab-pane :label="$t('order.details')" name="1" >
			<order-detail
			v-if="tabsValue==='1'"
			:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
			:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
			:row="rowClickIndex===null?{}:rowClickIndex"
			/>
			</el-tab-pane>
			<el-tab-pane :label="$t('order.workmanship')" name="2">
			<order-craft-detail
			v-if="tabsValue==='2'"
			:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
			:row="rowClickIndex===null?{}:rowClickIndex"
			/>
			</el-tab-pane>
			<el-tab-pane :label="$t('order.processCard')" name="3">
			@@ -753,6 +762,13 @@
			:row="rowClickIndex===null?{}:rowClickIndex"
			/>
			</el-tab-pane>
			<el-tab-pane :label="$t('order.processCardCollect')" name="4">
			<order-process-collect
			v-if="tabsValue==='4'"
			:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
			:row="rowClickIndex===null?{}:rowClickIndex"
			/>
			</el-tab-pane>
			</el-tabs>

			</div>