diff --git a/.eslintrc.js b/.eslintrc.js
index 3a5a637..5fd64f3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,8 +4,8 @@ module.exports = {
     node: true
   },
   'extends': [
-    'plugin:vue/essential',
-    '@vue/prettier'
+    'plugin:vue/essential'
+    // '@vue/prettier'
   ],
   plugins: [
     'vue'
@@ -15,6 +15,6 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
-    parser: 'babel-eslint'
+    // parser: 'babel-eslint'
   }
-}
\ No newline at end of file
+}
diff --git a/public/config.json b/public/config.json
index b0ef407..d9c3d49 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,4 +1,4 @@
 {
-    "BASE_URL": "http://192.168.0.109:9996",
-    "SERVER_IP": "http://192.168.0.109:9996"
+    "BASE_URL": "http://127.0.0.1:9996",
+    "SERVER_IP": "http://127.0.0.1:9996"
 }
diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js
index a57d404..128873a 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -15,6 +15,15 @@ export function getAllUdiInfos(query) {
         params: query
     });
 }
+export function getMutiUdiInfos(query) {
+    return axios({
+        url: "/udi/udirel/mutil/download",
+        method: "get",
+        params: query
+    });
+}
+
+
 
 export function getSmUdiInfos(query) {
     return axios({
diff --git a/src/views/basic/BasicThirdSysDetailModify.vue b/src/views/basic/BasicThirdSysDetailModify.vue
index 028d27f..537dbfa 100644
--- a/src/views/basic/BasicThirdSysDetailModify.vue
+++ b/src/views/basic/BasicThirdSysDetailModify.vue
@@ -138,7 +138,6 @@
         float: left;
         text-align: left;
         margin-top: 5px;
-
     }
 
     .text {
diff --git a/src/views/basic/BasicThirdSysModify.vue b/src/views/basic/BasicThirdSysModify.vue
index f62a8a6..7324861 100644
--- a/src/views/basic/BasicThirdSysModify.vue
+++ b/src/views/basic/BasicThirdSysModify.vue
@@ -1,125 +1,147 @@
 <template>
     <div>
-        <el-row :gutter="20" class="el-row" type="flex" align="middle">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>系统ID:&nbsp;</span>
+        <el-card>
+
+
+            <el-row :gutter="20" class="el-row" type="flex" align="middle">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>系统ID:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            :disabled="true"
+                            v-model="inputQuery.thirdId"
+                        ></el-input>
                     </div>
-                    <el-input
-                        style="width: 200px"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        :disabled="true"
-                        v-model="inputQuery.thirdId"
-                    ></el-input>
-                </div>
-            </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>系统名称:&nbsp;</span>
+                </el-col>
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>系统名称:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.thirdName"
+                        ></el-input>
                     </div>
-                    <el-input
-                        style="width: 200px"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.thirdName"
-                    ></el-input>
-                </div>
-            </el-col>
+                </el-col>
 
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>API说明文档:&nbsp;</span>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>API说明文档:&nbsp;</span>
+                        </div>
+                        <div style="padding-top: 5px">
+                            <a :href="inputQuery.guideUrl" target="_blank">{{ inputQuery.thirdName }}接口说明文档</a>
+                        </div>
+
+
+                    </div>
+                </el-col>
+                <el-col :span="4" class="el-col">
+                    <div class="text item">
+                        <el-checkbox v-model="inputQuery.enabled">是否启用</el-checkbox>
                     </div>
-                    <div style="padding-top: 5px">
-                        <a :href="inputQuery.guideUrl"  target="_blank">{{inputQuery.thirdName}}接口说明文档</a>
+                </el-col>
+                <el-col :span="4" class="el-col">
+                    <div class="text item">
+                        <el-checkbox v-model="inputQuery.mainSys">是否设为主系统</el-checkbox>
                     </div>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="18" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>第三方服务IP地址:&nbsp;</span>
+                        </div>
+
+                        <el-input
+                            style="width: 80%"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.thridUrl"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
 
+        </el-card>
+        <el-card>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
 
-                </div>
-            </el-col>
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.enabled">是否启用</el-checkbox>
-                </div>
-            </el-col>
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.mainSys">是否设为主系统</el-checkbox>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>第三方服务IP地址:&nbsp;</span>
+                    <div class="text item">
+                        <span>UDI自助管理平台接口授权:&nbsp;</span>
                     </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter=" 20" class="el-row" type="flex">
+                <el-col :span="24" class="el-col">
+                    <div class="text item">
+                        <label>apikey：</label>
+                        <el-input
+                            style="width: 38%; margin-right: 20px;"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.licenseApikey"
+                        ></el-input>
+                        <label>secretkey：</label>
+                        <el-input
+                            style="width: 38%"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.licenseSecretkey"
+                        ></el-input>
 
-                    <el-input
-                        style="width: 80%"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.thridUrl"
-                    ></el-input>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>UDI自助管理平台接口授权:&nbsp;</span>
                     </div>
-                    <label>apikey：</label>
-                    <el-input
-                        style="width: 40%; margin-right: 10px;"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.licenseApikey"
-                    ></el-input>
-                    <label>secretkey：</label>
-                    <el-input
-                        style="width: 40%"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.licenseSecretkey"
-                    ></el-input>
+                </el-col>
+            </el-row>
+        </el-card>
 
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
+
+        <el-card>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+
+                    <div class="text item">
                         <span>第三方服务接口授权:&nbsp;</span>
                     </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter=" 20" class="el-row" type="flex">
+                <el-col :span="24" class="el-col">
+                    <div class="text item">
+                        <label>apikey：</label>
+                        <el-input
+                            style="width: 38%; margin-right: 20px;"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.apikey"
+                        ></el-input>
+                        <label>secretkey：</label>
+                        <el-input
+                            style="width: 38%"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.apikey"
+                        ></el-input>
 
-                    <label>apikey：</label>
-                    <el-input
-                        style="width: 40%; margin-right: 10px;"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.apikey"
-                    ></el-input>
-                    <label>secretkey：</label>
-                    <el-input
-                        style="width: 40%"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.secretkey"
-                    ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
 
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 10px">
             <el-col :span="24" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
@@ -143,40 +165,39 @@
 </template>
 
 <script>
-    export default {
-        name: "inputQuery",
-        props: {
-            inputQuery: {
-                type: Object,
-                required: true,
-            },
+export default {
+    name: "inputQuery",
+    props: {
+        inputQuery: {
+            type: Object,
+            required: true,
         },
-    };
+    },
+};
 </script>
 <style scoped>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 5px;
-
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 5px;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
 
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
-        margin-bottom: 20px;
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 20px;
 
-    }
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
 
-    }
+}
 </style>
diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue
index 776a30b..1953806 100644
--- a/src/views/basic/CorpExport.vue
+++ b/src/views/basic/CorpExport.vue
@@ -48,6 +48,11 @@
                     >
                 </template>
             </el-table-column>
+            <el-table-column label="类型" prop="enabled">
+                <template slot-scope="scope">
+                    <span>{{ typeMap[scope.row.type] }}</span>
+                </template>
+            </el-table-column>
             <el-table-column
                 label="下载次数"
                 prop="dlCount"
@@ -57,6 +62,7 @@
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
                     <el-button
+                        v-if="scope.row.type==1"
                         type="text"
                         size="small"
                         @click.native.stop="downloadExcel(scope.row)"
@@ -109,7 +115,7 @@
                     fromType: null,
                     page: 1,
                     limit: 20,
-                    type: 1,
+                    // type: 1,
                     thirdSysFk: null,
                 },
                 selectType: 0,
@@ -131,6 +137,11 @@
                     2: "处理异常",
                     3: "处理完成"
                 },
+                typeMap: {
+                    1: '文件导出',
+                    2: '网络同步',
+
+                },
                 uploadFileUrl: null,
                 uploadData: {
                     thirdSys: "thirdId",
@@ -148,7 +159,7 @@
                     genKey: null,
                     status: null,
                     page: 1,
-                    type: 1,
+                    // type: 1,
                     limit: 20,
                     thirdSysFk: null,
                 };
@@ -190,8 +201,8 @@
                             a.href = URL.createObjectURL(blob);
                             console.log(a.href);
                             a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
+                                row.filePath.split("\\")[
+                                row.filePath.split("\\").length - 1
                                     ]; //  // 下载文件的名字
                             document.body.appendChild(a);
                             a.click();
diff --git a/src/views/basic/CorpExportSmp.vue b/src/views/basic/CorpExportSmp.vue
index 7ef055d..b8783ae 100644
--- a/src/views/basic/CorpExportSmp.vue
+++ b/src/views/basic/CorpExportSmp.vue
@@ -184,8 +184,8 @@
                         console.log(a.href);
                         //   a.download = ""; // 下载文件的名字
                         a.download =
-                            row.filePath.split("/")[
-                            row.filePath.split("/").length - 1
+                            row.filePath.split("\\")[
+                            row.filePath.split("\\").length - 1
                                 ]; //  // 下载文件的名字
                         document.body.appendChild(a);
                         a.click();
diff --git a/src/views/basic/CorpImport.vue b/src/views/basic/CorpImport.vue
index 059648f..9a07d53 100644
--- a/src/views/basic/CorpImport.vue
+++ b/src/views/basic/CorpImport.vue
@@ -77,13 +77,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(scope.row)"
-                    >详情
-                    </el-button
-                    >
+<!--                    <el-button-->
+<!--                        type="text"-->
+<!--                        size="small"-->
+<!--                        @click.native.stop="handleDetailClick(scope.row)"-->
+<!--                    >详情-->
+<!--                    </el-button-->
+<!--                    >-->
                     <el-button
                         type="text"
                         size="small"
diff --git a/src/views/basic/SelectDIDetailDialog.vue b/src/views/basic/SelectDIDetailDialog.vue
new file mode 100644
index 0000000..d711987
--- /dev/null
+++ b/src/views/basic/SelectDIDetailDialog.vue
@@ -0,0 +1,431 @@
+<template>
+    <div>
+        <el-card>
+
+
+            <el-form
+                :model="editQuery"
+                :rules="rules"
+                ref="editQuery"
+                label-width="100px"
+                style="margin-top: 20px"
+            >
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.cpmctymc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品标识:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.nameCode"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>规格型号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ggxh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>器械类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.qxlb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.cplb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>分类编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.flbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>商品条码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small" :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sptm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医保编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%" :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ybbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医疗器械注册人:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="ylqxzcrbarmc"
+                                v-model="editQuery.ylqxzcrbarmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册人英文名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ylqxzcrbarywmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>统一社会信用号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.tyshxydm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册证/备案号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zczbhhzbapzbh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>上级产品编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sjcpbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包装级别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.packLevel"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>计量单位/包装级别:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bzcj"
+                                :disabled="true"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.bhxjsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级产品编码:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhxjcpbm"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含最小销售包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhzxxsbzsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zxxsbzbhsydysl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>生产厂家:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含批号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.scbssfbhph"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含序列号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                v-model="editQuery.scbssfbhxlh"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含生产日期:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.scbssfbhscrq"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含失效日期:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                v-model="editQuery.scbssfbhsxrq"
+                                size="small"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品描述:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.cpms"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+        </el-card>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: "SelectDIDetailDialog",
+    props: {
+        editQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {}
+    },
+    methods: {},
+
+    created() {
+    },
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/UdiInfoImport.vue b/src/views/basic/UdiInfoImport.vue
index 0ab2322..37709cc 100644
--- a/src/views/basic/UdiInfoImport.vue
+++ b/src/views/basic/UdiInfoImport.vue
@@ -82,13 +82,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(scope.row)"
-                    >详情
-                    </el-button
-                    >
+<!--                    <el-button-->
+<!--                        type="text"-->
+<!--                        size="small"-->
+<!--                        @click.native.stop="handleDetailClick(scope.row)"-->
+<!--                    >详情-->
+<!--                    </el-button-->
+<!--                    >-->
                     <el-button
                         type="text"
                         size="small"
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 2d3f190..765c3bf 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -59,16 +59,16 @@
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="submit">查询</el-button>
                             <el-button type="primary" icon="search" @click="intentDetail"
-                            >关联选入
+                            >关联添加
                             </el-button>
 
                             <el-button type="primary" icon="search" @click="intentImportUdi"
-                            >选入DI器械
+                            >添加DI信息
                             </el-button
                             >
 
                             <el-button type="primary" icon="search" @click="intentImportErp"
-                            >选入产品信息
+                            >添加产品信息
                             </el-button
                             >
 
@@ -660,7 +660,22 @@
                             </div>
                         </el-col>
                     </el-row>
-
+                    <el-row :gutter="20" class="el-row" type="flex">
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>产品描述:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    :disabled="!checked"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.cpms"
+                                ></el-input>
+                            </div>
+                        </el-col>
+                    </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="10" class="el-col">
@@ -709,7 +724,7 @@
                 </div>
             </el-dialog>
             <el-dialog
-                title="关联选入器械信息"
+                title="关联添加器械信息"
                 :visible.sync="selectUdiDialogVisible"
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
@@ -719,7 +734,7 @@
                 <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
             </el-dialog>
             <el-dialog
-                title="从指定系统选入器械信息"
+                title="从指定系统添加器械字典"
                 :visible.sync="selectErpDialogVisible"
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
@@ -734,10 +749,11 @@
                     :data="thisData"
                     :defaultSys="defaultSys"
                     @closeUdi="closeUdi"
+                    :supEnable="false"
                 ></selectErp>
             </el-dialog>
             <el-dialog
-                title="选入DI器械信息"
+                title="添加DI器械信息"
                 :visible.sync="selectLocalVisible"
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue
index 2dd65c8..848cafd 100644
--- a/src/views/basic/UdiInfoManageSp.vue
+++ b/src/views/basic/UdiInfoManageSp.vue
@@ -655,6 +655,22 @@
                             </div>
                         </el-col>
                     </el-row>
+                    <el-row :gutter="20" class="el-row" type="flex">
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>产品描述:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    :disabled="!checked"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.cpms"
+                                ></el-input>
+                            </div>
+                        </el-col>
+                    </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="12" class="el-col">
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index a6775aa..ec1e5e5 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -75,9 +75,10 @@
                     style="width: 100%"
                     highlight-current-row="true"
                     v-loading="erpLloading"
-                    :row-class-name="tableRowClassName"
+
                     @current-change="handleErpChange"
                 >
+                    <!--                     :row-class-name="tableRowClassName"-->
                     <el-table-column label="序号" type="index"></el-table-column>
                     <el-table-column label="产品编码" prop="code"></el-table-column>
                     <el-table-column label="产品名称" prop="name"></el-table-column>
@@ -131,6 +132,7 @@
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-input
+                                :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
                                 v-model="unionQuery.cpmctymc"
                                 size="mini"
                                 clearable="true"
@@ -147,14 +149,14 @@
                                 placeholder="规格型号"
                                 clearable="true"
                                 size="mini"
-                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
                             ></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-input
                                 v-model="unionQuery.zczbhhzbapzbh"
                                 clearable="true"
-                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
                                 placeholder="注册/备案凭证号"
                                 size="mini"
                             ></el-input>
@@ -224,275 +226,293 @@
 </template>
 
 <script>
-    import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
-    import {combineUdi} from "../../api/basic/udiRelevance";
-    import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
-    import {getInvbasdoc} from "../../api/basic/getErps";
-
-    export default {
-        name: "closeDialog",
-        props: {
-            closeDialog: {
-                type: Function,
-                required: true,
-            },
-        },
+import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
+import {combineUdi} from "../../api/basic/udiRelevance";
+import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
+import {getInvbasdoc} from "../../api/basic/getErps";
 
-        data() {
-            return {
-                erpQuery: {
-                    code: null,
-                    name: "",
-                    thirdSys: null,
-                    spec: null,
-                    manufactory: null,
-                    registerNo: null,
-                    page: 1,
-                    limit: 10,
-                },
-                unionQuery: {
-                    page: 1,
-                    limit: 20,
-                    nameCode: "",
-                    cpmctymc: "",
-                    ylqxzcrbarmc: null,
-                    ggxh: "",
-                    zczbhhzbapzbh: "",
-                    isCheck: 1
-                },
-                combineQuery: {
-                    thirdId: "",
-                    keys: [],
-                    thirdSys: null,
-                },
-                fromOptions: [],
-                checked: true,
-                udidlList: [],
-                erpList: [],
-                pageTotal: 1,
-                total: 1,
-                currentRow: null,
-                loading: false,
-                erpLloading: false,
-                multipleUdiSelection: [],
-                thirdSys: [],
-                thirdSysFk: null,
-            };
+export default {
+    name: "closeDialog",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
         },
-        methods: {
-            serchList() {
-                this.unionQuery.page = 1;
-                this.getList();
-            },
-            getList() {
-                if (
-                    this.unionQuery.nameCode == "" &&
-                    this.unionQuery.cpmctymc == "" &&
-                    this.unionQuery.ylqxzcrbarmc == "" &&
-                    this.unionQuery.ggxh == ""
-                ) {
-                    this.$message.warning("请输入查询条件");
-                    return;
-                }
-                this.loading = true;
-                getUdiInfos(this.unionQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code == 20000) {
-                            this.udidlList = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                        }
+    },
 
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.udidlList = [];
-                        this.total = 0;
-                    });
+    data() {
+        return {
+            erpQuery: {
+                code: null,
+                name: "",
+                thirdSys: null,
+                spec: null,
+                manufactory: null,
+                registerNo: null,
+                page: 1,
+                limit: 10,
             },
-
-            checkSelectable(row) {
-                return !row.check;
-            },
-            handleCurrentChange(val) {
-                this.unionQuery.page = val;
-                this.getList();
+            unionQuery: {
+                page: 1,
+                limit: 20,
+                nameCode: "",
+                cpmctymc: "",
+                ylqxzcrbarmc: null,
+                ggxh: "",
+                zczbhhzbapzbh: "",
+                isCheck: 1
             },
-            tableRowClassName({row}) {
-                if (row.checked) return "warning-row";
-                return "";
-            },
-            handleErpChange(val) {
-                console.log(val);
-                this.currentRow = val;
-                // this.unionQuery.cpmctymc = this.currentRow.name;
-                // this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo;
-                // this.unionQuery.ggxh = this.currentRow.spec;
+            combineQuery: {
+                thirdId: "",
+                keys: [],
+                thirdSys: null,
             },
+            fromOptions: [],
+            checked: true,
+            udidlList: [],
+            erpList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            loading: false,
+            erpLloading: false,
+            multipleUdiSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+        };
+    },
+    methods: {
+        serchList() {
+            this.unionQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+            if (
+                this.unionQuery.nameCode == "" &&
+                this.unionQuery.cpmctymc == "" &&
+                this.unionQuery.ylqxzcrbarmc == "" &&
+                this.unionQuery.ggxh == ""
+            ) {
+                this.$message.warning("请输入查询条件");
+                return;
+            }
+            this.loading = true;
+            getUdiInfos(this.unionQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.udidlList = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
-            searchErpList() {
-                this.erpQuery.page = 1;
-                this.getErpList();
-            },
-            handleErpPageChange(val) {
-                this.erpQuery.page = val;
-                this.getErpList();
-            },
-            getErpList() {
-                this.erplLoading = true;
-                this.erpQuery.thirdSys = this.thirdSysFk;
-                getInvbasdoc(this.erpQuery)
-                    .then((response) => {
-                        this.erplLoading = false;
-                        if (response.code == 20000) {
-                            this.erpList = response.data.list || [];
-                            this.pageTotal = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                            this.erpList = [];
-                            this.pageTotal = 0;
-                        }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.udidlList = [];
+                    this.total = 0;
+                });
+        },
 
-                    })
-                    .catch(() => {
-                        this.erplLoading = false;
+        checkSelectable(row) {
+            return !row.check;
+        },
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        handleErpChange(val) {
+            console.log(val);
+            this.currentRow = val;
+            // this.unionQuery.cpmctymc = this.currentRow.name;
+            // this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo;
+            // this.unionQuery.ggxh = this.currentRow.spec;
+        },
+
+        searchErpList() {
+            this.erpQuery.page = 1;
+            this.getErpList();
+        },
+        handleErpPageChange(val) {
+            this.erpQuery.page = val;
+            this.getErpList();
+        },
+        getErpList() {
+            this.erplLoading = true;
+            this.erpQuery.thirdSys = this.thirdSysFk;
+            getInvbasdoc(this.erpQuery)
+                .then((response) => {
+                    this.erplLoading = false;
+                    if (response.code == 20000) {
+                        this.erpList = response.data.list || [];
+                        this.pageTotal = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
                         this.erpList = [];
                         this.pageTotal = 0;
-                    });
-            },
-            keyupErp_submit(event) {
-                this.erpQuery.page = 1;
-                this.getErpList();
-                event.target.select();
-            },
-            intentBack() {
-                this.$router.go(-1);
-            },
-            combine() {
-                let selectData = this.multipleUdiSelection;
-                var ids = [];
-                selectData.forEach((obj) => {
-                    ids.push(obj.uuid);
+                    }
+
+                })
+                .catch(() => {
+                    this.erplLoading = false;
+                    this.erpList = [];
+                    this.pageTotal = 0;
                 });
-                if (this.currentRow != null && this.currentRow.checked) {
-                    this.$message.warning("产品编码:" + this.currentRow.code + "已被选入");
-                    return;
-                }
-                if (this.currentRow == null) {
-                    this.$message.warning("未选择第三方产品信息");
-                    return;
-                }
-                if (ids.length == 0) {
-                    this.$message.warning("未选择医疗器械产品信息");
-                    return;
-                }
-                this.combineQuery.keys = ids;
-                this.combineQuery.thirdSys = this.thirdSysFk;
-                if (this.checked) {
-                    this.combineQuery.thirdId = this.currentRow.code;
-                    this.combineQuery.erpName = this.currentRow.name;
-                } else {
-                    this.combineQuery.thirdId = "";
-                }
-                combineUdi(this.combineQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$emit("closeUdi", true);
-                        } else {
-                            this.$emit("closeUdi", false);
-                        }
+        },
+        keyupErp_submit(event) {
+            this.erpQuery.page = 1;
+            this.getErpList();
+            event.target.select();
+        },
+        intentBack() {
+            this.$router.go(-1);
+        },
+
+        confirmCombine(ids) {
+            this.combineQuery.keys = ids;
+            this.combineQuery.thirdSys = this.thirdSysFk;
+            if (this.checked) {
+                this.combineQuery.thirdId = this.currentRow.code;
+                this.combineQuery.erpName = this.currentRow.name;
+            } else {
+                this.combineQuery.thirdId = "";
+            }
+            combineUdi(this.combineQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$emit("closeUdi", true);
+                    } else {
+                        // this.$emit("closeUdi", false);
+                        this.$message.warning(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.$emit("closeUdi", false);
+
+                });
+        },
+        combine() {
+            let selectData = this.multipleUdiSelection;
+            var ids = [];
+            selectData.forEach((obj) => {
+                ids.push(obj.uuid);
+            });
+
+            if (this.currentRow == null) {
+                this.$message.warning("未选择第三方产品信息");
+                return;
+            }
+            if (ids.length == 0) {
+                this.$message.warning("未选择医疗器械产品信息");
+                return;
+            }
+            if (this.currentRow != null && this.currentRow.checked) {
+
+                this.$confirm("产品编码:" + this.currentRow.code + "已被添加，是否继续添加", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.confirmCombine(ids);
                     })
                     .catch(() => {
-                        this.$emit("closeUdi", false);
                     });
-            },
+                return;
+            } else {
+                this.confirmCombine(ids);
+            }
+        },
 
-            intentDetail(row) {
-                this.$emit("productInfo", row);
-                this.closeDialog();
-            },
+        intentDetail(row) {
+            this.$emit("productInfo", row);
+            this.closeDialog();
+        },
 
-            handleSelectionUdiChange(val) {
-                this.multipleUdiSelection = val;
-            },
+        handleSelectionUdiChange(val) {
+            this.multipleUdiSelection = val;
+        },
 
-            keyup_submit(event) {
-                this.unionQuery.page = 1;
-                this.getList();
-                event.target.select();
-            },
+        keyup_submit(event) {
+            this.unionQuery.page = 1;
+            this.getList();
+            event.target.select();
+        },
 
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                    mainSys: true,
-                };
-                getBasicThirdSys(query)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+                mainSys: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
 
-                        this.thirdSysFk = this.thirdSys[0].thirdId;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-            },
-            findMethod(query) {
-                console.log(query);
-                let cQuery = {
-                    ylqxzcrbarmc: query,
-                    page: 1,
-                    limit: 10,
-                };
-                filterCompany(cQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.fromOptions = response.data || [];
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.options = [];
-                    });
-            },
+                    this.thirdSysFk = this.thirdSys[0].thirdId;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
         },
-        created() {
-            this.getBasicThirdSys();
+        findMethod(query) {
+            console.log(query);
+            let cQuery = {
+                ylqxzcrbarmc: query,
+                page: 1,
+                limit: 10,
+            };
+            filterCompany(cQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.fromOptions = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.options = [];
+                });
         },
-    };
+    },
+    created() {
+        this.getBasicThirdSys();
+    },
+};
 </script>
 
 <style scoped>
-    .checkitemTag {
-        float: left;
-        text-align: left;
-        margin-top: 5px;
-        width: 100%;
-    }
-
-    .query-form-item {
-        display: block !important;
-        margin-right: 10px;
-        margin-bottom: 5px;
-    }
-
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
-    }
-
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
-
-    div /deep/ .el-table .warning-row {
-        background: #bebebe;
-    }
-
-    div /deep/ .el-table .success-row {
-        background: #ffffff;
-    }
+.checkitemTag {
+    float: left;
+    text-align: left;
+    margin-top: 5px;
+    width: 100%;
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
 </style>
diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue
index 97e1f9f..12e3bd5 100644
--- a/src/views/basic/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/UdiInfoSelectLocalUdi.vue
@@ -51,8 +51,6 @@
                                 placeholder="器械通用名称"
                             ></el-input>
                         </el-form-item>
-
-
                     </el-row>
 
                     <el-row>
@@ -83,11 +81,11 @@
                                 >选入
                                 </el-button
                                 >
-                                <el-button type="primary" size="mini" icon="search" @click="combineUdiAll"
-                                           v-if="relId==null"
-                                >结果全部选入
-                                </el-button
-                                >
+                                <!--                                <el-button type="primary" size="mini" icon="search" @click="combineUdiAll"-->
+                                <!--                                           v-if="relId==null"-->
+                                <!--                                >结果全部选入-->
+                                <!--                                </el-button-->
+                                <!--                                >-->
                             </el-button-group>
                         </el-form-item>
                     </el-row>
@@ -104,7 +102,6 @@
                     @selection-change="handleSelectionUdiChange"
                 >
 
-                    <!--    @current-change="handleErpChange"-->
                     <el-table-column
                         v-if="relId==null"
                         type="selection"
@@ -137,6 +134,19 @@
                         prop="zczbhhzbapzbh"
                         show-overflow-tooltip
                     ></el-table-column>
+
+                    <el-table-column label="操作" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click="diDetail(scope.row)"
+                            >详情
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+
                 </el-table>
                 <el-pagination
                     :page-size="unionQuery.limit"
@@ -341,12 +351,30 @@
                 </el-row>
             </div>
         </el-card>
+
+
+        <el-dialog
+            title="器械信息详情"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="selectDialog"
+            width="65%"
+            append-to-body
+            v-if="selectDialog"
+        >
+            <selectDiDetail :editQuery="diDetails"
+            ></selectDiDetail>
+        </el-dialog>
+
     </div>
 </template>
 
 <script>
 import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "../../api/basic/udiRelevance";
+import selectDiDetail from "./SelectDIDetailDialog"
+import selectUdi from "@/views/basic/UdiInfoRelevance";
+import selectErp from "@/views/basic/UdiInfoselectErpUdi";
 
 export default {
     name: "closeDialog",
@@ -399,6 +427,8 @@ export default {
             loading: false,
             erpLloading: false,
             multipleUdiSelection: [],
+            selectDialog: false,
+            diDetails: null,
         };
     },
     methods: {
@@ -477,6 +507,13 @@ export default {
         checkSelectable(row) {
             return !row.check;
         },
+
+        diDetail(row) {
+
+            this.diDetails = row;
+            this.selectDialog = true;
+        },
+
         handleCurrentChange(val) {
             this.unionQuery.page = val;
             this.getList();
@@ -575,11 +612,13 @@ export default {
                     if (response.code == 20000) {
                         this.$emit("closeUdi", true);
                     } else {
+                        this.$message.error(response.message);
                         this.$emit("closeUdi", false);
                     }
                 })
                 .catch(() => {
                     this.combineLoading = false;
+
                     this.$emit("closeUdi", false);
                 });
         },
@@ -606,6 +645,9 @@ export default {
                 });
         },
     },
+    components: {
+        selectDiDetail,
+    },
 };
 </script>
 
diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue
index d64c112..e3687b9 100644
--- a/src/views/basic/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/UdiInfoselectErpUdi.vue
@@ -71,7 +71,8 @@
                                 >选入
                                 </el-button
                                 >
-                                <el-button type="primary" icon="search" @click="combineAll" v-if="isImport"
+                                <el-button type="primary" icon="search" @click="combineAll"
+                                           v-if="isImport  &&  !supEnable"
                                 >结果全部选入
                                 </el-button
                                 >
@@ -84,14 +85,12 @@
                     style="width: 100%"
                     highlight-current-row="true"
                     v-loading="erpLloading"
-                    :row-class-name="tableRowClassName"
                     @current-change="handleErpChange"
                     @selection-change="handleSelectionChange"
                 >
                     <el-table-column
                         v-if="isImport"
                         type="selection"
-                        :selectable="checkSelectable"
                         width="55"
                     ></el-table-column>
                     <el-table-column label="序号" type="index"></el-table-column>
@@ -308,267 +307,289 @@
 </template>
 
 <script>
-    import {modifyRel, addErp, addAllErp} from "../../api/basic/udiRelevance";
-    import {getInvbasdoc} from "../../api/basic/getErps";
-    import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
-
-    export default {
-        name: "closeDialog",
-        props: {
-            uuid: {
-                type: Object,
-                required: true,
-            },
-
-            data: {
-                type: Object,
-                required: true,
-            },
+import {modifyRel, addErp, addAllErp} from "../../api/basic/udiRelevance";
+import {getInvbasdoc} from "../../api/basic/getErps";
+import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
+
+export default {
+    name: "closeDialog",
+    props: {
+        uuid: {
+            type: Object,
+            required: true,
+        },
 
-            relId: {
-                type: Number,
-                required: true,
-            },
+        data: {
+            type: Object,
+            required: true,
+        },
 
-            isImport: {
-                type: Boolean,
-                required: true,
-            },
+        relId: {
+            type: Number,
+            required: true,
+        },
 
-            closeDialog: {
-                type: Function,
-                required: true,
-            },
-            defaultSys: {
-                type: Object,
-                required: true,
-            }
+        isImport: {
+            type: Boolean,
+            required: true,
         },
 
-        data() {
-            return {
-                erpQuery: {
-                    code: null,
-                    name: null,
-                    spec: null,
-                    registerNo: null,
-                    manufactory: null,
-                    thirdSys: null,
-                    supName:null,
-                    page: 1,
-                    limit: 10,
-
-                },
-                combineLoading: false,
-                combineQuery: {
-                    thirdId: "",
-                    relId: "",
-                    erpName: "",
-                    keys: [],
-                    thirdIds: [],
-                    thirdSys: null,
-                    query: null,
-                    isRlInv: null,
-                },
-
-                udidlList: [],
-                erpList: [],
-                pageTotal: 1,
-                total: 1,
-                currentRow: null,
-                loading: false,
-                erpLloading: false,
-                multipleUdiSelection: [],
-                thirdSys: [],
-                thirdSysFk: null,
-            };
+        closeDialog: {
+            type: Function,
+            required: true,
         },
-        methods: {
-            tableRowClassName({row}) {
-                if (row.checked) return "warning-row";
-                return "";
-            },
-            checkSelectable(row) {
-                return !row.checked;
-            },
-            handleCurrentChange(val) {
-                this.unionQuery.page = val;
-                this.getList();
-            },
-            handleErpChange(val) {
-                console.log(val);
-                this.currentRow = val;
+        defaultSys: {
+            type: Object,
+            required: true,
+        },
+        supEnable: {
+            type: Object,
+            required: true,
+        }
+    },
+
+    data() {
+        return {
+            erpQuery: {
+                code: null,
+                name: null,
+                spec: null,
+                registerNo: null,
+                manufactory: null,
+                thirdSys: null,
+                supName: null,
+                page: 1,
+                limit: 10,
+
             },
-            handleErpPageChange(val) {
-                this.erpQuery.page = val;
-                this.getErpList();
+            combineLoading: false,
+            combineQuery: {
+                thirdId: "",
+                relId: "",
+                erpName: "",
+                keys: [],
+                thirdIds: [],
+                thirdSys: null,
+                query: null,
+                isRlInv: null,
             },
 
-            searchErpList() {
-                this.erpQuery.page = 1;
-                this.getErpList();
-            },
+            udidlList: [],
+            erpList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            loading: false,
+            erpLloading: false,
+            multipleUdiSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+        };
+    },
+    methods: {
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        checkSelectable(row) {
+            return !row.checked;
+        },
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        handleErpChange(val) {
+            console.log(val);
+            this.currentRow = val;
+        },
+        handleErpPageChange(val) {
+            this.erpQuery.page = val;
+            this.getErpList();
+        },
 
-            keyup_submit(event) {
+        searchErpList() {
+            this.erpQuery.page = 1;
+            this.getErpList();
+        },
 
-                this.erpQuery.page = 1;
-                this.getErpList();
-                event.target.select();
-            },
-            getErpList() {
-                this.erplLoading = true;
-                this.erpQuery.thirdSys = this.thirdSysFk;
-                getInvbasdoc(this.erpQuery)
-                    .then((response) => {
-                        this.erplLoading = false;
-                        if (response.code == 20000) {
-                            this.erpList = response.data.list || [];
-                            this.pageTotal = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                            this.erpList = [];
-                            this.pageTotal = 0;
-                        }
-                    })
-                    .catch(() => {
-                        this.erplLoading = false;
+        keyup_submit(event) {
+
+            this.erpQuery.page = 1;
+            this.getErpList();
+            event.target.select();
+        },
+        getErpList() {
+            this.erplLoading = true;
+            this.erpQuery.thirdSys = this.thirdSysFk;
+            getInvbasdoc(this.erpQuery)
+                .then((response) => {
+                    this.erplLoading = false;
+                    if (response.code == 20000) {
+                        this.erpList = response.data.list || [];
+                        this.pageTotal = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
                         this.erpList = [];
                         this.pageTotal = 0;
-                    });
-            },
-            intentBack() {
-                this.closeDialog();
-            },
+                    }
+                })
+                .catch(() => {
+                    this.erplLoading = false;
+                    this.erpList = [];
+                    this.pageTotal = 0;
+                });
+        },
+        intentBack() {
+            this.closeDialog();
+        },
+
+        combineAll() {
+
+            this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.combineQuery.thirdSys = this.thirdSysFk;
+                    this.combineQuery.query = this.erpQuery;
+                    addAllErp(this.combineQuery)
+                        .then((response) => {
+                            if (response.code == 20000) {
+                                this.$message.success(response.data);
+                                this.$emit("closeUdi", true);
+                            } else {
+                                this.$message.error(response.message);
+                                this.$emit("closeUdi", false);
+                            }
+                        })
+                        .catch(() => {
+                            this.$emit("closeUdi", false);
+                        });
+                })
+                .catch(() => {
+                });
+
 
-            combineAll() {
+        },
 
-                this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
+        combine() {
+            this.combineQuery.query = null;
+            this.combineQuery.relId = this.relId;
+            this.combineQuery.thirdSys = this.thirdSysFk;
+            this.combineQuery.supEnable = this.supEnable;
+            if (this.isImport) {
+                this.combineQuery.thirdId = null;
+                let selectData = this.multipleUdiSelection;
+                let selected = '';
+                selectData.forEach((row) => {
+
+                    if (row.checked) {
+                        selected = selected + row.code + ",";
+                    }
+                    this.combineQuery.thirdIds.push(row.code);
+                });
+                // if (selected != null) {
+                //     this.$message.warning("产品编码：" + selected.code + "已被选入");
+                //     return;
+                // }
+                this.$confirm("产品编码：" + selected + "已被添加,是否继续添加", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning",
                 })
                     .then(() => {
-                        this.combineQuery.thirdSys = this.thirdSysFk;
-                        this.combineQuery.query = this.erpQuery;
-                        addAllErp(this.combineQuery)
+                        this.combineLoading = true;
+                        addErp(this.combineQuery)
                             .then((response) => {
+                                this.combineLoading = false;
                                 if (response.code == 20000) {
-                                    this.$message.success(response.data);
                                     this.$emit("closeUdi", true);
+                                    this.$message.success(response.data);
                                 } else {
-                                    this.$message.error(response.message);
                                     this.$emit("closeUdi", false);
+                                    this.$message.warning(response.message);
+                                    // let msgs= response.message.split(";");
+                                    // for(let i  = 0;i<msgs.length;i++){
+                                    //     this.$message.warning(msgs[i]);
+                                    // }
+
+
                                 }
                             })
                             .catch(() => {
+                                this.combineLoading = false;
                                 this.$emit("closeUdi", false);
                             });
                     })
                     .catch(() => {
                     });
 
-
-            },
-
-            combine() {
-                this.combineQuery.query = null;
-                this.combineQuery.relId = this.relId;
-                this.combineQuery.thirdSys = this.thirdSysFk;
-                if (this.isImport) {
-                    this.combineQuery.thirdId = null;
-                    let selectData = this.multipleUdiSelection;
-                    let selected = null;
-                    selectData.forEach((row) => {
-
-                        if (row.checked) {
-                            selected = row;
-                        }
-                        this.combineQuery.thirdIds.push(row.code);
-                    });
-                    if (selected != null) {
-                        this.$message.warning("产品编码：" + selected.code + "已被选入");
-                        return;
-                    }
-                    this.combineLoading = true;
-                    addErp(this.combineQuery)
-                        .then((response) => {
-                            this.combineLoading = false;
-                            if (response.code == 20000) {
-                                this.$emit("closeUdi", true);
-                            } else {
-                                this.$message.error(response.message);
-                                this.$emit("closeUdi", false);
-                            }
-                        })
-                        .catch(() => {
-                            this.combineLoading = false;
-                            this.$emit("closeUdi", false);
-                        });
-                } else {
-                    this.combineQuery.thirdId = this.currentRow.code;
-                    this.combineQuery.erpName = this.currentRow.name;
-                    if (this.currentRow.checked) {
-                        this.$message.warning("产品编码：" + this.currentRow.code + "已被选入");
-                        return;
-                    }
-                    this.combineLoading = true;
-                    modifyRel(this.combineQuery)
-                        .then((response) => {
-                            this.combineLoading = false;
-                            if (response.code == 20000) {
-                                this.$emit("closeUdi", true);
-                            } else {
-                                this.$emit("closeUdi", false);
-                            }
-                        })
-                        .catch(() => {
-                            this.combineLoading = false;
-                            this.$emit("closeUdi", false);
-                        });
+            } else {
+                this.combineQuery.thirdId = this.currentRow.code;
+                this.combineQuery.erpName = this.currentRow.name;
+                if (this.currentRow.checked) {
+                    this.$message.warning("产品编码：" + this.currentRow.code + "已被选入");
+                    return;
                 }
-            },
-
-            handleSelectionChange(val) {
-                console.log("----" + val);
-                this.multipleUdiSelection = val;
-            },
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                    mainSys: false,
-                    filter: true,
-                };
-                if (this.isImport) {
-                    query.mainSys = true;
-                }
-                getBasicThirdSys(query)
+                this.combineLoading = true;
+                modifyRel(this.combineQuery)
                     .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                        this.thirdSysFk = this.thirdSys[0].thirdId;
-                        if (this.defaultSys != null) {
-                            this.thirdSysFk = this.defaultSys;
+                        this.combineLoading = false;
+                        if (response.code == 20000) {
+                            this.$emit("closeUdi", true);
+                        } else {
+                            this.$emit("closeUdi", false);
                         }
                     })
                     .catch(() => {
-                        this.loading = false;
-                        this.list = [];
+                        this.combineLoading = false;
+                        this.$emit("closeUdi", false);
                     });
-            },
+            }
         },
-        created() {
-            console.log("-------------" + this.uuid);
-            this.getBasicThirdSys();
+
+        handleSelectionChange(val) {
+            console.log("----" + val);
+            this.multipleUdiSelection = val;
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+                mainSys: false,
+                filter: true,
+            };
+            if (this.isImport) {
+                query.mainSys = true;
+            }
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.thirdSysFk = this.thirdSys[0].thirdId;
+                    if (this.defaultSys != null) {
+                        this.thirdSysFk = this.defaultSys;
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
         },
-    };
+    },
+    created() {
+        console.log("-------------" + this.uuid);
+        this.getBasicThirdSys();
+    },
+};
 </script>
 
 <style scoped>
 
-    div /deep/ .el-table .warning-row {
-        background: #bebebe;
-    }
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
 
-    div /deep/ .el-table .success-row {
-        background: #ffffff;
-    }
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
 </style>
diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue
index b1d3e8f..19ba0fd 100644
--- a/src/views/basic/UdiinfoExport.vue
+++ b/src/views/basic/UdiinfoExport.vue
@@ -48,6 +48,11 @@
                     >
                 </template>
             </el-table-column>
+            <el-table-column label="类型" prop="enabled">
+                <template slot-scope="scope">
+                    <span>{{ typeMap[scope.row.type] }}</span>
+                </template>
+            </el-table-column>
             <el-table-column
                 label="下载次数"
                 prop="dlCount"
@@ -58,6 +63,7 @@
                 <template slot-scope="scope">
                     <el-button
                         type="text"
+                        v-if="scope.row.type==1"
                         size="small"
                         @click.native.stop="downloadExcel(scope.row)"
                     >下载
@@ -106,7 +112,7 @@ export default {
     data() {
         return {
             filterQuery: {
-                type: 1,
+                // type: 1,
                 genKey: null,
                 status: null,
                 fromType: null,
@@ -133,6 +139,11 @@ export default {
                 2: "处理异常",
                 3: "处理完成"
             },
+            typeMap: {
+                1: '文件导出',
+                2: '网络同步',
+
+            },
             uploadFileUrl: null,
             uploadData: {
                 thirdSys: "thirdId",
@@ -188,10 +199,9 @@ export default {
                     .then((res) => res.blob())
                     .then((blob) => {
                         a.href = URL.createObjectURL(blob);
-                        console.log(a.href);
                         a.download =
-                            row.filePath.split("/")[
-                            row.filePath.split("/").length - 1
+                            row.filePath.split("\\")[
+                            row.filePath.split("\\").length - 1
                                 ]; //  // 下载文件的名字
                         document.body.appendChild(a);
                         a.click();
diff --git a/src/views/basic/UdiinfoExportSmp.vue b/src/views/basic/UdiinfoExportSmp.vue
index c28a3ed..5273e62 100644
--- a/src/views/basic/UdiinfoExportSmp.vue
+++ b/src/views/basic/UdiinfoExportSmp.vue
@@ -184,8 +184,8 @@
                         console.log(a.href);
                         //   a.download = ""; // 下载文件的名字
                         a.download =
-                            row.filePath.split("/")[
-                            row.filePath.split("/").length - 1
+                            row.filePath.split("\\")[
+                            row.filePath.split("\\").length - 1
                                 ]; //  // 下载文件的名字
                         document.body.appendChild(a);
                         a.click();
diff --git a/src/views/basic/basicCompanyProduct.vue b/src/views/basic/basicCompanyProduct.vue
index 5eafa53..1385ce1 100644
--- a/src/views/basic/basicCompanyProduct.vue
+++ b/src/views/basic/basicCompanyProduct.vue
@@ -47,7 +47,7 @@
                                 type="primary"
                                 icon="search"
                                 @click="selectProduct()"
-                            >选择产品
+                            >添加产品
                             </el-button
                             >
                         </el-button-group>
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index 1ab1c77..f57d935 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -67,15 +67,16 @@
                             <!--</el-button-->
                             <!--&gt;-->
 
-                            <!--<el-button type="primary" icon="search" @click="intentImportErp"-->
-                            <!--&gt;选入产品信息-->
-                            <!--</el-button-->
-                            <!--&gt;-->
+
                             <el-button
                                 type="primary"
                                 icon="search"
                                 @click="selectProduct()"
-                            >选择产品
+                            >选入产品
+                            </el-button
+                            >
+                            <el-button type="primary" icon="search" @click="intentImportErp"
+                            >添加产品信息
                             </el-button
                             >
                         </el-button-group>
@@ -670,7 +671,22 @@
                             </div>
                         </el-col>
                     </el-row>
-
+                    <el-row :gutter="20" class="el-row" type="flex">
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>产品描述:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    :disabled="!checked"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.cpms"
+                                ></el-input>
+                            </div>
+                        </el-col>
+                    </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="12" class="el-col">
                         </el-col>
@@ -1192,6 +1208,22 @@
                             </div>
                         </el-col>
                     </el-row>
+                    <el-row :gutter="20" class="el-row" type="flex">
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>产品描述:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    :disabled="!checked"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.cpms"
+                                ></el-input>
+                            </div>
+                        </el-col>
+                    </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="12" class="el-col">
                         </el-col>
@@ -1221,7 +1253,7 @@
 
             </el-dialog>
             <el-dialog
-                title="关联选入器械信息"
+                title="关联选入耗材信息"
                 :visible.sync="selectUdiDialogVisible"
                 width="85%"
                 :close-on-click-modal="false"
@@ -1231,7 +1263,7 @@
                 <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
             </el-dialog>
             <el-dialog
-                title="从指定系统选入器械信息"
+                title="从指定系统添加耗材信息"
                 :visible.sync="selectErpDialogVisible"
                 width="85%"
                 :close-on-click-modal="false"
@@ -1246,6 +1278,7 @@
                     :data="thisData"
                     :defaultSys="defaultSys"
                     @closeUdi="closeUdi"
+                    :supEnable="true"
                 ></selectErp>
             </el-dialog>
             <el-dialog
@@ -1660,6 +1693,23 @@ export default {
             this.thisData = row;
             this.detailDialogVisible = true;
             this.editQuery = row;
+            this.relevanceEdit = {
+                id: row.rlId,
+                // thirdId: row.thirdId,
+                isUseDy: row.isUseDy,
+                isDisable: row.isDisable,
+                isAdavence: row.isAdavence,
+            };
+            let ttquery = {
+                uuid: row.uuid,
+                page: 1,
+                limit: 10,
+            };
+            console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
+
+            this.getDetailList(ttquery);
+            this.getThirdSysDetail();
+
         },
         sumitLockStatus(row) {
             let postQuery = {
@@ -1714,9 +1764,7 @@ export default {
             this.selectErpDialogVisible = false;
             this.selectLocalVisible = false;
             this.getThirdSysDetail();
-            if (val) {
-                this.getList();
-            }
+            this.getList();
         },
         getThirdSysDetail() {
             let query = {
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
index 69431df..1cac650 100644
--- a/src/views/basic/basicCompanyProductsImport.vue
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -1,880 +1,886 @@
 <template>
-  <div>
-
-    <el-form :inline="true" :model="filterQuery" size="mini">
-
-
-      <!--<el-row style="margin-top: 15px;width: 1000px">-->
-      <!--<el-form-item class="query-form-item">-->
-      <!--<el-input v-model="filterQuery.udiCode"-->
-      <!--style="width: 600px"-->
-      <!--placeholder="请扫描或输入UDI码"-->
-      <!--clearable="true"-->
-      <!--@keyup.enter.native="keyup_submit($event)"></el-input>-->
-      <!--</el-form-item>-->
-      <!--</el-row>-->
-
-      <el-row>
-        <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码" clearable="true"></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-        </el-form-item>
-
-
-        <el-form-item class="query-form-item">
-          <el-select v-model="filterQuery.filterType" 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-row>
-
-      <el-row>
-
-
-        <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人" clearable="true"></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
-        </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="getList">查询</el-button>
-            <el-button type="primary" icon="search" @click="selectExport"
-            >选中导入
-            </el-button>
-            <!--                        <el-button type="primary" icon="search" @click="allExport"-->
-            <!--                        >结果全部导入-->
-            <!--                        </el-button>-->
-
-          </el-button-group>
-        </el-form-item>
-      </el-row>
-    </el-form>
-
-    <el-table
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
-      <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="ERP产品ID"-->
-      <!--prop="thirdId"-->
-      <!--show-overflow-tooltip-->
-      <!--&gt;</el-table-column>-->
-      <!--<el-table-column-->
-      <!--label="ERP产品名称"-->
-      <!--prop="thirdName"-->
-      <!--show-overflow-tooltip-->
-      <!--&gt;</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 width="200" label="操作" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-              type="text"
-              size="small"
-              @click.native.stop="handleModifyClick(scope.row)"
-          >详情
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog
-        title="产品信息详情"
-        :visible.sync="editDialogVisible"
-        width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        append-to-body
-        v-if="editDialogVisible"
-    >
-      <el-table :data="sysList" style="width: 100%" 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="thirdName"
-            show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-            label="第三方产品ID"
-            prop="thirdId"
-            show-overflow-tooltip
-        ></el-table-column>
-      </el-table>
-      <el-table
-          v-loading="loading"
-          :data="detailList"
-          style="width: 100%; margin-top: 20px"
-          border
-          @current-change="handleDetail"
-      >
-        <el-table-column
-            label="产品标识"
-            prop="nameCode"
-            show-overflow-tooltip
-        ></el-table-column>
-
-        <el-table-column
-            label="产品通用名"
-            prop="cpmctymc"
-            show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-            label="包装级别"
-            prop="packLevel"
-            show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-            label="包装层级"
-            prop="bzcj"
-            show-overflow-tooltip
-        ></el-table-column>
-      </el-table>
-
-      <el-form
-          :model="editQuery"
-          :rules="rules"
-          ref="editQuery"
-          label-width="100px"
-          style="margin-top: 20px"
-      >
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>产品名称:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  :disabled="true"
-                  v-model="editQuery.cpmctymc"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>产品标识:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.nameCode"
-              ></el-input>
-            </div>
-          </el-col>
-
-
-        </el-row>
-
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>规格型号:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.ggxh"
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>器械类别:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.qxlb"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>产品类别:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.cplb"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>分类编码:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.flbm"
-              ></el-input>
-            </div>
-          </el-col>
-
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>商品条码:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.sptm"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>医保编码:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.ybbm"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>医疗器械注册人:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="ylqxzcrbarmc"
-                  v-model="editQuery.ylqxzcrbarmc"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>注册人英文名称:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.ylqxzcrbarywmc"
-              ></el-input>
-            </div>
-          </el-col>
-
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>统一社会信用号:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.tyshxydm"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>注册证/备案号:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.zczbhhzbapzbh"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>上级产品编码:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.sjcpbm"
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包装级别:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  :disabled="true"
-                  v-model="editQuery.packLevel"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>计量单位/包装级别:&nbsp;</span>
-              </div>
-
-              <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.bzcj"
-                  :disabled="true"
-
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包含下级包装数量:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  size="small"
-                  splaceholder="请输入内容"
-                  :disabled="true"
-                  v-model="editQuery.bhxjsl"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包含下级产品编码:&nbsp;</span>
-              </div>
-
-              <el-input
-                  style="width: 65%"
-                  size="small"
-                  :disabled="true"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.bhxjcpbm"
-
-              ></el-input>
-            </div>
-          </el-col>
-
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>包含最小销售包装数量:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  size="small"
-                  :disabled="true"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.bhzxxsbzsl"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="12" class="el-col">
-            <div class="text item">
-              <div class="itemTag">
-                <span>最小包装单元内包含使用单元数量:&nbsp;</span>
-              </div>
-              <el-input
-                  style="width: 65%"
-                  :disabled="!checked"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="editQuery.zxxsbzbhsydysl"
-              ></el-input>
-            </div>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item prop="name">
-              <el-checkbox v-model="checked" class="text item itemTag"
-              >以使用单元数量入库
-              </el-checkbox>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-    </el-dialog>
-
-    <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-    ></el-pagination>
-  </div>
+    <div>
+
+        <el-form :inline="true" :model="filterQuery" size="mini">
+
+
+            <!--<el-row style="margin-top: 15px;width: 1000px">-->
+            <!--<el-form-item class="query-form-item">-->
+            <!--<el-input v-model="filterQuery.udiCode"-->
+            <!--style="width: 600px"-->
+            <!--placeholder="请扫描或输入UDI码"-->
+            <!--clearable="true"-->
+            <!--@keyup.enter.native="keyup_submit($event)"></el-input>-->
+            <!--</el-form-item>-->
+            <!--</el-row>-->
+
+            <el-row>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码" clearable="true"></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+                </el-form-item>
+
+
+                <el-form-item class="query-form-item">
+                    <el-select v-model="filterQuery.filterType" 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-row>
+
+            <el-row>
+
+
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人" clearable="true"></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.supName" placeholder="配送企业" clearable="true"></el-input>
+                </el-form-item>
+
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+                </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="getList">查询</el-button>
+                        <el-button type="primary" icon="search" @click="selectExport"
+                        >选中导入
+                        </el-button>
+                        <!--                        <el-button type="primary" icon="search" @click="allExport"-->
+                        <!--                        >结果全部导入-->
+                        <!--                        </el-button>-->
+
+                    </el-button-group>
+                </el-form-item>
+            </el-row>
+        </el-form>
+
+        <el-table
+            v-loading="loading"
+            :data="list"
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+            <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="ERP产品ID"-->
+            <!--prop="thirdId"-->
+            <!--show-overflow-tooltip-->
+            <!--&gt;</el-table-column>-->
+            <!--<el-table-column-->
+            <!--label="ERP产品名称"-->
+            <!--prop="thirdName"-->
+            <!--show-overflow-tooltip-->
+            <!--&gt;</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 width="200" label="操作" fixed="right">
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleModifyClick(scope.row)"
+                    >详情
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-dialog
+            title="产品信息详情"
+            :visible.sync="editDialogVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="editDialogVisible"
+        >
+            <el-table :data="sysList" style="width: 100%" 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="thirdName"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="第三方产品ID"
+                    prop="thirdId"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
+            <el-table
+                v-loading="loading"
+                :data="detailList"
+                style="width: 100%; margin-top: 20px"
+                border
+                @current-change="handleDetail"
+            >
+                <el-table-column
+                    label="产品标识"
+                    prop="nameCode"
+                    show-overflow-tooltip
+                ></el-table-column>
+
+                <el-table-column
+                    label="产品通用名"
+                    prop="cpmctymc"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="包装级别"
+                    prop="packLevel"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="包装层级"
+                    prop="bzcj"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
+
+            <el-form
+                :model="editQuery"
+                :rules="rules"
+                ref="editQuery"
+                label-width="100px"
+                style="margin-top: 20px"
+            >
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.cpmctymc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品标识:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.nameCode"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>规格型号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ggxh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>器械类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.qxlb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.cplb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>分类编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.flbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>商品条码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sptm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医保编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ybbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医疗器械注册人:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="ylqxzcrbarmc"
+                                v-model="editQuery.ylqxzcrbarmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册人英文名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ylqxzcrbarywmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>统一社会信用号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.tyshxydm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册证/备案号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zczbhhzbapzbh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>上级产品编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sjcpbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包装级别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.packLevel"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>计量单位/包装级别:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bzcj"
+                                :disabled="true"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.bhxjsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级产品编码:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhxjcpbm"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含最小销售包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhzxxsbzsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zxxsbzbhsydysl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <el-form-item prop="name">
+                            <el-checkbox v-model="checked" class="text item itemTag"
+                            >以使用单元数量入库
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+
+        </el-dialog>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+    </div>
 </template>
 
 <script>
 import {
-  getUdiInfos,
-  updateErpProduct,
-  thirdSysDetail,
-  getSmUdiInfos
+    getUdiInfos,
+    updateErpProduct,
+    thirdSysDetail,
+    getSmUdiInfos
 } from "../../api/basic/udiRelevance";
 import {udiUpload} from "../../api/thrsys/smp"
 import {exportExcel} from "../../api/basic/udiInfoExport"
 import {selectSysParamByKey} from "../../api/param/systemParamConfig";
 import {filterByUuid} from "../../api/basic/udiInfo";
 import {
-  insertCompanyProductRelevance,
-  updateCompanyProductRelevance, insertFilter
+    insertCompanyProductRelevance,
+    updateCompanyProductRelevance, insertFilter
 } from "../../api/warehouse/companyProductRelevance";
 import store from "../../store";
 
 export default {
-  name: "UdIInfoSelect",
-  props: {
-    selectType: {
-      type: Object,
-      required: true,
+    name: "UdIInfoSelect",
+    props: {
+        selectType: {
+            type: Object,
+            required: true,
+        },
+        closeSelDialog: {
+            type: Function,
+            required: true,
+        },
     },
-    closeSelDialog: {
-      type: Function,
-      required: true,
+    data() {
+        return {
+            filterQuery: {
+                customerId: null,
+                uuids: [],
+                rlIds: [],
+                ylqxzcrbarmc: "",
+                supName: null,
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                addType: 1,
+                isDisable: false,
+            },
+
+            editQuery: null,
+            relevanceEdit: {
+                id: null,
+                thirdId: "",
+                isUseDy: false,
+            },
+            isImport: false,
+            isImportUdi: false,
+            isUploadSmp: false,
+            isImportFile: false,
+            uploadFileUrl: null,
+            checked: false,
+            list: [],
+            detailList: [],
+            sysList: [],
+            total: 0,
+            thirdNo: "",
+            uuid: "111",
+            thirdId: null,
+            relId: "",
+            thisData: {
+                nameCode: null,
+                cpmctymc: null,
+                ggxh: null
+            },
+            multipleSelection: [],
+            editDialogVisible: false,
+            selectUdiDialogVisible: false,
+            selectErpDialogVisible: false,
+            selectLocalVisible: false,
+        };
     },
-  },
-  data() {
-    return {
-      filterQuery: {
-        customerId: null,
-        uuids: [],
-        rlIds: [],
-        ylqxzcrbarmc: "",
-        cpmctymc: "",
-        nameCode: "",
-        page: 1,
-        limit: 20,
-        addType: 1,
-        isDisable: false,
-      },
-
-      editQuery: null,
-      relevanceEdit: {
-        id: null,
-        thirdId: "",
-        isUseDy: false,
-      },
-      isImport: false,
-      isImportUdi: false,
-      isUploadSmp: false,
-      isImportFile: false,
-      uploadFileUrl: null,
-      checked: false,
-      list: [],
-      detailList: [],
-      sysList: [],
-      total: 0,
-      thirdNo: "",
-      uuid: "111",
-      thirdId: null,
-      relId: "",
-      thisData: {
-        nameCode: null,
-        cpmctymc: null,
-        ggxh: null
-      },
-      multipleSelection: [],
-      editDialogVisible: false,
-      selectUdiDialogVisible: false,
-      selectErpDialogVisible: false,
-      selectLocalVisible: false,
-    };
-  },
-
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        customerId: null,
-        uuids: [],
-        rlIds: [],
-        ylqxzcrbarmc: "",
-        cpmctymc: "",
-        nameCode: "",
-        page: 1,
-        limit: 20,
-        addType: 1,
-      };
-      this.getList();
-    },
-    getList() {
-      this.loading = true;
-      this.filterQuery.customerId = store.getters.customerId;
-      getSmUdiInfos(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;
-          });
-    },
-
-    getDetailList(detailQuery) {
-      this.loading = true;
-      filterByUuid(detailQuery)
-          .then((response) => {
-            this.loading = false;
-            this.detailList = response.data || [];
-          })
-          .catch(() => {
-            this.loading = false;
-            this.detailList = [];
-          });
-    },
-
-    handleDetail(row) {
-      this.editQuery = row;
-      console.log(row);
-    },
-
-    combine() {
-      this.combineQuery.productUuid = this.currentRow.uuid;
-      this.combineQuery.customerId = store.getters.customerId;
-      insertCompanyProductRelevance(this.combineQuery).then(response => {
-        this.loading = false;
-        if (response.code === 20000) {
-          this.$message.success("添加成功");
-          this.closeDialog(true);
-        } else {
-          this.$message.error(response.message);
-        }
-      });
-    },
-
 
-    selectExport() {
-      var selectData = this.multipleSelection;
-      selectData.forEach((obj) => {
-        this.filterQuery.rlIds.push(obj.id);
-      });
-      this.allExport();
-
-    },
-    allExport() {
-      this.filterQuery.customerId = store.getters.customerId;
-      insertFilter(this.filterQuery).then(response => {
-        this.loading = false;
-        if (response.code == 20000) {
-          this.$message.success(response.data);
-          console.log("关闭弹窗");
-          this.$emit("closeSelDialog", true);
-          this.closeSelDialog();
-        } else {
-          this.$message.error(response.message);
-        }
-      });
-    },
-
-    intentDetail() {
-      this.isImportUdi = false;
-      this.selectUdiDialogVisible = true;
-    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                customerId: null,
+                uuids: [],
+                rlIds: [],
+                ylqxzcrbarmc: "",
+                supName:null,
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                addType: 1,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            getSmUdiInfos(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;
+                });
+        },
+
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleDetail(row) {
+            this.editQuery = row;
+            console.log(row);
+        },
+
+        combine() {
+            this.combineQuery.productUuid = this.currentRow.uuid;
+            this.combineQuery.customerId = store.getters.customerId;
+            insertCompanyProductRelevance(this.combineQuery).then(response => {
+                this.loading = false;
+                if (response.code === 20000) {
+                    this.$message.success("添加成功");
+                    this.closeDialog(true);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
 
-    intentImportErp(val) {
-      this.uuid = val.uuid;
-      this.relId = val.id;
-      this.isImport = true;
-      this.thisData = val;
-      this.selectErpDialogVisible = true;
-    },
-    uploadSMP() {
-      var selectData = this.multipleSelection;
-      selectData.forEach((obj) => {
-        this.filterQuery.uuids.push(obj.uuid);
-      });
-      this.allUploadSMP();
-    },
 
-    allUploadSMP() {
-      udiUpload(this.filterQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.$message({
-                type: "success",
-                message: "上传成功！",
-              });
-            } else {
-              this.$message({
-                type: "error",
-                message: response.message,
-              });
+        selectExport() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.rlIds.push(obj.id);
+            });
+            this.allExport();
+
+        },
+        allExport() {
+            this.filterQuery.customerId = store.getters.customerId;
+            insertFilter(this.filterQuery).then(response => {
+                this.loading = false;
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                    console.log("关闭弹窗");
+                    this.$emit("closeSelDialog", true);
+                    this.closeSelDialog();
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
+
+        intentDetail() {
+            this.isImportUdi = false;
+            this.selectUdiDialogVisible = true;
+        },
+
+        intentImportErp(val) {
+            this.uuid = val.uuid;
+            this.relId = val.id;
+            this.isImport = true;
+            this.thisData = val;
+            this.selectErpDialogVisible = true;
+        },
+        uploadSMP() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.uuids.push(obj.uuid);
+            });
+            this.allUploadSMP();
+        },
+
+        allUploadSMP() {
+            udiUpload(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "上传成功！",
+                        });
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: response.message,
+                        });
+                    }
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "error",
+                        message: "上传失败",
+                    });
+                    this.$emit("cancelDialog", true);
+                });
+        },
+        handleSelectionChange(val) {
+            console.log("----" + val);
+            this.multipleSelection = val;
+        },
+
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleModifyClick(row) {
+            this.editDialogVisible = true;
+            this.editQuery = row;
+            this.relevanceEdit = {
+                id: row.id,
+                thirdId: row.thirdId,
+                isUseDy: row.isUseDy,
+            };
+            this.checked = row.isUseDy == 1;
+
+            let ttquery = {
+                uuid: row.uuid,
+                page: 1,
+                limit: 10,
+            };
+            console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
+
+            this.getDetailList(ttquery);
+            this.getThirdSysDetail();
+        },
+        closeUdi(val) {
+            this.selectUdiDialogVisible = false;
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+            if (val) {
+                this.getList();
             }
-            this.$emit("cancelDialog", true);
-          })
-          .catch(() => {
-            this.$message({
-              type: "error",
-              message: "上传失败",
+        },
+        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 = [];
+                });
+        },
+        checkSelectable(row) {
+            return !row.isSelect;
+        },
+        uploadErpProduct() {
+            updateErpProduct()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: response.data,
+                        });
+                        this.$emit("closeDialog", true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        closeDialog() {
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+        },
+
+        selectSysParam() {
+            let query = {
+                paramKey: "smp_isUploadProuct",
+            };
+            selectSysParamByKey(query).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isUploadSmp = true;
+                    }
+                }
             });
-            this.$emit("cancelDialog", true);
-          });
-    },
-    handleSelectionChange(val) {
-      console.log("----" + val);
-      this.multipleSelection = val;
-    },
-
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
+            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;
+                }
+            });
+        },
     },
-    handleModifyClick(row) {
-      this.editDialogVisible = true;
-      this.editQuery = row;
-      this.relevanceEdit = {
-        id: row.id,
-        thirdId: row.thirdId,
-        isUseDy: row.isUseDy,
-      };
-      this.checked = row.isUseDy == 1;
-
-      let ttquery = {
-        uuid: row.uuid,
-        page: 1,
-        limit: 10,
-      };
-      console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
-
-      this.getDetailList(ttquery);
-      this.getThirdSysDetail();
+    mounted() {
     },
-    closeUdi(val) {
-      this.selectUdiDialogVisible = false;
-      this.selectErpDialogVisible = false;
-      this.selectLocalVisible = false;
-      if (val) {
+    components: {},
+    created() {
         this.getList();
-      }
-    },
-    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 = [];
-          });
-    },
-    checkSelectable(row) {
-      return !row.isSelect;
-    },
-    uploadErpProduct() {
-      updateErpProduct()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.$message({
-                type: "success",
-                message: response.data,
-              });
-              this.$emit("closeDialog", true);
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-          });
-    },
-
-    closeDialog() {
-      this.selectErpDialogVisible = false;
-      this.selectLocalVisible = false;
-    },
-
-    selectSysParam() {
-      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;
-        }
-      });
+        this.selectSysParam();
     },
-  },
-  mounted() {
-  },
-  components: {},
-  created() {
-    this.getList();
-    this.selectSysParam();
-  },
 };
 </script>
 <style scoped>
 .itemTag {
-  float: left;
-  text-align: left;
-  margin-top: 10px;
-  width: 25%;
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
 }
 
 .query-form-item {
-  display: block !important;
-  margin-right: 10px;
-  margin-bottom: 5px;
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
 }
 
 .text {
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
 }
 
 .el-row {
-  display: flex;
-  flex-wrap: wrap;
+    display: flex;
+    flex-wrap: wrap;
 }
 
 .el-col {
-  border-radius: 4px;
-  flex-wrap: wrap;
+    border-radius: 4px;
+    flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1eae648..072aaf3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -3,7 +3,7 @@
 
 
         <div>
-            <h3 class="toptitle">zhaoan医院UDI自助平台</h3>
+            <h3 class="toptitle">诏安县医院UDI自助平台</h3>
         </div>
 
         <el-form
diff --git a/src/views/thrsys/ThrCorpsExport.vue b/src/views/thrsys/ThrCorpsExport.vue
index 7e8fc6a..b13d7b0 100644
--- a/src/views/thrsys/ThrCorpsExport.vue
+++ b/src/views/thrsys/ThrCorpsExport.vue
@@ -191,8 +191,8 @@
                             a.href = URL.createObjectURL(blob);
                             console.log(a.href);
                             a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
+                                row.filePath.split("\\")[
+                                row.filePath.split("\\").length - 1
                                     ]; //  // 下载文件的名字
                             document.body.appendChild(a);
                             a.click();
diff --git a/src/views/thrsys/ThrCorpsImport.vue b/src/views/thrsys/ThrCorpsImport.vue
index d1050a1..57ab3a4 100644
--- a/src/views/thrsys/ThrCorpsImport.vue
+++ b/src/views/thrsys/ThrCorpsImport.vue
@@ -101,13 +101,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(scope.row)"
-                    >详情
-                    </el-button
-                    >
+<!--                    <el-button-->
+<!--                        type="text"-->
+<!--                        size="small"-->
+<!--                        @click.native.stop="handleDetailClick(scope.row)"-->
+<!--                    >详情-->
+<!--                    </el-button-->
+<!--                    >-->
                     <el-button
                         type="text"
                         size="small"
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index a178569..74c8b9f 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -74,13 +74,12 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="scope.row.code==1000 ||scope.row.code==1001"
                             @click.native.stop="handleDel(node,scope.row)"
                         >删除
                         </el-button
                         >
                     </template>
-
+                    <!--       :disabled="scope.row.code==1000 ||scope.row.code==1001"-->
                 </el-table-column>
             </el-table>
 
@@ -379,7 +378,7 @@ export default {
         // 显示表单
         handleForm(node, data, formName) {
             this.formVisible = true;
-            let no = this.getProjectNum() + Math.floor(Math.random() * 10000)
+            let no = Math.floor(Math.random() * 10000000)
             this.pidData = data || null;
             formJson.pid = (data && parseInt(data.id)) || "";
             this.formData = JSON.parse(JSON.stringify(formJson));
diff --git a/src/views/thrsys/ThrOrderExport.vue b/src/views/thrsys/ThrOrderExport.vue
index 6a0b0b4..fcbdf4f 100644
--- a/src/views/thrsys/ThrOrderExport.vue
+++ b/src/views/thrsys/ThrOrderExport.vue
@@ -191,8 +191,8 @@
                             a.href = URL.createObjectURL(blob);
                             console.log(a.href);
                             a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
+                                row.filePath.split("\\")[
+                                row.filePath.split("\\").length - 1
                                     ]; //  // 下载文件的名字
                             document.body.appendChild(a);
                             a.click();
diff --git a/src/views/thrsys/ThrOrderExportSmp.vue b/src/views/thrsys/ThrOrderExportSmp.vue
index 64babfa..87d5ba8 100644
--- a/src/views/thrsys/ThrOrderExportSmp.vue
+++ b/src/views/thrsys/ThrOrderExportSmp.vue
@@ -194,8 +194,8 @@
                         console.log(a.href);
                         //   a.download = ""; // 下载文件的名字
                         a.download =
-                            row.filePath.split("/")[
-                            row.filePath.split("/").length - 1
+                            row.filePath.split("\\")[
+                            row.filePath.split("\\").length - 1
                                 ]; //  // 下载文件的名字
                         document.body.appendChild(a);
                         a.click();
diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue
index 9f8b957..f28c835 100644
--- a/src/views/thrsys/ThrOrderImport.vue
+++ b/src/views/thrsys/ThrOrderImport.vue
@@ -101,13 +101,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(scope.row)"
-                    >详情
-                    </el-button
-                    >
+<!--                    <el-button-->
+<!--                        type="text"-->
+<!--                        size="small"-->
+<!--                        @click.native.stop="handleDetailClick(scope.row)"-->
+<!--                    >详情-->
+<!--                    </el-button-->
+<!--                    >-->
                     <el-button
                         type="text"
                         size="small"
diff --git a/src/views/thrsys/ThrProductsExport.vue b/src/views/thrsys/ThrProductsExport.vue
index e07cced..1181930 100644
--- a/src/views/thrsys/ThrProductsExport.vue
+++ b/src/views/thrsys/ThrProductsExport.vue
@@ -188,8 +188,8 @@
                             a.href = URL.createObjectURL(blob);
                             console.log(a.href);
                             a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
+                                row.filePath.split("\\")[
+                                row.filePath.split("\\").length - 1
                                     ];
                             document.body.appendChild(a);
                             a.click();
diff --git a/src/views/thrsys/ThrProductsExportSmp.vue b/src/views/thrsys/ThrProductsExportSmp.vue
index 63fa174..2174fe1 100644
--- a/src/views/thrsys/ThrProductsExportSmp.vue
+++ b/src/views/thrsys/ThrProductsExportSmp.vue
@@ -192,8 +192,8 @@
                         a.href = URL.createObjectURL(blob);
                         console.log(a.href);
                         a.download =
-                            row.filePath.split("/")[
-                            row.filePath.split("/").length - 1
+                            row.filePath.split("\\")[
+                            row.filePath.split("\\").length - 1
                                 ];
                         document.body.appendChild(a);
                         a.click();
diff --git a/src/views/thrsys/ThrProductsImport.vue b/src/views/thrsys/ThrProductsImport.vue
index e88aa02..bc5eff9 100644
--- a/src/views/thrsys/ThrProductsImport.vue
+++ b/src/views/thrsys/ThrProductsImport.vue
@@ -100,13 +100,13 @@
             </el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(scope.row)"
-                    >详情
-                    </el-button
-                    >
+<!--                    <el-button-->
+<!--                        type="text"-->
+<!--                        size="small"-->
+<!--                        @click.native.stop="handleDetailClick(scope.row)"-->
+<!--                    >详情-->
+<!--                    </el-button-->
+<!--                    >-->
                     <el-button
                         type="text"
                         size="small"
diff --git a/src/views/userManage/register.vue b/src/views/userManage/register.vue
index ef8b057..fd0dfaf 100644
--- a/src/views/userManage/register.vue
+++ b/src/views/userManage/register.vue
@@ -181,7 +181,17 @@
                     </el-col>
                 </el-row>
 
-
+                <el-row :gutter="20">
+                    <el-col :span="1">
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item>
+                            <el-checkbox v-model="udplatEnable">
+                                是否阳光采购平台企业
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
                 <el-row :gutter="20" v-if="registerConfigMap.companyCheckStatus">
                     <el-col :span="4">
                         <div class="register-text">
@@ -190,7 +200,7 @@
                     </el-col>
                     <el-col :span="10">
 
-                        <el-form-item prop="fromCorp">
+                        <el-form-item prop="udplatCompanyName">
                             <el-select
                                 v-model="inputQuery.udplatCompanyName"
                                 filterable
@@ -203,6 +213,7 @@
                                 style="width: 100%"
                                 @change="selectUdlpatOne"
                                 :loading="loading"
+                                :disabled="!udplatEnable"
                             >
                                 <el-option
                                     v-for="item in fromUdplatOptions"
@@ -229,6 +240,7 @@
                     </el-col>
                 </el-row>
 
+
                 <!--                <el-row :gutter="20">-->
                 <!--                    <el-col :span="4">-->
                 <!--                        <div class="register-text">-->
@@ -552,6 +564,7 @@ export default {
                 checkCompanyNameStatus: false,
                 licenseUrl: null,
             },
+            udplatEnable: false,
             headers: {},
             uploadUrl: null,
             fileUrl: null,
@@ -588,7 +601,7 @@ export default {
                     {required: true, message: "请输入企业名称", trigger: "blur"},
                 ],
                 udplatCompanyName: [
-                    {required: true, message: "请输入阳光采购平台企业名称", trigger: "blur"},
+                    {required: this.udplatEnable, message: "请输入阳光采购平台企业名称", trigger: "blur"},
                 ],
 
                 creditNum: [
diff --git a/src/views/warehouse/DialogSelectRl.vue b/src/views/warehouse/DialogSelectRl.vue
index e863ee5..f90e3fd 100644
--- a/src/views/warehouse/DialogSelectRl.vue
+++ b/src/views/warehouse/DialogSelectRl.vue
@@ -500,12 +500,12 @@
 </template>
 
 <script>
-    import {
-        getUdiInfos,getAllUdiInfos,
-        deletetUdiInfos,
-        thirdSysDetail,
-        removeRl, sysFilter
-    } from "../../api/basic/udiRelevance";
+import {
+    getUdiInfos, getAllUdiInfos,
+    deletetUdiInfos,
+    thirdSysDetail,
+    removeRl, sysFilter, getMutiUdiInfos
+} from "../../api/basic/udiRelevance";
     import {selectSysParamByKey} from "../../api/param/systemParamConfig";
     import {filterByUuid} from "../../api/basic/udiInfo";
     import {updateBind} from "../../api/warehouse/order"
@@ -587,7 +587,7 @@
             getList() {
                 this.loading = true;
                 this.filterQuery.nameCode = this.curRow.nameCode;
-                getAllUdiInfos(this.filterQuery)
+                getMutiUdiInfos(this.filterQuery)
                     .then((response) => {
                         this.loading = false;
                         this.list = response.data.list || [];
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index a0b7e71..028ae24 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -169,7 +169,7 @@
                     <el-form-item prop="code">
                         <el-input
                             @focus="getInputFocus($event)"
-                            @keypress.enter.native="addCode()"
+                            @keypress.enter.native="enterKey($event)"
                             v-model="formData.code"
                             ref='inputRef'
                         ></el-input>
@@ -186,10 +186,19 @@
                     >
                 </el-col>
 
-                <div class="text item" style="margin-left: 30px"> 已扫码条码：{{ total }}
-                </div>
+
             </el-row>
+            <el-row :gutter="20">
+                <el-col :span="16" style="margin-left: 40px">
+                    <el-checkbox v-model="sitcomScan">分段扫码</el-checkbox>
+                </el-col>
+                <el-col :span="4">
+                    <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
+                    </div>
+                </el-col>
+
 
+            </el-row>
             <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
                       :row-style="rowStyle"
                       ref="multipleTable">
@@ -363,6 +372,7 @@ export default {
             curRow: null,
             selectRlVisible: false,
             dialogTableVisible: false,
+            sitcomScan: false,
         };
     },
     components: {
@@ -426,6 +436,13 @@ export default {
                 this.getList();
             }
         },
+        enterKey(event) {
+            if (this.sitcomScan) {
+                return;
+            } else {
+                this.addCode(event);
+            }
+        },
         addCode(event) {
             this.formData.corpOrderId = this.formData.corpOrderId.trim();
             this.actionEnable = true;
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 450d122..8b65bac 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -116,7 +116,7 @@
                     <el-col :span="19">
                         <el-form-item prop="code">
                             <el-input
-                                @keypress.enter.native="addCode()"
+                                @keypress.enter.native="enterKey($event)"
                                 v-model="formData.code"
                                 ref='inputRef'
                                 @focus="getInputFocus($event)"
@@ -134,9 +134,17 @@
                         </el-button
                         >
                     </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="16" style="margin-left: 40px">
+                        <el-checkbox v-model="sitcomScan">分段扫码</el-checkbox>
+                    </el-col>
+                    <el-col :span="4">
+                        <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
+                        </div>
+                    </el-col>
+
 
-                    <!--                <div class="text item" style="margin-left: 30px"> 已扫码条码：{{ total }}-->
-                    <!--                </div>-->
                 </el-row>
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
                           :row-style="rowStyle"
@@ -302,6 +310,7 @@ export default {
             storageList: [],
             selectRlVisible: false,
             dialogTableVisible: false,
+            sitcomScan: false,
         };
     },
     components: {
@@ -366,6 +375,14 @@ export default {
                 this.getList();
             }
         },
+
+        enterKey(event) {
+            if (this.sitcomScan) {
+                return;
+            } else {
+                this.addCode(event);
+            }
+        },
         addCode(event) {
             if (event == null) {
                 this.$refs.inputRef.focus();
@@ -552,7 +569,6 @@ export default {
         },
 
 
-
         selectBindRl(row) {
             let query = {
                 id: this.curRow.id,
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 92b3530..c877564 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -124,7 +124,13 @@
                         <!--                        >打印订单-->
                         <!--                        </el-button-->
                         <!--                        >-->
-
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="handleDetailForm(scope.$index, scope.row)"
+                        >编辑
+                        </el-button
+                        >
                         <div v-if="scope.row.enableSupplementOrder">
                             <el-button
                                 type="text"
@@ -133,6 +139,7 @@
                                 平衡补单
                             </el-button>
                         </div>
+
                     </template>
                 </el-table-column>
             </el-table>
@@ -147,11 +154,11 @@
         </el-card>
 
         <el-card class="el-card">
-            <el-row style="margin-bottom: 20px;">
-                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>
-            </el-row>
+            <!--            <el-row style="margin-bottom: 20px;">-->
+            <!--                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>-->
+            <!--                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>-->
+            <!--                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>-->
+            <!--            </el-row>-->
 
             <el-table v-loading="detailLoading"
                       :data="detailList"
@@ -267,158 +274,23 @@
             </div>
         </el-dialog>
 
-        <!--<el-dialog-->
-        <!--    title="配货"-->
-        <!--    :visible.sync="distributionVisible"-->
-        <!--    width="60%"-->
-        <!--    v-if="distributionVisible"-->
-        <!--    @close='closeDialog'-->
-        <!--&gt;-->
-        <!--    <stockOrderDistribution-->
-        <!--        :closeDialog="closeDialog"-->
-        <!--        :idQuery="idQuery"-->
-        <!--    ></stockOrderDistribution>-->
-        <!--</el-dialog>-->
-
-        <!--<el-dialog-->
-        <!--    title="编辑"-->
-        <!--    :visible.sync="detailFormVisible"-->
-        <!--    :before-close="hideDetailForm"-->
-        <!--    width="85%"-->
-        <!--    top="5vh"-->
-        <!--&gt;-->
-        <!--    <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">-->
+        <el-dialog
+            title="单据设置"
+            :visible.sync="stockOrderEditVisible"
+            width="80%"
+            v-if="stockOrderEditVisible"
+            @close='closeDialog'
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
+            <StockOrderEdit
+                :closeDialog="closeDialog"
+                :detailList="detailList"
 
-        <!--        <el-row :gutter="20">-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>产品通用名：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="productName">-->
-        <!--                    <el-input v-model="detailFormData.productName" auto-complete="off"-->
-        <!--                              :disabled="true"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>包装规格：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="spec">-->
-        <!--                    <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--        </el-row>-->
-        <!--        <el-row :gutter="20">-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>单据数量：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="count">-->
-        <!--                    <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>实际数量：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="reCount">-->
-        <!--                    <el-input v-model="detailFormData.reCount" auto-complete="off" :disabled="true"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--        </el-row>-->
-        <!--        <el-row :gutter="20">-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>生产日期：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="productDate">-->
-        <!--                    <el-input v-model="detailFormData.productDate" auto-complete="off"-->
-        <!--                              :disabled="false"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>失效日期：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="expireDate">-->
-        <!--                    <el-input v-model="detailFormData.expireDate" auto-complete="off"-->
-        <!--                              :disabled="false"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--        </el-row>-->
-        <!--        <el-row :gutter="20">-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>批次号：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="batchNo">-->
-        <!--                    <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="3">-->
-        <!--                <div class="ao-text">-->
-        <!--                    <span>扫码数量：</span>-->
-        <!--                </div>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="7">-->
-        <!--                <el-form-item prop="sweepCount">-->
-        <!--                    <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"-->
-        <!--                              oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
-        <!--                </el-form-item>-->
-        <!--            </el-col>-->
-        <!--        </el-row>-->
-        <!--    </el-form>-->
-        <!--    <div slot="footer" class="dialog-footer">-->
-        <!--        <el-button @click.native="hideDetailForm">取消</el-button>-->
-        <!--        <el-button-->
-        <!--            type="primary"-->
-        <!--            @click.native="submitUploadDetail()"-->
-        <!--            :loading="detailFormLoading"-->
-        <!--        >提交-->
-        <!--        </el-button-->
-        <!--        >-->
-        <!--    </div>-->
-        <!--</el-dialog>-->
+            ></StockOrderEdit>
+        </el-dialog>
 
-        <!--<el-dialog-->
-        <!--    title="码详情"-->
-        <!--    :visible.sync="qrcodeDetailVisible"-->
-        <!--    width="70%"-->
-        <!--    v-if="qrcodeDetailVisible"-->
-        <!--    @close='closeQRCodeDetailDialog'-->
-        <!--&gt;-->
-        <!--    <stockOrderQRCodeDetail-->
-        <!--        :closeDialog="closeQRCodeDetailDialog"-->
-        <!--        :idQuery="idQuery"-->
-        <!--    ></stockOrderQRCodeDetail>-->
-        <!--</el-dialog>-->
 
-        <!--<el-dialog-->
-        <!--    title="码管理"-->
-        <!--    :visible.sync="qrcodeExportVisible"-->
-        <!--    width="60%"-->
-        <!--    v-if="qrcodeExportVisible"-->
-        <!--    @close='closeQRCodeExportDialog'-->
-        <!--&gt;-->
-        <!--    <stockQRCodeExport-->
-        <!--        :closeDialog="closeQRCodeExportDialog"-->
-        <!--        :idQuery="idQuery"-->
-        <!--    ></stockQRCodeExport>-->
-        <!--</el-dialog>-->
     </div>
 </template>
 
@@ -439,6 +311,7 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
 import store from "../../store";
 import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
 
 export default {
     name: "stockOrderDelSearch",
@@ -505,6 +378,7 @@ export default {
             },
             isSp: store.getters.customerId,
             detailFormVisible: false,
+            stockOrderEditVisible: false,
             detailFormData: {},
             detailFormLoading: false,
             haveDistributionVisible: true,
@@ -849,11 +723,12 @@ export default {
         },
         // 显示表单
         handleDetailForm(index, row) {
-            this.detailFormVisible = true;
-            this.detailFormData = {};
-            if (row !== null) {
-                this.detailFormData = Object.assign({}, row);
-            }
+            // this.detailFormVisible = true;
+            // this.detailFormData = {};
+            // if (row !== null) {
+            //     this.detailFormData = Object.assign({}, row);
+            // }
+            this.stockOrderEditVisible = true;
         },
         hideDetailForm() {
             // 更改值
@@ -950,6 +825,7 @@ export default {
         stockOrderDistribution,
         stockOrderQRCodeDetail,
         stockQRCodeExport,
+        StockOrderEdit
     },
     filters: {
         statusFilterType(status) {
diff --git a/src/views/warehouse/stockOrderEdit.vue b/src/views/warehouse/stockOrderEdit.vue
new file mode 100644
index 0000000..f1b5c5f
--- /dev/null
+++ b/src/views/warehouse/stockOrderEdit.vue
@@ -0,0 +1,269 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <el-row style="margin-bottom: 20px;">
+                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>
+                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>
+                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>
+            </el-row>
+
+            <el-table v-loading="detailLoading"
+                      :data="detailList"
+                      @selection-change="changeFun"
+                      style="width: 100%">
+
+                <el-table-column
+                    type="selection"
+                    width="55">
+                </el-table-column>
+
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
+                <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
+                <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
+
+                <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
+                <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
+                <el-table-column label="价格" width="120" prop="price"></el-table-column>
+                <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
+                    <template slot-scope="scope">
+                        <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.secSalesListNo"
+                                  placeholder="请输入"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">
+                    <template slot-scope="scope">
+                        <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.firstSalesInvNo"
+                                  placeholder="请输入"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">
+                    <template slot-scope="scope">
+                        <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.secSalesInvNo"
+                                  placeholder="请输入"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="发票日期" width="150" prop="invoiceDate">
+                    <template slot-scope="scope">
+                        <el-date-picker :disabled="scope.$index !== currentCheckIndex" format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                                        v-model="scope.row.invoiceDate" style="width: 100%;"></el-date-picker>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="150" prop="price" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="handleEdit(scope.$index, scope.row)"
+                        >编辑
+                        </el-button>
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="handleSave(scope.$index, scope.row)"
+                        >保存
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="detailQuery.limit"
+                @current-change="detailHandleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+            >
+            </el-pagination>
+        </el-card>
+
+        <el-dialog v-bind:width="'25%'" :visible.sync="salesListNoFormVisible" append-to-body>
+            <el-form :model="batchForm">
+                <label></label>
+                <el-form-item label="销售清单：" :label-width="formLabelWidth">
+                    <el-input style="width: 80%;;" v-model="batchForm.secSalesListNo" autocomplete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="salesListNoFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="batchSetParams('1','salesListNo')">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible"  append-to-body>
+            <el-form :model="batchForm">
+                <label></label>
+                <el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
+                    <el-input style="width: 80%;;" v-model="batchForm.firstSalesInvNo" autocomplete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="firstSalesInvNoFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="batchSetParams('1','firstSalesInvNo')">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible"  append-to-body>
+            <el-form :model="batchForm">
+                <label></label>
+                <el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
+                    <el-input style="width: 80%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="发票日期：" :label-width="formLabelWidth">
+                    <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                                    v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="secSalesInvNoFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="batchSetParams('1','secSalesInvNo')">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+    </div>
+
+</template>
+
+<script>
+import {stockOrderDetail, updateStockOrderDetail} from "@/api/warehouse/stockOrder";
+
+export default {
+    name: "stockOrderEdit",
+    props: {
+        detailList: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            detailQuery: {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
+            },
+            batchForm: {
+                secSalesListNo: '',
+                firstSalesInvNo: '',
+                secSalesInvNo: '',
+                invoiceDate: ''
+            },
+            multipId: [],
+            currentCheckIndex: -1,
+            salesListNoFormVisible: false,
+            firstSalesInvNoFormVisible: false,
+            secSalesInvNoFormVisible: false,
+        }
+    },
+    methods: {
+        handleEdit(index, row) {
+            this.currentCheckIndex = index;
+            console.log(this.currentCheckIndex)
+        },
+        handleSave(index, row) {
+            this.currentCheckIndex = -1;
+
+            updateStockOrderDetail(row).then((res) => {
+                if (res.code == 20000) {
+                    this.$message.success(res.data);
+                }
+            })
+        },
+        changeFun(row) {
+            let _this = this;
+            _this.multipId = []; //每次改动重置ID
+            row.forEach((item) => {
+                _this.multipId.push(item.id);
+            })
+            console.log(this.multipId);
+        },
+        batchSetParams(flag, type) {
+            if (flag == '1' && type == 'salesListNo') {
+                this.salesListNoFormVisible = false;
+                this.detailList.forEach(data => {
+                    this.multipId.forEach(id => {
+                        if (data.id == id) {
+                            data.secSalesListNo = this.batchForm.secSalesListNo;
+                            //更新到数据库
+                            updateStockOrderDetail(data);
+                        }
+                    })
+                });
+                //置空批量设置表单
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
+            } else if (flag == '1' && type == 'firstSalesInvNo') {
+                this.firstSalesInvNoFormVisible = false;
+                this.detailList.forEach(data => {
+                    this.multipId.forEach(id => {
+                        if (data.id == id) {
+                            data.firstSalesInvNo = this.batchForm.firstSalesInvNo;
+                            //更新到数据库
+                            updateStockOrderDetail(data);
+                        }
+                    })
+                });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
+            } else if (flag == '1' && type == 'secSalesInvNo') {
+                this.secSalesInvNoFormVisible = false;
+                this.detailList.forEach(data => {
+                    this.multipId.forEach(id => {
+                        if (data.id == id) {
+                            data.secSalesInvNo = this.batchForm.secSalesInvNo;
+                            data.invoiceDate = this.batchForm.invoiceDate;
+                            //更新到数据库
+                            updateStockOrderDetail(data);
+                        }
+                    })
+                });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
+            } else {
+                if (this.multipId.length == 0) {
+                    this.$message.warning("请选择数据");
+                } else {
+                    switch (type) {
+                        case 'salesListNo':
+                            this.salesListNoFormVisible = true;
+                            return;
+                        case 'firstSalesInvNo':
+                            this.firstSalesInvNoFormVisible = true;
+                            return;
+                        case 'secSalesInvNo':
+                            this.secSalesInvNoFormVisible = true;
+                            return;
+                        default:
+                            return;
+                    }
+                }
+            }
+        },
+
+        detailHandleCurrentChange(val) {
+            this.query.page = val;
+            this.getStockOrderDetailList();
+        },
+        getStockOrderDetailList(row) {
+            if (this.$isNotBlank(row)) {
+                this.detailQuery.orderIdFk = row.id;
+            }
+            this.detailLoading = true;
+            stockOrderDetail(this.detailQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.detailLoading = false;
+                    this.detailList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.detailLoading = false;
+                    this.detailList = [];
+                });
+        },
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index ba47013..69036e0 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -124,14 +124,13 @@
                         >单据打印
                         </el-button
                         >
-                        <!--            v-if="haveDistributionVisible"-->
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="handleDetailForm(scope.$index, scope.row)"-->
-                        <!--                        >编辑-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="handleDetailForm(scope.$index, scope.row)"
+                        >编辑
+                        </el-button
+                        >
                     </template>
                 </el-table-column>
             </el-table>
@@ -146,11 +145,11 @@
         </el-card>
 
         <el-card class="el-card">
-            <el-row style="margin-bottom: 20px;">
-                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>
-            </el-row>
+<!--            <el-row style="margin-bottom: 20px;">-->
+<!--                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>-->
+<!--                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>-->
+<!--                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>-->
+<!--            </el-row>-->
 
             <el-table v-loading="detailLoading"
                       :data="detailList"
@@ -267,6 +266,22 @@
             </div>
         </el-dialog>
 
+        <el-dialog
+            title="单据设置"
+            :visible.sync="stockOrderEditVisible"
+            width="80%"
+            v-if="stockOrderEditVisible"
+            @close='closeDialog'
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
+            <StockOrderEdit
+                :closeDialog="closeDialog"
+                :detailList="detailList"
+
+            ></StockOrderEdit>
+        </el-dialog>
+
 
         <el-dialog
             title="单据设置"
@@ -276,11 +291,11 @@
             @close='closeDialog'
             :close-on-click-modal="false"
             :close-on-press-escape="false"
-            :before-close="handleClose"
+            append-to-body
         >
             <stockOrderEditDistribution
                 :closeDialog="closeDialog"
-                :idQuery="idQuery"
+                :detailList="detailList"
 
             ></stockOrderEditDistribution>
         </el-dialog>
@@ -456,6 +471,7 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
 import store from "../../store";
 import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
 
 export default {
     name: "stockOrderSearch",
@@ -501,6 +517,7 @@ export default {
                 id: "",
             },
             distributionSetVisible: false,
+            stockOrderEditVisible: false,
             distributionVisible: false,
             detailFormRules: {
                 batchNo: [
@@ -602,7 +619,7 @@ export default {
             this.currentCheckIndex = index;
             console.log(this.currentCheckIndex)
         },
-        handleSave(index, row) {
+        handleSave        (index, row) {
             this.currentCheckIndex = -1;
 
             updateStockOrderDetail(row).then((res) => {
@@ -871,11 +888,14 @@ export default {
         },
         // 显示表单
         handleDetailForm(index, row) {
-            this.detailFormVisible = true;
-            this.detailFormData = {};
-            if (row !== null) {
-                this.detailFormData = Object.assign({}, row);
-            }
+            // this.detailFormVisible = true;
+            // this.detailFormData = {};
+            // if (row !== null) {
+            //     this.detailFormData = Object.assign({}, row);
+
+            this.stockOrderEditVisible = true;
+
+
         },
         hideDetailForm() {
             // 更改值
@@ -943,14 +963,17 @@ export default {
                 }
             });
         }
-    },
+    }
+    ,
     components: {
+        StockOrderEdit,
         draggable,
         stockOrderDistribution,
         stockOrderEditDistribution,
         stockOrderQRCodeDetail,
         stockQRCodeExport,
-    },
+    }
+    ,
     filters: {
         statusFilterType(status) {
             const statusMap = {
@@ -958,7 +981,8 @@ export default {
                 1: "success"
             };
             return statusMap[status];
-        },
+        }
+        ,
         statusFilterName(status) {
             const statusMap = {
                 "1": "草稿",
@@ -967,7 +991,8 @@ export default {
                 "4": "已校验",
             };
             return statusMap[status];
-        },
+        }
+        ,
         typeFilterName(type) {
             const typeMap = {
                 1: "预入库",
@@ -975,7 +1000,8 @@ export default {
             };
             return typeMap[type];
         }
-    },
+    }
+    ,
     created() {
         this.getStorage();
         this.getBusType();