diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index bf927da..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,22 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -258,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -283,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -299,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -312,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index bf927da..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,22 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -258,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -283,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -299,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -312,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index bf927da..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,22 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -258,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -283,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -299,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -312,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 949e8e8..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,8 +152,26 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
@@ -180,15 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index bf927da..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,22 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -258,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -283,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -299,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -312,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 949e8e8..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,8 +152,26 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
@@ -180,15 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index bf927da..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,22 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -258,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -283,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -299,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -312,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 949e8e8..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,8 +152,26 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
@@ -180,15 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 7649153..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,7 +62,7 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
@@ -75,7 +72,7 @@
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -128,6 +125,7 @@
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,11 +137,6 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -168,15 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link

diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 9827d37..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
@@ -33,12 +33,12 @@
   {
     text: '价格名称',
     value: 'priceName',
-    width: '120',
+    width: '90',
   },
   {
     text: '检校类型',
     value: 'checkType',
-    width: '120',
+    width: '90',
   },
   // {
   //   text: '型号',
@@ -55,27 +55,27 @@
   {
     text: '标准价格（元)',
     value: 'price',
-    width: '200',
+    width: '120',
   },
   {
     text: '业务员折扣权限',
     value: 'operatorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '负责人折扣权限',
     value: 'directorDiscountPermission',
-    width: '200',
+    width: '130',
   },
   {
     text: '依据标准',
     value: 'priceStandard',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '200',
+    width: '120',
   },
 ])
 
@@ -112,8 +112,27 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
@@ -148,6 +167,7 @@
   show.value = true
   fetchData(true)
 }
+const { proxy } = getCurrentInstance() as any
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -183,6 +203,7 @@
       uploadPrice(fd).then((res) => {
         if (res.code === 200) {
           ElMessage.success('上传成功')
+          fetchData(true)
         }
         else {
           ElMessage.error(res.message)
@@ -292,19 +313,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -314,9 +335,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
                   size="small"
                   type="primary"
                   link
@@ -333,6 +355,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 4058fb9..2e0c9b4 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,10 +1,6 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { exportFile } from '@/utils/exportUtils'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -26,7 +22,7 @@
   isDel: 0,
   model: '',
   operatorDiscountPermission: '',
-  price: null,
+  price: '',
   priceDescription: '',
   priceItem: '',
   priceLimit: '',
@@ -42,16 +38,6 @@
 const priceItemOptions = ref([])
 const operatorDiscountPermissionOptions = ref([])
 const directorDiscountPermissionOptions = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -87,6 +73,30 @@
 
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
   if (type === '提交' && props.buttonType !== '编辑') {
     getPriceAddList(formInline.value).then((res) => {
       if (res.code === 200) {
@@ -132,18 +142,6 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
-}
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
-}
 if (props.buttonType !== '') {
   getInfo()
 }
@@ -180,15 +178,15 @@
         </el-form-item> -->
         <el-form-item label="价格名称:" label-width="110">
           <el-input
-            v-model="formInline.priceName"
-            placeholder="请输入价格名称"
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <span>
           <el-form-item label="检校类型:" label-width="110">
             <el-select
-              v-model="formInline.checkType"
+              v-model.trim="formInline.checkType"
               clearable
               placeholder="检校类型"
               size="default"
@@ -215,7 +213,7 @@
         </span>
         <el-form-item label="类别:" label-width="auto">
           <el-select
-            v-model="formInline.priceType"
+            v-model.trim="formInline.priceType"
             clearable
             placeholder="类别"
             style="width: 80%;"
@@ -233,7 +231,7 @@
         <div class="input-width">
           <el-form-item label="项目:" label-width="110">
             <el-select
-              v-model="formInline.priceItem"
+              v-model.trim="formInline.priceItem"
               clearable
               placeholder="项目"
               style="width: 80%;"
@@ -250,7 +248,7 @@
           </el-form-item>
           <el-form-item label="依据标准:" label-width="110">
             <el-input
-              v-model="formInline.priceStandard"
+              v-model.trim="formInline.priceStandard"
               style="width: 18vw;"
               clearable
               placeholder="依据标准"
@@ -262,9 +260,9 @@
         <div>
           <el-form-item label="标准价格（元):" label-width="110">
             <el-input
-              v-model="formInline.price"
+              v-model.trim="formInline.price"
               clearable
-              placeholder="依据标准"
+              placeholder="标准价格（元)"
               size="default"
               :disabled="buttonType === '详情'"
             />
@@ -274,18 +272,18 @@
           <el-form-item label="限制范围:" label-width="110">
             <el-input
               v-model="formInline.priceLimit"
-              placeholder="请输入限制范围"
+              placeholder="限制范围"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
           <el-form-item label="说明:">
-            <el-input v-model="formInline.priceDescription" placeholder="请输入说明" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
         <div>
           <el-form-item label="业务员折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.operatorDiscountPermission"
+              v-model.trim="formInline.operatorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -302,7 +300,7 @@
           </el-form-item>
           <el-form-item label="负责人折扣权限:" label-width="auto">
             <el-select
-              v-model="formInline.directorDiscountPermission"
+              v-model.trim="formInline.directorDiscountPermission"
               style="width: 26vw;"
               clearable
               placeholder="业务员折扣权限"
@@ -320,7 +318,7 @@
         </div>
         <div class="input-width">
           <el-form-item label="备注:" label-width="110">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
           </el-form-item>
         </div>
       </el-form>
@@ -351,7 +349,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index bf927da..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,22 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -258,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -283,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -299,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -312,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 949e8e8..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,8 +152,26 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
@@ -180,15 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 7649153..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,7 +62,7 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
@@ -75,7 +72,7 @@
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -128,6 +125,7 @@
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,11 +137,6 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -168,15 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      ElMessage.success('删除成功')
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;