diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 89a39656..13b1eaa6 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1,61 +1,88 @@
 <template>
   <div>
     <el-card>
-      <el-row>
-        <el-col :span="3" v-show="showSearch">
+      <el-row type="flex">
+        <el-col v-show="showSearch" style="width: 300px">
           <div style="height: 100%">
-            <el-tree :data="treeList"
-                     class="tree"
-                     :default-expand-all="true"
-                     @node-click="handleNodeClick"
-                     :expand-on-click-node="false">
-                 <span class="custom-tree-node" slot-scope="{ node, data }">
-                   <span style="font-size: 14px;font-weight: 500;">{{ node.label }}</span></span>
+            <el-tree
+              :data="treeList"
+              class="tree"
+              :default-expand-all="true"
+              @node-click="handleNodeClick"
+              :expand-on-click-node="false"
+            >
+              <span class="custom-tree-node" slot-scope="{ node, data }">
+                <span style="font-size: 14px; font-weight: 500">{{
+                  node.label
+                }}</span></span
+              >
             </el-tree>
           </div>
         </el-col>
-        <el-col :span="21" style="border-left:  3px solid #dddddd">
-          <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
+        <el-col style="border-left: 3px solid #dddddd; overflow-x: scroll">
+          <el-form
+            :model="filterQuery"
+            size="mini"
+            label-width="100px"
+            v-show="showSearch"
+          >
             <el-row>
               <el-col :span="18">
                 <el-form-item class="query-form-item" label="UDI码:">
-                  <el-input v-model="filterQuery.udiCode"
-                            style="width: 97%"
-                            placeholder="请扫描或输入UDI码"
-                            clearable="true"
-                            @keyup.enter.native="keyup_submit($event)"></el-input>
+                  <el-input
+                    v-model="filterQuery.udiCode"
+                    style="width: 97%"
+                    placeholder="请扫描或输入UDI码"
+                    clearable="true"
+                    @keyup.enter.native="keyup_submit($event)"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="最小销售标识:">
-                  <el-input v-model="filterQuery.unionCode" placeholder="请输入最小销售标识"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.unionCode"
+                    placeholder="请输入最小销售标识"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="物资名称:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称" clearable="true"
-                            style="width: 90%"></el-input>
+                  <el-input
+                    v-model="filterQuery.cpmctymc"
+                    placeholder="请输入物资名称"
+                    clearable="true"
+                    style="width: 90%"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="规格型号:">
-                  <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" clearable="true"
-                            style="width: 90%"></el-input>
+                  <el-input
+                    v-model="filterQuery.ggxh"
+                    placeholder="请输入规格型号"
+                    clearable="true"
+                    style="width: 90%"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="对照条件:">
-                  <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件"
-                             style="width: 90%">
+                  <el-select
+                    v-model="filterQuery.filterType"
+                    placeholder="请选择过滤对照条件"
+                    style="width: 90%"
+                  >
                     <el-option
                       v-for="item in filterList"
                       :key="item.filterType"
                       :label="item.sysName"
-                      :value="item.filterType">
+                      :value="item.filterType"
+                    >
                       <span style="float: left">{{ item.sysName }}</span>
                     </el-option>
                   </el-select>
@@ -65,21 +92,32 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册备案人:">
-                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入注册备案人"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.ylqxzcrbarmc"
+                    placeholder="请输入注册备案人"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="第三方编码:">
-                  <el-input v-model="filterQuery.thrPiId" placeholder="请输入第三方主系统编码"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.thrPiId"
+                    placeholder="请输入第三方主系统编码"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="集采状态:">
-                  <el-select v-model="filterQuery.groupBuy" placeholder="请选择集采状态" clearable style="width: 90%">
+                  <el-select
+                    v-model="filterQuery.groupBuy"
+                    placeholder="请选择集采状态"
+                    clearable
+                    style="width: 90%"
+                  >
                     <el-option label="全部" value=""></el-option>
                     <el-option label="集采" value="true"></el-option>
                     <el-option label="非集采" value="false"></el-option>
@@ -88,7 +126,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="可配送状态:">
-                  <el-select v-model="filterQuery.dispatch" placeholder="请选择可配送状态" clearable style="width: 90%">
+                  <el-select
+                    v-model="filterQuery.dispatch"
+                    placeholder="请选择可配送状态"
+                    clearable
+                    style="width: 90%"
+                  >
                     <el-option label="全部" value=""></el-option>
                     <el-option label="可配送" value="true"></el-option>
                     <el-option label="不可配送" value="false"></el-option>
@@ -100,57 +143,124 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册/备案号:">
-                  <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.zczbhhzbapzbh"
+                    placeholder="请输入注册/备案号"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="生产企业:">
-                  <el-input v-model="filterQuery.manufactory" placeholder="请输入生产企业"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.manufactory"
+                    placeholder="请输入生产企业"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
           <div class="top-right-btn">
             <el-button-group>
-              <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="submit">查询</el-button>
+              <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="submit"
+                >查询</el-button
+              >
               <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="intentImportUdi"
+                >选入DI信息</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="intentImportErp"
+                >添加院内字典</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="intentDetail"
+                >关联添加</el-button
+              >
             </el-button-group>
           </div>
           <el-divider style="margin: 15px"></el-divider>
           <el-table
             v-loading="loading"
             :data="list"
-            style="width: 100%;"
+            style="width: 100%"
             border
             key="1"
             @selection-change="handleSelectionChange"
           >
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-            <el-table-column label="主系统编码" prop="mainId" width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" width="180" show-overflow-tooltip></el-table-column>
-            <el-table-column label="集采状态" prop="groupBuy" width="120" show-overflow-tooltip>
+            <el-table-column
+              label="最小销售产品标识"
+              prop="nameCode"
+              width="140"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="主系统编码"
+              prop="mainId"
+              width="120"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="物资名称"
+              prop="cpmctymc"
+              width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="规格型号"
+              prop="ggxh"
+              width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="注册/备案号"
+              prop="zczbhhzbapzbh"
+              width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="注册/备案人"
+              prop="ylqxzcrbarmc"
+              width="180"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="集采状态"
+              prop="groupBuy"
+              width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag :type="(scope.row.groupBuy) | statusFilterType">
+                <el-tag :type="scope.row.groupBuy | statusFilterType">
                   {{ groupBuyMap[scope.row.groupBuy] }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="可配送状态" prop="dispatch" width="120" show-overflow-tooltip>
+            <el-table-column
+              label="可配送状态"
+              prop="dispatch"
+              width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                <el-tag :type="scope.row.dispatch | statusFilterType">
                   {{ dispatchMap[scope.row.dispatch] }}
                 </el-tag>
               </template>
@@ -162,24 +272,27 @@
                   size="small"
                   :disabled="scope.row.originUuid != null"
                   @click.native.stop="intentSelectUdi(scope.row)"
-                >关联DI
+                  >关联DI
                 </el-button>
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="handleModifyClick(scope.row)"
-                >详情
+                  >详情
                 </el-button>
 
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="diEdit(scope.row)"
-                >编辑
+                  >编辑
                 </el-button>
 
-                <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                >删除
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="deleteDialog(scope.row)"
+                  >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -193,31 +306,87 @@
             v-if="editDialogVisible"
           >
             <el-card>
-              <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+              <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="第三方系统名称"
+                  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-card>
             <el-card>
-              <div style=" float: left;
-                        text-align: left;
-                        font-weight: bold;
-                        margin-bottom: 8px">
+              <div
+                style="
+                  float: left;
+                  text-align: left;
+                  font-weight: bold;
+                  margin-bottom: 8px;
+                "
+              >
                 <span>产品标识:</span>
               </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>
-                <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
+              <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>
+                <el-table-column
+                  label="包装级别"
+                  prop="packLevel"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="包装单位"
+                  prop="packUnit"
+                  show-overflow-tooltip
+                ></el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -227,10 +396,9 @@
                 ref="editQuery"
                 border
                 label-width="140px"
-                style="margin-top: 20px;  "
+                style="margin-top: 20px"
               >
                 <el-collapse v-model="activeNames">
-
                   <el-collapse-item name="1">
                     <template slot="title">
                       <p class="form-title">产品属性</p>
@@ -242,7 +410,12 @@
                           <div class="itemTag">
                             <span>产品是否禁用:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isDisable" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.isDisable"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -254,7 +427,12 @@
                           <div class="itemTag">
                             <span>是否寄售:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isAdavence" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.isAdavence"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -268,7 +446,12 @@
                           <div class="itemTag">
                             <span>允许无批次号:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoBatch" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoBatch"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -280,7 +463,12 @@
                           <div class="itemTag">
                             <span>允许无失效日期:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoExpire" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoExpire"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -294,7 +482,12 @@
                           <div class="itemTag">
                             <span>允许无生产日期:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoProduct" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoProduct"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -306,7 +499,12 @@
                           <div class="itemTag">
                             <span>允许无序列号:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoSerial" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoSerial"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -320,7 +518,12 @@
                           <div class="itemTag">
                             <span>启用使用单元:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isUseDy" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.isUseDy"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -332,7 +535,12 @@
                           <div class="itemTag">
                             <span>允许科室多次使用出库:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.useMuti" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.useMuti"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -342,7 +550,6 @@
                     </el-row>
                   </el-collapse-item>
 
-
                   <el-collapse-item name="2">
                     <template slot="title">
                       <p class="form-title">产品标识基本信息</p>
@@ -377,7 +584,6 @@
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -393,7 +599,6 @@
                             :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.bhxjcpbm"
-
                           ></el-input>
                         </div>
                       </el-col>
@@ -415,7 +620,6 @@
                     </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">
@@ -482,7 +686,6 @@
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -578,7 +781,6 @@
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                       <el-col :span="12" class="el-col">
@@ -588,7 +790,8 @@
                           </div>
                           <el-input
                             style="width: 65%"
-                            size="small" :disabled="true"
+                            size="small"
+                            :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.ybbm"
                           ></el-input>
@@ -632,13 +835,13 @@
                           </div>
                           <el-input
                             style="width: 65%"
-                            size="small" :disabled="true"
+                            size="small"
+                            :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.sptm"
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -650,7 +853,8 @@
                           <el-input
                             style="width: 65%"
                             size="small"
-                            splaceholder="请输入内容" :disabled="true"
+                            splaceholder="请输入内容"
+                            :disabled="true"
                             v-model="editQuery.measname"
                           ></el-input>
                         </div>
@@ -672,8 +876,6 @@
                     </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">
@@ -691,11 +893,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable1"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -707,10 +914,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable2"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -724,11 +937,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable3"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -740,10 +958,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable4"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -757,11 +981,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable5"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -773,10 +1002,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable6"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -790,10 +1025,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable7"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -805,10 +1046,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable8"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -820,10 +1067,8 @@
                         </div>
                       </el-col>
                     </el-row>
-
                   </el-collapse-item>
 
-
                   <el-collapse-item name="4">
                     <template slot="title">
                       <p class="form-title">生产标识基本信息</p>
@@ -938,7 +1183,6 @@
                             splaceholder="请输入内容"
                             v-model="editQuery.bzcj"
                             :disabled="true"
-
                           ></el-input>
                         </div>
                       </el-col>
@@ -966,7 +1210,6 @@
                     </template>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -979,14 +1222,16 @@
                             splaceholder="请输入内容"
                             v-model="editQuery.versionNumber"
                           ></el-input>
-                          <el-button type="text" size="small" @click.native.stop="selectVersion()"
-                                     style="margin-left: 5%"
-                          >切换版本
+                          <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="selectVersion()"
+                            style="margin-left: 5%"
+                            >切换版本
                           </el-button>
                         </div>
                       </el-col>
                     </el-row>
-
                   </el-collapse-item>
                 </el-collapse>
               </el-form>
@@ -1012,12 +1257,20 @@
               @closePre="closeUdi"
             ></product-edit>
 
-            <div style="text-align: center;margin-top: 12px">
-              <el-button type="primary" size="small" icon="search" @click="onAddSubmit(false)"
-              >提交
+            <div style="text-align: center; margin-top: 12px">
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="onAddSubmit(false)"
+                >提交
               </el-button>
-              <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-              >取消
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="cancelDialog"
+                >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1033,12 +1286,20 @@
               :editQuery="editSingleFormat"
             ></product-single-edit>
 
-            <div style="text-align: center;margin-top: 12px">
-              <el-button type="primary" size="small" icon="search" @click="onAddSingleSubmit(false)"
-              >提交
+            <div style="text-align: center; margin-top: 12px">
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="onAddSingleSubmit(false)"
+                >提交
               </el-button>
-              <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-              >取消
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="cancelDialog"
+                >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1050,7 +1311,10 @@
             width="85%"
             v-if="selectUdiDialogVisible"
           >
-            <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
+            <selectUdi
+              @closeUdi="closeUdi"
+              :isImportUdi="isImportUdi"
+            ></selectUdi>
           </el-dialog>
           <el-dialog
             title="耗材字典-从指定系统添加器械信息"
@@ -1105,7 +1369,7 @@
             ></selectUdiVersion>
           </el-dialog>
           <pagination
-            v-show="total>0"
+            v-show="total > 0"
             :total="total"
             :limit.sync="filterQuery.limit"
             :page.sync="filterQuery.page"
@@ -1154,8 +1418,6 @@
               :rId="rId"
             ></selectUnBindHospProduct>
           </el-dialog>
-
-
         </el-col>
       </el-row>
     </el-card>
@@ -1171,10 +1433,18 @@ import {
   updateErpProduct,
   uploadSmp,
   thirdSysDetail,
-  removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
+  removeRl,
+  sysFilter,
+  spcombie,
+  lockStatus,
+  removeDiRl,
+  disableUdi,
 } from "@/api/basic/product/udiRelevance";
-import {selectSysParamByKey, finProductSet} from "@/api/param/systemParamConfig";
-import {filterByUuid} from "@/api/basic/product/udiInfo";
+import {
+  selectSysParamByKey,
+  finProductSet,
+} from "@/api/param/systemParamConfig";
+import { filterByUuid } from "@/api/basic/product/udiInfo";
 
 import selectUdi from "./UdiInfoSelectRel.vue";
 import selectErp from "./udiInfoselectErpUdi";
@@ -1182,11 +1452,10 @@ import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectUdiVersion from "./UdiinfoSelectVersion";
 import ProductEdit from "@/views/basic/product/productEdit";
 import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
-import productUdiType from "@/views/basic/product/productUdiType"
+import productUdiType from "@/views/basic/product/productUdiType";
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
-import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
-
+import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
 
 export default {
   data() {
@@ -1223,15 +1492,15 @@ export default {
         sptm: null,
         packUnit: null,
         measname: null,
-        nameCode: null
+        nameCode: null,
       },
       groupBuyMap: {
         true: "集采",
-        false: "非集采"
+        false: "非集采",
       },
       dispatchMap: {
         true: "可配送",
-        false: "不可配送"
+        false: "不可配送",
       },
       pId: 0,
       productRemarkSet: {},
@@ -1270,24 +1539,23 @@ export default {
       thisData: {
         nameCode: null,
         cpmctymc: null,
-        ggxh: null
+        ggxh: null,
       },
       multipleSelection: [],
-      editDialogVisible: false,       //详情
+      editDialogVisible: false, //详情
       editDiDialogVisible: false,
       editSingleDiDialogVisible: false,
-      selectUdiDialogVisible: false,  //关联选入
-      selectErpDialogVisible: false,  //选入ERP产品
+      selectUdiDialogVisible: false, //关联选入
+      selectErpDialogVisible: false, //选入ERP产品
       selectVersionVisible: false,
-      selectLocalVisible: false,      //关联UDI
+      selectLocalVisible: false, //关联UDI
       isUseDyCheck: false,
-      lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
-      activeNames: ['1'],
+      lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
+      activeNames: ["1"],
       useNumEnable: true,
     };
   },
   filters: {
-
     statusFilterType(status) {
       const statusMap = {
         false: "warning",
@@ -1307,12 +1575,13 @@ export default {
         unionCode: null,
         udiCode: null,
         ylqxzcrbarmc: "",
-        cpmctymc: "", thrPiId: null,
+        cpmctymc: "",
+        thrPiId: null,
         nameCode: "",
         ggxh: null,
         page: 1,
         limit: 20,
-        addType: 1
+        addType: 1,
       };
       this.getList();
     },
@@ -1411,8 +1680,7 @@ export default {
             this.$message.error(response.message);
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     deleteDialog(rowId) {
@@ -1424,8 +1692,7 @@ export default {
         .then(() => {
           this.deleteOrders(rowId);
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     intentDetail() {
@@ -1447,7 +1714,7 @@ export default {
         .then(() => {
           let query = {
             relId: this.pId,
-            thirdSys: row.sysId
+            thirdSys: row.sysId,
           };
           removeRl(query)
             .then((response) => {
@@ -1463,14 +1730,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {
-            });
+            .catch(() => {});
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
-
     removeDi() {
       this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -1495,11 +1759,9 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {
-            });
+            .catch(() => {});
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     intentSelectErp(val) {
@@ -1556,20 +1818,18 @@ export default {
       this.selectLocalVisible = true;
     },
 
-
     intentImportUdi() {
       this.relId = null;
       this.thisData = {
         nameCode: null,
         cpmctymc: null,
         ggxh: null,
-        ylqxzcrbarmc: null
+        ylqxzcrbarmc: null,
       };
       this.isImport = false;
       this.selectLocalVisible = true;
     },
 
-
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -1600,7 +1860,6 @@ export default {
       };
       this.checked = row.isUseDy == 1;
 
-
       this.editQuery = row;
       //获取产品标识列表
       let ttquery = {
@@ -1611,13 +1870,12 @@ export default {
       this.getThirdSysDetail();
     },
 
-
     lockProducts(status) {
       let selectData = this.multipleSelection;
       let postQuery = {
         ids: [],
         lockStatus: status,
-      }
+      };
       selectData.forEach((row) => {
         postQuery.ids.push(row.id);
       });
@@ -1630,7 +1888,6 @@ export default {
           } else {
             this.$message.error(response.message);
           }
-
         })
         .catch(() => {
           this.loading = false;
@@ -1659,7 +1916,6 @@ export default {
           this.loading = false;
           this.filterList = [];
         });
-
     },
     singleDiEdit() {
       let temp = JSON.parse(JSON.stringify(this.editQuery));
@@ -1696,7 +1952,7 @@ export default {
     },
     onAddSubmit(relSubmit) {
       this.editFormat.relSubmit = relSubmit;
-      console.log(this.editFormat)
+      console.log(this.editFormat);
       updatetUdiInfos(this.editFormat)
         .then((response) => {
           if (response.code == 20000) {
@@ -1728,11 +1984,9 @@ export default {
         });
     },
 
-
     findBasicProductSet() {
       finProductSet().then((response) => {
         if (response.code == 20000) {
-
           this.productRemarkSet = response.data;
         } else {
           //出错了
@@ -1793,40 +2047,38 @@ export default {
           var invlist = response.data || [];
           this.treeList = this.handleTree(invlist, "code", "parentCode");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     addHospProduct(data) {
-      this.rId = data.code
+      this.rId = data.code;
       if (data.code != 10000) {
-        this.filterQuery.relCode = data.code
+        this.filterQuery.relCode = data.code;
       } else {
         this.filterQuery.relCode = null;
       }
       this.selectHospProductVisible = true;
     },
     removeHospProduct(data) {
-      this.rId = data.code
+      this.rId = data.code;
       if (data.code != 10000) {
-        this.filterQuery.relCode = data.code
+        this.filterQuery.relCode = data.code;
       } else {
         this.filterQuery.relCode = null;
       }
       this.selectUnBindHospProductVisible = true;
     },
     handleNodeClick(data) {
-      this.rId = data.code
+      this.rId = data.code;
       if (data.code != 10000) {
-        this.filterQuery.relCode = data.code
+        this.filterQuery.relCode = data.code;
       } else {
         this.filterQuery.relCode = null;
       }
       this.getList();
-    }
-  },
-  mounted() {
+    },
   },
+  mounted() {},
   components: {
     ProductSingleEdit,
     ProductEdit,
@@ -1836,7 +2088,7 @@ export default {
     selectUdiVersion,
     productUdiType,
     selectHospProduct,
-    selectUnBindHospProduct
+    selectUnBindHospProduct,
   },
   created() {
     this.findBasicProductSet();
@@ -1847,7 +2099,16 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style scoped lang="scss">
+.tree {
+  ::v-deep .el-tree-node {
+    white-space: normal;
+    .el-tree-node__content {
+      height: 100%;
+      align-items: start;
+    }
+  }
+}
 .itemTag {
   float: left;
   text-align: right;
@@ -1873,7 +2134,7 @@ export default {
   margin-bottom: 0px;
 }
 
-.el-row {
+/* .el-row {
   display: flex;
   flex-wrap: wrap;
   margin-bottom: 6px;
@@ -1882,7 +2143,7 @@ export default {
 .el-col {
   border-radius: 4px;
   flex-wrap: wrap;
-}
+} */
 
 .el-table .cell.el-tooltip {
   white-space: pre-wrap;
@@ -1896,6 +2157,4 @@ export default {
   padding-bottom: 17px;
   padding-top: 17px;
 }
-
-
 </style>