diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id

diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 762c88e..e26b603 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -23,7 +23,6 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
-  certificateClass: '',
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -32,7 +31,7 @@
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  certificateReportType: '', // 证书类型
+  certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
   orderId: '', // 委托书id
@@ -177,7 +176,6 @@
 const clearList = () => {
   const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
-    certificateClass: '',
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -186,7 +184,7 @@
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    certificateReportType: '', // 证书类型
+    certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
@@ -327,6 +325,10 @@
 
 // 按钮切换
 const changeCurrentButton = (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    return
+  }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
@@ -335,8 +337,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-
-  fetchData(true)
+  setTimeout(() => {
+    fetchData(true)
+  }, 800)
 })
 </script>
 
@@ -380,15 +383,15 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
+        <el-select v-model="listQuery.certificateClass" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,13 +404,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/certPrint') && (activeTitle === '全部' || activeTitle === '可打印')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/agree') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/refuse') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>

diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 762c88e..e26b603 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -23,7 +23,6 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
-  certificateClass: '',
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -32,7 +31,7 @@
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  certificateReportType: '', // 证书类型
+  certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
   orderId: '', // 委托书id
@@ -177,7 +176,6 @@
 const clearList = () => {
   const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
-    certificateClass: '',
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -186,7 +184,7 @@
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    certificateReportType: '', // 证书类型
+    certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
@@ -327,6 +325,10 @@
 
 // 按钮切换
 const changeCurrentButton = (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    return
+  }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
@@ -335,8 +337,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-
-  fetchData(true)
+  setTimeout(() => {
+    fetchData(true)
+  }, 800)
 })
 </script>
 
@@ -380,15 +383,15 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
+        <el-select v-model="listQuery.certificateClass" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,13 +404,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/certPrint') && (activeTitle === '全部' || activeTitle === '可打印')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/agree') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/refuse') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index afc8a7d..c087472 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -476,16 +476,14 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
+                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="customerNoFocus">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
+                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
+                    选择
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -706,5 +704,11 @@
     }
   }
 }
+
+.selectBtn {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 </style>
 

diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 762c88e..e26b603 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -23,7 +23,6 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
-  certificateClass: '',
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -32,7 +31,7 @@
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  certificateReportType: '', // 证书类型
+  certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
   orderId: '', // 委托书id
@@ -177,7 +176,6 @@
 const clearList = () => {
   const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
-    certificateClass: '',
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -186,7 +184,7 @@
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    certificateReportType: '', // 证书类型
+    certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
@@ -327,6 +325,10 @@
 
 // 按钮切换
 const changeCurrentButton = (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    return
+  }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
@@ -335,8 +337,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-
-  fetchData(true)
+  setTimeout(() => {
+    fetchData(true)
+  }, 800)
 })
 </script>
 
@@ -380,15 +383,15 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
+        <el-select v-model="listQuery.certificateClass" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,13 +404,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/certPrint') && (activeTitle === '全部' || activeTitle === '可打印')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/agree') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/refuse') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index afc8a7d..c087472 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -476,16 +476,14 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
+                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="customerNoFocus">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
+                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
+                    选择
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -706,5 +704,11 @@
     }
   }
 }
+
+.selectBtn {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 </style>
 
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 2783ee2..a8222ac 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,14 +161,15 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-          :is-showmulti-select="multi"
-          :is-multi="multi"
+
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
-            <el-table-column label="" width="40" align="center">
+            <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>

diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 762c88e..e26b603 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -23,7 +23,6 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
-  certificateClass: '',
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -32,7 +31,7 @@
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  certificateReportType: '', // 证书类型
+  certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
   orderId: '', // 委托书id
@@ -177,7 +176,6 @@
 const clearList = () => {
   const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
-    certificateClass: '',
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -186,7 +184,7 @@
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    certificateReportType: '', // 证书类型
+    certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
@@ -327,6 +325,10 @@
 
 // 按钮切换
 const changeCurrentButton = (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    return
+  }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
@@ -335,8 +337,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-
-  fetchData(true)
+  setTimeout(() => {
+    fetchData(true)
+  }, 800)
 })
 </script>
 
@@ -380,15 +383,15 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
+        <el-select v-model="listQuery.certificateClass" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,13 +404,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/certPrint') && (activeTitle === '全部' || activeTitle === '可打印')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/agree') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/refuse') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index afc8a7d..c087472 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -476,16 +476,14 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
+                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="customerNoFocus">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
+                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
+                    选择
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -706,5 +704,11 @@
     }
   }
 }
+
+.selectBtn {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 </style>
 
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 2783ee2..a8222ac 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,14 +161,15 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-          :is-showmulti-select="multi"
-          :is-multi="multi"
+
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
-            <el-table-column label="" width="40" align="center">
+            <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 7c5afd2..43f2165 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -88,6 +88,7 @@
       measureSegmentId: item.deptId, // 执行部门
       measureSegment: item.organizeName, // 执行部门名称
       executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
       // alreadyCertifications: 0, // 已出具证书总数
       requireCertifications: 1, // 应出具证书总数
       measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
@@ -105,7 +106,10 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log(form)
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
   if (props.type == 'distribute') {
     setMeasureProcess(form).then((res) => {
       ElMessage.success('保存成功')

diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 762c88e..e26b603 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -23,7 +23,6 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
-  certificateClass: '',
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -32,7 +31,7 @@
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  certificateReportType: '', // 证书类型
+  certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
   orderId: '', // 委托书id
@@ -177,7 +176,6 @@
 const clearList = () => {
   const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
-    certificateClass: '',
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -186,7 +184,7 @@
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    certificateReportType: '', // 证书类型
+    certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
@@ -327,6 +325,10 @@
 
 // 按钮切换
 const changeCurrentButton = (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    return
+  }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
@@ -335,8 +337,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-
-  fetchData(true)
+  setTimeout(() => {
+    fetchData(true)
+  }, 800)
 })
 </script>
 
@@ -380,15 +383,15 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
+        <el-select v-model="listQuery.certificateClass" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,13 +404,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/certPrint') && (activeTitle === '全部' || activeTitle === '可打印')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/agree') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/refuse') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index afc8a7d..c087472 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -476,16 +476,14 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
+                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="customerNoFocus">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
+                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
+                    选择
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -706,5 +704,11 @@
     }
   }
 }
+
+.selectBtn {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 </style>
 
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 2783ee2..a8222ac 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,14 +161,15 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-          :is-showmulti-select="multi"
-          :is-multi="multi"
+
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
-            <el-table-column label="" width="40" align="center">
+            <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 7c5afd2..43f2165 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -88,6 +88,7 @@
       measureSegmentId: item.deptId, // 执行部门
       measureSegment: item.organizeName, // 执行部门名称
       executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
       // alreadyCertifications: 0, // 已出具证书总数
       requireCertifications: 1, // 应出具证书总数
       measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
@@ -105,7 +106,10 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log(form)
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
   if (props.type == 'distribute') {
     setMeasureProcess(form).then((res) => {
       ElMessage.success('保存成功')
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 493fbba..4998c5a 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -93,6 +93,7 @@
   measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
 }
 // 退回流程节点
 export interface IScheduleBack {

diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index e3c72af..20ecc23 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,15 +1,15 @@
 // 证书打印查询
 export interface ICertPrintSearch {
-  certificateClass: string
-  certificateNo: string
-  createUserId: number
+  certificateClass: string // 证书类型
+  certificateNo: string // 证书编号
+  createUserId: number // 创建人id
   printStatus: number | null
-  certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  certificateReportType: string // 证书类型
+  // certificationReportCode: string // 证书编号
+  // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
   approvalStatus: string // 审批状态-审批查询用
   orderId: string // 委托书id
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 762c88e..e26b603 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -23,7 +23,6 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
-  certificateClass: '',
   certificateNo: '', // 证书编号
   createUserId: 0,
   printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -32,7 +31,7 @@
   customerName: '', // 委托方名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  certificateReportType: '', // 证书类型
+  certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
   orderId: '', // 委托书id
@@ -177,7 +176,6 @@
 const clearList = () => {
   const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
-    certificateClass: '',
     certificateNo: '', // 证书编号
     createUserId: 0,
     printStatus: 0, // 可打印(证书可打印传0,全部传null)
@@ -186,7 +184,7 @@
     customerName: '', // 委托方名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    certificateReportType: '', // 证书类型
+    certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
     orderId: '', // 委托书id
@@ -327,6 +325,10 @@
 
 // 按钮切换
 const changeCurrentButton = (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    return
+  }
   active.value = val
   activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
@@ -335,8 +337,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-
-  fetchData(true)
+  setTimeout(() => {
+    fetchData(true)
+  }, 800)
 })
 </script>
 
@@ -380,15 +383,15 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
+        <el-select v-model="listQuery.certificateClass" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/certPrint/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,13 +404,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/certPrint') && (activeTitle === '全部' || activeTitle === '可打印')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/agree') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="proxy.hasPerm('/schedule/certPrint/refuse') && activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index afc8a7d..c087472 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -476,16 +476,14 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
+                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  >
-                    <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="customerNoFocus">
-                        选择
-                      </el-button>
-                    </template>
-                  </el-input>
+                  />
+                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
+                    选择
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -706,5 +704,11 @@
     }
   }
 }
+
+.selectBtn {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 </style>
 
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 2783ee2..a8222ac 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,14 +161,15 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-          :is-showmulti-select="multi"
-          :is-multi="multi"
+
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
         >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
-            <el-table-column label="" width="40" align="center">
+            <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
index 7c5afd2..43f2165 100644
--- a/src/views/business/schedule/task/components/processConfig.vue
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -88,6 +88,7 @@
       measureSegmentId: item.deptId, // 执行部门
       measureSegment: item.organizeName, // 执行部门名称
       executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
       // alreadyCertifications: 0, // 已出具证书总数
       requireCertifications: 1, // 应出具证书总数
       measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
@@ -105,7 +106,10 @@
     orderId: props.orderId,
     sampleId: props.sampleId,
   }
-  console.log(form)
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
   if (props.type == 'distribute') {
     setMeasureProcess(form).then((res) => {
       ElMessage.success('保存成功')
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 493fbba..4998c5a 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -93,6 +93,7 @@
   measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
   updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
 }
 // 退回流程节点
 export interface IScheduleBack {
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index e315600..7497590 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -12,16 +12,14 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
-const menus = [
-  { name: '待分发', value: 'sampleStatus;2' },
-  { name: '检测中', value: 'sampleStatus;3' },
-  { name: '检测完', value: 'sampleStatus;4' },
-  { name: '超期样品', value: 'sampleStatus;8' },
-]
-const currentMenu = ref('sampleStatus;2') // 当前选中状态
+const menu = ref<IMenu[]>([])
+const active = ref('') // 当前选中状态
+const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -45,21 +43,48 @@
   getDictByCode('sampleBelong').then((response) => {
     sampleBelongList.value = response.data
   })
-}
-getDict()
+  getDictByCode('sampleStatus').then((response) => {
+    // 制作右上角的菜单
+    const menuIds: string[] = []
+    response.data.forEach((item: dictType) => {
+      if (['待分发', '检测中', '检测完成', '已超期(查询使用)'].includes(item.name)) {
+        if (item.name === '待分发') {
+          active.value = item.value
+          activeTitle.value = item.name
+        }
 
+        menuIds.push(item.value)
+        menu.value.push({
+          name: item.name,
+          id: `${item.value}`,
+        })
+      }
+    })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      if (menuIds.includes(window.sessionStorage.getItem('buttonBoxActive')!)) {
+        active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      }
+      else {
+        active.value = menu.value.find(item => item.name === '待分发')!.id // 待分发
+      }
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '待分发')!.id // 待分发
+    }
+  })
+}
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
-  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '委托方名称', value: 'customerName', width: '120', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
-  { text: '样品属性', value: 'sampleBelongName', align: 'center' },
+  { text: '样品属性', value: 'sampleBelongName', width: '80', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
   { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
   { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
@@ -91,7 +116,7 @@
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e.map((item: { sampleId: string }) => item.sampleId)
 }
 
 // 点击搜索
@@ -108,12 +133,13 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleBelong: '', // 样品属性
-    sampleStatus: '2', // 分发状态
+    sampleStatus: active.value, // 分发状态
     startTime: '', //	应检定开始时间
     endTime: '', //	应检定结束时间
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
@@ -153,17 +179,26 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
+    const obj = {
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      orderNo: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      isUrgent: '', // 是否加急
+      sampleBelong: '', // 样品属性
+      sampleStatus: active.value, // 分发状态
+      startTime: '', //	应检定开始时间
+      endTime: '', //	应检定结束时间
+    }
+    const params = {
+      ...obj,
+      ids: checkoutList.value,
+    }
+    exportTaskList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '任务分发列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -193,73 +228,62 @@
 }
 
 // 选择按钮变更
-watch(currentMenu, (val: string) => {
-  const vals = val.split(';')
-  if (vals.length > 1) {
-    listQuery.value.sampleStatus = vals[1]
+watch(active, (val: string) => {
+  if (val === null) {
+    activeTitle.value = '可打印'
+    active.value = '2'
+    listQuery.value.sampleStatus = '2'
+    return
   }
+  active.value = val
+  listQuery.value.sampleStatus = val
+  window.sessionStorage.setItem('buttonBoxActive', val)
   fetchData(false)
 })
+watch(timeRange, (val: any) => {
+  if (val) {
+    listQuery.value.startTime = val[0]
+    listQuery.value.endTime = val[1]
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 
-fetchData(false)
+onMounted(() => {
+  getDict() // 获取字典-审批状态
+  fetchData(false)
+})
 </script>
 
 <template>
   <app-container>
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
-      <el-radio-group v-model="currentMenu">
-        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+      <el-radio-group v-model="active">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.id">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
-    <search-area
-      :need-clear="true"
-      @search="searchList" @clear="clearList"
-    >
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
-        <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
-          class="short-input"
-          clearable
-        />
+        <el-input v-model.trim="listQuery.sampleNo" placeholder="样品编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品名称"
-          clearable
-          class="short-input"
-        />
+        <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable class="short-input" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="委托书编号"
-          clearable
-          class="short-input"
-        />
+        <el-input v-model.trim="listQuery.orderNo" placeholder="委托书编号" clearable class="short-input" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="委托方代码"
-          class="short-input"
-          clearable
-        />
+        <el-input v-model.trim="listQuery.customerNo" placeholder="委托方代码" class="short-input" clearable />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="timeRange"
-          type="datetimerange"
-          range-separator="到"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          start-placeholder="应检完开始时间"
-          end-placeholder="应检完结束时间"
-          style="width: 280px;"
+          v-model="timeRange" type="datetimerange" range-separator="到" format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD" start-placeholder="应检完开始时间" end-placeholder="应检完结束时间" style="width: 280px;"
         />
       </search-item>
       <search-item>
@@ -276,12 +300,18 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        <icon-button
+          v-if="proxy.hasPerm('/schedule/taskList/export')" icon="icon-export" title="导出" type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/schedule/taskList/print')" icon="icon-print" title="打印" type="primary"
+          @click="printList"
+        />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="145">
@@ -289,10 +319,13 @@
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="proxy.hasPerm('/schedule/taskList/binding')" size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/taskList/distribute') && listQuery.sampleStatus !== '4'" size="small" type="primary" link
+                @click="handleDistribute(row)"
+              >
                 分发
               </el-button>
             </template>