From cd620d55f21b3deaaa5a3df4682ca84720b1bf61 Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Tue, 16 May 2023 16:47:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userInformation.vue | 246 +++++++++++++++++-----------------
 1 file changed, 126 insertions(+), 120 deletions(-)

diff --git a/src/views/userInformation.vue b/src/views/userInformation.vue
index 385fafc..90105a6 100644
--- a/src/views/userInformation.vue
+++ b/src/views/userInformation.vue
@@ -2,11 +2,25 @@
   <!-- 用户信息填写 页面-->
   <el-card class="userInformation">
     <!-- 用户填写信息表单 -->
-    <div>
-      <h2 style="text-align: center">用户注册表</h2>
-      <div style="display: flex">
-        <!-- 审核认证 -->
-        <el-form
+    <div
+      style="
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: column;
+        align-items: flex-end;
+      "
+    >
+      <!-- 审核认证 -->
+      <div
+        style="    width: 100%;
+    font-size: 30px;
+    text-align: center;
+}"
+      >
+        <span>审核状态:</span>
+        <span> 已通过</span>
+      </div>
+      <!--  <el-form
           style="margin: 20px; width: 300px"
           label-width="80px"
           label-position="right"
@@ -43,129 +57,113 @@
               v-model="certificationForm.businessld"
             ></el-input>
           </el-form-item>
-        </el-form>
-        <!-- 企业信息 -->
-        <el-form
-          label-width="135px"
-          :model="firmForm"
-          :rules="rulesFirmForm"
-          ref="firmForm"
-          label-position="right"
-          style="margin: 20px; width: 400px"
-        >
-          <h3 style="text-align: center">企业信息</h3>
-          <el-form-item label="企业名称" prop="companyName">
-            <el-input
-              placeholder="请输入企业名称"
-              v-model="firmForm.companyName"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="社会统一信用号" prop="creditNum">
-            <el-input
-              placeholder="请输入企业统一社会信用号"
-              v-model="firmForm.creditNum"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="企业类型" prop="bussinessStatus">
-            <el-select
-              v-model="firmForm.bussinessStatus"
-              placeholder="请选择企业类型"
-            >
-              <el-option label="生产企业" value="1"></el-option>
-              <el-option label="流通企业" value="2"></el-option>
-              <el-option label="医疗机构" value="3"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="法人名称" prop="legalPerson">
-            <el-input
-              placeholder="请输入法人名称"
-              v-model="firmForm.legalPerson"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="法人身份证号" prop="legalldCard">
-            <el-input
-              placeholder="请输入法人身份证号"
-              v-model="firmForm.legalldCard"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="注册地址" prop="registerAddress">
-            <el-input
-              placeholder="请输入注册地址"
-              v-model="firmForm.registerAddress"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="联系方式" prop="contactWay">
-            <el-input
-              placeholder="请输入联系方式"
-              v-model="firmForm.contactWay"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="邮箱" prop="email">
-            <el-input
-              placeholder="请输入邮箱"
-              v-model="firmForm.email"
-            ></el-input>
-          </el-form-item>
-          <!-- <el-form-item label="注册状态" prop="checkStatus">
+        </el-form> -->
+      <!-- 企业信息 -->
+      <el-form
+        label-width="135px"
+        :model="firmForm"
+        :rules="rulesFirmForm"
+        ref="firmForm"
+        label-position="right"
+        style="margin: 20px; width: 100%"
+      >
+        <h3 style="text-align: center">企业信息</h3>
+        <el-form-item label="企业名称" prop="companyName">
+          <el-input
+            placeholder="请输入企业名称"
+            v-model="firmForm.companyName"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="社会统一信用号" prop="creditNum">
+          <el-input
+            placeholder="请输入企业统一社会信用号"
+            v-model="firmForm.creditNum"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业类型" prop="bussinessStatus">
+          <el-select
+            v-model="firmForm.bussinessStatus"
+            placeholder="请选择企业类型"
+          >
+            <el-option label="生产企业" value="1"></el-option>
+            <el-option label="流通企业" value="2"></el-option>
+            <el-option label="医疗机构" value="3"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="法人名称" prop="legalPerson">
+          <el-input
+            placeholder="请输入法人名称"
+            v-model="firmForm.legalPerson"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="法人身份证号" prop="legalldCard">
+          <el-input
+            placeholder="请输入法人身份证号"
+            v-model="firmForm.legalldCard"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="注册地址" prop="registerAddress">
+          <el-input
+            placeholder="请输入注册地址"
+            v-model="firmForm.registerAddress"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactWay">
+          <el-input
+            placeholder="请输入联系方式"
+            v-model="firmForm.contactWay"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱" prop="email">
+          <el-input
+            placeholder="请输入邮箱"
+            v-model="firmForm.email"
+          ></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="注册状态" prop="checkStatus">
           <el-select disabled v-model="firmForm.checkStatus">
             <el-option label="未审核" value="0"></el-option>
             <el-option label="已审核" value="1"></el-option>
             <el-option label="未通过" value="2"></el-option>
           </el-select>
         </el-form-item> -->
-          <el-form-item label="备注" prop="comments">
-            <el-input v-model="firmForm.comments"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              class="bntNext"
-              @click="submitfirmForm('firmForm')"
-              >提交</el-button
-            >
-          </el-form-item>
-        </el-form>
+        <el-form-item label="备注" prop="comments">
+          <el-input v-model="firmForm.comments"></el-input>
+        </el-form-item>
+
         <!-- 企业负责人信息 -->
-        <el-form
-          label-width="80px"
-          class="userForm"
-          label-position="right"
-          style="margin: 20px; width: 300px"
-        >
-          <h4 style="text-align: center">企业负责人信息</h4>
-          <el-form-item label="姓名">
-            <el-input placeholder="请输入姓名"></el-input> </el-form-item
-          ><el-form-item label="电话">
-            <el-input placeholder="请输入电话"></el-input> </el-form-item
-          ><el-form-item label="手机">
-            <el-input placeholder="请输入手机"></el-input> </el-form-item
-          ><el-form-item label="QQ">
-            <el-input placeholder="请输入QQ"></el-input> </el-form-item
-          ><el-form-item label="微信">
-            <el-input placeholder="请输入微信"></el-input> </el-form-item
-          ><el-form-item label="邮箱">
-            <el-input placeholder="请输入邮箱"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
+
+        <h4 style="text-align: center">企业负责人信息</h4>
+        <el-form-item label="姓名">
+          <el-input placeholder="请输入姓名"></el-input> </el-form-item
+        ><el-form-item label="电话">
+          <el-input placeholder="请输入电话"></el-input> </el-form-item
+        ><el-form-item label="手机">
+          <el-input placeholder="请输入手机"></el-input> </el-form-item
+        ><el-form-item label="QQ">
+          <el-input placeholder="请输入QQ"></el-input> </el-form-item
+        ><el-form-item label="微信">
+          <el-input placeholder="请输入微信"></el-input> </el-form-item
+        ><el-form-item label="邮箱">
+          <el-input placeholder="请输入邮箱"></el-input>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button
+            type="primary"
+            class="bntNext"
+            @click="submitfirmForm('firmForm')"
+            >提交</el-button
+          >
+        </el-form-item> -->
+      </el-form>
       <!-- 资质证书表格 -->
-      <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          margin: 50px 20px 20px;
-        "
-      >
-        <span>企业资质证书</span>
-        <el-button type="success">添加资质证书</el-button>
-      </div>
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column fixed prop="date" label="证书名称"> </el-table-column>
+      <el-table :data="tableData" border>
+        <el-table-column prop="date" label="证书名称"> </el-table-column>
         <el-table-column prop="name" label="证书编号"> </el-table-column>
         <el-table-column prop="province" label="起始日期"> </el-table-column>
         <el-table-column prop="city" label="有效期至"> </el-table-column>
         <el-table-column prop="address" label="证书文件"> </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="140px">
           <template slot-scope="scope">
             <el-button @click="handleClick(scope.row)" type="text" size="small"
               >查看</el-button
@@ -175,6 +173,12 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-button-group
+        style="width: 100%; display: flex; justify-content: center"
+      >
+        <el-button type="primary" style="margin: 10px 50px">注册</el-button>
+        <el-button type="primary" style="margin: 10px 50px">修改</el-button>
+      </el-button-group>
     </div>
   </el-card>
 </template>
@@ -339,12 +343,14 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
 .userInformation {
+  background-image: url("../assets/login.jpg");
   .el-card__body {
     display: flex;
-    justify-content: center;
-  }
-  .el-input {
-    width: 200px;
+    justify-content: flex-end;
+    margin-right: 50px;
+    .el-select {
+      width: 100%;
+    }
   }
 }
 </style>

From 20804f3cbf015136e6bc557ef6cde8526c0d5383 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 16 May 2023 17:47:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8C=BB=E7=96=97?=
 =?UTF-8?q?=E5=99=A8=E6=A2=B0=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/udiRlCompany.js                 |  56 ++
 .../basic/product/SelectDIDetailDialog.vue    |   8 +-
 .../basic/product/UdiInfoSelectLocalUdi.vue   |  99 +-
 src/views/basic/product/UdiRlCompany.vue      | 424 ++++++++
 .../basic/product/udilnfoManageSpDetail.vue   | 929 ++++++++----------
 5 files changed, 927 insertions(+), 589 deletions(-)
 create mode 100644 src/api/basic/udiRlCompany.js
 create mode 100644 src/views/basic/product/UdiRlCompany.vue

diff --git a/src/api/basic/udiRlCompany.js b/src/api/basic/udiRlCompany.js
new file mode 100644
index 0000000..98dcf42
--- /dev/null
+++ b/src/api/basic/udiRlCompany.js
@@ -0,0 +1,56 @@
+import axios from "@/utils/request";
+
+
+export function filterRlCompany(query) {
+  return axios(
+    {
+      url: "/udi/basic/rel/filter",
+      method: "get",
+      params: query
+    }
+  )
+}
+
+export function filterByUuid(query) {
+  return axios(
+    {
+      url: "/udiwms/udiinfo/local/filterByUuid",
+      method: "get",
+      params: query
+    }
+  )
+}
+
+
+export function seachCompany(query) {
+  return axios(
+    {
+      url: "/udi/auth/user/comapny/search",
+      method: "get",
+      params: query
+    }
+  )
+}
+
+export function deleteRel(query) {
+  return axios({
+    url: "/udi/basic/rel/delete",
+    method: "post",
+    data: query
+  });
+}
+
+export function batchCombine(query) {
+  return axios({
+    url: "/udi/basic/rel/batch/save",
+    method: "post",
+    data: query
+  });
+}
+
+
+
+
+
+
+
diff --git a/src/views/basic/product/SelectDIDetailDialog.vue b/src/views/basic/product/SelectDIDetailDialog.vue
index 601ade6..3d6c687 100644
--- a/src/views/basic/product/SelectDIDetailDialog.vue
+++ b/src/views/basic/product/SelectDIDetailDialog.vue
@@ -10,8 +10,7 @@
                 ">
         <span>产品标识:</span>
       </div>
-
-      <el-table  :data="detailList" style="width: 100%" border key="3" highlight-current-row>
+      <el-table :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>
@@ -464,7 +463,7 @@
 
 <script>
 
-import { filterByUuid, selectOriginuuid } from '@/api/basic/product/udiInfo'
+import {filterByUuid} from "@/api/basic/udiRlCompany";
 
 export default {
   name: "SelectDIDetailDialog",
@@ -482,7 +481,7 @@ export default {
   },
   methods: {
     getDetailList(detailQuery) {
-      selectOriginuuid(detailQuery)
+      filterByUuid(detailQuery)
         .then((response) => {
           this.detailList = response.data || [];
         })
@@ -512,6 +511,7 @@ export default {
   padding-bottom: 17px;
   padding-top: 17px;
 }
+
 .itemTag {
   float: left;
   text-align: right;
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index c1239c2..4a96848 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -342,6 +342,7 @@ import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
 import {isBlank} from "@/utils/strUtil";
+import {batchCombine} from "../../../api/basic/udiRlCompany";
 
 export default {
   name: "closeDialog",
@@ -350,26 +351,10 @@ export default {
       type: Function,
       required: true,
     },
-    relId: {
-      type: Number,
-      required: true,
-    },
-    isImport: {
-      type: Object,
-      required: true,
-    },
-    data: {
-      type: Object,
-      required: true,
-    },
-    thirdId: {
+    companyId: {
       type: Object,
       required: true,
     },
-    idSpliUdi: {
-      type: Object,
-      required: true,
-    }
   },
 
   data() {
@@ -388,11 +373,7 @@ export default {
       cpmctymc1: "",
       combineLoading: false,
       combineQuery: {
-        idSpliUdi: false,
-        thirdId: "",
-        relId: "",
-        erpName: "",
-        thirdName: null,
+        companyId: null,
         keys: [],
       },
       checked: true,
@@ -540,18 +521,7 @@ export default {
     },
 
     checkCombine() {
-       if(isBlank(this.relId)) {
-        this.checkedUdi();
-      } else {
-        this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.checkedUdi();
-          });
-      }
+      this.checkedUdi();
     },
 
     checkedUdi() {
@@ -564,7 +534,7 @@ export default {
           if (this.currentRow.check) {
             selected = this.currentRow;
           }
-        } else{
+        } else {
           this.$message.warning('请选入产品!');
           return;
         }
@@ -583,68 +553,19 @@ export default {
         return;
       }
       this.combineLoading = true;
-      checkExitUdi(this.combineQuery)
-        .then((response) => {
-          this.combineLoading = false;
-          if (response.code == 20000) {
-            this.combine();
-            // combineUdi(this.combineQuery)
-            //     .then((response) => {
-            //         this.combineLoading = false;
-            //         if (response.code == 20000) {
-            //             this.$emit("closeUdi", true);
-            //         } else {
-            //             this.$emit("closeUdi", false);
-            //         }
-            //     })
-            //     .catch(() => {
-            //         this.combineLoading = false;
-            //         this.$emit("closeUdi", false);
-            //     });
-          } else if (response.code == 499) {
-            this.$confirm(response.message, {type: "warning"})
-              .then(_ => {
-                this.combine();
-                // combineUdi(this.combineQuery)
-                //     .then((response) => {
-                //         this.combineLoading = false;
-                //         if (response.code == 20000) {
-                //             this.$emit("closeUdi", true);
-                //         } else {
-                //             this.$emit("closeUdi", false);
-                //         }
-                //     })
-                //     .catch(() => {
-                //         this.combineLoading = false;
-                //         this.$emit("closeUdi", false);
-                //     });
-              })
-              .catch(_ => {
-
-                this.combineQuery.keys = [];
-              });
-          }
-        })
-        .catch(() => {
-          this.combineLoading = false;
-          this.$emit("closeUdi", false);
-        });
+      this.combine();
     },
 
     combine() {
-      if (this.idSpliUdi) {
-        this.combineQuery.idSpliUdi = true;
-        this.combineQuery.thirdId = this.thirdId;
-        this.combineQuery.erpName = this.data.thirdName;
-      }
-      combineUdi(this.combineQuery)
+      this.combineQuery.companyId = this.companyId;
+      batchCombine(this.combineQuery)
         .then((response) => {
           this.combineLoading = false;
           if (response.code == 20000) {
-            this.$emit("closeUdi", true);
+            this.intentBack();
           } else {
             this.$message.error(response.message);
-            this.$emit("closeUdi", false);
+            this.intentBack();
           }
         })
         .catch(() => {
diff --git a/src/views/basic/product/UdiRlCompany.vue b/src/views/basic/product/UdiRlCompany.vue
new file mode 100644
index 0000000..a894bcd
--- /dev/null
+++ b/src/views/basic/product/UdiRlCompany.vue
@@ -0,0 +1,424 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="注册企业:">
+              <el-select
+                v-model="filterQuery.companyIdFk"
+                style="width: 90%"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择注册企业"
+                :remote-method="findMethod"
+                :loading="loading"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.id"
+                >
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品编码:">
+              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="注册备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loading" :data="list" key="1" style="width: 100%"
+                border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="注册企业" prop="companyName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="企业类型" prop="companyName" show-overflow-tooltip>
+
+          <template slot-scope="scope">
+            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
+          </template>
+
+        </el-table-column>
+        <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="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column width="120" label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-dialog
+        title="产品信息详情"
+        :visible.sync="editDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="60%"
+        v-if="editDialogVisible"
+      >
+        <selectDetail
+          :detailQuery="detailQuery"
+          :checked="checked"
+          @closeUdi="closeUdi"
+        >
+        </selectDetail>
+      </el-dialog>
+
+      <el-dialog
+        title="选入医疗器械信息"
+        :visible.sync="selectProductVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectProductVisible"
+      >
+        <selectLocalUdi
+          :closeDialog="closeDialog"
+          :companyId="filterQuery.companyIdFk"
+        ></selectLocalUdi>
+      </el-dialog>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+import selectProduct from "./basicCompanyProductsImport";
+import selectUdi from "./udiInfoRelevance.vue";
+import selectErp from "./udiInfoselectErpUdi";
+import selectLocalUdi from "./UdiInfoSelectLocalUdi";
+import selectDetail from "./udilnfoManageSpDetail";
+import {filterRlCompany, seachCompany, deleteRel} from "../../../api/basic/udiRlCompany";
+
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+        thrPiId: null,
+        filterType: null,
+        companyName: null,
+        companyIdFk: null,
+      },
+      fromOptions: [],
+      editQuery: null,
+      detailQuery: null,
+      defaultSys: null,
+      isImport: false,
+      isImportUdi: false,
+      isUploadSmp: false,
+      isSpCombine: false,
+      isImportFile: false,
+      uploadFileUrl: null,
+      checked: false,
+      list: [],
+      detailList: [],
+      sysList: [],
+      filterList: [],
+      total: 0,
+      thirdNo: "",
+      uuid: "111",
+      originUuid: null,
+      thirdId: null,
+      relId: "",
+      thisData: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null
+      },
+      selectProductVisible: false,
+      multipleSelection: [],
+      editDialogVisible: false,       //详情
+      selectUdiDialogVisible: false,  //关联选入
+      selectErpDialogVisible: false,  //选入ERP产品
+      selectLocalVisible: false,      //关联UDI
+      selectVersionVisible: false,
+      isUseDyCheck: false,
+      loading: false,
+      activeNames: ['1'],
+      companyTypeMap: {
+        1: "生产企业",
+        2: "代理商",
+        3: "购买方",
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        lockStatus: null,
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        thrPiId: null,
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+      };
+      this.total = 0;
+      this.list = [];
+      this.getList();
+    },
+    search() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      filterRlCompany(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    keyup_submit(event) {
+      this.filterQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    handleDetail(row) {
+      this.editQuery = row;
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
+
+      deleteRel(tquery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    selectProduct() {
+      if (this.$isBlank(this.filterQuery.companyIdFk)) {
+        this.$message.error("请先选择注册企业！");
+        return;
+      }
+      this.selectProductVisible = true;
+    },
+
+    cancelDialog() {
+      this.editDialogVisible = false;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleModifyClick(row) {
+      this.uuid = row.uuid;
+      this.isImport = false;
+      this.thisData = row;
+      this.editDialogVisible = true;
+      this.detailQuery = row;
+      this.checked = row.isUseDy == 1;
+    },
+
+    closeUdi(val) {
+      this.selectUdiDialogVisible = false;
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.getList();
+    },
+
+    selectVersion() {
+      this.selectVersionVisible = true;
+      this.uuid = this.editQuery.uuid;
+      this.originUuid = this.editQuery.originUuid;
+    },
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.selectVersionVisible = false;
+      this.selectProductVisible = false;
+      this.getList();
+    },
+
+
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        searchKey: query,
+        page: 1,
+        limit: 10,
+      };
+      seachCompany(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    selectUdi,
+    selectErp,
+    selectLocalUdi,
+    selectProduct,
+    selectDetail
+  }
+  ,
+  created() {
+    this.getList();
+    this.findMethod();
+  }
+  ,
+}
+;
+</script>
+<style scoped>
+
+
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap;
+}
+
+
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
+}
+
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
+
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
+
+.form-title {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
+}
+</style>
diff --git a/src/views/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue
index 891ab15..f1c1cef 100644
--- a/src/views/basic/product/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/udilnfoManageSpDetail.vue
@@ -1,497 +1,462 @@
 <template>
-   <div>
-     <el-card>
-    <el-table :data="sysList" style="width: 100%" 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>
-
-
-    <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border key="3" @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>
-      <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-form :model="detailQuery" :rules="rules" ref="detailQuery" label-width="100px" style="margin-top: 20px">
-      <el-collapse v-model="activeNames">
-        <el-collapse-item name="1">
-          <template slot="title">
-            <p class="form-title">产品标识基本信息</p>
-          </template>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>产品标识:&nbsp;</span>
+  <div>
+    <el-card>
+      <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border key="3"
+                @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>
+        <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-form :model="detailQuery" :rules="rules" ref="detailQuery" label-width="100px" style="margin-top: 20px">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item name="1">
+            <template slot="title">
+              <p class="form-title">产品标识基本信息</p>
+            </template>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品标识:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.nameCode"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.nameCode"
-                ></el-input>
-              </div>
-            </el-col>
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.zxxsbzbhsydysl"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.zxxsbzbhsydysl"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>包含下级产品编码:&nbsp;</span>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>包含下级产品编码:&nbsp;</span>
+                  </div>
+
+                  <el-input
+                    style="width: 65%"
+                    size="small"
+                    :disabled="true"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.bhxjcpbm"
+
+                  ></el-input>
                 </div>
-
-                <el-input
-                  style="width: 65%"
-                  size="small"
-                  :disabled="true"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.bhxjcpbm"
-
-                ></el-input>
-              </div>
-            </el-col>
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>包含最小销售包装数量:&nbsp;</span>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>包含最小销售包装数量:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    size="small"
+                    :disabled="true"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.bhzxxsbzsl"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  size="small"
-                  :disabled="true"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.bhzxxsbzsl"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-
-        <el-collapse-item name="2">
-          <template slot="title">
-            <p class="form-title">产品基本信息</p>
-          </template>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>产品名称:&nbsp;</span>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+
+          <el-collapse-item name="2">
+            <template slot="title">
+              <p class="form-title">产品基本信息</p>
+            </template>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品名称:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    size="small"
+                    splaceholder="请输入内容"
+                    :disabled="true"
+                    v-model="detailQuery.cpmctymc"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  :disabled="true"
-                  v-model="detailQuery.cpmctymc"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>产品标识:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品标识:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.nameCode"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.nameCode"
-                ></el-input>
-              </div>
-            </el-col>
-
-
-          </el-row>
-
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>规格型号:&nbsp;</span>
+              </el-col>
+
+
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>规格型号:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.ggxh"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.ggxh"
-                ></el-input>
-              </div>
-            </el-col>
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>器械类别:&nbsp;</span>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>器械类别:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.qxlb"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.qxlb"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>产品类别:&nbsp;</span>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品类别:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.cplb"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.cplb"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>分类编码:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>分类编码:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.flbm"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.flbm"
-                ></el-input>
-              </div>
-            </el-col>
-
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>商品条码:&nbsp;</span>
+              </el-col>
+
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>商品条码:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.sptm"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.sptm"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>医保编码:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>医保编码:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.ybbm"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.ybbm"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>医疗器械注册人:&nbsp;</span>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>医疗器械注册人:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="ylqxzcrbarmc"
+                    v-model="detailQuery.ylqxzcrbarmc"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="ylqxzcrbarmc"
-                  v-model="detailQuery.ylqxzcrbarmc"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>注册人英文名称:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>注册人英文名称:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.ylqxzcrbarywmc"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.ylqxzcrbarywmc"
-                ></el-input>
-              </div>
-            </el-col>
-
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>统一社会信用号:&nbsp;</span>
+              </el-col>
+
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>统一社会信用号:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.tyshxydm"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.tyshxydm"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>注册证/备案号:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>注册证/备案号:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.zczbhhzbapzbh"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.zczbhhzbapzbh"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20" class="el-row" type="flex">
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>生产企业:&nbsp;</span>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>生产企业:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    size="small"
+                    splaceholder="请输入内容"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  splaceholder="请输入内容"
-                ></el-input>
-              </div>
-            </el-col>
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>产品描述:&nbsp;</span>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品描述:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.cpms"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.cpms"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-
-        </el-collapse-item>
-
-        <el-collapse-item name="3">
-          <template slot="title">
-            <p class="form-title">生产标识基本信息</p>
-          </template>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>是否包含批号:&nbsp;</span>
+              </el-col>
+            </el-row>
+
+          </el-collapse-item>
+
+          <el-collapse-item name="3">
+            <template slot="title">
+              <p class="form-title">生产标识基本信息</p>
+            </template>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>是否包含批号:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.scbssfbhph"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.scbssfbhph"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>是否包含序列号:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>是否包含序列号:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    size="small"
+                    v-model="detailQuery.scbssfbhxlh"
+                    splaceholder="请输入内容"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  v-model="detailQuery.scbssfbhxlh"
-                  splaceholder="请输入内容"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>是否包含生产日期:&nbsp;</span>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>是否包含生产日期:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.scbssfbhscrq"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.scbssfbhscrq"
-                ></el-input>
-              </div>
-            </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>是否包含失效日期:&nbsp;</span>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>是否包含失效日期:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="!checked"
+                    v-model="detailQuery.scbssfbhsxrq"
+                    size="small"
+                    splaceholder="请输入内容"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  v-model="detailQuery.scbssfbhsxrq"
-                  size="small"
-                  splaceholder="请输入内容"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-
-        <el-collapse-item name="4">
-          <template slot="title">
-            <p class="form-title">包装标识信息</p>
-          </template>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>上级产品编码:&nbsp;</span>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+
+          <el-collapse-item name="4">
+            <template slot="title">
+              <p class="form-title">包装标识信息</p>
+            </template>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>上级产品编码:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    :disabled="true"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.sjcpbm"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.sjcpbm"
-                ></el-input>
-              </div>
-            </el-col>
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>包装级别:&nbsp;</span>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>包装级别:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    size="small"
+                    splaceholder="请输入内容"
+                    :disabled="true"
+                    v-model="detailQuery.packLevel"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  :disabled="true"
-                  v-model="detailQuery.packLevel"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>包装层级:&nbsp;</span>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>包装层级:&nbsp;</span>
+                  </div>
+
+                  <el-input
+                    style="width: 65%"
+                    size="small"
+                    splaceholder="请输入内容"
+                    v-model="detailQuery.bzcj"
+                    :disabled="true"
+
+                  ></el-input>
                 </div>
-
-                <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.bzcj"
-                  :disabled="true"
-
-                ></el-input>
-              </div>
-            </el-col>
-
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>包含下级包装数量:&nbsp;</span>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>包含下级包装数量:&nbsp;</span>
+                  </div>
+                  <el-input
+                    style="width: 65%"
+                    size="small"
+                    splaceholder="请输入内容"
+                    :disabled="true"
+                    v-model="detailQuery.bhxjsl"
+                  ></el-input>
                 </div>
-                <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  :disabled="true"
-                  v-model="detailQuery.bhxjsl"
-                ></el-input>
-              </div>
-            </el-col>
-          </el-row>
-
-        </el-collapse-item>
-
-      </el-collapse>
-
-      <el-row :gutter="20" class="el-row" type="flex">
-        <el-col :span="24" class="el-col">
-          <div style="margin-top: 18px;margin-bottom: 18px">
-            <el-checkbox v-model="checked" disabled
-            >启用使用单元
-            </el-checkbox>
-            <el-checkbox v-model="detailQuery.isDisable" disabled
-            >是否禁用
-            </el-checkbox>
-            <el-checkbox v-model="detailQuery.isAdavence" disabled
-            >是否寄售
-            </el-checkbox>
-            <el-checkbox v-model="detailQuery.allowNoBatch" disabled
-            >允许无批次号
-            </el-checkbox>
-            <el-checkbox v-model="detailQuery.allowNoExpire" disabled
-            >允许无失效日期
-            </el-checkbox>
-            <el-checkbox v-model="detailQuery.allowNoProduct" disabled
-            >允许无生产日期
-            </el-checkbox>
-          </div>
-        </el-col>
-      </el-row>
-    </el-form>
-     </el-card>
-   </div>
+              </el-col>
+            </el-row>
+
+          </el-collapse-item>
+
+        </el-collapse>
+
+      </el-form>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import {filterDetail} from "@/api/basic/udiinfoImport";
-import {thirdSysDetail} from "@/api/basic/udiRelevance";
-import {filterByUuid} from "@/api/basic/udiInfo";
+
+import {filterByUuid} from "@/api/basic/udiRlCompany";
 
 export default {
   name: "udilnfoManageSpDetail",
@@ -500,11 +465,7 @@ export default {
       type: Object,
       required: true,
     },
-    relevanceEdit: {
-      type: Object,
-      required: true,
-    },
-    checked:{
+    checked: {
       type: Boolean,
       required: true,
     },
@@ -512,37 +473,13 @@ export default {
   data() {
     return {
       sysList: [],
-      detailList:[],
-      relevanceEdit: {
-        id: null,
-        thirdId: "",
-        isDisable: null,
-        isUseDy: false,
-        isLock: null,
-        isAdavence: null,
-      },
+      detailList: [],
     }
   },
   methods: {
-
-    getThirdSysDetail() {
-      let query = {
-        id: this.relevanceEdit.id,
-      };
-
-      thirdSysDetail(query)
-        .then((response) => {
-          this.loading = false;
-          this.sysList = response.data.list || [];
-        })
-        .catch(() => {
-          this.loading = false;
-          this.sysList = [];
-        });
-    },
     getDetailList() {
       let ttquery = {
-        id: this.detailQuery.rlId
+        uuid: this.detailQuery.uuid
       };
       this.loading = true;
       filterByUuid(ttquery)
@@ -563,7 +500,6 @@ export default {
     },
   },
   created() {
-    this.getThirdSysDetail();
     this.getDetailList(this.detailQuery.id);
   }
 }
@@ -610,6 +546,7 @@ export default {
 .el-table .cell.el-tooltip {
   white-space: pre-wrap;
 }
+
 .form-title {
   font-size: 16px;
   font-family: Noto Sans SC;