diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index f74783d..2b57a17 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,13 +1,532 @@
 <script lang="ts" setup name="CustomerList">
-// 设备交接单编辑
+import type { Ref } from 'vue'
+import type { IReceiptDetail, dictType } from './receiptList-interface'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const secrecyList = ref<dictType[]>([]) // 保密要求
+
+const ruleFormRef = ref()
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  orderCode: '', // 委托书编号
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方邮编
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  appearance: '', // 样品外观
+  relyFile: '', // 依据文件
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      else if (item.value === 'fax') {
+        item.label = '传真'
+      }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  getDictByCode('secrecy').then((response) => {
+    secrecyList.value = response.data
+  })
+}
+getDict()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  // if (val && val.length) {
+  //   list.value = [] // 切换委托方时把样品清单置空
+  //   const getValue = val[0]
+  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
+  //   dataForm.value.customerId = getValue.id // 委托方id
+  //   dataForm.value.customerName = getValue.customerName // 委托方名称
+  //   dataForm.value.phone = getValue.phone // 委托方电话
+  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  // }
+}
+
+// 点击提交
+const submit = () => {}
+
+// 点击选择委托书编号
+const selectOrder = () => {
+
+}
 </script>
 
 <template>
   <app-container>
-    设备交接单编辑
+    <div id="main">
+      <div class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>11111111</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
+            提交
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托书编号:" prop="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-input
+                    v-model="dataForm.reciever"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托方代码:" prop="customerNo">
+                  <el-input
+                    v-model="dataForm.customerNo"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectCustomer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托方名称:" prop="customerName">
+                  <el-input
+                    v-model="dataForm.customerName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方传真'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="postalCode">
+                  <el-input
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="样品外观:">
+                  <el-input
+                    v-model="dataForm.appearance"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入样品外观'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="样品清单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            从样品库中添加
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <!-- <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+                <el-option
+                  v-for="i in powerVoltageMap"
+                  :key="i.value"
+                  :label="i.name"
+                  :value="i.value"
+                />
+              </el-select>
+              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </detail-block>
+
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <!-- 选择样品组件 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.customer-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
 </style>

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index f74783d..2b57a17 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,13 +1,532 @@
 <script lang="ts" setup name="CustomerList">
-// 设备交接单编辑
+import type { Ref } from 'vue'
+import type { IReceiptDetail, dictType } from './receiptList-interface'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const secrecyList = ref<dictType[]>([]) // 保密要求
+
+const ruleFormRef = ref()
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  orderCode: '', // 委托书编号
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方邮编
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  appearance: '', // 样品外观
+  relyFile: '', // 依据文件
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      else if (item.value === 'fax') {
+        item.label = '传真'
+      }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  getDictByCode('secrecy').then((response) => {
+    secrecyList.value = response.data
+  })
+}
+getDict()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  // if (val && val.length) {
+  //   list.value = [] // 切换委托方时把样品清单置空
+  //   const getValue = val[0]
+  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
+  //   dataForm.value.customerId = getValue.id // 委托方id
+  //   dataForm.value.customerName = getValue.customerName // 委托方名称
+  //   dataForm.value.phone = getValue.phone // 委托方电话
+  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  // }
+}
+
+// 点击提交
+const submit = () => {}
+
+// 点击选择委托书编号
+const selectOrder = () => {
+
+}
 </script>
 
 <template>
   <app-container>
-    设备交接单编辑
+    <div id="main">
+      <div class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>11111111</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
+            提交
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托书编号:" prop="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-input
+                    v-model="dataForm.reciever"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托方代码:" prop="customerNo">
+                  <el-input
+                    v-model="dataForm.customerNo"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectCustomer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托方名称:" prop="customerName">
+                  <el-input
+                    v-model="dataForm.customerName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方传真'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="postalCode">
+                  <el-input
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="样品外观:">
+                  <el-input
+                    v-model="dataForm.appearance"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入样品外观'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="样品清单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            从样品库中添加
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <!-- <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+                <el-option
+                  v-for="i in powerVoltageMap"
+                  :key="i.value"
+                  :label="i.name"
+                  :value="i.value"
+                />
+              </el-select>
+              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </detail-block>
+
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <!-- 选择样品组件 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.customer-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index e397b7e..d9ed9d3 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -22,3 +22,37 @@
   deliverTime: string // 交接时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IReceiptDetail {
+  orderCode: string // 委托书编号
+  certificationCompany: string // 证书单位名称
+  certificationCompanyFex: string // 传真
+  certificationCompanyEmail: string // 邮编
+  reciever: string // 接收人
+  recieverPhone: string // 接收人电话
+  certificationCompanyAddress: string // 证书单位地址
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  fax: string // 委托方邮编
+  postalCode: string // 委托邮编
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  requireOverTime: string // 完成时间
+  deliverTime: string // 交接时间
+  measureCategory: string // 检校类别
+  secrecy: string // 保密要求
+  appearance: string // 样品外观
+  relyFile: string // 依据文件
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index f74783d..2b57a17 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,13 +1,532 @@
 <script lang="ts" setup name="CustomerList">
-// 设备交接单编辑
+import type { Ref } from 'vue'
+import type { IReceiptDetail, dictType } from './receiptList-interface'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const secrecyList = ref<dictType[]>([]) // 保密要求
+
+const ruleFormRef = ref()
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  orderCode: '', // 委托书编号
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方邮编
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  appearance: '', // 样品外观
+  relyFile: '', // 依据文件
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      else if (item.value === 'fax') {
+        item.label = '传真'
+      }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  getDictByCode('secrecy').then((response) => {
+    secrecyList.value = response.data
+  })
+}
+getDict()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  // if (val && val.length) {
+  //   list.value = [] // 切换委托方时把样品清单置空
+  //   const getValue = val[0]
+  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
+  //   dataForm.value.customerId = getValue.id // 委托方id
+  //   dataForm.value.customerName = getValue.customerName // 委托方名称
+  //   dataForm.value.phone = getValue.phone // 委托方电话
+  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  // }
+}
+
+// 点击提交
+const submit = () => {}
+
+// 点击选择委托书编号
+const selectOrder = () => {
+
+}
 </script>
 
 <template>
   <app-container>
-    设备交接单编辑
+    <div id="main">
+      <div class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>11111111</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
+            提交
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托书编号:" prop="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-input
+                    v-model="dataForm.reciever"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托方代码:" prop="customerNo">
+                  <el-input
+                    v-model="dataForm.customerNo"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectCustomer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托方名称:" prop="customerName">
+                  <el-input
+                    v-model="dataForm.customerName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方传真'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="postalCode">
+                  <el-input
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="样品外观:">
+                  <el-input
+                    v-model="dataForm.appearance"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入样品外观'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="样品清单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            从样品库中添加
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <!-- <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+                <el-option
+                  v-for="i in powerVoltageMap"
+                  :key="i.value"
+                  :label="i.name"
+                  :value="i.value"
+                />
+              </el-select>
+              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </detail-block>
+
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <!-- 选择样品组件 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.customer-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index e397b7e..d9ed9d3 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -22,3 +22,37 @@
   deliverTime: string // 交接时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IReceiptDetail {
+  orderCode: string // 委托书编号
+  certificationCompany: string // 证书单位名称
+  certificationCompanyFex: string // 传真
+  certificationCompanyEmail: string // 邮编
+  reciever: string // 接收人
+  recieverPhone: string // 接收人电话
+  certificationCompanyAddress: string // 证书单位地址
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  fax: string // 委托方邮编
+  postalCode: string // 委托邮编
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  requireOverTime: string // 完成时间
+  deliverTime: string // 交接时间
+  measureCategory: string // 检校类别
+  secrecy: string // 保密要求
+  appearance: string // 样品外观
+  relyFile: string // 依据文件
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 0c41a5a..feb3507 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -71,8 +71,14 @@
 
 // 点击编辑/详情
 const handleEdit = (row: IReceiptList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.id}`)
+  $router.push(`/schedule/receipt/${pageType}/${row.id}`)
 }
+
+// 点击新建
+const add = () => {
+  $router.push('/schedule/receipt/add')
+}
+
 // 点击取消
 const handleCancle = (id: string) => {
 
@@ -233,7 +239,6 @@
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index f74783d..2b57a17 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,13 +1,532 @@
 <script lang="ts" setup name="CustomerList">
-// 设备交接单编辑
+import type { Ref } from 'vue'
+import type { IReceiptDetail, dictType } from './receiptList-interface'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const secrecyList = ref<dictType[]>([]) // 保密要求
+
+const ruleFormRef = ref()
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  orderCode: '', // 委托书编号
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方邮编
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  appearance: '', // 样品外观
+  relyFile: '', // 依据文件
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      else if (item.value === 'fax') {
+        item.label = '传真'
+      }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  getDictByCode('secrecy').then((response) => {
+    secrecyList.value = response.data
+  })
+}
+getDict()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  // if (val && val.length) {
+  //   list.value = [] // 切换委托方时把样品清单置空
+  //   const getValue = val[0]
+  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
+  //   dataForm.value.customerId = getValue.id // 委托方id
+  //   dataForm.value.customerName = getValue.customerName // 委托方名称
+  //   dataForm.value.phone = getValue.phone // 委托方电话
+  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  // }
+}
+
+// 点击提交
+const submit = () => {}
+
+// 点击选择委托书编号
+const selectOrder = () => {
+
+}
 </script>
 
 <template>
   <app-container>
-    设备交接单编辑
+    <div id="main">
+      <div class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>11111111</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
+            提交
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托书编号:" prop="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-input
+                    v-model="dataForm.reciever"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托方代码:" prop="customerNo">
+                  <el-input
+                    v-model="dataForm.customerNo"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectCustomer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托方名称:" prop="customerName">
+                  <el-input
+                    v-model="dataForm.customerName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方传真'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="postalCode">
+                  <el-input
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="样品外观:">
+                  <el-input
+                    v-model="dataForm.appearance"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入样品外观'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="样品清单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            从样品库中添加
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <!-- <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+                <el-option
+                  v-for="i in powerVoltageMap"
+                  :key="i.value"
+                  :label="i.name"
+                  :value="i.value"
+                />
+              </el-select>
+              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </detail-block>
+
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <!-- 选择样品组件 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.customer-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index e397b7e..d9ed9d3 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -22,3 +22,37 @@
   deliverTime: string // 交接时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IReceiptDetail {
+  orderCode: string // 委托书编号
+  certificationCompany: string // 证书单位名称
+  certificationCompanyFex: string // 传真
+  certificationCompanyEmail: string // 邮编
+  reciever: string // 接收人
+  recieverPhone: string // 接收人电话
+  certificationCompanyAddress: string // 证书单位地址
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  fax: string // 委托方邮编
+  postalCode: string // 委托邮编
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  requireOverTime: string // 完成时间
+  deliverTime: string // 交接时间
+  measureCategory: string // 检校类别
+  secrecy: string // 保密要求
+  appearance: string // 样品外观
+  relyFile: string // 依据文件
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 0c41a5a..feb3507 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -71,8 +71,14 @@
 
 // 点击编辑/详情
 const handleEdit = (row: IReceiptList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.id}`)
+  $router.push(`/schedule/receipt/${pageType}/${row.id}`)
 }
+
+// 点击新建
+const add = () => {
+  $router.push('/schedule/receipt/add')
+}
+
 // 点击取消
 const handleCancle = (id: string) => {
 
@@ -233,7 +239,6 @@
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 62a642a..8a06d0e 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -17,7 +17,6 @@
 const infoId = ref('') // id
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const showPrintButton = ref(true) // 打印的时候需要隐藏打印和关闭两个按钮
 const ruleFormRef = ref()
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
@@ -32,7 +31,7 @@
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
-  companyAddress: '', // 委托方地址
+  customerAddress: '', // 委托方地址
   remark: '', // 备注
   minioFileName: '', // 附件
   isUrgent: 0, // 是否加急 0否 1是
@@ -56,8 +55,19 @@
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
   { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '附件说明', value: 'appendixState', align: 'center' },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
 ])
+
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('要求检完时间不能为空'))
+  }
+  if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
+    return callback(new Error('要求检完时间应大于预计送达时间'))
+  }
+  callback()
+}
 // 校验规则
 const rules = reactive<FormRules>({
   deliverer: [{ required: true, message: '要求送样人不能为空', trigger: 'blur' }],
@@ -65,10 +75,10 @@
   customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
   phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  companyAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间不能为空', trigger: 'change' }],
-  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }],
   isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }],
 }) // 表单验证规则
@@ -146,12 +156,13 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
     const getValue = val[0]
     dataForm.value.customerNo = getValue.customerNo // 委托方代码
     dataForm.value.customerId = getValue.id // 委托方id
     dataForm.value.customerName = getValue.customerName // 委托方名称
     dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -197,7 +208,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
-    appendixState: '', // 附件说明
+    appendixDescn: '', // 附件说明
     mesureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
@@ -287,13 +298,13 @@
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
-          updateOrder(params).then((res) => {
+          updateOrder(params).then(() => {
             ElMessage.success('已保存')
             $router.go(-1)
           })
         }
         if (pageType.value === 'add') { // 新建
-          addOrder(params).then((res) => {
+          addOrder(params).then(() => {
             ElMessage.success('已保存')
             $router.go(-1)
           })
@@ -309,21 +320,6 @@
   popTitle: '委托书详情', // 打印配置页上方的标题
   extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() {
-    console.log('正在加载预览窗口！')
-    showPrintButton.value = false
-  }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() {
-    showPrintButton.value = false
-    console.log('开始打印之前！')
-  }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() {
-    console.log('关闭了打印工具！')
-    showPrintButton.value = true
-  }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
   standard: '',
   extarCss: '',
 })
@@ -332,6 +328,7 @@
 const getInfo = () => {
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.phone = res.data.customerPhone
     list.value = res.data.customerSampleInfoList
   })
 }
@@ -345,14 +342,14 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="pageType === 'detail'" id="title" class="customer-title">
+      <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
         <div class="title">
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
       <detail-page title="检测/校准委托单">
-        <template v-if="showPrintButton" #btns>
+        <template #btns>
           <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
             打印
           </el-button>
@@ -480,9 +477,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16">
-                <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-form-item label="委托方地址:" prop="customerAddress">
                   <el-input
-                    v-model="dataForm.companyAddress"
+                    v-model="dataForm.customerAddress"
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index f74783d..2b57a17 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,13 +1,532 @@
 <script lang="ts" setup name="CustomerList">
-// 设备交接单编辑
+import type { Ref } from 'vue'
+import type { IReceiptDetail, dictType } from './receiptList-interface'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const secrecyList = ref<dictType[]>([]) // 保密要求
+
+const ruleFormRef = ref()
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  orderCode: '', // 委托书编号
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方邮编
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  appearance: '', // 样品外观
+  relyFile: '', // 依据文件
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      else if (item.value === 'fax') {
+        item.label = '传真'
+      }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  getDictByCode('secrecy').then((response) => {
+    secrecyList.value = response.data
+  })
+}
+getDict()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  // if (val && val.length) {
+  //   list.value = [] // 切换委托方时把样品清单置空
+  //   const getValue = val[0]
+  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
+  //   dataForm.value.customerId = getValue.id // 委托方id
+  //   dataForm.value.customerName = getValue.customerName // 委托方名称
+  //   dataForm.value.phone = getValue.phone // 委托方电话
+  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  // }
+}
+
+// 点击提交
+const submit = () => {}
+
+// 点击选择委托书编号
+const selectOrder = () => {
+
+}
 </script>
 
 <template>
   <app-container>
-    设备交接单编辑
+    <div id="main">
+      <div class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>11111111</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
+            提交
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托书编号:" prop="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-input
+                    v-model="dataForm.reciever"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托方代码:" prop="customerNo">
+                  <el-input
+                    v-model="dataForm.customerNo"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectCustomer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托方名称:" prop="customerName">
+                  <el-input
+                    v-model="dataForm.customerName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方传真'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="postalCode">
+                  <el-input
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="样品外观:">
+                  <el-input
+                    v-model="dataForm.appearance"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入样品外观'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="样品清单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            从样品库中添加
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <!-- <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+                <el-option
+                  v-for="i in powerVoltageMap"
+                  :key="i.value"
+                  :label="i.name"
+                  :value="i.value"
+                />
+              </el-select>
+              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </detail-block>
+
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <!-- 选择样品组件 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.customer-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index e397b7e..d9ed9d3 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -22,3 +22,37 @@
   deliverTime: string // 交接时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IReceiptDetail {
+  orderCode: string // 委托书编号
+  certificationCompany: string // 证书单位名称
+  certificationCompanyFex: string // 传真
+  certificationCompanyEmail: string // 邮编
+  reciever: string // 接收人
+  recieverPhone: string // 接收人电话
+  certificationCompanyAddress: string // 证书单位地址
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  fax: string // 委托方邮编
+  postalCode: string // 委托邮编
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  requireOverTime: string // 完成时间
+  deliverTime: string // 交接时间
+  measureCategory: string // 检校类别
+  secrecy: string // 保密要求
+  appearance: string // 样品外观
+  relyFile: string // 依据文件
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 0c41a5a..feb3507 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -71,8 +71,14 @@
 
 // 点击编辑/详情
 const handleEdit = (row: IReceiptList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.id}`)
+  $router.push(`/schedule/receipt/${pageType}/${row.id}`)
 }
+
+// 点击新建
+const add = () => {
+  $router.push('/schedule/receipt/add')
+}
+
 // 点击取消
 const handleCancle = (id: string) => {
 
@@ -233,7 +239,6 @@
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 62a642a..8a06d0e 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -17,7 +17,6 @@
 const infoId = ref('') // id
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const showPrintButton = ref(true) // 打印的时候需要隐藏打印和关闭两个按钮
 const ruleFormRef = ref()
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
@@ -32,7 +31,7 @@
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
-  companyAddress: '', // 委托方地址
+  customerAddress: '', // 委托方地址
   remark: '', // 备注
   minioFileName: '', // 附件
   isUrgent: 0, // 是否加急 0否 1是
@@ -56,8 +55,19 @@
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
   { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '附件说明', value: 'appendixState', align: 'center' },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
 ])
+
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('要求检完时间不能为空'))
+  }
+  if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
+    return callback(new Error('要求检完时间应大于预计送达时间'))
+  }
+  callback()
+}
 // 校验规则
 const rules = reactive<FormRules>({
   deliverer: [{ required: true, message: '要求送样人不能为空', trigger: 'blur' }],
@@ -65,10 +75,10 @@
   customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
   phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  companyAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间不能为空', trigger: 'change' }],
-  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }],
   isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }],
 }) // 表单验证规则
@@ -146,12 +156,13 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
     const getValue = val[0]
     dataForm.value.customerNo = getValue.customerNo // 委托方代码
     dataForm.value.customerId = getValue.id // 委托方id
     dataForm.value.customerName = getValue.customerName // 委托方名称
     dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -197,7 +208,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
-    appendixState: '', // 附件说明
+    appendixDescn: '', // 附件说明
     mesureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
@@ -287,13 +298,13 @@
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
-          updateOrder(params).then((res) => {
+          updateOrder(params).then(() => {
             ElMessage.success('已保存')
             $router.go(-1)
           })
         }
         if (pageType.value === 'add') { // 新建
-          addOrder(params).then((res) => {
+          addOrder(params).then(() => {
             ElMessage.success('已保存')
             $router.go(-1)
           })
@@ -309,21 +320,6 @@
   popTitle: '委托书详情', // 打印配置页上方的标题
   extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() {
-    console.log('正在加载预览窗口！')
-    showPrintButton.value = false
-  }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() {
-    showPrintButton.value = false
-    console.log('开始打印之前！')
-  }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() {
-    console.log('关闭了打印工具！')
-    showPrintButton.value = true
-  }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
   standard: '',
   extarCss: '',
 })
@@ -332,6 +328,7 @@
 const getInfo = () => {
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.phone = res.data.customerPhone
     list.value = res.data.customerSampleInfoList
   })
 }
@@ -345,14 +342,14 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="pageType === 'detail'" id="title" class="customer-title">
+      <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
         <div class="title">
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
       <detail-page title="检测/校准委托单">
-        <template v-if="showPrintButton" #btns>
+        <template #btns>
           <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
             打印
           </el-button>
@@ -480,9 +477,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16">
-                <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-form-item label="委托方地址:" prop="customerAddress">
                   <el-input
-                    v-model="dataForm.companyAddress"
+                    v-model="dataForm.customerAddress"
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index e05405d..cc24992 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -39,7 +39,7 @@
   customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
-  companyAddress: string // 委托方地址
+  customerAddress: string // 委托方地址
   remark: string // 备注
   minioFileName: string // 附件
   isUrgent: number // 是否加急
@@ -54,7 +54,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
-  appendixState: string // 附件说明
+  appendixDescn: string // 附件说明
   mesureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑

diff --git a/server.xml b/server.xml
new file mode 100644
index 0000000..2be2bbc
--- /dev/null
+++ b/server.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="11302" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443"  />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation that requires the JSSE
+         style configuration. When using the APR/native implementation, the
+         OpenSSL style configuration is required as described in the APR/native
+         documentation -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+ 
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/src/api/approval.ts b/src/api/approval.ts
index 88ff0a5..68d4e20 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -15,7 +15,7 @@
 }
 
 // 取消审批
-export function cancelApproval(data: { processId?: string; comments: string }) {
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index f74783d..2b57a17 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,13 +1,532 @@
 <script lang="ts" setup name="CustomerList">
-// 设备交接单编辑
+import type { Ref } from 'vue'
+import type { IReceiptDetail, dictType } from './receiptList-interface'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const visible = ref(false) // 控制选择委托方对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const secrecyList = ref<dictType[]>([]) // 保密要求
+
+const ruleFormRef = ref()
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  orderCode: '', // 委托书编号
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方邮编
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  appearance: '', // 样品外观
+  relyFile: '', // 依据文件
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      else if (item.value === 'fax') {
+        item.label = '传真'
+      }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  getDictByCode('secrecy').then((response) => {
+    secrecyList.value = response.data
+  })
+}
+getDict()
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  // if (val && val.length) {
+  //   list.value = [] // 切换委托方时把样品清单置空
+  //   const getValue = val[0]
+  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
+  //   dataForm.value.customerId = getValue.id // 委托方id
+  //   dataForm.value.customerName = getValue.customerName // 委托方名称
+  //   dataForm.value.phone = getValue.phone // 委托方电话
+  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  // }
+}
+
+// 点击提交
+const submit = () => {}
+
+// 点击选择委托书编号
+const selectOrder = () => {
+
+}
 </script>
 
 <template>
   <app-container>
-    设备交接单编辑
+    <div id="main">
+      <div class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>11111111</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
+            提交
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+            保存
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <div id="form">
+          <el-form
+            ref="ruleFormRef"
+            :model="dataForm"
+            :label-width="120"
+            label-position="right"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托书编号:" prop="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-input
+                    v-model="dataForm.reciever"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="委托方代码:" prop="customerNo">
+                  <el-input
+                    v-model="dataForm.customerNo"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="selectCustomer">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托方名称:" prop="customerName">
+                  <el-input
+                    v-model="dataForm.customerName"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方传真'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="postalCode">
+                  <el-input
+                    v-model="dataForm.postalCode"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="样品外观:">
+                  <el-input
+                    v-model="dataForm.appearance"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入样品外观'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="marg">
+              <el-col :span="12">
+                <el-form-item label="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="样品清单">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            从样品库中添加
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+            增加行
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+            删除行
+          </el-button>
+        </template>
+        <!-- <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
+                v-model="scope.row[item.value]"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :disabled="item.disabled"
+                class="input"
+              />
+              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
+                <el-option
+                  v-for="i in powerVoltageMap"
+                  :key="i.value"
+                  :label="i.name"
+                  :value="i.value"
+                />
+              </el-select>
+              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </detail-block>
+
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel' || item.value === 'fax'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <!-- 选择样品组件 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.customer-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index e397b7e..d9ed9d3 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -22,3 +22,37 @@
   deliverTime: string // 交接时间
   remark: string // 备注
 }
+
+// 详情表单
+export interface IReceiptDetail {
+  orderCode: string // 委托书编号
+  certificationCompany: string // 证书单位名称
+  certificationCompanyFex: string // 传真
+  certificationCompanyEmail: string // 邮编
+  reciever: string // 接收人
+  recieverPhone: string // 接收人电话
+  certificationCompanyAddress: string // 证书单位地址
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  fax: string // 委托方邮编
+  postalCode: string // 委托邮编
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  orderTime: string // 委托日期
+  requireOverTime: string // 完成时间
+  deliverTime: string // 交接时间
+  measureCategory: string // 检校类别
+  secrecy: string // 保密要求
+  appearance: string // 样品外观
+  relyFile: string // 依据文件
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index 0c41a5a..feb3507 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -71,8 +71,14 @@
 
 // 点击编辑/详情
 const handleEdit = (row: IReceiptList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.id}`)
+  $router.push(`/schedule/receipt/${pageType}/${row.id}`)
 }
+
+// 点击新建
+const add = () => {
+  $router.push('/schedule/receipt/add')
+}
+
 // 点击取消
 const handleCancle = (id: string) => {
 
@@ -233,7 +239,6 @@
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/schedule/receiptList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 62a642a..8a06d0e 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -17,7 +17,6 @@
 const infoId = ref('') // id
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const showPrintButton = ref(true) // 打印的时候需要隐藏打印和关闭两个按钮
 const ruleFormRef = ref()
 // 表单
 const dataForm: Ref<IOrderDetail> = ref({
@@ -32,7 +31,7 @@
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
   phone: '', // 委托方电话
-  companyAddress: '', // 委托方地址
+  customerAddress: '', // 委托方地址
   remark: '', // 备注
   minioFileName: '', // 附件
   isUrgent: 0, // 是否加急 0否 1是
@@ -56,8 +55,19 @@
   { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
   { text: '检定项目', value: 'mesureContent', align: 'center', required: true },
   { text: '备注', value: 'remark', align: 'center' },
-  { text: '附件说明', value: 'appendixState', align: 'center' },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
 ])
+
+// 自定义校验规则--要求检完时间不能比预计送达时间大
+const requireOverTimeValid = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    return callback(new Error('要求检完时间不能为空'))
+  }
+  if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
+    return callback(new Error('要求检完时间应大于预计送达时间'))
+  }
+  callback()
+}
 // 校验规则
 const rules = reactive<FormRules>({
   deliverer: [{ required: true, message: '要求送样人不能为空', trigger: 'blur' }],
@@ -65,10 +75,10 @@
   customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
   customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
   phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
-  companyAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
   orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
   planDeliverTime: [{ type: 'date', required: true, message: '要求预计送达时间不能为空', trigger: 'change' }],
-  requireOverTime: [{ type: 'date', required: true, message: '要求检完时间不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   certifications: [{ required: true, message: '要求证书类别不能为空', trigger: 'change' }],
   isUrgent: [{ required: true, message: '要求是否加急不能为空', trigger: 'change' }],
 }) // 表单验证规则
@@ -146,12 +156,13 @@
 // 选好委托方
 const confirmCheckout = (val: Array<ICustomer>) => {
   if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
     const getValue = val[0]
     dataForm.value.customerNo = getValue.customerNo // 委托方代码
     dataForm.value.customerId = getValue.id // 委托方id
     dataForm.value.customerName = getValue.customerName // 委托方名称
     dataForm.value.phone = getValue.phone // 委托方电话
-    dataForm.value.companyAddress = getValue.briefName // 委托方地址
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
   }
 }
 
@@ -197,7 +208,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     powerVoltage: '', // 电源电压
-    appendixState: '', // 附件说明
+    appendixDescn: '', // 附件说明
     mesureContent: '', // 检定项目
     remark: '', // 备注
     isEdit: true, // 是否可编辑
@@ -287,13 +298,13 @@
           customerSampleInfoList: list.value,
         }
         if (pageType.value === 'edit') { // 编辑
-          updateOrder(params).then((res) => {
+          updateOrder(params).then(() => {
             ElMessage.success('已保存')
             $router.go(-1)
           })
         }
         if (pageType.value === 'add') { // 新建
-          addOrder(params).then((res) => {
+          addOrder(params).then(() => {
             ElMessage.success('已保存')
             $router.go(-1)
           })
@@ -309,21 +320,6 @@
   popTitle: '委托书详情', // 打印配置页上方的标题
   extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() {
-    console.log('正在加载预览窗口！')
-    showPrintButton.value = false
-  }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() {
-    showPrintButton.value = false
-    console.log('开始打印之前！')
-  }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() {
-    console.log('关闭了打印工具！')
-    showPrintButton.value = true
-  }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
   standard: '',
   extarCss: '',
 })
@@ -332,6 +328,7 @@
 const getInfo = () => {
   getOrderDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
+    dataForm.value.phone = res.data.customerPhone
     list.value = res.data.customerSampleInfoList
   })
 }
@@ -345,14 +342,14 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="pageType === 'detail'" id="title" class="customer-title">
+      <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
         <div class="title">
           航天计量检测技术（江苏）有限公司
         </div>
       </div>
       <detail-page title="检测/校准委托单">
-        <template v-if="showPrintButton" #btns>
+        <template #btns>
           <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
             打印
           </el-button>
@@ -480,9 +477,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16">
-                <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-form-item label="委托方地址:" prop="customerAddress">
                   <el-input
-                    v-model="dataForm.companyAddress"
+                    v-model="dataForm.customerAddress"
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index e05405d..cc24992 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -39,7 +39,7 @@
   customerId: string // 委托方id
   customerName: string // 委托方名称
   phone: string // 委托方电话
-  companyAddress: string // 委托方地址
+  customerAddress: string // 委托方地址
   remark: string // 备注
   minioFileName: string // 附件
   isUrgent: number // 是否加急
@@ -54,7 +54,7 @@
   sampleModel: string // 样品型号
   manufacturingNo: string // 出厂编号
   powerVoltage: string // 电源电压
-  appendixState: string // 附件说明
+  appendixDescn: string // 附件说明
   mesureContent: string // 检定项目
   remark: string // 备注
   isEdit?: boolean // 是否可编辑
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index abf559c..612b3b4 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -18,7 +18,7 @@
   getReceiveApplyList,
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
@@ -233,7 +233,7 @@
 const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
     const params = {
-      taskId: row.taskId!,
+      processInstanceId: row.processId!,
       comments: '',
     }
     ElMessageBox.confirm(
@@ -246,7 +246,7 @@
       },
     )
       .then(() => {
-        submitApproval('revoke', params).then((res) => {
+        cancelApproval(params).then((res) => {
           ElMessage({
             type: 'success',
             message: '取消成功',