diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6c094bd..61e887a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6c094bd..61e887a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 181c46d..e369399 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -282,6 +282,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -348,16 +353,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  删除
                 </el-button>
               </template>
             </el-table-column>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6c094bd..61e887a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 181c46d..e369399 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -282,6 +282,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -348,16 +353,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..17adf39 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -167,8 +167,8 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button type="primary" @click="clickBtn('同意')">
+          同意
         </el-button>
         <el-button type="info" @click="close">
           关闭

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6c094bd..61e887a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 181c46d..e369399 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -282,6 +282,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -348,16 +353,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..17adf39 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -167,8 +167,8 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button type="primary" @click="clickBtn('同意')">
+          同意
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 1e5f914..779821b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6c094bd..61e887a 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 181c46d..e369399 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -282,6 +282,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -348,16 +353,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..17adf39 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -167,8 +167,8 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button type="primary" @click="clickBtn('同意')">
+          同意
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 1e5f914..779821b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 105dc2e..e278819 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -92,6 +92,7 @@
   taskId?: '' // 任务id, 流程审批用
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
 }
 
 export interface IlistTypes {
@@ -108,8 +109,8 @@
 }
 
 export interface IButton {
-  name: string
+  name: string // 按钮名称
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
+  proxy?: string // 权限
+  show?: Function // 是否显示
 }