diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
index 80d91b7..c7e8343 100644
--- a/src/api/business/task.ts
+++ b/src/api/business/task.ts
@@ -5,10 +5,10 @@
 import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
 const prefix = '/meter'
 
-// 列表查询
+// 任务分发列表查询
 export function getTaskList(data: ITaskQuery) {
   return request({
-    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 7b538cf..1d02839 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -9,9 +9,7 @@
   customerName: string // 委托方名称
   isUrgent: string // 是否加急
   sampleAttr: string // 样品属性
-  sendState: string // 分发状态
-  outState: string // 超期状态
-  formId: string // formId
+  sampleStatus: string // 分发状态
   limit: number
   offset: number
 }
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 799a420..f784804 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -16,12 +16,12 @@
 const $router = useRouter()
 // 右上角按钮
 const menus = [
-  { name: '待分发', value: 'sendState;0' },
-  { name: '检测中', value: 'sendState;1' },
-  { name: '检测完', value: 'sendState;2' },
-  { name: '超期样品', value: 'outState;1' },
+  { name: '待分发', value: 'sampleStatus;2' },
+  { name: '检测中', value: 'sampleStatus;3' },
+  { name: '检测完', value: 'sampleStatus;4' },
+  { name: '超期样品', value: 'sampleStatus;8' },
 ]
-const currentMenu = ref('sendState;0') // 当前选中状态
+const currentMenu = ref('sampleStatus;2') // 当前选中状态
 // 查询条件
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 const listQuery: Ref<ITaskQuery> = ref({
@@ -34,9 +34,7 @@
   sampleAttr: '', // 样品属性
   startTime: '', // 应检完时间-开始
   endTime: '', // 应检完时间-结束
-  sendState: '', // 分发状态
-  outState: '', // 超期状态
-  formId: 'jlglsygfsp', // 任务分发formId
+  sampleStatus: '2', // 样品状态:默认待分发
   offset: 1,
   limit: 20,
 })
@@ -82,18 +80,18 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // 模拟数据
-  list.value = [
-    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
-    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
-  ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  // // 模拟数据
+  // list.value = [
+  //   { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+  //   { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
+  // ]
+  // loadingTable.value = false
+  // console.log(listQuery.value)
+  getTaskList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = response.data.total
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -114,9 +112,7 @@
     customerName: '', // 委托方名称
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
-    formId: 'jlglsygfsp',
-    sendState: '1', // 分发状态
-    outState: '', // 超期状态
+    sampleStatus: '2', // 分发状态
     offset: 1,
     limit: 20,
   }
@@ -202,9 +198,7 @@
 watch(currentMenu, (val: string) => {
   const vals = val.split(';')
   if (vals.length > 1) {
-    listQuery.value.sendState = ''
-    listQuery.value.outState = ''
-    listQuery.value[vals[0] as 'sendState' | 'outState'] = vals[1]
+    listQuery.value.sampleStatus = vals[1]
   }
   fetchData(false)
 })
@@ -300,7 +294,7 @@
               <el-button size="small" link type="primary" @click="bindLabel(row)">
                 标签绑定
               </el-button>
-              <el-button v-if="listQuery.sendState !== '2'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.sampleStatus !== '4'" size="small" type="primary" link @click="handleDistribute(row)">
                 分发
               </el-button>
             </template>
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index f9466e8..9bde3e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -215,43 +215,27 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="类别:" prop="priceType">
-                <el-select
+                <el-input
                   v-model.trim="formInline.priceType"
                   clearable
-                  :placeholder="pageType === 'detail' ? '' : '请选择类别'"
+                  :placeholder="pageType === 'detail' ? '' : '类别'"
                   :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option
-                    v-for="item in priceTypeOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.value"
-                  />
-                </el-select>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="项目:" prop="priceItem">
-                <el-select
+                <el-input
                   v-model.trim="formInline.priceItem"
                   clearable
-                  :placeholder="pageType === 'detail' ? '' : '请选择项目'"
+                  :placeholder="pageType === 'detail' ? '' : '类别'"
                   :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option
-                    v-for="item in priceItemOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.value"
-                  />
-                </el-select>
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="依据标准:" prop="priceStandard">
                 <el-input
                   v-model.trim="formInline.priceStandard"
@@ -280,14 +264,14 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
               <el-form-item label="说明:">
                 <el-input v-model="formInline.priceDescription" :placeholder="pageType === 'detail' ? '' : '说明'" :disabled="pageType === 'detail'" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="业务员折扣权限:" prop="operatorDiscountPermission">
                 <el-select
                   v-model.trim="formInline.operatorDiscountPermission"
@@ -305,9 +289,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="负责人折扣权限:" prop="directorDiscountPermission">
                 <el-select
                   v-model.trim="formInline.directorDiscountPermission"
@@ -327,7 +309,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input v-model="formInline.remark" :placeholder="pageType === 'detail' ? '' : '备注'" :disabled="pageType === 'detail'" />
               </el-form-item>