From cf7fcb4e4a2f42ed01706eb071c64324f69c3f27 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 18 Jul 2022 18:01:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/inputSelectCheckbox.vue | 60 +++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 1fd6ae7a..b3b00168 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -126,41 +126,41 @@ export default {
dataList.push(element)
})
this.options = dataList
- if (!this.data.note1) {
- this.$http.get('/sys/user/info').then(({ data: res }) => {
- console.log(res.data)
- this.data.note1 = res.data.deptId
- })
- }
+ // if (!this.data.note1) {
+ // this.$http.get('/sys/user/info').then(({ data: res }) => {
+ // console.log(res.data)
+ // this.data.note1 = res.data.deptId
+ // })
+ // }
})
} else if (this.data.name === '部门联系人') {
- this.$http.get('/sys/dept/all').then(res => {
- const dataList = []
- res.data.data.forEach((element) => {
- dataList.push(element)
+ // this.$http.get('/sys/dept/all').then(res => {
+ // const dataList = []
+ // res.data.data.forEach((element) => {
+ // dataList.push(element)
+ // })
+ // this.options = dataList
+ if (!this.data.note1) {
+ this.$http.get('/sys/user/info').then(({ data: res }) => {
+ console.log(res.data)
+ this.data.note1 = res.data.realName || ''
})
- this.options = dataList
- if (!this.data.note1) {
- this.$http.get('/sys/user/info').then(({ data: res }) => {
- console.log(res.data)
- this.data.note1 = res.data.realName || ''
- })
- }
- })
+ }
+ // })
} else if (this.data.name === '部门联系人电话') {
- this.$http.get('/sys/dept/all').then(res => {
- const dataList = []
- res.data.data.forEach((element) => {
- dataList.push(element)
+ // this.$http.get('/sys/dept/all').then(res => {
+ // const dataList = []
+ // res.data.data.forEach((element) => {
+ // dataList.push(element)
+ // })
+ // this.options = dataList
+ if (!this.data.note1) {
+ this.$http.get('/sys/user/info').then(({ data: res }) => {
+ console.log(res.data)
+ this.data.note1 = res.data.mobile || ''
})
- this.options = dataList
- if (!this.data.note1) {
- this.$http.get('/sys/user/info').then(({ data: res }) => {
- console.log(res.data)
- this.data.note1 = res.data.mobile || ''
- })
- }
- })
+ }
+ // })
}
},
chekBoxChange (list) {
From 0a8cc6257de0df39cbe0e8e3f0a502df6961af1f Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Mon, 18 Jul 2022 18:04:38 +0800
Subject: [PATCH 2/2] 633bug
---
back/src/views/modules/putOnTheShelf/components/special.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 0333e984..dfb9c246 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -67,7 +67,7 @@