From eb111d4a86e77aa8d61998d5bc5bea48435c6306 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 20 Apr 2023 15:06:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E5=86=85=E9=83=A8?=
=?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/business/stockOrder.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 2f8f704..7fc3c66 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -152,7 +152,7 @@
-
+
Date: Thu, 20 Apr 2023 15:18:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
package.json | 4 +-
src/api/sync/spsSyncStatus.js | 9 +
src/utils/request.js | 2 +-
src/views/sync/SysUdimsData.vue | 751 +++++++++++++++-----------------
vue.config.js | 2 +-
6 files changed, 371 insertions(+), 399 deletions(-)
diff --git a/.env.development b/.env.development
index 3d5a50f..a8d313a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理系统
ENV = 'development'
# 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://localhost:9993/dev-api/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/'
diff --git a/package.json b/package.json
index 57441c3..c77df60 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
"author": "LionLi",
"license": "MIT",
"scripts": {
- "dev": "vue-cli-service serve",
- "build:prod": "vue-cli-service build",
+ "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode development",
+ "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode production",
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src"
},
diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js
index d3425b4..091be2f 100644
--- a/src/api/sync/spsSyncStatus.js
+++ b/src/api/sync/spsSyncStatus.js
@@ -43,3 +43,12 @@ export function updateConfig(query) {
});
}
+export function infoByStatus(query) {
+ return axios({
+ url: "/spssync/basic/udiinfo/infoByStatus",
+ method: "post",
+ data: query,
+ responseType: 'blob'
+ });
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index b02dfd7..86a9ce2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -86,7 +86,7 @@ service.interceptors.response.use(res => {
if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data
}
- if (code === 401) {
+ if (code === 2) {
if (!isRelogin.show) {
isRelogin.show = true;
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index b12356e..b457e49 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -12,19 +12,16 @@
-
-
-
+
+
+
+
-
+
@@ -32,135 +29,74 @@
查询
- 同步单据
+ 同步单据
-
+
+ v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
同步单据类型
- 同步基础信息
+ && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
同步国家库DI数据
+ v-if="configParms.dbDiProducts==2">同步国家库DI数据
-
+
-
-
-
+
+
+
-
+
- {{ status[scope.row.status] }}
-
+ {{ status[scope.row.status] }}
+
-
+
- {{ wmsstatus[scope.row.receiveStatus] }}
-
+ {{ wmsstatus[scope.row.receiveStatus] }}
+
-
-
-
-
+
+
+
+
+
+
- 详情
-
- 删除
-
+
+ 下载
+
+
+
+ 删除
+
+
-
+
-
+
@@ -168,319 +104,346 @@
diff --git a/vue.config.js b/vue.config.js
index d246608..2eee3de 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.0.43:9993/`,
+ target: process.env.VUE_APP_BASE_API,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''