Merge remote-tracking branch 'origin/otherChange' into zhairh

public/config.json

@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.41:9996",
+    "BASE_URL": "http://192.168.0.166:9996",
-    "SERVER_IP": "http://192.168.0.41:9996",
+    "SERVER_IP": "http://192.168.0.166:9996",
     "hosp_name": "福建省XX市医院"
 }
 

src/views/basic/UdiInfoManage.vue

@@ -907,7 +907,7 @@
 
                                 <el-row :gutter="20" class="el-row" type="flex">
 
-                                    <el-col :span="12" class="el-col">
+                                    <el-col :span="8" class="el-col">
                                         <div class="text item">
                                             <div class="itemTag">
                                                 <span>当前版本号:&nbsp;</span>
@@ -919,11 +919,21 @@
                                                 splaceholder="请输入内容"
                                                 v-model="editQuery.versionNumber"
                                             ></el-input>
+                                        </div>
+                                    </el-col>
+
+                                    <el-col :span="2" class="el-col">
                                         <el-button type="text" size="small" @click.native.stop="selectVersion()"
                                                    style="margin-left: 5%"
                                         >切换版本
                                         </el-button>
-                                        </div>
+                                    </el-col>
+                                    <el-col :span="2" class="el-col">
+                                        <el-button type="text" size="small" @click.native.stop="updateVersion()"
+                                                   :loading="updateLoading"
+                                                   style="margin-left: 5%"
+                                        >更新当前版本信息
+                                        </el-button>
                                     </el-col>
                                 </el-row>
 
@@ -1027,7 +1037,7 @@ import {
     removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
 } from "../../api/basic/udiRelevance";
 import {selectSysParamByKey, finProductSet} from "../../api/param/systemParamConfig";
-import {filterByUuid} from "../../api/basic/udiInfo";
+import {dlLastVersionByDi, filterByUuid} from "../../api/basic/udiInfo";
 
 import selectUdi from "./UdiInfoRelevance.vue";
 import selectErp from "./UdiInfoselectErpUdi";
@@ -1101,6 +1111,7 @@ export default {
             configParms: {},
             activeNames: ['1'],
             useNumEnable: true,
+            updateLoading: false,
         };
     },
 
@@ -1219,6 +1230,39 @@ export default {
             this.originUuid = this.editQuery.originUuid;
             this.relId = this.editQuery.id;
         },
+
+
+        updateVersion() {
+            this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.updateLoading = true;
+                    let query = {nameCode: this.editQuery.nameCode};
+                    dlLastVersionByDi(query)
+                        .then((response) => {
+                            this.updateLoading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("更新成功！");
+                                this.closeDialog();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.updateLoading = false;
+                            this.udidlList = [];
+                            this.total = 0;
+                        });
+                })
+                .catch(() => {
+                });
+
+        },
+
+
         deleteOrders(data) {
             this.loading = true;
             let tquery = {

src/views/basic/basicProductEdit.vue

@@ -712,7 +712,7 @@
                             <p class="form-title">版本信息</p>
                         </template>
                         <el-row :gutter="20" class="el-row" type="flex">
-                            <el-col :span="12" class="el-col">
+                            <el-col :span="8" class="el-col">
                                 <div class="text item">
                                     <div class="itemTag">
                                         <span>当前版本号:&nbsp;</span>
@@ -724,11 +724,21 @@
                                         splaceholder="请输入内容"
                                         v-model="editQuery.versionNumber"
                                     ></el-input>
+                                </div>
+                            </el-col>
+
+                            <el-col :span="2" class="el-col">
                                 <el-button type="text" size="small" @click.native.stop="selectVersion()"
                                            style="margin-left: 5%"
                                 >切换版本
                                 </el-button>
-                                </div>
+                            </el-col>
+                            <el-col :span="2" class="el-col">
+                                <el-button type="text" size="small" @click.native.stop="updateVersion()"
+                                           :loading="updateLoading"
+                                           style="margin-left: 5%"
+                                >更新当前版本信息
+                                </el-button>
                             </el-col>
                         </el-row>
                     </el-collapse-item>
@@ -766,6 +776,25 @@
                 :supEnable="true"
             ></selectErp>
         </el-dialog>
+
+
+        <el-dialog
+            title="选择DI版本"
+            :visible.sync="selectVersionVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            append-to-body
+            v-if="selectVersionVisible"
+        >
+            <selectUdiVersion
+                :closeDialog="closeDialog"
+                :relId="relId"
+                :uuid="uuid"
+                :originUuid="originUuid"
+                @closeUdi="closeUdi"
+            ></selectUdiVersion>
+        </el-dialog>
     </div>
 </template>
 
@@ -773,6 +802,8 @@
 import {removeDiRl, removeRl, updatetUdiInfos} from "@/api/basic/udiRelevance";
 import {finProductSet} from "@/api/param/systemParamConfig";
 import selectErp from "./UdiInfoselectErpUdi";
+import selectUdiVersion from "./UdiinfoSelectVersion";
+import {dlLastVersionByDi} from "../../api/basic/udiInfo";
 
 export default {
     name: "basicProductEdit",
@@ -825,6 +856,9 @@ export default {
                 isUseDy: false,
                 isAdavence: null,
             },
+            originUuid: null,
+            selectVersionVisible: false,
+            updateLoading: false,
         }
     },
 
@@ -937,7 +971,7 @@ export default {
                                     type: "success",
                                     message: "删除成功！",
                                 });
-                                this.cancelDialog();
+                                this.closeUdi();
                             } else {
                                 this.$message.error(response.message);
                             }
@@ -949,6 +983,42 @@ export default {
                 });
         },
 
+        selectVersion() {
+            this.selectVersionVisible = true;
+            this.uuid = this.editQuery.uuid;
+            this.originUuid = this.editQuery.originUuid;
+            this.relId = this.editQuery.id;
+        },
+
+        updateVersion() {
+            this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.updateLoading = true;
+                    let query = {nameCode: this.editQuery.nameCode};
+                    dlLastVersionByDi(query)
+                        .then((response) => {
+                            this.updateLoading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("更新成功！");
+                                this.closeUdi();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.updateLoading = false;
+                            this.udidlList = [];
+                            this.total = 0;
+                        });
+                })
+                .catch(() => {
+                });
+
+        },
     },
     created() {
         this.relId = this.editQuery.rlId;
@@ -956,9 +1026,10 @@ export default {
             this.checked = true
         }
         this.findBasicProductSet();
-    },
+    }
+    ,
     components: {
-        selectErp,
+        selectErp, selectUdiVersion
     }