diff --git a/public/config.json b/public/config.json
index baa752d..61112ea 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,5 @@
{
- "BASE_URL": "http://192.168.1.13:9996",
- "SERVER_IP": "http://192.168.1.13:9996",
+ "BASE_URL": "http://192.168.0.109:9996",
+ "SERVER_IP": "http://192.168.0.109:9996",
"hosp_name": "诏安县总医院(测试)"
}
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index b20f92c..1b72bea 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -9,7 +9,7 @@
扫码单据类型:
-
+
{
- this.entrustUserArray = res.data;
- }).catch((error) => {
- this.$message.error("用户数据加载失败")
- });
-
- //加载单据类型数据
- warehouseBussinessTypeList(query).then((res) => {
- this.entrustBusArray = res.data;
- }).catch((error) => {
- this.$message.error("单据类型数据加载失败")
- });
- if (this.$isBlank(this.inputQuery.entrustInv)) {
- this.inputQuery.entrustUser = null;
- }
+ this.$set(this.inputQuery, "entrustUser","");
+ this.$set(this.inputQuery, "entrustInv","");
this.getEntrustStorage();
},
@@ -243,9 +227,14 @@ export default {
code: code
}
+ this.$set(this.inputQuery, "entrustUser","");
+ this.$set(this.inputQuery, "entrustAction","");
+ this.$forceUpdate();
//加载用户数据
warehouseUserList(query).then((res) => {
+ this.entrustUserArray=[];
this.entrustUserArray = res.data;
+
}).catch((error) => {
this.$message.error("用户数据加载失败")
});
@@ -253,16 +242,15 @@ export default {
//加载单据类型数据
warehouseBussinessTypeList(query).then((res) => {
this.entrustBusArray = res.data;
+
}).catch((error) => {
this.$message.error("单据类型数据加载失败")
});
- },
- actionChange(action) {
+ },
- }
},
computed: {
corpType() {
diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue
index 380c890..3b61380 100644
--- a/src/views/thrsys/SysUdimsData.vue
+++ b/src/views/thrsys/SysUdimsData.vue
@@ -19,7 +19,6 @@
-
+
+
@@ -383,6 +385,7 @@ import DialogSelectUnit from "./DialogSelectUnit";
import selectRlDialog from "./DialogSelectRl";
import editCodeDialog from "./editCode";
import A from "../../plugin/KeyScaner"
+import {deleteLog} from "@/api/basic/udiinfolog";
export default {
@@ -575,6 +578,9 @@ export default {
this.formData.code = this.originCode;
});
+ } else if (response.code == 508) {
+ this.originCode = "";
+ this.formData.code = "01" + response.data.nameCode;
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 2073e60..bfae674 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -488,6 +488,26 @@ export default {
this.formData.code = this.originCode;
});
+ } else if (response.code == 508) {
+ this.originCode = "";
+ this.formData.code = "01" + response.data.nameCode;
+ // this.$confirm("当前商品条码对应产品信息:\n" +
+ // "DI标识:" + response.data.nameCode + "\n" +
+ // "产品名称:" + response.data.cpmctymc + "\n" +
+ // "规格型号:" + response.data.cpmctymc + "\n" +
+ // "医疗器械注册人:" + response.data.ylqxzcrbarmc + "\n" + "是否继续添加?", "提示", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(() => {
+ // this.originCode = "01" + response.data.nameCode;
+ // this.formData.code = this.originCode;
+ // })
+ // .catch(() => {
+ // this.originCode = "";
+ // this.formData.code = "";
+ // });
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',