diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 73ce023..763e371 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -2,18 +2,18 @@
   <div>
     <el-card>
       <el-row>
-        <el-col :span="2" v-show="showSearch">
+        <el-col :span="3" v-show="showSearch">
           <div style="height: 100%">
             <el-tree :data="treeList"
                      class="tree"
                      @node-click="handleNodeClick"
                      :expand-on-click-node="false">
                  <span class="custom-tree-node" slot-scope="{ node, data }">
-                   <span style="font-size: 15px;font-weight: 500;">{{ node.label }}</span></span>
+                   <span style="font-size: 14px;font-weight: 500;">{{ node.label }}</span></span>
             </el-tree>
           </div>
         </el-col>
-        <el-col :span="22">
+        <el-col :span="21">
           <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
             <el-row>
               <el-col :span="18">
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 6e9f274..2b67249 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -50,8 +50,7 @@
           <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="180px">
             <template slot-scope="scope">
-              <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>
-            </template>
+              <el-button type="text" @click.native.stop="singleDiEdit(scope.row)">编辑</el-button>     </template>
           </el-table-column>
         </el-table>
       </el-card>
@@ -800,8 +799,8 @@ export default {
     cancelDialog() {
       this.editSingleDiDialogVisible = false;
     },
-    singleDiEdit() {
-      let temp = JSON.parse(JSON.stringify(this.editQuery));
+    singleDiEdit(val) {
+      let temp = val;
       this.editSingleFormat.uuid = temp.uuid;
       this.editSingleFormat.id = temp.id;
       this.editSingleFormat.sptm = temp.sptm;
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 5cce6e6..0034816 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -135,18 +135,19 @@
             <el-button
               type="text"
               size="small"
+              v-if="scope.row.status == 5"
               @click.native.stop="rollback(scope.row)"
             >撤回
             </el-button
             >
 
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteDialog(scope.row)"
-            >删除
-            </el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="deleteDialog(scope.row)"-->
+<!--            >删除-->
+<!--            </el-button-->
+<!--            >-->
           </template>
         </el-table-column>
       </el-table>
@@ -331,7 +332,7 @@
 <script>
 import {
   deleteInvByBillNo,
-  getOrderList, rollbackOrder
+  getOrderList, rollbackOrder, rollUnReceivebackOrder
 } from "../../api/inout/order";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -774,7 +775,7 @@ export default {
         type: 'warning'
       }).then(() => {
         let param = {billNo: row.billNo};
-        rollbackOrder(param).then((res) => {
+        rollUnReceivebackOrder(param).then((res) => {
           if (res.code === 20000) {
             this.$message.success("撤回成功");
             this.getList();
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 8fdaaf3..d7dd0a6 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -402,7 +402,7 @@ export default {
       let data = {
         relId: row.bindRlFk,
         supId: row.supId,
-        zczbhhzbapzbh: row.zczbhhzbapzbh,
+        zczbhhzbapzbh: row.certCode,
         orderEntity: this.idQuery,
       }
       this.loading = true;
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index d80f264..8d18750 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -76,9 +76,9 @@
                 <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
                 <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                 <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
-                <el-table-column v-if="isSpCombine" label="审核状态" prop="lockStatus" show-overflow-tooltip>
+                <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        {{ lockStatusMap[scope.row.auditStatus] }}
+                        {{ lockStatusMap[scope.row.lockStatus] }}
                     </template>
                 </el-table-column>
                 <el-table-column width="180" label="操作">