diff --git a/.env.production b/.env.production index ecac90c..a0ae4e4 100644 --- a/.env.production +++ b/.env.production @@ -6,7 +6,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' #林纪裕 -VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/' @@ -15,13 +15,13 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # 平潭 -# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # 文明懂 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # 刘恩典 -# VUE_APP_BASE_API = 'http://192.168.0.235:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/' # 漳州中医院 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js index 743ce5f..ae9e830 100644 --- a/src/api/basic/udiRelevance.js +++ b/src/api/basic/udiRelevance.js @@ -52,15 +52,6 @@ export function updatetUdiInfos(query) { } -export function checkExitUdi(query) { - return axios({ - url: "/udi/udirel/check/udi", - method: "post", - data: query - }); -} - - export function combineUdi(query) { return axios({ url: "/udi/udirel/revleance", diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index 7ff2190..a0fe2fd 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -65,22 +65,27 @@
显示/隐藏搜索栏显示/隐藏搜索栏 + 重置重置 + 查询查询 + 新增新增 + 导出单据类型导出单据类型 + 导入单据类型导入单据类型 + @@ -139,13 +145,13 @@ 编辑 + >编辑 删除 + >删除 @@ -165,9 +171,9 @@
提交 + >提交 - 取消 + 取消
@@ -191,14 +197,14 @@ icon="search" @click="onModifySubmit" :disabled="!configParams.typeScan" - >提交 + >提交 取消 + >取消
@@ -224,8 +230,8 @@ import { import modifyDialog from "./bussinessTypeModify"; import axios from "axios"; import store from "@/store"; -import { findConfig } from "@/api/sync/spsSyncStatus"; -import { isBlank } from "@/utils/strUtil"; +import {findConfig} from "@/api/sync/spsSyncStatus"; +import {isBlank} from "@/utils/strUtil"; export default { data() { @@ -312,6 +318,7 @@ export default { checkVailDate: 0, //校验近效期 checkExpire: true, //校验过期 checkCertExpire: false, //校验证书过期 + editType: 2, }, enableMap: { true: "是", @@ -490,7 +497,7 @@ export default { const binaryData = []; binaryData.push(response); let url = window.URL.createObjectURL( - new Blob(binaryData, { type: "application/json" }) + new Blob(binaryData, {type: "application/json"}) ); this.loading = false; const eleLink = document.createElement("a"); @@ -579,6 +586,7 @@ export default { checkVailDate: 0, //校验近效期 checkExpire: 2, //校验过期 checkCertExpire: 0, //校验证书过期 + editType: 2, backPreinType: 1, sortNum: 999, }; @@ -599,7 +607,8 @@ export default { .then(() => { this.deleteOrders(rowId); }) - .catch(() => {}); + .catch(() => { + }); }, deleteOrders(data) { @@ -619,7 +628,8 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }, handleChange(response, files, fileList) { if (response.code != 20000) { @@ -644,13 +654,15 @@ export default { this.configParams = response.data; } }) - .catch(() => {}); + .catch(() => { + }); }, }, components: { modifyDialog, }, - mounted() {}, + mounted() { + }, created() { this.init(); this.getSyncConfig(); diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue index 906175b..9ebd90d 100644 --- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue @@ -394,6 +394,7 @@ export default { erpName: "", thirdName: null, keys: [], + devKeys: [], }, checked: true, udidlList: [], @@ -561,6 +562,8 @@ export default { if (this.relId != null) { this.combineQuery.relId = this.relId; this.combineQuery.keys.push(this.currentRow.uuid); + this.combineQuery.devKeys.push(this.currentRow.deviceRecordKey); + if (this.currentRow.check) { selected = this.currentRow; } @@ -573,6 +576,7 @@ export default { selected = obj; } this.combineQuery.keys.push(obj.uuid); + this.combineQuery.devKeys.push(obj.deviceRecordKey); }); } if (selected != null) { diff --git a/src/views/basic/product/UdiinfoSelectVersion.vue b/src/views/basic/product/UdiinfoSelectVersion.vue index 92cc5da..1c24044 100644 --- a/src/views/basic/product/UdiinfoSelectVersion.vue +++ b/src/views/basic/product/UdiinfoSelectVersion.vue @@ -134,6 +134,7 @@ export default { erpName: "", thirdName: null, keys: [], + devKeys: [], }, checked: true, @@ -201,11 +202,11 @@ export default { }, checkCombine(row) { - this.combineQuery.keys = []; if (this.relId != null) { this.combineQuery.relId = this.relId; this.combineQuery.keys.push(row.uuid); + this.combineQuery.devKeys.push(row.deviceRecordKey); } else return; this.combineLoading = true; diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 06af484..05c6e55 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -311,6 +311,9 @@ export default { curAction: { corpType: 0, genUnit: false, + checkWebNew: null, + mainAction: null, + }, fromOptions: [], isCodeAlive: true, diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue index 1537a04..1e303b0 100644 --- a/src/views/inout/PanelCreateOrderCodes.vue +++ b/src/views/inout/PanelCreateOrderCodes.vue @@ -21,6 +21,12 @@ width="120" show-overflow-tooltip > + + :default-sort="defaultSort" @sort-change="handleSortChange" border> + { this.loading = false; diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue index 10002cb..ae0699b 100644 --- a/src/views/inventory/InvPreProducts.vue +++ b/src/views/inventory/InvPreProducts.vue @@ -142,6 +142,7 @@ + @@ -250,7 +251,8 @@ export default { expireDate: null, supId: null, deptCode: null, - invCode: null + invCode: null, + price: null, } }; }, @@ -352,7 +354,8 @@ export default { expireDate: row.expireDate, supId: row.supId, deptCode: row.deptCode, - invCode: row.invCode + invCode: row.invCode, + price: row.price } }, closeDetailDialog() { diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue index b334905..be85188 100644 --- a/src/views/inventory/InvPreProductsDetail.vue +++ b/src/views/inventory/InvPreProductsDetail.vue @@ -90,6 +90,12 @@ width="120" show-overflow-tooltip > + { this.loading = false; diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index d42c38c..3a1e669 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -140,8 +140,9 @@ show-overflow-tooltip width="200"> - + + @@ -270,7 +271,8 @@ export default { expireDate: null, supId: null, deptCode: null, - invCode: null + invCode: null, + price:null, }, addInvRemindSetDialogVisible: null, invId: null @@ -375,7 +377,8 @@ export default { expireDate: row.expireDate, supId: row.supId, deptCode: row.deptCode, - invCode: row.invCode + invCode: row.invCode, + price: row.price } }, closeDetailDialog() { diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue index db1ba6d..db4811c 100644 --- a/src/views/inventory/InvProductsDetail.vue +++ b/src/views/inventory/InvProductsDetail.vue @@ -88,6 +88,12 @@ width="120" show-overflow-tooltip > + { this.loading = false; if (res.code === 20000) { diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue index c5a83c9..1902eb4 100644 --- a/src/views/inventory/InvSupPreInProducts.vue +++ b/src/views/inventory/InvSupPreInProducts.vue @@ -129,6 +129,7 @@ + @@ -229,7 +230,8 @@ export default { expireDate: null, supId: null, deptCode: null, - invCode: null + invCode: null, + price: null, } }; }, @@ -273,7 +275,7 @@ export default { event.target.select(); }, - clear(){ + clear() { this.findMethod(); }, @@ -305,9 +307,9 @@ export default { getInvListByUser(query) .then((response) => { this.invList = response.data || []; - for(var i=0;i< this.invList.length;i++){ - if(this.invList[i].advanceType == 2){ - this.filterQuery.invCode=this.invList[i].code; + for (var i = 0; i < this.invList.length; i++) { + if (this.invList[i].advanceType == 2) { + this.filterQuery.invCode = this.invList[i].code; } } this.getList(); @@ -348,7 +350,9 @@ export default { expireDate: row.expireDate, supId: row.supId, deptCode: row.deptCode, - invCode: row.invCode + invCode: row.invCode, + invSpaceCode: row.invSpaceCode, + price: row.price } }, closeDetailDialog() { @@ -394,7 +398,7 @@ export default { } this.findMethod(); this.getInvList(); - // this.getList(); + // this.getList(); }, }; diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue index 6c4e818..eccf6e3 100644 --- a/src/views/inventory/InvSupPreProducts.vue +++ b/src/views/inventory/InvSupPreProducts.vue @@ -128,6 +128,7 @@ + @@ -228,7 +229,8 @@ export default { expireDate: null, supId: null, deptCode: null, - invCode: null + invCode: null, + price: null, } }; }, @@ -271,7 +273,7 @@ export default { this.getList(); event.target.select(); }, - clear(){ + clear() { this.findMethod(); }, @@ -302,9 +304,9 @@ export default { getInvListByUser(query) .then((response) => { this.invList = response.data || []; - for(var i=0;i< this.invList.length;i++){ - if(this.invList[i].advanceType == 3){ - this.filterQuery.invCode=this.invList[i].code; + for (var i = 0; i < this.invList.length; i++) { + if (this.invList[i].advanceType == 3) { + this.filterQuery.invCode = this.invList[i].code; } } @@ -346,7 +348,8 @@ export default { expireDate: row.expireDate, supId: row.supId, deptCode: row.deptCode, - invCode: row.invCode + invCode: row.invCode, + price: row.price } }, closeDetailDialog() { diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue index 75cae9d..871f728 100644 --- a/src/views/inventory/InvSupProuducts.vue +++ b/src/views/inventory/InvSupProuducts.vue @@ -129,6 +129,7 @@ + @@ -251,7 +252,8 @@ export default { expireDate: null, supId: null, deptCode: null, - invCode: null + invCode: null, + price: null, }, addInvRemindSetDialogVisible: false, invId: null @@ -282,7 +284,7 @@ export default { this.getList(); event.target.select(); }, - clear(){ + clear() { this.findMethod(); }, @@ -324,7 +326,7 @@ export default { getInvListByUser() .then((response) => { this.invLists = response.data || []; - this.invList = this.invLists.filter( item => item.code != 1000001 && item.code != 1000002) + this.invList = this.invLists.filter(item => item.code != 1000001 && item.code != 1000002) this.getList(); }) .catch(() => { @@ -363,7 +365,9 @@ export default { expireDate: row.expireDate, supId: row.supId, deptCode: row.deptCode, - invCode: row.invCode + invCode: row.invCode, + invSpaceCode: row.invSpaceCode, + price: row.price } }, closeDetailDialog() {