diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index d8b0f70..d4d37c4 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -153,6 +153,7 @@
         :before-close="refresh"
       >
         <basicProductEdit
+          :productRemarkSet="productRemarkSet"
           :editQuery="editQuery"
           :closeDialog="closeDialog">
         </basicProductEdit>
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 86c7e08..fb26cd2 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -9,13 +9,6 @@
       <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
       <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-      <el-table-column label="操作">
-        <template slot-scope="scope">
-          <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
-          <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
   </el-card>
   <el-card>
@@ -25,12 +18,7 @@
                         margin-bottom: 8px">
       <span>产品标识:</span>
     </div>
-    <div style=" float: right;
-                        text-align: right;
-                        margin-bottom: 8px;">
-      <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息
-      </el-button>
-    </div>
+
     <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
       <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
       <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 92bc3d8..f905022 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -1,6 +1,47 @@
 <template>
   <div>
-    <el-form :model="editQuery" :rules="rules" ref="editQuery" border label-width="120px">
+
+    <el-card>
+      <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
+            <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card>
+      <div style=" float: left;
+                        text-align: left;
+                        font-weight: bold;
+                        margin-bottom: 8px">
+        <span>产品标识:</span>
+      </div>
+      <div style=" float: right;
+                        text-align: right;
+                        margin-bottom: 8px;">
+        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息
+        </el-button>
+      </div>
+      <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row >
+        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-card>
+    <el-form :model="editQuery" :rules="rules" ref="editQuery" border label-width="120px" style="margin-top: 20px;  ">
       <el-row type="flex" class="edit-row">
         <el-col :span="12">
           <el-form-item label="商品条码:">
@@ -52,12 +93,38 @@
         </el-button>
       </el-button-group>
     </el-form>
+    </el-card>
+
+    <el-dialog
+      title="耗材字典-从指定系统添加器械信息"
+      :visible.sync="selectErpDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      append-to-body
+      v-if="selectErpDialogVisible"
+    >
+      <selectErp
+        :closeDialog="closeDialog"
+        :uuid="uuid"
+        :relId="relId"
+        :isImport="isImport"
+        :data="thisData"
+        :defaultSys="defaultSys"
+        @closeUdi="closeUdi2"
+        :supEnable="false"
+      ></selectErp>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { disableUdi } from '@/api/basic/product/udiRelevance'
+import { disableUdi, removeDiRl, removeRl, thirdSysDetail } from '@/api/basic/product/udiRelevance'
 import { updateById } from '@/api/basic/udiRelevance'
+import { filterByUuid } from '@/api/basic/udiInfo'
+import selectErp from "./udiInfoselectErpUdi";
+import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
 
 export default {
   name: 'productEdit',
@@ -66,6 +133,10 @@ export default {
       type: Object,
       required: true
     },
+    productRemarkSet: {
+      type: Object,
+      required: true
+    },
     closeDialog: {
       type: Function,
       required: true
@@ -76,7 +147,30 @@ export default {
     return {
       isUseDyCheck: false,
       useNumEnable: true,
-      editDialogVisible:false
+      editDialogVisible:false,
+      sysList:{},
+      relId:null,
+      defaultSys:null,
+      detailList:{},
+      isImport:null,
+      thisData: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null
+      },
+      selectVersionVisible:false,
+      originUuid: null,
+      uuid:null,
+      editSingleFormat: {
+        uuid: null,
+        relId: null,
+        sptm: null,
+        packUnit: null,
+        measname: null,
+        nameCode:null
+      },
+      editSingleDiDialogVisible: false,
+      selectErpDialogVisible: false,  //选入ERP产品
     }
   },
 
@@ -102,9 +196,118 @@ export default {
         }
       })
 
-    }
-
-  }
+    },
+    getThirdSysDetail() {
+      let query = {
+        id: this.editQuery.rlId,
+      };
+      thirdSysDetail(query)
+        .then((response) => {
+          this.loading = false;
+          this.sysList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.sysList = [];
+        });
+    },
+    addSelectErp(row) {
+      this.defaultSys = row.sysId;
+      this.isImport = false;
+      this.relId=this.editQuery.rlId;
+      this.thisData = this.editQuery;
+      this.selectErpDialogVisible = true;
+    },
+    removeErp(row) {
+      this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.editQuery.rlId,
+            thirdSys: row.sysId
+          };
+          removeRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+                this.getThirdSysDetail();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    removeDi() {
+      this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.editQuery.rlId,
+          };
+          removeDiRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+                this.editDialogVisible=false;
+                this.closeDialog();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    getDetailList(detailQuery) {
+      this.loading = true;
+      filterByUuid(detailQuery)
+        .then((response) => {
+          this.loading = false;
+          this.detailList = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
+    closeUdi2() {
+      this.selectUdiDialogVisible = false;
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.selectVersionVisible = false;
+      this.getThirdSysDetail();
+    },
+  },
+  components: {
+    selectErp
+  },
+  created() {
+    this.getThirdSysDetail();
+    var ttquery = {
+      id: this.editQuery.rlId,
+      page: 1,
+      limit: 10,
+    };
+    this.getDetailList(ttquery);
+  },
 }
 </script>