diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index a6a5e1b2..53ac1c1c 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -214,35 +214,35 @@
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(9)"
-                    v-if="queryParams.taskStatus == 30"
+                    v-show="queryParams.taskStatus == 30"
                     v-hasPermi="['receive:examine:fgs']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(5)"
-                    v-if="queryParams.taskStatus == 31"
+                    v-show="queryParams.taskStatus == 31"
                     v-hasPermi="['receive:examine:sgb']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(7)"
-                    v-if="queryParams.taskStatus == 31"
+                    v-show="queryParams.taskStatus == 31"
                     v-hasPermi="['receive:examine:ajb']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(1)"
-                    v-if="queryParams.taskStatus == 32"
+                    v-show="queryParams.taskStatus == 32"
                     v-hasPermi="['receive:examine:nbry-jjfgs']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(3)"
-                    v-if="queryParams.taskStatus == 32"
+                    v-show="queryParams.taskStatus == 32"
                     v-hasPermi="['receive:examine:nbry-sbfgs']"
                     >确 定</el-button
                 >
@@ -267,35 +267,35 @@
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(10)"
-                    v-if="queryParams.taskStatus == 30"
+                    v-show="queryParams.taskStatus == 30"
                     v-hasPermi="['receive:examine:fgs']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(6)"
-                    v-if="queryParams.taskStatus == 31"
+                    v-show="queryParams.taskStatus == 31"
                     v-hasPermi="['receive:examine:sgb']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(8)"
-                    v-if="queryParams.taskStatus == 31"
+                    v-show="queryParams.taskStatus == 31"
                     v-hasPermi="['receive:examine:ajb']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(2)"
-                    v-if="queryParams.taskStatus == 32"
+                    v-show="queryParams.taskStatus == 32"
                     v-hasPermi="['receive:examine:nbry-jjfgs']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(4)"
-                    v-if="queryParams.taskStatus == 32"
+                    v-show="queryParams.taskStatus == 32"
                     v-hasPermi="['receive:examine:nbry-sbfgs']"
                     >确 定</el-button
                 >
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 7f951336..782585c2 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -210,7 +210,7 @@
                         type="primary"
                         @click="handleExamine(scope.row)"
                         v-hasPermi="['receive:examine:fgs']"
-                        v-if="
+                        v-show="
                             Number(scope.row.examineStatusId) == 30 &&
                             scope.row.deptId == currentDeptId
                         "
@@ -221,7 +221,7 @@
                         type="primary"
                         @click="handleExamine(scope.row)"
                         v-hasPermi="['receive:examine:sgb']"
-                        v-if="
+                        v-show="
                             Number(scope.row.examineStatusId) == 31 &&
                             (scope.row.leaseApplyInfoList[0].status == '0' ||
                                 scope.row.leaseApplyInfoList[0].status == '7' ||
@@ -235,7 +235,7 @@
                         type="primary"
                         @click="handleExamine(scope.row)"
                         v-hasPermi="['receive:examine:ajb']"
-                        v-if="
+                        v-show="
                             Number(scope.row.examineStatusId) == 31 &&
                             (scope.row.leaseApplyInfoList[0].status == '0' ||
                                 scope.row.leaseApplyInfoList[0].status == '5' ||
@@ -249,7 +249,7 @@
                         type="primary"
                         @click="handleExamine(scope.row, 'jjfgs')"
                         v-hasPermi="['receive:examine:nbry-jjfgs']"
-                        v-if="
+                        v-show="
                             Number(scope.row.examineStatusId) == 32 &&
                             (scope.row.leaseApplyInfoList[0].status == '5' ||
                                 scope.row.leaseApplyInfoList[0].status == '7' ||
@@ -263,7 +263,7 @@
                         type="primary"
                         @click="handleExamine(scope.row, 'sbfgs')"
                         v-hasPermi="['receive:examine:nbry-sbfgs']"
-                        v-if="
+                        v-show="
                             Number(scope.row.examineStatusId) == 32 &&
                             (scope.row.leaseApplyInfoList[0].status == '5' ||
                                 scope.row.leaseApplyInfoList[0].status == '7' ||
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index d3341b7f..46180c8f 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -164,7 +164,7 @@
                     <el-button
                         size="mini"
                         type="primary"
-                        v-if="scope.row.taskStatus != 35"
+                        v-show="scope.row.taskStatus != 35"
                         @click="handleOut(scope.row)"
                         v-hasPermi="['picking:outbound']"
                     >
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
index b15c36ef..2cc3adc9 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
@@ -123,9 +123,9 @@
         v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="examineVisible = false">取 消</el-button>
-        <el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus == 31"
+        <el-button type="primary" @click="subAuditLeaseByCompany(9)" v-show="queryParams.taskStatus == 31"
           v-hasPermi="['receive:examine:fgs']">确 定</el-button>
-        <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus == 32"
+        <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-show="queryParams.taskStatus == 32"
           v-hasPermi="['receive:examine:nbs']">确 定</el-button>
       </div>
     </el-dialog>
@@ -135,9 +135,9 @@
         v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refuseVisible = false">取 消</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus == 31"
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-show="queryParams.taskStatus == 31"
           v-hasPermi="['receive:examine:fgs']">确 定</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus == 32"
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-show="queryParams.taskStatus == 32"
           v-hasPermi="['receive:examine:nbs']">确 定</el-button>
       </div>
     </el-dialog>
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 95e1d34a..09f6b5f1 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -232,7 +232,7 @@
                         type="primary"
                         @click="handleExamine(scope.row)"
                         v-hasPermi="['receive:examine:fgs']"
-                        v-if="
+                        v-show="
                             Number(scope.row.examineStatusId) == 31 ||
                             Number(scope.row.examineStatusId) == 117
                         "
@@ -243,7 +243,7 @@
                         type="primary"
                         @click="handleExamine(scope.row)"
                         v-hasPermi="['receive:examine:nbs']"
-                        v-if="Number(scope.row.examineStatusId) == 32"
+                        v-show="Number(scope.row.examineStatusId) == 32"
                         >审批</el-button
                     >
 
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index cbe6b332..789f211f 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -282,7 +282,7 @@
                         size="medium"
                         type="text"
                         icon="el-icon-edit"
-                        v-if="scope.row.applyStatus == '0'"
+                        v-show="scope.row.applyStatus == '0'"
                         v-hasPermi="['return:auditing']"
                         @click="handleUpdate(scope.row, 'update')"
                     >
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
index 3f612dde..bc17270e 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -221,7 +221,7 @@
                         @click="handleReturn(scope.row, 'see')"
                         icon="el-icon-d-arrow-right"
                         v-hasPermi="['return:btn']"
-                        v-if="scope.row.taskStatus != '40'"
+                        v-show="scope.row.taskStatus != '40'"
                     >
                         退料
                     </el-button>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index 299a1756..44360e29 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -308,14 +308,14 @@
                     <el-button
                         type="text"
                         icon="el-icon-edit"
-                        v-if="scope.row.taskStatus == 30"
+                        v-show="scope.row.taskStatus == 30"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['picking:apply:edit']"
                         >编辑</el-button
                     >
                     <el-button
                         type="text"
-                        v-if="
+                        v-show="
                             (scope.row.taskStatus == 98 ||
                                 scope.row.taskStatus == 99 ||
                                 scope.row.taskStatus == 100) &&
@@ -331,7 +331,7 @@
                     <el-button
                         type="text"
                         icon="el-icon-delete"
-                        v-if="scope.row.taskStatus == 30"
+                        v-show="scope.row.taskStatus == 30"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['picking:apply:del']"
                         style="color: #f56c6c"
@@ -382,7 +382,7 @@ export default {
     data() {
         return {
             // 遮罩层
-            loading: true,
+            loading: false,
             // 选中数组
             ids: [],
             // 非单个禁用
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
index bf5093ab..c69d01c1 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -603,6 +603,9 @@ export default {
                 { name: '待出库', id: 33 },
                 { name: '出库进行中', id: 34 },
                 { name: '完成', id: 35 },
+                { name: '分公司审核驳回', id: 98 },
+                { name: '分管审核驳回', id: 99 },
+                { name: '内部审核驳回', id: 100 },
             ],
             orderStatusList: [
                 { name: '申请时间-升序', id: 0 },
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index ff0b7368..68c28f42 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -168,7 +168,7 @@
                         icon="el-icon-shopping-cart-2"
                         style="color: #e6a23c"
                         type="text"
-                        v-if="row.taskStatus != 35"
+                        v-show="row.taskStatus != 35"
                         @click="handleOut(row)"
                         v-hasPermi="['picking:outbound:out']"
                     >
@@ -179,7 +179,6 @@
                         style="color: #67c23a"
                         icon="el-icon-tickets"
                         @click="handleOutboundOrder(row)"
-                        v-if="row.taskStatus == 35"
                     >
                         出库单
                     </el-button>
@@ -554,7 +553,7 @@
             @closeDialogOuter="closeDialogOuter"
         >
             <template slot="outerContent">
-                <VueEasyPrint tableShow ref="remarksPrintRef">
+                <VueEasyPrint tableShow ref="remarksPrintRef" style="padding: 0 10px; width: 750px;">
                     <!-- <el-row :gutter="20">
                         <el-col span="6">申请人：</el-col>
                         <el-col span="6">领料工程：</el-col>
@@ -569,18 +568,19 @@
                         <li>
                             领料单位：<span>{{ unitName }}</span>
                         </li>
-                        <li>
-                            领料工程：<span>{{ proName }}</span>
-                        </li>
                         <li>
                             领料单号：<span>{{ code }}</span>
                         </li>
+                        <li>
+                            领料工程：<span>{{ proName }}</span>
+                        </li>
                     </ul>
-                    <el-table style="margin: 15px 0" :data="outboundOrderList">
+                    <el-table style="margin: 15px 0; padding: 1px;" :data="outboundOrderList">
                         <el-table-column
                             align="center"
                             label="序号"
                             type="index"
+                            width="55"
                         />
                         <el-table-column
                             align="center"
@@ -601,11 +601,13 @@
                             align="center"
                             label="申请数量"
                             prop="preNum"
+                            width="55"
                         />
                         <el-table-column
                             align="center"
                             label="出库数量"
                             prop="outNum"
+                            width="55"
                         />
                         <el-table-column
                             align="center"
@@ -634,7 +636,7 @@
                             领料申请人：<span>{{ applyFor }}</span>
                         </li>
                         <li> 批注人：<span></span> </li>
-                        <li style="margin-right: 260px">
+                        <li style="margin-right: 200px">
                             审批人：<span></span>
                         </li>
                     </ul>
@@ -771,7 +773,7 @@ export default {
             },
             // 出库单 弹框配置项
             dialogConfig: {
-                outerWidth: '80%',
+                outerWidth: '800px',
                 outerVisible: false,
                 center: true,
             },
@@ -1120,6 +1122,7 @@ export default {
     display: flex;
     justify-content: space-between;
     list-style: none;
+    flex-wrap: wrap;
     padding: 0;
     font-size: 16px;
     font-weight: bold;
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
index dea8a366..9c685c61 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
@@ -295,7 +295,7 @@
                         icon="el-icon-edit-outline"
                         style="color: #e6a23c"
                         type="text"
-                        v-if="scope.row.taskStatus == '101'"
+                        v-show="scope.row.taskStatus == '101'"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['return:apply:reject:submit']"
                         >驳回提交</el-button
diff --git a/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
index b7f3a08a..ba00581b 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
@@ -285,7 +285,7 @@
                         icon="el-icon-finished"
                         style="color: #e6a23c"
                         type="text"
-                        v-if="scope.row.taskStatus == '37'"
+                        v-show="scope.row.taskStatus == '37'"
                         v-hasPermi="['return:auditing:auditing']"
                         @click="handleUpdate(scope.row, 'update')"
                     >
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
index f3c48930..c92ab45c 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
@@ -224,7 +224,7 @@
                         @click="handleReturn(scope.row, 'see')"
                         icon="el-icon-d-arrow-right"
                         v-hasPermi="['return:receive:handler']"
-                        v-if="
+                        v-show="
                             scope.row.taskStatus == 38 ||
                             scope.row.taskStatus == 39
                         "
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 50df1d9e..09da00a3 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -241,7 +241,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-setting"
-                        v-if="scope.row.repairStatusCode == '43'"
+                        v-show="scope.row.repairStatusCode == '43'"
                         @click="handleUpdate(scope.row, 'update')"
                         v-hasPermi="['service:button']"
                     >
diff --git a/sgzb-ui/src/views/repairTest/repairScrap/index.vue b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
index 66a6cad9..2811e8fe 100644
--- a/sgzb-ui/src/views/repairTest/repairScrap/index.vue
+++ b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
@@ -253,7 +253,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-setting"
-                        v-if="scope.row.repairStatusCode == '43'"
+                        v-show="scope.row.repairStatusCode == '43'"
                         @click="handleUpdate(scope.row, 'update')"
                         v-hasPermi="['service:button']"
                     >
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index b5f4aefb..656f20bb 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -245,7 +245,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-circle-check"
-                        v-if="scope.row.taskStatus == 46"
+                        v-show="scope.row.taskStatus == 46"
                         @click="handleUpdate(scope.row, 'update')"
                         v-hasPermi="['service:auditing']"
                         >审核</el-button
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
index ed51874b..e9d5b68f 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@@ -70,7 +70,7 @@
                     icon="el-icon-edit-outline"
                     @click="handleAuditing(data)"
                     v-hasPermi="['forecast:waste:auditing']"
-                    v-if="data.taskStatus === 121 || data.taskStatus === 120"
+                    v-show="data.taskStatus === 121 || data.taskStatus === 120"
                     >审核</el-button
                 >
             </template>
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
index f934ddba..06aa0981 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
@@ -78,7 +78,7 @@
                         style="color: #f56c6c"
                         icon="el-icon-finished"
                         v-hasPermi="['submit:scrap']"
-                        v-if="data.taskStatus == 124"
+                        v-show="data.taskStatus == 124"
                         @click="handleSubmitScrap(data)"
                         >提交报废</el-button
                     >
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
index bf174ace..632774f4 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
@@ -73,7 +73,7 @@
                     type="text"
                     style="color: #e6a23c"
                     icon="el-icon-edit-outline"
-                    v-if="data.disposition == 0"
+                    v-show="data.disposition == 0"
                     @click="handleDisposition(data)"
                     v-hasPermi="['scrap:disposition']"
                 >
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
index fc495998..d4db2f48 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
@@ -49,7 +49,7 @@
                     type="text"
                     style="color: #e6a23c"
                     icon="el-icon-edit-outline"
-                    v-if="auditingIsShow(data)"
+                    v-show="auditingIsShow(data)"
                     v-hasPermi="['scrap:auditing']"
                     @click="handleAuditing(data)"
                 >
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 6eab183c..052b6239 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -246,7 +246,7 @@
                         size="mini"
                         type="warning"
                         icon="el-icon-edit"
-                        v-if="
+                        v-show="
                             (scope.row.purchasingStatus == '验收合格') &&
                             scope.row.manageType != '1'
                         "
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index d071e8ed..565d9a34 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -194,7 +194,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
-                        v-if="scope.row.taskStatus == '105'"
+                        v-show="scope.row.taskStatus == '105'"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['warehousing:auditing']"
                         >审核</el-button
diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
index 2559c2a1..87cee1c0 100644
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@@ -180,7 +180,7 @@
                         type="primary"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
-                        v-if="scope.row.taskStatus == '入库进行中'"
+                        v-show="scope.row.taskStatus == '入库进行中'"
                         v-hasPermi="['repairTest:auditing']"
                         >审核</el-button
                     >
diff --git a/sgzb-ui/src/views/system/dept/index.vue b/sgzb-ui/src/views/system/dept/index.vue
index 9cf1b534..b9bfa963 100644
--- a/sgzb-ui/src/views/system/dept/index.vue
+++ b/sgzb-ui/src/views/system/dept/index.vue
@@ -85,7 +85,7 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-show="scope.row.parentId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
index e4fbb35b..a55cdcdd 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
@@ -220,7 +220,7 @@
                                 type="danger"
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.row)"
-                                v-if="scope.row.userName"
+                                v-show="scope.row.userName"
                                 v-hasPermi="['machinery:keeper:unbind']"
                             >
                                 解绑
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue
index 0a18ba6c..dad469ad 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue
@@ -128,7 +128,7 @@
                     <!--              v-hasPermi="['system:dept:add']"-->
                     <!--          >新增</el-button>-->
                     <el-button
-                        v-if="scope.row.parentId != 0"
+                        v-show="scope.row.parentId != 0"
                         size="mini"
                         type="danger"
                         icon="el-icon-delete"
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/personnel/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/personnel/index.vue
index 2e301c32..24b30f4c 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/personnel/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/personnel/index.vue
@@ -222,7 +222,7 @@
                                 type="danger"
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.row)"
-                                v-if="scope.row.userName"
+                                v-show="scope.row.userName"
                                 v-hasPermi="['machinery:personnel:unbind']"
                             >
                                 解绑
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index 662a6b9b..af7e8f71 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -1008,6 +1008,7 @@ export default {
         handleNodeClick(data) {
             console.log('🚀 ~ handleNodeClick ~ data:', data)
             this.queryParams.typeId = data.id
+            this.form.companyId = data.companyId
             this.handleQuery()
         },
         // 取消按钮
@@ -1075,6 +1076,7 @@ export default {
                 } else {
                     this.field101fileList = []
                 }
+                this.form.companyId = response.data.companyId
 
                 this.imageUrl = this.form.photoUrl
                 this.open = true
@@ -1232,7 +1234,7 @@ export default {
         treeChange(val) {
             console.log(val, '树节点')
 
-            this.form.companyId = val.companyId
+            // this.form.companyId = val.companyId
         },
         // 详情
         handleDetails(row) {
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
index 06246109..f0fc7605 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
@@ -125,7 +125,7 @@
                     plain
                     icon="el-icon-plus"
                     size="mini"
-                    v-if="isAccept"
+                    v-show="isAccept"
                     :disabled="multiple"
                     @click="handleListCheck"
                     v-hasPermi="['newPurchase:parts:notice:accept:batch']"
@@ -251,7 +251,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
-                        v-if="isAccept && scope.row.status == 0"
+                        v-show="isAccept && scope.row.status == 0"
                         @click="handleCheck(scope.row)"
                         v-hasPermi="['newPurchase:parts:notice:accept']"
                         >验收</el-button
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
index c28f77fa..36cd4bc2 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
@@ -140,7 +140,7 @@
                     <el-button
                         type="text"
                         icon="el-icon-edit"
-                        v-if="scope.row.taskStatus == 68"
+                        v-show="scope.row.taskStatus == 68"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['newPurchase:parts:edit']"
                         >编辑</el-button
@@ -149,7 +149,7 @@
                         type="text"
                         icon="el-icon-circle-check"
                         style="color: #e6a23c"
-                        v-if="scope.row.taskStatus == 68"
+                        v-show="scope.row.taskStatus == 68"
                         @click="handleCheck(scope.row)"
                         v-hasPermi="['newPurchase:parts:accept']"
                         >验收</el-button
@@ -166,7 +166,7 @@
                         style="color: #f56c6c"
                         type="text"
                         icon="el-icon-delete"
-                        v-if="scope.row.taskStatus == 68"
+                        v-show="scope.row.taskStatus == 68"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['newPurchase:parts:del']"
                         >删除</el-button
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
index 283ad85f..674d8f09 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
@@ -179,7 +179,7 @@
                         style="color: #e6a23c"
                         type="text"
                         icon="el-icon-finished"
-                        v-if="scope.row.taskStatus == '122'"
+                        v-show="scope.row.taskStatus == '122'"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['newPurchase:service:auditing']"
                         >审核</el-button
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
index 542559fc..ab6b4abe 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
@@ -183,7 +183,7 @@
                         type="text"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
-                        v-if="scope.row.taskStatus == 24"
+                        v-show="scope.row.taskStatus == 24"
                         v-hasPermi="['newPurchase:tools:edit']"
                         >编辑</el-button
                     >
@@ -191,7 +191,7 @@
                         type="text"
                         icon="el-icon-circle-check"
                         style="color: #e6a23c"
-                        v-if="
+                        v-show="
                             scope.row.purchasingStatus == '待通知' ||
                             scope.row.purchasingStatus == '待验收'
                         "
@@ -203,7 +203,7 @@
                         type="text"
                         icon="el-icon-edit-outline"
                         style="color: #67c23a"
-                        v-if="
+                        v-show="
                             scope.row.purchasingStatus == '验收合格' &&
                             scope.row.manageType != '1'
                         "
@@ -239,7 +239,7 @@
                         type="text"
                         style="color: #f56c6c"
                         icon="el-icon-delete"
-                        v-if="
+                        v-show="
                             scope.row.purchasingStatus == '待通知' ||
                             scope.row.purchasingStatus == '验收未通过' ||
                             scope.row.purchasingStatus ==
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
index 4b579f72..f9316acd 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
@@ -200,7 +200,7 @@
                         type="primary"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
-                        v-if="scope.row.taskStatus == 69"
+                        v-show="scope.row.taskStatus == 69"
                         v-hasPermi="['warehousing:newParts:auditing']"
                     >
                         审核
@@ -209,7 +209,7 @@
                         size="mini"
                         type="info"
                         icon="el-icon-edit"
-                        v-if="scope.row.taskStatus == 70"
+                        v-show="scope.row.taskStatus == 70"
                         @click="handlePrint(scope.row)"
                         v-hasPermi="['warehousing:newParts:list']"
                     >
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index bdafdf88..8eed2dea 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -196,7 +196,7 @@
                         style="color: #e6a23c"
                         type="text"
                         icon="el-icon-finished"
-                        v-if="scope.row.taskStatus == '105'"
+                        v-show="scope.row.taskStatus == '105'"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['warehousing:newTools:auditing']"
                         >审核</el-button
@@ -205,7 +205,7 @@
                         type="text"
                         icon="el-icon-tickets"
                         style="color: #67c23a"
-                        v-if="
+                        v-show="
                             scope.row.taskStatus == '28' ||
                             scope.row.taskStatus == '123'
                         "
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
index 9891e1f3..75e1a535 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
@@ -183,7 +183,7 @@
                         type="primary"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
-                        v-if="scope.row.taskStatus == '入库进行中'"
+                        v-show="scope.row.taskStatus == '入库进行中'"
                         v-hasPermi="['warehousing:repair:auditing']"
                         >审核</el-button
                     >