From 8db622afa75fda47d41ea9f465a88c2f91bf7a22 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 12 Mar 2025 10:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=BA=93=E5=AD=98=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- package.json | 9 +- src/api/biz/traceQuery.js | 40 + src/views/basic/collectPoint/timerSetting.vue | 40 +- src/views/biz/DrugTraceQuery.vue | 809 +++++++++ src/views/collect/ConfirmDrugDealOrder.vue | 1453 ++++++++--------- src/views/collect/IoSplitFiFoProgress.vue | 349 ++++ 项目结构 | 33 + 8 files changed, 1957 insertions(+), 780 deletions(-) create mode 100644 src/api/biz/traceQuery.js create mode 100644 src/views/biz/DrugTraceQuery.vue create mode 100644 src/views/collect/IoSplitFiFoProgress.vue create mode 100644 项目结构 diff --git a/.env.development b/.env.development index 284595a2..29124b16 100644 --- a/.env.development +++ b/.env.development @@ -6,10 +6,10 @@ ENV = 'development' # 开发环境 # VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://192.168.0.43:9991' +VUE_APP_BASE_API = 'http://192.168.0.188:9991' # VUE_APP_BASE_SPMS_API = 'http://192.168.0.43:9993' -VUE_APP_BASE_SPMS_API = 'http://192.168.0.43:10001/directToSpms' +VUE_APP_BASE_SPMS_API = 'http://192.168.0.188:10002/directToSpms' VUE_APP_SYNC_API ="http://127.0.0.1:10001" # VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' diff --git a/package.json b/package.json index 81a45964..44df32ce 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "author": "Glxp", "license": "MIT", "scripts": { - "build:prod": " vue-cli-service build", + "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:test": "vue-cli-service build --mode test", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", "server": "SET NODE_OPTIONS=--openssl-legacy-provider && webpack-dev-server --env.server --env.develop --inline --max-old-space-size=3000", - "dev": " vue-cli-service serve --open" + "dev": "vue-cli-service serve --open" }, "husky": { "hooks": { @@ -37,13 +37,13 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "0.4.0", "@tinymce/tinymce-vue": "^3.2.8", - "@jiaminghi/data-view": "^2.10.0", "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "^3.19.1", - "echarts": "^5.5.1", + "echarts": "4.9.0", "element-china-area-data": "^5.0.2", "element-ui": "2.15.8", "file-saver": "2.0.5", @@ -52,6 +52,7 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "js-sha256": "^0.10.1", + "jsbarcode": "^3.11.6", "jsencrypt": "3.0.0-rc.1", "loadsh": "^0.0.4", "lodash": "^4.17.21", diff --git a/src/api/biz/traceQuery.js b/src/api/biz/traceQuery.js new file mode 100644 index 00000000..30af345e --- /dev/null +++ b/src/api/biz/traceQuery.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +/** + * 获取单据记录 + * @param {Object} data 查询参数 + * @returns {Promise} 请求结果 + */ +export function getOrderRecords(data) { + return request({ + url: '/udiwms/inout/order/filter', + method: 'post', + data + }) +} + +/** + * 获取单据记录明细 + * @param {Object} data 查询参数 + * @returns {Promise} 请求结果 + */ +export function getOrderDetails(data) { + return request({ + url: '/udiwms/inout/bizDetail/filterList', + method: 'post', + data + }) +} + +/** + * 获取药品信息 + * @param {Object} data 查询参数 + * @returns {Promise} 请求结果 + */ +export function getDrugInfo(data) { + return request({ + url: '/di/udirel/filterUdi', + method: 'post', + data + }) +} diff --git a/src/views/basic/collectPoint/timerSetting.vue b/src/views/basic/collectPoint/timerSetting.vue index cc88cb7d..78cdf061 100644 --- a/src/views/basic/collectPoint/timerSetting.vue +++ b/src/views/basic/collectPoint/timerSetting.vue @@ -256,7 +256,7 @@ - + @@ -264,8 +264,8 @@ - - + + @@ -305,7 +305,7 @@ import {getSet, updateSet} from "@/api/collect/collectSet"; import ShelfDisplay from "@/components/ShelfDisplay"; -import { isBlank } from '@/utils/strUtil' +import {isBlank} from '@/utils/strUtil' export default { name: 'timerSetting', @@ -382,20 +382,20 @@ export default { ] }, ], - activeNames: ['0', '1', '2', '3','4'], + activeNames: ['0', '1', '2', '3', '4'], formData: { startDownloadTime: null, lastCodeSplit: true, isScanCodeCheck: true, getSplitConfirm: false, - fixedCount:null, + fixedCount: null, pdaMaxCount: null, ipcMaxCount: null, - autoDecode:1, - outputMode:1, + autoDecode: 1, + outputMode: 1, }, systemParam: null, - socket:null, + socket: null, } }, @@ -424,25 +424,25 @@ export default { this.ShelfDisplayFlag = true }, save() { - if (isBlank(this.formData.scanMaxCount)){ + if (isBlank(this.formData.scanMaxCount)) { this.formData.scanMaxCount = 0 } - if (isBlank(this.formData.pdaMaxCount)){ + if (isBlank(this.formData.pdaMaxCount)) { this.formData.pdaMaxCount = 0 } - if (isBlank(this.formData.ipcMaxCount)){ + if (isBlank(this.formData.ipcMaxCount)) { this.formData.ipcMaxCount = 0 } - if (isBlank(this.formData.autoDecode)){ + if (isBlank(this.formData.autoDecode)) { this.formData.autoDecode = 1 } - if (isBlank(this.formData.fixedCount)){ + if (isBlank(this.formData.fixedCount)) { this.formData.fixedCount = 0 } - if (isBlank(this.formData.outputMode)){ + if (isBlank(this.formData.outputMode)) { this.formData.outputMode = 1 } - if (isBlank(this.formData.drugDealConfirm)){ + if (isBlank(this.formData.drugDealConfirm)) { this.formData.drugDealConfirm = 0 } updateSet(this.formData) @@ -456,12 +456,12 @@ export default { }); if (this.socket && this.socket.readyState === WebSocket.OPEN) { - const { autoDecode, fixedCount, outputMode } = this.formData; + const {autoDecode, fixedCount, outputMode} = this.formData; const settings = [ - { key: "AutoDecode", value: autoDecode }, - { key: "FixedCount", value: fixedCount }, - { key: "OutputMode", value: outputMode } + {key: "AutoDecode", value: autoDecode}, + {key: "FixedCount", value: fixedCount}, + {key: "OutputMode", value: outputMode} ]; settings.forEach(setting => { diff --git a/src/views/biz/DrugTraceQuery.vue b/src/views/biz/DrugTraceQuery.vue new file mode 100644 index 00000000..abb2eca0 --- /dev/null +++ b/src/views/biz/DrugTraceQuery.vue @@ -0,0 +1,809 @@ + + + + + diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue index 8b8d44b4..7b56a3a5 100644 --- a/src/views/collect/ConfirmDrugDealOrder.vue +++ b/src/views/collect/ConfirmDrugDealOrder.vue @@ -1,359 +1,319 @@ diff --git a/src/views/collect/IoSplitFiFoProgress.vue b/src/views/collect/IoSplitFiFoProgress.vue new file mode 100644 index 00000000..793c040c --- /dev/null +++ b/src/views/collect/IoSplitFiFoProgress.vue @@ -0,0 +1,349 @@ + + + + + diff --git a/项目结构 b/项目结构 new file mode 100644 index 00000000..f5fc9c24 --- /dev/null +++ b/项目结构 @@ -0,0 +1,33 @@ +├── build // 构建相关 +├── bin // 执行脚本 +├── build // 编译文件 +├── public // 公共文件 +│ ├── tinymce // 富文本组件 +│ ├── favicon.ico // favicon图标 +│ └── index.html // html模板 +│ └── robots.txt // 反爬虫 +├── src // 源代码 +│ ├── api // 所有请求 +│ ├── assets // 主题 字体等静态资源 +│ ├── components // 全局公用组件 +│ ├── directive // 全局指令 +│ ├── layout // 布局 +│ ├── plugins // 通用方法 +│ ├── router // 路由 +│ ├── store // 全局 store管理 +│ ├── utils // 全局公用方法 +│ ├── views // 所有界面组件 +│ ├── App.vue // 入口页面 +│ ├── main.js // 入口 加载组件 初始化等 +│ ├── permission.js // 权限管理 +│ └── settings.js // 系统配置 +├── .editorconfig // 编码格式 +├── .env.development // 开发环境配置 +├── .env.production // 生产环境配置 +├── .env.staging // 测试环境配置 +├── .eslintignore // 忽略语法检查 +├── .eslintrc.js // eslint 配置项 +├── .gitignore // git 忽略项 +├── babel.config.js // babel.config.js +├── package.json // package.json +└── vue.config.js // vue.config.js