From 1be3375fdd8f8b14bc0d00eafdd48431dae39989 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 21 Oct 2022 17:16:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-system-ui/src/views/userManage/userManageList.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-system-ui/src/views/userManage/userManageList.vue b/anrui-system-ui/src/views/userManage/userManageList.vue index 3c13cae53a..219df52f20 100644 --- a/anrui-system-ui/src/views/userManage/userManageList.vue +++ b/anrui-system-ui/src/views/userManage/userManageList.vue @@ -7,9 +7,12 @@ + + + - - + + @@ -204,6 +207,7 @@ export default { timer: null, roleListAll: [], search: { + name: '', userName: '', roleSid: '' }, From c22a2aed50918361f9d012627bb7f7a1233ab56d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 21 Oct 2022 17:18:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-system-ui/src/views/Home/Home.vue | 24 ++++++++++----------- anrui-system-ui/src/views/flow/doneList.vue | 4 ++-- anrui-system-ui/src/views/flow/todoList.vue | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue index f175c62b5e..d4feba2594 100644 --- a/anrui-system-ui/src/views/Home/Home.vue +++ b/anrui-system-ui/src/views/Home/Home.vue @@ -365,23 +365,23 @@ export default { // this.$router.push({path: '/index'}) let myPopup = window.open('/#/index', '_blank') } else if (index == '7') { - let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank') + // let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank') } else if (index == '8') { - let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank') + // let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank') } else if (index == '1') { - let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank') + // let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank') } else if (index == '4') { - let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank') + // let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank') } else if (index == '5') { - let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank') + // let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank') } else if (index == '0') { - let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank') + // let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank') } // const page = this.$router.resolve({name: name}) // window.open(page.href,'_blank') diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue index a98f21aefb..c11e14214e 100644 --- a/anrui-system-ui/src/views/flow/doneList.vue +++ b/anrui-system-ui/src/views/flow/doneList.vue @@ -255,8 +255,8 @@ import flowRecords from '@/components/flow/flowRecord' selectUrl(this.selectUrl_list).then((response) => { if (response.code === '200') { // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) } else { this.$notify({ title: '提示', diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue index 88f0ee5c39..e1b6d66466 100644 --- a/anrui-system-ui/src/views/flow/todoList.vue +++ b/anrui-system-ui/src/views/flow/todoList.vue @@ -286,8 +286,8 @@ export default { selectUrl(this.selectUrl_list).then((response) => { if (response.code === '200') { // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) console.log('已办拼接url:',this.url) } else { this.$notify({ From 7d4efde924306e34c0a1bf664df5907880ffd5ae Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 21 Oct 2022 17:21:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue | 4 ++-- .../src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue | 2 +- .../ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue | 2 +- .../workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue | 4 ++-- .../ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue index c0c025271a..02690e35ed 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue @@ -81,7 +81,7 @@
-
政策详情(含签单折让、开票下浮等)
+
政策详情(仅适用于陕汽品牌)
扣减运费
@@ -768,7 +768,7 @@ export default { return } if (this.formobj.departureDate === '') { - alert('厂家发车日期不能为空!') + alert('物流发车日期不能为空!') return } if (this.freightChecked) { diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue index d02de97b03..00a56d34f7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue @@ -79,7 +79,7 @@
-
政策详情(含签单折让、开票下浮等)
+
政策详情(仅适用于陕汽品牌)
扣减运费
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue index 69b0364370..73bd582ccc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue @@ -81,7 +81,7 @@
-
政策详情(含签单折让、开票下浮等)
+
政策详情(仅适用于陕汽品牌)
扣减运费
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index 28cfbe799d..ed42d52d54 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -80,7 +80,7 @@
-
政策详情(含签单折让、开票下浮等)
+
政策详情(仅适用于陕汽品牌)
扣减运费
@@ -789,7 +789,7 @@ export default { return } if (this.formobj.departureDate === '') { - alert('厂家发车日期不能为空!') + alert('物流发车日期不能为空!') return } if (this.freightChecked) { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue index 51dfa9d536..57bce47e43 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue @@ -79,7 +79,7 @@
-
政策详情(含签单折让、开票下浮等)
+
政策详情(仅适用于陕汽品牌)
扣减运费