diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 21a15cb..76af0b4 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -4,6 +4,8 @@
 import { listPageApi } from '@/api/device/standingBook'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,7 +19,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -39,7 +41,7 @@
     value: 'managerStateName',
     align: 'center',
 
-  }]
+  }])
 // 获取数据列表
 const fetchData = () => {
   select.value = -1

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 21a15cb..76af0b4 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -4,6 +4,8 @@
 import { listPageApi } from '@/api/device/standingBook'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,7 +19,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -39,7 +41,7 @@
     value: 'managerStateName',
     align: 'center',
 
-  }]
+  }])
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index fdf958e..cf0dab9 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -26,7 +28,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '科室编号',
     value: 'organizeNo',
@@ -126,7 +128,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 21a15cb..76af0b4 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -4,6 +4,8 @@
 import { listPageApi } from '@/api/device/standingBook'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,7 +19,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -39,7 +41,7 @@
     value: 'managerStateName',
     align: 'center',
 
-  }]
+  }])
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index fdf958e..cf0dab9 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -26,7 +28,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '科室编号',
     value: 'organizeNo',
@@ -126,7 +128,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index 5d062f7..c01e00a 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -23,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '姓名',
     value: 'name',
@@ -124,7 +126,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 21a15cb..76af0b4 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -4,6 +4,8 @@
 import { listPageApi } from '@/api/device/standingBook'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,7 +19,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -39,7 +41,7 @@
     value: 'managerStateName',
     align: 'center',
 
-  }]
+  }])
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index fdf958e..cf0dab9 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -26,7 +28,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '科室编号',
     value: 'organizeNo',
@@ -126,7 +128,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index 5d062f7..c01e00a 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -23,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '姓名',
     value: 'name',
@@ -124,7 +126,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 57fd7a8..39d8683 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -354,8 +354,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="筹建日期开始日期"
-          end-placeholder="筹建日期结束日期"
+          start-placeholder="筹建开始日期"
+          end-placeholder="筹建结束日期"
         />
       </search-item>
     </search-area>

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 21a15cb..76af0b4 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -4,6 +4,8 @@
 import { listPageApi } from '@/api/device/standingBook'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,7 +19,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -39,7 +41,7 @@
     value: 'managerStateName',
     align: 'center',
 
-  }]
+  }])
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index fdf958e..cf0dab9 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -26,7 +28,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '科室编号',
     value: 'organizeNo',
@@ -126,7 +128,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index 5d062f7..c01e00a 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -23,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '姓名',
     value: 'name',
@@ -124,7 +126,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 57fd7a8..39d8683 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -354,8 +354,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="筹建日期开始日期"
-          end-placeholder="筹建日期结束日期"
+          start-placeholder="筹建开始日期"
+          end-placeholder="筹建结束日期"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index c9f6db1..3f55a30 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -122,6 +122,7 @@
 }
 // 申请formInline类型
 export interface IformInline {
+  processId?: string // 流程实例ID
   applyNo: string // 申请编号
   applyName: string // 申请名称
   applyTime: string // 申请时间
@@ -233,4 +234,5 @@
   standardNo: string // 标准编号
   standardOwner: string // 标准负责人
   taskId: string // 任务id
+  minioFileName: any // 附件名称数组
 }

diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index b10cf2c..2060cbe 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -69,3 +69,11 @@
   })
 }
 
+// 选择样品列表
+export function getOrderSampleList(data: { customerId: string; customerNo: string; orderId: string }) {
+  return request({
+    url: '/customer/sample/listPageByOrder',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 0a08114..2479614 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,13 +196,14 @@
       @select="selectClick"
       @row-click="rowClick"
     >
+      <slot name="preColumns" />
+
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 3e19b31..68ced75 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -23,6 +23,7 @@
 const dataForm: Ref<IOrderDetail> = ref({
   id: '',
   orderCode: '', // 委托书编号
+  orderId: '', // 委托书编号
   deliverer: '', // 送检人
   delivererTel: '', // 送样人联系方式
   orderTime: '', // 委托日期
@@ -93,7 +94,7 @@
   }
   if ($route.params.status) {
     isReceived.value = $route.params.status === '2'
-    console.log('样品砖淘', isReceived.value)
+    console.log('样品状态', isReceived.value)
   }
 }
 
@@ -181,6 +182,8 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    console.log(val)
+
     // 切换委托方时把不是手填的样品删了
     list.value.filter(item => !item.sampleNo)
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
@@ -669,7 +672,7 @@
     <!-- 选择委托方组件 -->
     <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index fd9a10b..d7033d8 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -35,6 +35,7 @@
 export interface IOrderDetail {
   id?: string
   orderCode: string // 委托书编号
+  orderId?: string // 委托书id
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
   orderTime: string // 委托日期
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index d1e2598..720a2e3 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -5,7 +5,7 @@
 import { ElMessage } from 'element-plus'
 import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/customer/sampleList'
+import { getOrderSampleList } from '@/api/business/schedule/order'
 
 const props = defineProps({
   visible: {
@@ -16,19 +16,29 @@
     type: String,
     default: '',
   },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 型号
+const listQuery = ref({
+  // sampleNo: '', // 样品编号
+  // sampleName: '', // 样品名称
+  // sampleModel: '', // 型号
+  orderId: props.orderId || '', // 委托书id
+  customerId: props.customerId || '', // 委托方id
   customerNo: props.customerNo || '', // 委托方代码
-  customerName: '', // 委托方名称
-  startTime: '', // 检定开始时间
-  endTime: '', // 检定结束时间
-  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  // customerName: '', // 委托方名称
+  // startTime: '', // 检定开始时间
+  // endTime: '', // 检定结束时间
+  // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
   limit: 20,
 })
@@ -62,7 +72,7 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerNo = props.customerNo
-  getSampleList(listQuery.value).then((response) => {
+  getOrderSampleList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -137,8 +147,8 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" @close="cancle">
-      <search-area
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <!-- <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
       >
@@ -156,7 +166,7 @@
             clearable
           />
         </search-item>
-      </search-area>
+      </search-area> -->
       <normal-table
         :data="list"
         :total="total"
@@ -168,7 +178,7 @@
         :height="260"
         :page-sizes="[20]"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       />
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 5b7e7c7..f9c88a4 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -271,7 +271,7 @@
           type: 'warning',
         },
       ).then(() => {
-        formInline.value.time = formInline.value.checkDate
+        formInline.value.time = formInline.value.checkDate as string
         if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 3e0498c..4d35520 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -16,7 +16,9 @@
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
@@ -431,6 +433,12 @@
   getInfo()
 }
 onMounted(async () => {
+  formInline.value.applyName = '设备检修申请' // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
@@ -475,27 +483,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
+            <el-form-item label="申请名称:">
               <el-input
                 v-model.trim="formInline.applyName"
                 :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
+            <el-form-item label="申请单位:">
+              <!-- <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
+              /> -->
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
+            <el-form-item label="申请人:">
+              <!-- <el-select
                 v-model="formInline.applyPerson"
                 :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
@@ -513,7 +526,12 @@
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 5e2b089..66427b8 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -23,7 +23,9 @@
 import { getUserList } from '@/api/system/user'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import useUserStore from '@/store/modules/user'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const approvalDialog = ref() // 审批对话框显隐
 const typeValue = ref() // add、edit、detail
@@ -48,9 +50,12 @@
   taskId: '', // 任务id（审批用）
   id: '',
   processId: '', // 流程id--查询审批记录使用
+  applyNo: '', // 申请编号
   applyName: '', // 申请名称
   applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   time: '', // 领用时间
   applyDesc: '', // 申请说明
 })
@@ -70,8 +75,8 @@
 // 表单校验规则
 const rules = reactive<FormRules>({
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
+  applyUnitName: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPersonName: [{ required: true, message: '申请人不能为空', trigger: 'change' }],
   time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
   applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
@@ -221,8 +226,10 @@
       const params = {
         applyName: form.value.applyName, // 申请名称
         applyUnit: form.value.applyUnit, // 申请单位
-        processId: form.value.processId,
+        applyUnitName: form.value.applyUnitName, // 申请单位名称
+        processId: form.value.processId, // 流程实例id
         applyPerson: form.value.applyPerson, // 申请人
+        applyPersonName: form.value.applyPersonName, // 申请人名称
         time: form.value.time, // 领用时间
         applyDesc: form.value.applyDesc, // 申请说明
         applyType: '1', // 申请类型 领用1
@@ -315,8 +322,11 @@
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
     form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyUnitName = res.data.applyUnitName || user.deptName // 部门名称
     form.value.applyName = res.data.applyName // 申请名称
     form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.applyPersonName = res.data.applyPersonName || user.name// 申请人名称
+    form.value.applyNo = res.data.applyNo// 申请编号
     form.value.time = res.data.time // 领用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
@@ -366,6 +376,12 @@
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
+  form.value.applyName = '设备领用申请' // 申请名称固定
+  form.value.applyUnit = user.deptId // 申请单位
+  form.value.applyUnitName = user.deptName // 申请单位名称
+  form.value.applyPerson = user.id // 申请人
+  form.value.applyPersonName = user.name // 申请人名称
+  form.value.time = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
   // 编辑、详情获取详情页信息
   if (typeValue.value === 'edit' || typeValue.value === 'detail') {
     fetchReceiveApplyListDetail() // 获取详细信息
@@ -419,29 +435,43 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="申请名称" prop="applyName">
+                <el-form-item label="申请编号:">
+                  <el-input
+                    v-model="form.applyNo"
+                    :placeholder="typeValue === 'detail' ? '' : '系统自动生成'"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请名称">
                   <el-input
                     v-model="form.applyName"
                     :placeholder="typeValue === 'detail' ? '' : '请输入申请名称'"
-                    clearable
-                    :disabled="typeValue === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请单位" prop="applyUnit">
-                  <dept-select
-                    v-model="form.applyUnit"
+                <el-form-item label="申请单位">
+                  <!-- <dept-select
+                    v-model="form.applyUnitName"
                     placeholder="请选择申请单位"
                     :data="useDeptList"
                     :disabled="typeValue === 'detail'"
+                  /> -->
+                  <el-input
+                    v-model="form.applyUnitName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="applyPerson">
-                  <el-select
-                    v-model="form.applyPerson"
+                <el-form-item label="申请人">
+                  <!-- <el-select
+                    v-model="form.applyPersonName"
                     :disabled="typeValue === 'detail'"
                     placeholder="请选择申请人"
                     style="width: 100%;"
@@ -452,7 +482,12 @@
                     :loading="applyPersonLoading"
                   >
                     <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
+                  </el-select> -->
+                  <el-input
+                    v-model="form.applyPersonName"
+                    :class="{ 'detail-input': typeValue === 'detail' }"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 10d6a51..0ebc982 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -34,9 +34,9 @@
     default: '', // 审批状态 ‘’代表全部
   },
 })
-const emit = defineEmits(['setData'])
 const { proxy } = getCurrentInstance() as any
-// 关闭
+// 从路由中获取页面类型参数
+const $route = useRoute()
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyUnit: '', // 申请部门
@@ -57,8 +57,6 @@
 const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据。
 const list = ref([])
 // 总数
@@ -334,6 +332,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    applyUnit: '', // 申请部门
     applyNo: '', // 申请编号
     applyStatus: '', // 申请状态
     applyType: props.applyType, // 申请类型
@@ -391,11 +390,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '标准装置申请列表')
+    printJSON(list.value, properties, `标准装置${$route.meta.title}列表`)
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
-    printJSON(printList, properties, '标准装置申请列表')
+    printJSON(printList, properties, `标准装置${$route.meta.title}列表`)
   }
   else {
     ElMessage.warning('无可打印内容')
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 12e69ec..4668128 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,12 +1,12 @@
 <!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
-import StandarDialog from './standardDialog.vue'
+import StandardDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -22,7 +22,7 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -134,6 +134,7 @@
   standardNo: '', // 标准编号
   standardOwner: '', // 标准负责人
   taskId: '', // 任务id
+  minioFileName: [], // 附件
 })
 // 下拉框数组类型
 interface IOptions {
@@ -310,27 +311,13 @@
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框类型
 interface standardListType {
   id: string
   standardName: string
 }
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -338,7 +325,7 @@
   $router.back()
 }
 // 表单验证规则
-const rules = ref({
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -346,15 +333,15 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ type: 'date', required: true, message: '筹建日期不能为空', trigger: 'change' }],
   applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ type: 'date', required: true, message: '考核日期不能为空', trigger: 'change' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
   standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
@@ -366,28 +353,43 @@
 // 第几条数据选择
 const listIndex = ref(0)
 
-// 文件上传点击对象
-interface uploadIndexRowType {
-  $index: number
-}
-// 文件上传点击第几行
-const uploadIndex = (row: uploadIndexRowType) => {
-  listIndex.value = row.$index
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
-  console.log(file)
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
+// ---------------------------------------文件上传-------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
     }
-  })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        res.data.forEach((item: string) => {
+          formInline.value.fileList.push({
+            minioFileName: item,
+          })
+        })
+        fromListInfo.value.fileList = formInline.value.fileList
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+}
+// -----------------------------------------------------------------------------------
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -476,28 +478,35 @@
     formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
     formInline.value.applyPerson = res.data.applyPerson // 申请人
     formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
+    formInline.value.fileList = res.data.fileList // 文件列表
   })
 }
 
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!, // 任务id
-    comments: '', // 取消内容
+    processInstanceId: fromListInfo.value.processId!,
+    comments: '',
   }
-  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    submitApproval('revoke', params).then((res) => {
-      ElMessage({
-        type: 'success',
-        message: '取消成功',
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      cancelApproval(params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
       })
     })
-  })
 }
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -570,6 +579,11 @@
         fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
         fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
         fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        fromListInfo.value.fileList = formInline.value.fileList.map((item) => {
+          return {
+            minioFileName: item.minioFileName,
+          }
+        }) // 文件列表
         if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
@@ -608,16 +622,11 @@
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
-// 选择了标准名称后
+// 点击标准名称选择
 const standardChange = () => {
   standarDialog.value.initDialog()
 }
 
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-
 // 表格多选框
 const handleSelectionChange = (e: any) => {
   selectionList.value = e
@@ -660,6 +669,9 @@
 // 选择标准装置完成之后
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
+  nextTick(() => {
+    ruleFormRef.value?.clearValidate() // 清除校验
+  })
 }
 
 const approvalRecordData = ref([]) // 审批流程数据
@@ -1054,7 +1066,7 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '考核日期'"
                 format="YYYY-MM-DD"
@@ -1096,7 +1108,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="pageType === 'detail' ? '' : '标准温度'"
                 class="full-width-input"
                 disabled
               />
@@ -1106,7 +1118,7 @@
             <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度'"
                 class="full-width-input"
                 disabled
               />
@@ -1164,6 +1176,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="pageType === 'add'" id="file" type="primary" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.fileList.length ? '上传' : '上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.fileList" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item.minioFileName">
+                  <span v-if="pageType === 'add'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <span v-if="pageType !== 'add' && !formInline.fileList.length">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
@@ -1229,7 +1257,7 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
-  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" @add="StandarAddRow" />
   <!-- 选择设备弹窗 -->
   <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
index 8f00182..4663068 100644
--- a/src/views/device/standardEquipment/components/listApply/standardDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -1,11 +1,13 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="StandardDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getStandardList } from '@/api/device/standard'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -24,20 +26,15 @@
   limit: 5, // 一页多少条
 })
 const loadingTable = ref<boolean>(false)
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-}
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<columnsType[]>([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -136,7 +133,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择标准装置" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -161,7 +158,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index cfad14e..795c1c0 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -119,7 +119,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 59a986f..916397b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,8 +1,8 @@
 <!-- 标准装置详情表单 -->
 <script lang="ts" setup name="BaseInfo">
-import { ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
@@ -43,7 +43,7 @@
   managerState: '', // 管理状态
   managerStateName: '', // 管理状态名称
   measureMajor: '', // 计量专业
-  fileList: [], // 文件列表
+  fileList: [] as any, // 文件列表
   measureMajorName: '', // 计量专业名称
   mesureRange: '', // 测量范围
   organizeNo: '', // 组织机构代码
@@ -136,11 +136,8 @@
   })
 }
 getStandardOwnerOptions()
-// 关闭
-const close = () => {
-  emit('close')
-}
-const rules = ref({
+
+const rules = reactive<FormRules>({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
   projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
@@ -231,6 +228,14 @@
   formInline.value.laboratoryOwnerContact = data.phone
 }
 
+// 删除附件
+const del = (index: any) => {
+  formInline.value.fileList.splice(index, 1)
+  formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+    return item.minioFileName
+  })
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -244,15 +249,14 @@
     }
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data
-        const tempfileList = [] as any
         res.data.forEach((item: string) => {
-          tempfileList.push({
+          formInline.value.fileList.push({
             minioFileName: item,
           })
         })
-        formInline.value.fileList = tempfileList
-        // 重置当前验证
+        formInline.value.minioFileName = formInline.value.fileList.map((item: any) => {
+          return item.minioFileName
+        })
         ElMessage.success('文件上传成功')
       }
       else {
@@ -701,13 +705,15 @@
           <el-col :span="24">
             <el-form-item label="文件:">
               <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+                {{ !formInline.minioFileName.length ? '上传' : '上传' }}
               </el-button>
               <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
-                <show-photo :minio-file-name="item" />
+                <show-photo :minio-file-name="item">
+                  <span v-if="buttonType !== 'detail'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
               </div>
               <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
-              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 21a15cb..76af0b4 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -4,6 +4,8 @@
 import { listPageApi } from '@/api/device/standingBook'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -17,7 +19,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -39,7 +41,7 @@
     value: 'managerStateName',
     align: 'center',
 
-  }]
+  }])
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index fdf958e..cf0dab9 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -26,7 +28,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '科室编号',
     value: 'organizeNo',
@@ -126,7 +128,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index 5d062f7..c01e00a 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -6,6 +6,8 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -23,7 +25,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '姓名',
     value: 'name',
@@ -124,7 +126,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 57fd7a8..39d8683 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -354,8 +354,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="筹建日期开始日期"
-          end-placeholder="筹建日期结束日期"
+          start-placeholder="筹建开始日期"
+          end-placeholder="筹建结束日期"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index c9f6db1..3f55a30 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -122,6 +122,7 @@
 }
 // 申请formInline类型
 export interface IformInline {
+  processId?: string // 流程实例ID
   applyNo: string // 申请编号
   applyName: string // 申请名称
   applyTime: string // 申请时间
@@ -233,4 +234,5 @@
   standardNo: string // 标准编号
   standardOwner: string // 标准负责人
   taskId: string // 任务id
+  minioFileName: any // 附件名称数组
 }
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index b2e752f..ac79924 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -121,7 +121,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">