diff --git a/public/config.json b/public/config.json index 0812e25..8195b20 100644 --- a/public/config.json +++ b/public/config.json @@ -1,7 +1,7 @@ { - "UDI_SYNC_SERVER_IP": "http://192.168.0.115:9995/", - "BASE_URL":"http://192.168.0.115:9991", - "SERVER_IP": "http://192.168.0.115:9991/", - "WEBSOCKET_URL": "ws://192.168.0.115:9991/UDI_WMS_MC/api/websocket/", + "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", + "BASE_URL":"http://192.168.0.109:9991", + "SERVER_IP": "http://192.168.0.109:9991/", + "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "hosp_name": "诏安县总医院(测试)" } diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 3744d99..9c10c45 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -218,6 +218,7 @@ export default { scanPreIn: null, vailInv: null, entrutSpms: null, + codeFillCheck: null, }, enableMap: { true: "是", @@ -389,7 +390,9 @@ export default { ullageFill: row.ullageFill, scanPreIn: row.scanPreIn, vailInv: row.vailInv, - entrutSpms: row.entrutSpms + entrutSpms: row.entrutSpms, + codeFillCheck: row.codeFillCheck, + }; this.modifyDialogVisible = true; diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index f28fff7..c43439f 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -213,6 +213,8 @@ 是否访问库存 + 是否三期校验 + diff --git a/src/views/business/errorCode.vue b/src/views/business/errorCode.vue index 7015a8d..c9c66eb 100644 --- a/src/views/business/errorCode.vue +++ b/src/views/business/errorCode.vue @@ -30,12 +30,33 @@ + + + + + @@ -125,6 +166,7 @@ import { import draggable from "vuedraggable"; import DialogSelectUnit from "./DialogSelectUnit"; import selectRlDialog from "./DialogSelectRl"; +import editCodeDialog from "@/views/inout/editCode"; export default { name: "idQuery", @@ -154,10 +196,13 @@ export default { multipleSelection: [], selectRlVisible: false, dialogTableVisible: false, + codeDetail: null, + editTitle: "补齐三期", + editCodeVisible: false, }; }, components: { - draggable, DialogSelectUnit, selectRlDialog + draggable, DialogSelectUnit, selectRlDialog,editCodeDialog }, methods: { handleSelectionChange(val) { @@ -307,6 +352,13 @@ export default { } return rowBackground; }, + closeCodeDialog() { + this.editCodeVisible = false; + }, + editCode(row) { + this.codeDetail = row; + this.editCodeVisible = true; + }, }, filters: {}, mounted() {