diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 91569cb..70cda00 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -710,7 +710,6 @@ export default {
     }
     ,
     bindId(val) {
-      debugger
       if (this.curRow.code != null || this.type == 1) {
         this.$emit("selectBindRl", val);
         // this.$emit("closeBindDialog", true);
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index e6c50ee..1d65b1f 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -407,7 +407,6 @@ export default {
         };
     },
     created() {
-        debugger
         this.getRoIds();
         this.getCompanyCertList();
         this.customerlist();
@@ -545,7 +544,6 @@ export default {
       getRoIds(){
           let params={companyId:this.inputQuery.customerId}
         getRoId(params).then((res) =>{
-          debugger
           this.inputQuery.roleId=parseInt(res.data.roleId);
         })
       },
diff --git a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
index 488b340..f09887f 100644
--- a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
+++ b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
@@ -211,7 +211,6 @@ export default {
       }
       this.loading = true;
       this.filterQuery.status = 3;
-      debugger
       this.filterQuery.supId = this.customerId;
       listOrder(this.filterQuery)
         .then((response) => {
diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue
index f786eda..cc88c8a 100644
--- a/src/views/purchase/purReturned/purReturnedEditDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue
@@ -479,7 +479,6 @@ export default {
     };
   },
   created() {
-    debugger
     if (this.$isNotBlank(this.idQuery.id)) {
       this.query.limit = 100;
       this.pId = this.idQuery.id;
diff --git a/src/views/supplier/company/basicCompany.vue b/src/views/supplier/company/basicCompany.vue
index 96a56ad..1e3ac89 100644
--- a/src/views/supplier/company/basicCompany.vue
+++ b/src/views/supplier/company/basicCompany.vue
@@ -399,7 +399,7 @@ export default {
             addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
             editTye: 1,
             checkFlag: {
-                0: "草稿",
+                0: "未认证",
                 1: "已通过",
                 2: "已拒绝",
                 3: "变更未审核",
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index 8d18750..84e6bf4 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -1,245 +1,280 @@
 <template>
-    <div>
-        <el-card>
-            <el-form  :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
-                <el-row>
-                  <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-col :span="6">
-                    <el-form-item label="对照条件:">
-                        <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
-                            <el-option
-                                v-for="item in filterList"
-                                :key="item.filterType"
-                                :label="item.sysName"
-                                :value="item.filterType">
-                                <span style="float: left">{{ item.sysName }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <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-col :span="6">
-                    <el-form-item label="第三方产品编码:">
-                        <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="审核状态:" v-if="isSpCombine">
-                        <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态">
-                            <el-option label="全部" value=""></el-option>
-                            <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-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" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
-                <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="thirdId" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产企业" prop="ylqxzcrbarmc" 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="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
-                <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        {{ lockStatusMap[scope.row.lockStatus] }}
-                    </template>
-                </el-table-column>
-                <el-table-column width="180" label="操作">
-                    <template slot-scope="scope">
-                        <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3" @click.native.stop="intentSelectUdi(scope.row)">关联DI</el-button>
-                        <el-button v-if="scope.row.lockStatus!=3" type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
-                        <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"  @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-                        <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3" @click.native.stop="sumitLockStatus(scope.row)">提交审核</el-button>
-                        <el-button v-if="isSpCombine" type="text" size="small"    @click.native.stop="splitSelectUdi(scope.row)" :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">拆分产品</el-button>
-                        <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :limit.sync="filterQuery.limit"
-            :page.sync="filterQuery.page"
-            @pagination="handleCurrentChange"
-          ></pagination>
-
-
-            <el-dialog
-                title="产品信息编辑"
-                :visible.sync="editDialogVisible"
-                width="80%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="editDialogVisible"
-                :before-close="refresh"
-            >
-                <basicProductEdit
-                    :editQuery="editQuery"
-                    :closeDialog="closeDialog">
-                </basicProductEdit>
-
-
-            </el-dialog>
-            <el-dialog
-                title="产品信息详情"
-                :visible.sync="detailDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="detailDialogVisible"
-            >
-                <basicProductDetail
-                    :productRemarkSet="productRemarkSet"
-                    :editQuery="editQuery"
-                    :closeDialog="closeDialog">
-                >
-                </basicProductDetail>
-            </el-dialog>
-            <el-dialog
-                title="关联选入耗材信息"
-                :visible.sync="selectUdiDialogVisible"
-                width="85%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="selectUdiDialogVisible"
-            >
-                <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
-            </el-dialog>
-            <el-dialog
-                :title="selectErpTitle"
-                :visible.sync="selectErpDialogVisible"
-                width="85%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="selectErpDialogVisible"
-            >
-                <selectErp
-                    :closeDialog="closeDialog"
-                    :uuid="uuid"
-                    :relId="relId"
-                    :intentThirdId="intentThirdId"
-                    :isImport="isImport"
-                    :data="thisData"
-                    :defaultSys="defaultSys"
-                    @closeUdi="closeUdi"
-                    :supEnable="true"
-                ></selectErp>
-            </el-dialog>
-            <el-dialog
-                title="选入DI器械信息"
-                :visible.sync="selectLocalVisible"
-                width="85%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="selectLocalVisible"
-            >
-                <selectLocalUdi
-                    :closeDialog="closeDialog"
-                    :relId="relId"
-                    :thirdId="thirdId"
-                    :idSpliUdi="idSpliUdi"
-                    :isImportUdi="isImportUdi"
-                    :data="thisData"
-                    @closeUdi="closeUdi"
-                ></selectLocalUdi>
-            </el-dialog>
-            <el-dialog
-                title="选入产品信息"
-                :visible.sync="selectProductVisible"
-                width="85%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="selectProductVisible"
-            >
-                <selectProduct
-                    :closeSelDialog="closeSelDialog"
-                    :uuid="uuid"
-                ></selectProduct>
-            </el-dialog>
-
-            <el-dialog
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                title="新增配送产品"
-                :visible.sync="addProductVisible"
-                width="85%"
-                v-if="addProductVisible"
-                @close="closeAddDialog"
-            >
-                <ThrProductsAdd
-                    :closeAddDialog="closeAddDialog"
-                    :newType="newType"></ThrProductsAdd>
-            </el-dialog>
-            <el-dialog
-                title="选择DI版本"
-                :visible.sync="selectVersionVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="85%"
-                v-if="selectVersionVisible"
-            >
-                <selectUdiVersion
-                    :closeDialog="closeDialog"
-                    :relId="relId"
-                    :uuid="uuid"
-                    :originUuid="originUuid"
-                    @closeUdi="closeUdi"
-                ></selectUdiVersion>
-            </el-dialog>
-        </el-card>
-    </div>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
+        <el-row>
+          <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-col :span="6">
+            <el-form-item label="对照条件:">
+              <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
+                <el-option
+                  v-for="item in filterList"
+                  :key="item.filterType"
+                  :label="item.sysName"
+                  :value="item.filterType">
+                  <span style="float: left">{{ item.sysName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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-col :span="6">
+            <el-form-item label="第三方产品编码:">
+              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="审核状态:" v-if="isSpCombine">
+              <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态">
+                <el-option label="全部" value=""></el-option>
+                <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-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" style="width: 100%" @selection-change="handleSelectionChange" border
+                highlight-current-row>
+        <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="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" 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="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ lockStatusMap[scope.row.lockStatus] }}
+          </template>
+        </el-table-column>
+        <el-table-column width="180" label="操作">
+          <template slot-scope="scope">
+            <el-button v-if="isSpCombine" type="text" size="small"
+                       :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
+                       @click.native.stop="intentSelectUdi(scope.row)">关联DI
+            </el-button>
+            <el-button v-if="scope.row.lockStatus!=3" type="text" size="small"
+                       @click.native.stop="handleModifyClick(scope.row)">编辑
+            </el-button>
+            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                        >
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3" >详情</el-dropdown-item>
+                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine"  :disabled="scope.row.lockStatus===3">提交审核</el-dropdown-item>
+                <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
+                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">拆分产品</el-dropdown-item>
+                <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+
+<!--            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"-->
+<!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
+<!--            </el-button>-->
+<!--            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"-->
+<!--                       @click.native.stop="sumitLockStatus(scope.row)">提交审核-->
+<!--            </el-button>-->
+<!--            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"-->
+<!--                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
+<!--              拆分产品-->
+<!--            </el-button>-->
+<!--            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除-->
+<!--            </el-button>-->
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+
+      <el-dialog
+        title="产品信息编辑"
+        :visible.sync="editDialogVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="editDialogVisible"
+        :before-close="refresh"
+      >
+        <basicProductEdit
+          :editQuery="editQuery"
+          :closeDialog="closeDialog">
+        </basicProductEdit>
+
+
+      </el-dialog>
+      <el-dialog
+        title="产品信息详情"
+        :visible.sync="detailDialogVisible"
+        width="70%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="detailDialogVisible"
+      >
+        <basicProductDetail
+          :productRemarkSet="productRemarkSet"
+          :editQuery="editQuery"
+          :closeDialog="closeDialog">
+          >
+        </basicProductDetail>
+      </el-dialog>
+      <el-dialog
+        title="关联选入耗材信息"
+        :visible.sync="selectUdiDialogVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectUdiDialogVisible"
+      >
+        <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
+      </el-dialog>
+      <el-dialog
+        :title="selectErpTitle"
+        :visible.sync="selectErpDialogVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectErpDialogVisible"
+      >
+        <selectErp
+          :closeDialog="closeDialog"
+          :uuid="uuid"
+          :relId="relId"
+          :intentThirdId="intentThirdId"
+          :isImport="isImport"
+          :data="thisData"
+          :defaultSys="defaultSys"
+          @closeUdi="closeUdi"
+          :supEnable="true"
+        ></selectErp>
+      </el-dialog>
+      <el-dialog
+        title="选入DI器械信息"
+        :visible.sync="selectLocalVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectLocalVisible"
+      >
+        <selectLocalUdi
+          :closeDialog="closeDialog"
+          :relId="relId"
+          :thirdId="thirdId"
+          :idSpliUdi="idSpliUdi"
+          :isImportUdi="isImportUdi"
+          :data="thisData"
+          @closeUdi="closeUdi"
+        ></selectLocalUdi>
+      </el-dialog>
+      <el-dialog
+        title="选入产品信息"
+        :visible.sync="selectProductVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectProductVisible"
+      >
+        <selectProduct
+          :closeSelDialog="closeSelDialog"
+          :uuid="uuid"
+        ></selectProduct>
+      </el-dialog>
+
+      <el-dialog
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        title="新增配送产品"
+        :visible.sync="addProductVisible"
+        width="85%"
+        v-if="addProductVisible"
+        @close="closeAddDialog"
+      >
+        <ThrProductsAdd
+          :closeAddDialog="closeAddDialog"
+          :newType="newType"></ThrProductsAdd>
+      </el-dialog>
+      <el-dialog
+        title="选择DI版本"
+        :visible.sync="selectVersionVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectVersionVisible"
+      >
+        <selectUdiVersion
+          :closeDialog="closeDialog"
+          :relId="relId"
+          :uuid="uuid"
+          :originUuid="originUuid"
+          @closeUdi="closeUdi"
+        ></selectUdiVersion>
+      </el-dialog>
+    </el-card>
+  </div>
 </template>
 
 <script>
 import {
-    deletetUdiInfos,
-    updatetUdiInfos,
-    updateErpProduct,
-    uploadSmp,
-    thirdSysDetail,
-    removeRl, sysFilter, spcombie, lockStatus, removeDiRl
+  deletetUdiInfos,
+  updatetUdiInfos,
+  updateErpProduct,
+  uploadSmp,
+  thirdSysDetail,
+  removeRl, sysFilter, spcombie, lockStatus, removeDiRl
 } from "../../../api/basic/udiRelevance";
 import store from "../../../store/index";
-import { deleteCompanyProductRelevance, filterCompanyProductRelevance } from "../../../api/supplier/companyProductRelevance";
+import {
+  deleteCompanyProductRelevance,
+  filterCompanyProductRelevance
+} from "../../../api/supplier/companyProductRelevance";
 import {finProductSet, selectSysParamByKey} from "../../../api/param/systemParamConfig";
 import {filterByUuid} from "../../../api/basic/udiInfo";
 
@@ -254,630 +289,652 @@ import basicProductDetail from "@/views/supplier/company/basicCompanyproductDeta
 
 
 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,
-                auditStatus: null,
-            },
-            idSpliUdi: false,
-            newType: 2,
-            selectProductVisible: false,
-            addProductVisible: false,
-            selectVersionVisible: false,
-            editQuery: null,
-            productRemarkSet: {},
-            relevanceEdit: {
-                id: null,
-                thirdId: "",
-                isDisable: null,
-                isUseDy: false,
-                isAdavence: null,
-                pId: null,
-            },
-            pId: 0,
-            productType: null,
-            defaultSys: null,
-            isImport: false,
-            intentThirdId: null,
-            isSpCombine: false,
-            isImportUdi: false,
-            isUploadSmp: 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
-            },
-            multipleSelection: [],
-            editDialogVisible: false,       //编辑
-            detailDialogVisible: false,//产品信息详情
-            selectUdiDialogVisible: false,  //关联选入
-            selectErpDialogVisible: false,  //选入ERP产品
-            selectLocalVisible: false,      //关联UDI
-            auditStatusMap: {
-                1: '通过',
-                2: '不通过',
-                3: '反审',
-                4: '申请反审',
-                5: '拒绝反审',
-            },
-
-            selectErpTitle: "从指定系统添加耗材信息",
-            lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
-            isUseDyCheck: false,
-            loading: false,
-            activeNames: ['1']
-        };
-    },
-
-    methods: {
-      hideSearch() {
-        this.showSearch = !this.showSearch;
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+        thrPiId: null,
+        filterType: null,
+        auditStatus: null,
       },
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                unionCode: null,
-                udiCode: null,
-                ylqxzcrbarmc: "",
-                cpmctymc: "", thrPiId: null,
-                nameCode: "",
-                ggxh: null,
-                page: 1,
-                limit: 20,
-                addType: 1,
-            };
-            this.getList();
-        },
-      refresh(){
-        this.getList();
-        this.editDialogVisible=false;
+      idSpliUdi: false,
+      newType: 2,
+      selectProductVisible: false,
+      addProductVisible: false,
+      selectVersionVisible: false,
+      editQuery: null,
+      productRemarkSet: {},
+      relevanceEdit: {
+        id: null,
+        thirdId: "",
+        isDisable: null,
+        isUseDy: false,
+        isAdavence: null,
+        pId: null,
       },
-        search() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            this.getProductRelevanceList();
-        },
-        getProductRelevanceList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            filterCompanyProductRelevance(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;
+      pId: 0,
+      productType: null,
+      defaultSys: null,
+      isImport: false,
+      intentThirdId: null,
+      isSpCombine: false,
+      isImportUdi: false,
+      isUploadSmp: 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
+      },
+      multipleSelection: [],
+      editDialogVisible: false,       //编辑
+      detailDialogVisible: false,//产品信息详情
+      selectUdiDialogVisible: false,  //关联选入
+      selectErpDialogVisible: false,  //选入ERP产品
+      selectLocalVisible: false,      //关联UDI
+      auditStatusMap: {
+        1: '通过',
+        2: '不通过',
+        3: '反审',
+        4: '申请反审',
+        5: '拒绝反审',
+      },
+
+      selectErpTitle: "从指定系统添加耗材信息",
+      lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
+      isUseDyCheck: false,
+      loading: false,
+      activeNames: ['1']
+    };
+  },
+
+  methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "", thrPiId: null,
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+      };
+      this.getList();
+    },
+    refresh() {
+      this.getList();
+      this.editDialogVisible = false;
+    },
+    search() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.getProductRelevanceList();
+    },
+    getProductRelevanceList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      filterCompanyProductRelevance(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();
+    },
+    getDetailList(detailQuery) {
+      this.loading = true;
+      filterByUuid(detailQuery)
+        .then((response) => {
+          this.isUseDyCheck = false;
+          this.loading = false;
+          this.detailList = response.data || [];
+          this.productType = this.detailList[0].productType;
+          this.detailList.forEach((item, index, array) => {
+            if (item.zxxsbzbhsydysl > 1) {
+              this.isUseDyCheck = true;
+            }
+          });
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
+
+    handleDetail(row) {
+      let rlId = this.editQuery.rlId;
+      this.editQuery = row;
+      this.editQuery.rlId = rlId;
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
+
+      deletetUdiInfos(tquery)
+        .then((response) => {
+          if (response.code == 20000) {
             this.getList();
-            event.target.select();
-        },
-        getDetailList(detailQuery) {
-            this.loading = true;
-            filterByUuid(detailQuery)
-                .then((response) => {
-                    this.isUseDyCheck = false;
-                    this.loading = false;
-                    this.detailList = response.data || [];
-                    this.productType = this.detailList[0].productType;
-                    this.detailList.forEach((item, index, array) => {
-                        if (item.zxxsbzbhsydysl > 1) {
-                            this.isUseDyCheck = true;
-                        }
-                    });
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-
-        handleDetail(row) {
-            let rlId = this.editQuery.rlId;
-            this.editQuery = row;
-            this.editQuery.rlId = rlId;
-        },
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
-
-            deletetUdiInfos(tquery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
+            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(() => {
-                });
-        },
-
-        intentDetail() {
-            this.isImportUdi = false;
-            this.selectUdiDialogVisible = true;
-        },
-        addSelectErp(row) {
-            this.defaultSys = row.sysId;
-            this.isImport = false;
-            this.selectErpTitle = "从" + row.sysName + "选入耗材信息";
-            this.selectErpDialogVisible = true;
-        },
-
-        removeErp(row) {
-            this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let query = {
-                        relId: this.editQuery.rlId,
-                        thirdSys: row.sysId
-                    };
-                    removeRl(query)
-                        .then((response) => {
-                            if (response.code == 20000) {
-                                this.getThirdSysDetail()();
-                                this.$message({
-                                    type: "success",
-                                    message: "删除成功！",
-                                });
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                        });
-                })
-                .catch(() => {
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+
+    intentDetail() {
+      this.isImportUdi = false;
+      this.selectUdiDialogVisible = true;
+    },
+    addSelectErp(row) {
+      this.defaultSys = row.sysId;
+      this.isImport = false;
+      this.selectErpTitle = "从" + row.sysName + "选入耗材信息";
+      this.selectErpDialogVisible = true;
+    },
+
+    removeErp(row) {
+      this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.editQuery.rlId,
+            thirdSys: row.sysId
+          };
+          removeRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.getThirdSysDetail()();
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
                 });
-        },
-        removeDi() {
-            this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+              } else {
+                this.$message.error(response.message);
+              }
             })
-                .then(() => {
-                    let query = {
-                        relId: this.editQuery.rlId,
-                    };
-                    removeDiRl(query)
-                        .then((response) => {
-                            if (response.code == 20000) {
-                                this.$message({
-                                    type: "success",
-                                    message: "删除成功！",
-                                });
-                                this.getList();
-                                this.cancelDialog();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                        });
-                })
-                .catch(() => {
-                });
-        },
-        intentSelectErp(val) {
-            this.uuid = val.uuid;
-            this.relId = val.rlId;
-            this.isImport = false;
-            this.thisData = val;
-            this.selectErpDialogVisible = true;
-        },
-
-        intentImportErp(val) {
-            this.defaultSys = null;
-            this.uuid = val.uuid;
-            this.relId = val.rlId;
-            this.isImport = true;
-            this.thisData = val;
-            this.intentThirdId = val.thirdId;
-            this.selectErpDialogVisible = true;
-        },
-        uploadSMP() {
-            var selectData = this.multipleSelection;
-            var keys = [];
-            selectData.forEach((obj) => {
-                keys.push(obj.id);
-            });
-            var tquery = {
-                keys: keys,
-            };
-            uploadSmp(tquery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "上传成功！",
-                        });
-                    } else {
-                        this.$message({
-                            type: "error",
-                            message: response.message,
-                        });
-                    }
-                })
-                .catch(() => {
-                    this.$message({
-                        type: "error",
-                        message: "上传失败",
-                    });
-                });
-        },
-        intentSelectUdi(val) {
-            this.relId = val.rlId;
-            this.isImportUdi = true;
-            this.thisData = val;
-            this.idSpliUdi = false;
-            this.thirdId = val.thirdId;
-            this.selectLocalVisible = true;
-        },
-
-        splitSelectUdi(val) {
-            this.thirdId = val.thirdId;
-            this.isImportUdi = true;
-            this.thisData = val;
-            this.idSpliUdi = true;
-            this.selectLocalVisible = true;
-        },
-
-        intentImportUdi() {
-            this.relId = null;
-            this.selectLocalVisible = true;
-        },
-        deleteCompanyProductRelevance(row) {
-            this.$confirm("是否移除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.productLoading = true;
-                let tquery = {
-                    id: row.id,
-                };
-                deleteCompanyProductRelevance(tquery)
-                    .then((response) => {
-                        this.productLoading = false;
-                        if (response.code === 20000) {
-                            this.getProductRelevanceList();
-                            this.$message({
-                                type: "success",
-                                message: "移除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.productLoading = false;
-                    });
-            }).catch(() => {
+            .catch(() => {
             });
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        closeSelDialog(val) {
-            this.selectProductVisible = false;
-            this.addProductVisible = false;
-        },
-        cancelDialog() {
-            this.editDialogVisible = false;
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
-            this.getList();
-        },
-        handleDetailClick(row) {
-            this.thisData = row;
-            this.detailDialogVisible = true;
-            this.editQuery = row;
-            this.relevanceEdit = {
-                id: row.rlId,
-                isUseDy: row.isUseDy,
-                isDisable: row.isDisable,
-                isAdavence: row.isAdavence,
-            };
-        },
-        sumitLockStatus(row) {
-            let postQuery = {
-                ids: [],
-                lockStatus: 2,
-            }
-            postQuery.ids.push(row.rlId);
-            lockStatus(postQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.loading = false;
-                        this.$message.success(response.data);
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-
-                })
-                .catch(() => {
-                    this.loading = false;
+        })
+        .catch(() => {
+        });
+    },
+    removeDi() {
+      this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.editQuery.rlId,
+          };
+          removeDiRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
                 });
-        },
-        handleModifyClick(row) {
-            this.editQuery = row;
-            this.editDialogVisible = true;
-        },
-        closeUdi(val) {
-            this.selectUdiDialogVisible = false;
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-            this.detailDialogVisible=false;
-            this.selectVersionVisible = false;
-            if (val) {
+                this.getList();
                 this.cancelDialog();
-            }
-        },
-        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 = [];
-                });
-        },
-        getSysFilter() {
-            sysFilter()
-                .then((response) => {
-                    this.loading = false;
-                    this.filterList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.filterList = [];
-                });
-
-        },
-        uploadErpProduct() {
-            updateErpProduct()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: response.data,
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
-        selectVersion() {
-            this.selectVersionVisible = true;
-            this.uuid = this.editQuery.uuid;
-            this.originUuid = this.editQuery.originUuid;
-            this.relId = this.editQuery.rlId;
-        },
-        closeDialog() {
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-            this.selectProductVisible = false;
-            this.editDialogVisible = false;
-            this.selectVersionVisible = false;
-            this.closeUdi();
-            this.getList();
-        },
-        onAddSubmit() {
-            this.relevanceEdit.isDisable = this.editQuery.isDisable;
-            this.relevanceEdit.isLock = this.editQuery.isLock;
-            this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
-            this.relevanceEdit = this.editQuery
-            this.relevanceEdit.pid = this.pId;
-            if (this.checked == true) {
-                this.relevanceEdit.isUseDy = 1;
-            } else {
-                this.relevanceEdit.isUseDy = 0;
-            }
-            this.relevanceEdit.id = this.editQuery.rlId,
-                updatetUdiInfos(this.relevanceEdit)
-                    .then((response) => {
-                        this.loading = false;
-                        this.getList();
-                        this.cancelDialog();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.cancelDialog();
-                    });
-        },
-        selectSysParam() {
-
-            spcombie().then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isSpCombine = true;
-                    } else {
-                        this.isSpCombine = false;
-                    }
-                }
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
             });
+        })
+        .catch(() => {
+        });
+    },
+    intentSelectErp(val) {
+      this.uuid = val.uuid;
+      this.relId = val.rlId;
+      this.isImport = false;
+      this.thisData = val;
+      this.selectErpDialogVisible = true;
+    },
 
-            let query = {
-                paramKey: "smp_isUploadProuct",
-            };
-            selectSysParamByKey(query).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isUploadSmp = true;
-                    }
-                }
-            });
-            let query1 = {
-                paramKey: "upload_pi_file_enabled",
-            };
-            selectSysParamByKey(query1).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isImportFile = true;
-                    }
-                }
+    intentImportErp(val) {
+      this.defaultSys = null;
+      this.uuid = val.uuid;
+      this.relId = val.rlId;
+      this.isImport = true;
+      this.thisData = val;
+      this.intentThirdId = val.thirdId;
+      this.selectErpDialogVisible = true;
+    },
+    uploadSMP() {
+      var selectData = this.multipleSelection;
+      var keys = [];
+      selectData.forEach((obj) => {
+        keys.push(obj.id);
+      });
+      var tquery = {
+        keys: keys,
+      };
+      uploadSmp(tquery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: "上传成功！",
             });
-            let query2 = {
-                paramKey: "upload_pi_file_url",
-            };
-            selectSysParamByKey(query2).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.paramValue;
-                }
+          } else {
+            this.$message({
+              type: "error",
+              message: response.message,
             });
-        },
-        selectProduct() {
-            this.selectProductVisible = true;
-        },
-        closeAddDialog(val) {
-            if (val) {
-                this.getList();
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: "error",
+            message: "上传失败",
+          });
+        });
+    },
+    intentSelectUdi(val) {
+      this.relId = val.rlId;
+      this.isImportUdi = true;
+      this.thisData = val;
+      this.idSpliUdi = false;
+      this.thirdId = val.thirdId;
+      this.selectLocalVisible = true;
+    },
+
+    splitSelectUdi(val) {
+      this.thirdId = val.thirdId;
+      this.isImportUdi = true;
+      this.thisData = val;
+      this.idSpliUdi = true;
+      this.selectLocalVisible = true;
+    },
+
+    intentImportUdi() {
+      this.relId = null;
+      this.selectLocalVisible = true;
+    },
+    deleteCompanyProductRelevance(row) {
+      this.$confirm("是否移除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.productLoading = true;
+        let tquery = {
+          id: row.id,
+        };
+        deleteCompanyProductRelevance(tquery)
+          .then((response) => {
+            this.productLoading = false;
+            if (response.code === 20000) {
+              this.getProductRelevanceList();
+              this.$message({
+                type: "success",
+                message: "移除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
             }
-            this.addProductVisible = false;
-        },
-
-        findBasicProductSet() {
-            finProductSet().then((response) => {
-                if (response.code == 20000) {
-                    this.productRemarkSet = response.data;
-                } else {
-                    //出错了
-                }
+          })
+          .catch(() => {
+            this.productLoading = false;
+          });
+      }).catch(() => {
+      });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    closeSelDialog(val) {
+      this.selectProductVisible = false;
+      this.addProductVisible = false;
+    },
+    cancelDialog() {
+      this.editDialogVisible = false;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleDetailClick(row) {
+      this.thisData = row;
+      this.detailDialogVisible = true;
+      this.editQuery = row;
+      this.relevanceEdit = {
+        id: row.rlId,
+        isUseDy: row.isUseDy,
+        isDisable: row.isDisable,
+        isAdavence: row.isAdavence,
+      };
+    },
+    sumitLockStatus(row) {
+      let postQuery = {
+        ids: [],
+        lockStatus: 2,
+      }
+      postQuery.ids.push(row.rlId);
+      lockStatus(postQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.loading = false;
+            this.$message.success(response.data);
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+          }
+
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleModifyClick(row) {
+      this.editQuery = row;
+      this.editDialogVisible = true;
+    },
+    closeUdi(val) {
+      this.selectUdiDialogVisible = false;
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.detailDialogVisible = false;
+      this.selectVersionVisible = false;
+      if (val) {
+        this.cancelDialog();
+      }
+    },
+
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDetailClick":
+          this.handleDetailClick(row);
+          break;
+        case "sumitLockStatus":
+          this.sumitLockStatus(row);
+          break;
+        case "splitSelectUdi":
+          this.splitSelectUdi(row);
+          break;
+        case "deleteCompanyProductRelevance":
+          this.deleteCompanyProductRelevance(row);
+          break;
+        default:
+          break;
+      }
+    },
+
+    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 = [];
+        });
+    },
+    getSysFilter() {
+      sysFilter()
+        .then((response) => {
+          this.loading = false;
+          this.filterList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.filterList = [];
+        });
+
+    },
+    uploadErpProduct() {
+      updateErpProduct()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: response.data,
             });
-        },
-
-    }
-    ,
-    mounted() {
-    }
-    ,
-    components: {
-        selectUdi,
-        selectErp,
-        selectLocalUdi,
-        selectProduct,
-        ThrProductsAdd,
-      selectUdiVersion,
-      basicProductEdit,
-      basicProductDetail
-    }
-    ,
-    created() {
-        this.findBasicProductSet();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+    selectVersion() {
+      this.selectVersionVisible = true;
+      this.uuid = this.editQuery.uuid;
+      this.originUuid = this.editQuery.originUuid;
+      this.relId = this.editQuery.rlId;
+    },
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.selectProductVisible = false;
+      this.editDialogVisible = false;
+      this.selectVersionVisible = false;
+      this.closeUdi();
+      this.getList();
+    },
+    onAddSubmit() {
+      this.relevanceEdit.isDisable = this.editQuery.isDisable;
+      this.relevanceEdit.isLock = this.editQuery.isLock;
+      this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
+      this.relevanceEdit = this.editQuery
+      this.relevanceEdit.pid = this.pId;
+      if (this.checked == true) {
+        this.relevanceEdit.isUseDy = 1;
+      } else {
+        this.relevanceEdit.isUseDy = 0;
+      }
+      this.relevanceEdit.id = this.editQuery.rlId,
+        updatetUdiInfos(this.relevanceEdit)
+          .then((response) => {
+            this.loading = false;
+            this.getList();
+            this.cancelDialog();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
+    selectSysParam() {
+
+      spcombie().then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isSpCombine = true;
+          } else {
+            this.isSpCombine = false;
+          }
+        }
+      });
+
+      let query = {
+        paramKey: "smp_isUploadProuct",
+      };
+      selectSysParamByKey(query).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isUploadSmp = true;
+          }
+        }
+      });
+      let query1 = {
+        paramKey: "upload_pi_file_enabled",
+      };
+      selectSysParamByKey(query1).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isImportFile = true;
+          }
+        }
+      });
+      let query2 = {
+        paramKey: "upload_pi_file_url",
+      };
+      selectSysParamByKey(query2).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.paramValue;
+        }
+      });
+    },
+    selectProduct() {
+      this.selectProductVisible = true;
+    },
+    closeAddDialog(val) {
+      if (val) {
         this.getList();
-        this.selectSysParam();
-        this.getSysFilter();
-    }
-    ,
+      }
+      this.addProductVisible = false;
+    },
+
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data;
+        } else {
+          //出错了
+        }
+      });
+    },
+
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    selectUdi,
+    selectErp,
+    selectLocalUdi,
+    selectProduct,
+    ThrProductsAdd,
+    selectUdiVersion,
+    basicProductEdit,
+    basicProductDetail
+  }
+  ,
+  created() {
+    this.findBasicProductSet();
+    this.getList();
+    this.selectSysParam();
+    this.getSysFilter();
+  }
+  ,
 }
 ;
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 6px;
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 6px;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  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;
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
 }
+
 .el-form-item--mini.el-form-item {
   margin-bottom: 9px;
 }
diff --git a/src/views/userManage/userAccountManage.vue b/src/views/userManage/userAccountManage.vue
index 671baee..b94bd8a 100644
--- a/src/views/userManage/userAccountManage.vue
+++ b/src/views/userManage/userAccountManage.vue
@@ -1,36 +1,28 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="query" label-width="100px">
+      <el-form :model="query" label-width="100px" :inline="true" class="query-form" size="mini">
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="用户账号:">
-              <el-input v-model="query.userName" style="width: 90%" placeholder="请输入用户账号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="状态:">
-              <el-select v-model="query.userFlag" style="width: 90%" placeholder="请选择状态">
-                <el-option label="全部" value=""></el-option>
-                <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-col>
-          <el-col :span="4">
+          <el-form-item label="用户账号:">
+            <el-input v-model="query.userName" placeholder="请输入用户账号"></el-input>
+          </el-form-item>
+          <el-form-item label="状态:">
+            <el-select v-model="query.userFlag" placeholder="请选择状态">
+              <el-option label="全部" value=""></el-option>
+              <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>
             <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-              <el-button type="primary" @click.native="handleForm(null, null)">新增</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)">新增</el-button>
             </el-button-group>
           </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
-
-
       <el-table v-loading="loading" :data="list" border style="width: 100%">
         <el-table-column label="序号" type="index" width="50" fixed></el-table-column>
         <el-table-column label="用户账号" prop="userName" fixed></el-table-column>
@@ -135,7 +127,7 @@ import {
   authAdminDelete
 } from '../../api/auth/authAdmin'
 
-import { userInfo } from '../../api/auth/login'
+import {userInfo} from '../../api/auth/login'
 
 const formJson = {
   id: '',
@@ -198,10 +190,10 @@ export default {
       formData: formJson,
       formRules: {},
       addRules: {
-        userName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        userName: [{required: true, message: '请输入姓名', trigger: 'blur'}],
         passWord: [
-          { required: true, message: '请输入密码', trigger: 'blur' },
-          { validator: validatePass, trigger: 'blur' }
+          {required: true, message: '请输入密码', trigger: 'blur'},
+          {validator: validatePass, trigger: 'blur'}
         ],
         checkPassword: [
           {
@@ -209,14 +201,14 @@ export default {
             message: '请再次输入密码',
             trigger: 'blur'
           },
-          { validator: validatePass2, trigger: 'blur' }
+          {validator: validatePass2, trigger: 'blur'}
         ]
         // userFlag: [
         //   { required: true, message: "请选择状态", trigger: "change" },
         // ],
       },
       editRules: {
-        userName: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
+        userName: [{required: true, message: '请输入姓名', trigger: 'blur'}]
         // userFlag: [
         //   { required: true, message: "请选择状态", trigger: "change" },
         // ],
@@ -381,7 +373,7 @@ export default {
           type: 'warning'
         })
           .then(() => {
-            let para = { id: row.id }
+            let para = {id: row.id}
             this.deleteLoading = true
             authAdminDelete(para)
               .then((response) => {
@@ -426,8 +418,6 @@ export default {
   },
   created() {
     this.getList()
-    debugger
-
   }
 }
 </script>