diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js
index 86b9edc..769f3ac 100644
--- a/src/api/basic/udiInfo.js
+++ b/src/api/basic/udiInfo.js
@@ -7,6 +7,7 @@ export function getUdiInfos(query) {
         params: query
     });
 }
+
 export function filterCompany(query) {
     return axios({
         url: "/udiwms/udiinfo/filterCompany",
@@ -23,4 +24,11 @@ export function filterByUuid(query) {
     });
 }
 
+export function filterByVersion(query) {
+    return axios({
+        url: "/udiwms/syncdi/version",
+        method: "get",
+        params: query
+    });
+}
 
diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js
index 128873a..1243b7d 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -177,6 +177,14 @@ export function lockStatus(query) {
     });
 }
 
+export function changeVersion(query) {
+    return axios({
+        url: "/udi/udirel/changeVersion",
+        method: "post",
+        data: query
+    });
+}
+
 
 
 
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index ff2b4c1..5d82c05 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -676,6 +676,24 @@
                                 ></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: 35%"
+                                    :disabled="!checked"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.versionNumber"
+                                ></el-input>
+                                <el-button type="text" size="small" @click.native.stop="selectVersion()"
+                                           style="margin-left: 5%"
+                                >切换版本
+                                </el-button>
+                            </div>
+                        </el-col>
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -769,6 +787,23 @@
                     @closeUdi="closeUdi"
                 ></selectLocalUdi>
             </el-dialog>
+
+            <el-dialog
+                title="选择DI版本"
+                :visible.sync="selectVersionVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="85%"
+                v-if="selectVersionVisible"
+            >
+                <selectUdiVersion
+                    :closeDialog="closeDialog"
+                    :relId="relId"
+                    :uuid="uuid"
+                    :originUuid="originUuid"
+                    @closeUdi="closeUdi"
+                ></selectUdiVersion>
+            </el-dialog>
             <el-pagination
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
@@ -795,6 +830,8 @@ import {filterByUuid} from "../../api/basic/udiInfo";
 import selectUdi from "./UdiInfoRelevance.vue";
 import selectErp from "./UdiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
+import selectUdiVersion from "./UdiinfoSelectVersion";
+
 
 export default {
     data() {
@@ -838,6 +875,7 @@ export default {
             total: 0,
             thirdNo: "",
             uuid: "111",
+            originUuid: null,
             thirdId: null,
             relId: "",
             thisData: {
@@ -849,6 +887,7 @@ export default {
             editDialogVisible: false,       //详情
             selectUdiDialogVisible: false,  //关联选入
             selectErpDialogVisible: false,  //选入ERP产品
+            selectVersionVisible: false,
             selectLocalVisible: false,      //关联UDI
             isUseDyCheck: false,
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
@@ -939,6 +978,12 @@ export default {
             this.editQuery = row;
             console.log(row);
         },
+        selectVersion() {
+            this.selectVersionVisible = true;
+            this.uuid = this.editQuery.uuid;
+            this.originUuid = this.editQuery.originUuid;
+            this.relId = this.editQuery.id;
+        },
         deleteOrders(data) {
             this.loading = true;
             let tquery = {
@@ -1175,9 +1220,11 @@ export default {
             this.selectUdiDialogVisible = false;
             this.selectErpDialogVisible = false;
             this.selectLocalVisible = false;
+            this.selectVersionVisible = false;
             this.getThirdSysDetail();
             if (val) {
                 this.getList();
+                this.cancelDialog();
             }
         },
         getThirdSysDetail() {
@@ -1228,6 +1275,7 @@ export default {
         closeDialog() {
             this.selectErpDialogVisible = false;
             this.selectLocalVisible = false;
+            this.selectVersionVisible = false;
         },
         onAddSubmit() {
 
@@ -1240,6 +1288,7 @@ export default {
             } else {
                 this.relevanceEdit.isUseDy = 0;
             }
+
             updatetUdiInfos(this.relevanceEdit)
                 .then((response) => {
                     this.loading = false;
@@ -1303,6 +1352,7 @@ export default {
         selectUdi,
         selectErp,
         selectLocalUdi,
+        selectUdiVersion,
     },
     created() {
         this.getList();
diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue
index 2a491df..24d482f 100644
--- a/src/views/basic/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/UdiInfoselectErpUdi.vue
@@ -305,7 +305,7 @@
 </template>
 
 <script>
-import {modifyRel, addErp, addAllErp} from "../../api/basic/udiRelevance";
+import {modifyRel, addErp, addAllErp,combineUdi} from "../../api/basic/udiRelevance";
 import {getInvbasdoc} from "../../api/basic/getErps";
 import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
 
@@ -513,7 +513,7 @@ export default {
                     })
                         .then(() => {
                             this.combineLoading = true;
-                            addErp(this.combineQuery)
+                            combineUdi(this.combineQuery)
                                 .then((response) => {
                                     this.combineLoading = false;
                                     if (response.code == 20000) {
@@ -536,7 +536,7 @@ export default {
                             this.combineQuery.thirdIds = [];
                         });
                 } else {
-                    addErp(this.combineQuery)
+                    combineUdi(this.combineQuery)
                         .then((response) => {
                             this.combineLoading = false;
                             if (response.code == 20000) {
diff --git a/src/views/basic/UdiinfoSelectVersion.vue b/src/views/basic/UdiinfoSelectVersion.vue
new file mode 100644
index 0000000..be37197
--- /dev/null
+++ b/src/views/basic/UdiinfoSelectVersion.vue
@@ -0,0 +1,294 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <div>
+
+
+                <el-table
+                    :data="udidlList"
+                    style="width: 100%"
+                    v-loading="loading"
+                    highlight-current-row="true"
+                    :row-class-name="tableRowClassName"
+                    @current-change="handleErpChange"
+                    @selection-change="handleSelectionUdiChange"
+                >
+                    <el-table-column label="序号" type="index"></el-table-column>
+
+                    <el-table-column
+                        label="版本号"
+                        prop="versionNumber"
+                        show-overflow-tooltip
+                    ></el-table-column>
+
+                    <el-table-column
+                        label="产品标识"
+                        prop="nameCode"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="产品名称"
+                        prop="cpmctymc"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="规格型号"
+                        prop="ggxh"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="医疗器械注册人"
+                        prop="ylqxzcrbarmc"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="注册证编号"
+                        prop="zczbhhzbapzbh"
+                        show-overflow-tooltip
+                    ></el-table-column>
+
+                    <el-table-column label="操作" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click="diDetail(scope.row)"
+                            >详情
+                            </el-button
+                            >
+                            <el-button
+                                type="text"
+                                size="small"
+                                :disabled="scope.row.uuid === originUuid"
+                                @click="checkCombine(scope.row)"
+                            >选入
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+
+                </el-table>
+                <el-pagination
+                    :page-size="unionQuery.limit"
+                    @current-change="handleCurrentChange"
+                    layout="prev, pager, next"
+                    :total="total"
+                ></el-pagination>
+
+            </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 {filterByVersion, filterCompany,} from "../../api/basic/udiInfo";
+import {changeVersion, checkExitUdi} from "../../api/basic/udiRelevance";
+import selectDiDetail from "./SelectDIDetailDialog"
+
+export default {
+    name: "UdiinfoSelectVersion",
+    props: {
+        relId: {
+            type: Object,
+            required: true,
+        },
+        uuid: {
+            type: Object,
+            required: true,
+        },
+        originUuid: {
+            type: Object,
+            required: true,
+        },
+
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+    },
+
+    data() {
+        return {
+            unionQuery: {
+                uuid: null
+            },
+            combineLoading: false,
+            combineQuery: {
+                idSpliUdi: false,
+                thirdId: "",
+                relId: "",
+                erpName: "",
+                thirdName: null,
+                keys: [],
+            },
+
+            checked: true,
+            udidlList: [],
+            erpList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            fromOptions: [],
+            loading: false,
+            erpLloading: false,
+            multipleUdiSelection: [],
+            selectDialog: false,
+            diDetails: null,
+        };
+    },
+    methods: {
+
+
+        getList() {
+            this.loading = true;
+            filterByVersion(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;
+                });
+        },
+
+
+        checkSelectable(row) {
+            return !row.check;
+        },
+
+        diDetail(row) {
+            this.diDetails = row;
+            this.selectDialog = true;
+        },
+
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        tableRowClassName({row, rowIndex}) {
+            if (row.check) return "warning-row";
+            return "";
+        },
+        handleErpChange(val) {
+            console.log(val);
+            this.currentRow = val;
+        },
+        intentBack() {
+            this.closeDialog();
+        },
+
+        checkCombine(row) {
+
+            this.combineQuery.keys = [];
+            if (this.relId != null) {
+                this.combineQuery.relId = this.relId;
+                this.combineQuery.keys.push(row.uuid);
+            } else
+                return;
+            this.combineLoading = true;
+            checkExitUdi(this.combineQuery)
+                .then((response) => {
+                    this.combineLoading = false;
+                    if (response.code == 20000) {
+                        this.combine();
+                    } else if (response.code == 499) {
+                        this.$confirm(response.message, {type: "warning"})
+                            .then(_ => {
+                                this.combine();
+                            })
+                            .catch(_ => {
+
+                                this.combineQuery.keys = [];
+                            });
+                    }
+                })
+                .catch(() => {
+                    this.combineLoading = false;
+                    this.$emit("closeDialog", false);
+                });
+
+
+        },
+
+        combine() {
+            changeVersion(this.combineQuery)
+                .then((response) => {
+                    this.combineLoading = false;
+                    if (response.code == 20000) {
+                        this.$message.success("切换成功！");
+                        this.$emit("closeUdi", true);
+                    } else {
+                        this.$message.error(response.message);
+                        this.$emit("closeUdi", false);
+                    }
+                })
+                .catch(() => {
+                    this.combineLoading = false;
+                    this.intentBack();
+                });
+        },
+
+        handleSelectionUdiChange(val) {
+            this.multipleUdiSelection = val;
+        },
+    },
+    components: {
+        selectDiDetail,
+    },
+    created() {
+        this.unionQuery.uuid = this.uuid;
+        this.getList();
+    },
+};
+</script>
+
+<style scoped>
+.checkitemTag {
+    float: left;
+    text-align: left;
+    margin-top: 5px;
+    width: 100%;
+}
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+
+.el-card {
+    margin-right: 20px;
+    /*transition: all .5s;*/
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+</style>