优化

snowy-admin-web/src/views/biz/bizorder/flow.vue

@@ -1,5 +1,5 @@
 <template>
-	<xn-form-container title="流水" :width="1200" :visible="visible" :destroy-on-close="true" @close="onClose">
+	<xn-form-container title="流水" :width="1300" :visible="visible" :destroy-on-close="true" @close="onClose">
 		<s-table
 			ref="tableRef"
 			:columns="columns"
@@ -81,19 +81,29 @@
 						<p style="margin-bottom: 0">编号：{{ record.orderNumber }}</p>
 					</div>
 				</template>
+
+				<template v-if="column.dataIndex === 'action'">
+					<a-space>
+						<a @click="detailRef.onOpen(record)">详情</a>
+					</a-space>
+				</template>
 			</template>
 		</s-table>
 	</xn-form-container>
+
+	<Detail ref="detailRef" />
 </template>
 
 <script setup name="recordDoubleForm">
 	import { cloneDeep } from 'lodash-es'
 	import bizRecordApi from "@/api/biz/bizRecordApi";
+	import Detail from "@/views/biz/record/detail.vue";
 	// 默认是关闭状态
 	const visible = ref(false)
 	const formData = ref({})
 	const table = ref()
 	const resultJson = ref()
+	const detailRef = ref()
 
 	const labelStyle = {
 		width: '20%'
@@ -148,6 +158,14 @@
 		}
 	]
 
+	// 操作栏通过权限判断是否显示
+	columns.push({
+		title: '操作',
+		dataIndex: 'action',
+		align: 'center',
+		width: 150
+	})
+
 	const orderId = ref()
 	// 打开抽屉
 	const onOpen = (record) => {

snowy-admin-web/src/views/biz/record/detail.vue

@@ -76,20 +76,20 @@
 		<a-space>
 			<a-image :width="200" :src="formData.driverSign" />
 		</a-space>
-		<a-divider></a-divider>
-		<a-descriptions title="司机回签" style="margin-top: 15px">
+		<a-divider v-if="formData.orderType == '1'"></a-divider>
+		<a-descriptions title="司机回签" style="margin-top: 15px" v-if="formData.orderType == '1'">
 			<a-descriptions-item label="卸货重量"><a-tag color="green">{{ formData.unloadWeight }} 吨</a-tag></a-descriptions-item>
 		</a-descriptions>
-		<a-space>
+		<a-space v-if="formData.orderType == '1'">
 			<div v-for="(item,index) in fileList " :key="item.value">
 				<a-image :width="200" :src="item.url" />
 			</div>
 
 		</a-space>
-		<a-divider></a-divider>
-		<a-descriptions title="签收审核" style="margin-top: 15px">
+		<a-divider v-if="formData.orderType == '1'"></a-divider>
+		<a-descriptions title="签收审核" style="margin-top: 15px" v-if="formData.orderType == '1'">
 		</a-descriptions>
-		<a-space>
+		<a-space v-if="formData.orderType == '1'">
 			<a-image :width="200" :src="formData.auditSign" />
 		</a-space>
 		<template #footer>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/entity/BizRecord.java

@@ -220,4 +220,8 @@ public class BizRecord extends CommonEntity {
     private String unloadName;
 
     private String auditSign;
+
+    @TableField(exist = false)
+    /**订单类型*/
+    private String orderType;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/mapper/mapping/BizRecordMapper.xml

@@ -320,6 +320,7 @@
             br.audit_sign,
             bo.order_name,
             bo.order_number,
+            bo.order_type,
             bc.name customerName,
             bar.status
         from biz_record br