diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json
index 532451fb3..7590b9183 100755
--- a/openhis-ui-vue3/package-lock.json
+++ b/openhis-ui-vue3/package-lock.json
@@ -45,7 +45,9 @@
"vue-area-linkage": "^5.1.0",
"vue-cropper": "^1.1.1",
"vue-plugin-hiprint": "^0.0.19",
- "vue-router": "^4.3.0"
+ "vue-router": "^4.3.0",
+ "vxe-table": "^4.19.6",
+ "xe-utils": "^3.9.1"
},
"devDependencies": {
"@playwright/test": "^1.58.2",
@@ -3573,6 +3575,25 @@
"url": "https://github.com/sponsors/antfu"
}
},
+ "node_modules/@vxe-ui/core": {
+ "version": "4.4.13",
+ "resolved": "https://registry.npmjs.org/@vxe-ui/core/-/core-4.4.13.tgz",
+ "integrity": "sha512-ViWvzmsW7ZWrowzJrXxQzOJhJwEqOgcX9LNjddF1B5KD49tyNsG5UkeMMAtgV8qSpR8qvJ8TukdIqRN4wgmH4w==",
+ "license": "MIT",
+ "dependencies": {
+ "dom-zindex": "^1.0.7",
+ "xe-utils": "^4.0.8"
+ },
+ "peerDependencies": {
+ "vue": "^3.2.0"
+ }
+ },
+ "node_modules/@vxe-ui/core/node_modules/xe-utils": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-4.0.8.tgz",
+ "integrity": "sha512-l+p++9iPtSxpf/5ZCzkPXsyV0avE34KzieAC9oAhi+3e98PLJaBQHNiY2V8Lnbiux4JFAbU10p8AT6oujXkP9A==",
+ "license": "MIT"
+ },
"node_modules/abbrev": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-2.0.0.tgz",
@@ -5486,6 +5507,12 @@
"url": "https://github.com/fb55/entities?sponsor=1"
}
},
+ "node_modules/dom-zindex": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/dom-zindex/-/dom-zindex-1.0.7.tgz",
+ "integrity": "sha512-cKU/h8v8IPBgdZOTPbPmq3Ib+Ac5C+kKoh9I4LbGR9BM3GwbmB16KYWKJcj5M2BavnA66EbgYzxYDLd1IytnlQ==",
+ "license": "MIT"
+ },
"node_modules/domelementtype": {
"version": "1.3.1",
"resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz",
@@ -13783,6 +13810,24 @@
"url": "https://github.com/fb55/entities?sponsor=1"
}
},
+ "node_modules/vxe-pc-ui": {
+ "version": "4.14.26",
+ "resolved": "https://registry.npmjs.org/vxe-pc-ui/-/vxe-pc-ui-4.14.26.tgz",
+ "integrity": "sha512-JtOShAA2HG+M9QybmuY0+ufagCFJpKWIMNcgHM9X8yysmZC/J7ivqFjn3tXTGzv5IA7JsaF6uelMzx2O0FKksQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@vxe-ui/core": "^4.4.13"
+ }
+ },
+ "node_modules/vxe-table": {
+ "version": "4.19.6",
+ "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.19.6.tgz",
+ "integrity": "sha512-KMFjriaQSpHbLPD8O7hc+FtVE521mLiDhif+oDilqMd7Zf8+oTvt7RLUW/KqN+vur4A2RqQtRWBs2vlrk0dc0g==",
+ "license": "MIT",
+ "dependencies": {
+ "vxe-pc-ui": "^4.14.0"
+ }
+ },
"node_modules/w3c-xmlserializer": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -14062,6 +14107,12 @@
}
}
},
+ "node_modules/xe-utils": {
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-3.9.1.tgz",
+ "integrity": "sha512-Ujk5UmoH6Iaqhgz3oGwfCXVcMdUJKlXnfvLABdnMyseMG0eHsX2mcCvLd/8sGlIXtfwsprI9bW7vgcVognLmqQ==",
+ "license": "MIT"
+ },
"node_modules/xml-name-validator": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json
index 52769f150..a443eb54d 100755
--- a/openhis-ui-vue3/package.json
+++ b/openhis-ui-vue3/package.json
@@ -63,7 +63,9 @@
"vue-area-linkage": "^5.1.0",
"vue-cropper": "^1.1.1",
"vue-plugin-hiprint": "^0.0.19",
- "vue-router": "^4.3.0"
+ "vue-router": "^4.3.0",
+ "vxe-table": "^4.19.6",
+ "xe-utils": "^3.9.1"
},
"devDependencies": {
"@playwright/test": "^1.58.2",
@@ -90,4 +92,4 @@
"vitest": "^4.0.18",
"vue-tsc": "^3.1.8"
}
-}
\ No newline at end of file
+}
diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js
index 81bb708c8..a67fbed70 100755
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -1,5 +1,7 @@
import {createApp} from 'vue';
+import VxeUIAll from 'vxe-table';
+import 'vxe-table/lib/style.css';
import Cookies from 'js-cookie';
// 导入 hiprint 并挂载到全局 window 对象
@@ -122,6 +124,7 @@ directive(app);
// 全局禁止点击遮罩层关闭弹窗
ElDialog.props.closeOnClickModal.default = false;
// 使用element-plus 并且设置全局的大小
+app.use(VxeUIAll);
app.use(ElementPlus, {
locale: zhCn,
// 支持 large、default、small
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue
index 1f42faf5a..17705008f 100755
--- a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue
@@ -75,23 +75,23 @@
-
-
-
-
-
+
{{ scope.row.busNo ? scope.row.busNo : '-' }}
-
+
-
{{ scope.row.volume ? scope.row.volume : '-' }}
-
-
+
{{ scope.row.originBuyingPrice ? scope.row.originBuyingPrice : '-' }}
-
-
+
@@ -158,8 +159,8 @@
step="0.01"
/>
-
-
+
{{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
-
-
+
@@ -180,10 +182,11 @@
step="0.01"
/>
-
-
+
@@ -195,8 +198,8 @@
autosize
/>
-
-
+
+
-
-
-
-
-
+
{{ scope.row.busNo ? scope.row.busNo : '-' }}
-
-
+
{{ scope.row.volume ? scope.row.volume : '-' }}
-
-
+
{{ scope.row.originBuyingPrice ? scope.row.originBuyingPrice : '-' }}
-
-
+
@@ -350,8 +354,8 @@
step="0.01"
/>
-
-
+
{{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
-
-
+
@@ -372,10 +377,11 @@
step="0.01"
/>
-
-
+
@@ -387,8 +393,8 @@
autosize
/>
-
-
+
+
-
-
-
-
-
+
{{ scope.row.busNo ? scope.row.busNo : '-' }}
-
+
-
{{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
-
-
+
@@ -534,10 +541,11 @@
step="0.01"
/>
-
-
+
@@ -549,8 +557,8 @@
autosize
/>
-
-
+
+
-
-
-
-
-
+
{{ scope.row.name }}
-
-
+
{{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
-
-
+
@@ -723,10 +732,11 @@
step="0.01"
/>
-
-
+
@@ -738,8 +748,8 @@
autosize
/>
-
-
+
+