diff --git a/public/config.json b/public/config.json
index 7f05b28..4fa0fa2 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,7 +1,7 @@
{
- "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9991/",
- "BASE_URL": "http://127.0.0.1:9992",
- "SERVER_IP": "http://127.0.0.1:9992",
- "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/",
+ "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9991/",
+ "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/router/index.js b/src/router/index.js
index c8579af..61a2b12 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1339,6 +1339,15 @@ export const asyncRouterMap = [
}
},
+ {
+ path: "onHand",
+ name: "现存量查询",
+ component: onHand,
+ meta: {
+ authRule: ["warehouse/onHand"]
+ }
+ },
+
{
path: "innerOrder",
component: innerOrder,
diff --git a/src/views/inventory/innerCodeDetail.vue b/src/views/inventory/innerCodeDetail.vue
index 3ec7390..899e721 100644
--- a/src/views/inventory/innerCodeDetail.vue
+++ b/src/views/inventory/innerCodeDetail.vue
@@ -2,27 +2,27 @@
-
-
- 生成内部码
-
-
- 打印全部
-
-
+
+
+ 生成内部码
+
+
+ 打印全部
+
+
+
-
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 429a881..8d601c2 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -147,7 +147,17 @@
-
+
+
+ 首营资质证书
+
+ 配送企业
+
+ 生产企业
+
+ 配送产品
+
+
单据(单据状态)
- addBusTypeDialog
+
待校验单据
未验收单据
@@ -320,6 +330,10 @@ export default {
orderSyncDlTime: null,
delaySyncTime: null,
busTypes: [],
+ companyCert: null,
+ manufacturerCert: null,
+ productCert: null,
+
},
checkedBusTypes: [],
@@ -338,7 +352,7 @@ export default {
getConfig() {
findConfig()
.then((response) => {
-
+
this.configQuery = response.data;
this.checkedBusTypes = this.configQuery.busTypes;
if (this.configQuery.busTypes != null) {
@@ -456,7 +470,7 @@ export default {
handleCurrentChange(val) {
this.busQuery.page = val;
this.getBusType();
-
+
},
},
created() {
diff --git a/src/views/userManage/param/company.vue b/src/views/userManage/param/company.vue
index 7c1637d..d062a8a 100644
--- a/src/views/userManage/param/company.vue
+++ b/src/views/userManage/param/company.vue
@@ -117,43 +117,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 应用码(APPID):
+
+
+
+
+
+
+
+
+
+
+
+
+ 授权码(APPSecret):
+
+
+
+
+
+
+
+
@@ -285,7 +290,16 @@ export default {
border-radius: 4px;
flex-wrap: wrap;
}
+
+.form-title {
+ font-size: 16px;
+ font-family: Noto Sans SC;
+ font-weight: bold;
+ color: #303133;
+}
+
+