From b19361005fd190d3c5dffa2e2bdaac600e635b30 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Mon, 18 Jul 2022 18:24:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8A=8A=E9=83=A8=E9=97=A8=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E5=92=8C=E7=94=B5=E8=AF=9D=E7=BB=99=E6=88=91?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=9D=A5=EF=BC=81=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PutOnTheShelf.vue                   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 6a85dd20..d7a45ddb 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -488,6 +488,20 @@
             })
           }
         })
+      } else if (item.name === '部门联系人') {
+        if (!item.note1) {
+          getUserInfo().then(({ data: res1 }) => {
+            console.log(res1.data)
+            item.note1 = res1.data.realName || ''
+          })
+        }
+      } else if (item.name === '部门联系人电话') {
+        if (!item.note1) {
+          getUserInfo().then(({ data: res1 }) => {
+            console.log(res1.data)
+            item.note1 = res1.data.mobile || ''
+          })
+        }
       } else {
         data.value.list.push(item)
       }

From 0ee999ed861af001cdc528424beb3dfe29d9b03c Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 18 Jul 2022 18:24:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=B1=95=E7=A4=BA=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue | 20 ++++++++++---------
 .../modules/ability/bsabilityservice.vue      | 19 +++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index c7a467c4..acb89473 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -120,7 +120,7 @@
               >{{ $t("delete") }}</el-button
             >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
-              >展示</el-button
+              >详情</el-button
             >
             <el-button type="text" size="small" @click="showDocument(scope.row)"
               >开发文档</el-button
@@ -303,15 +303,17 @@ export default {
       }
     },
     showDetail (val) {
+      console.log(val)
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
       // this.addOrUpdateHandle(id)
-      this.addOrUpdateVisible = true
-      this.disabled = false
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false
-        this.$refs.addOrUpdate.dataFormShowDetails = val
-        this.$refs.addOrUpdate.init()
-      })
-      this.disabled = true
+      // this.addOrUpdateVisible = true
+      // this.disabled = false
+      // this.$nextTick(() => {
+      //   this.$refs.addOrUpdate.UpdateState = false
+      //   this.$refs.addOrUpdate.dataFormShowDetails = val
+      //   this.$refs.addOrUpdate.init()
+      // })
+      // this.disabled = true
     },
     showDocument (val) {
       window.open(
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 3a23cc9b..6ab5a324 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -103,7 +103,7 @@
               >{{ $t("delete") }}</el-button
             >
             <el-button type="text" size="small" @click="showDetail(scope.row)"
-              >展示</el-button
+              >详情</el-button
             >
             <el-button type="text" size="small" @click="showDocument(scope.row)"
               >开发文档</el-button
@@ -287,14 +287,15 @@ export default {
         })
     },
     showDetail (val) {
-      this.addOrUpdateVisible = true
-      this.disabled = false
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false
-        this.$refs.addOrUpdate.dataFormShowDetails = val
-        this.$refs.addOrUpdate.init()
-      })
-      this.disabled = true
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+      // this.addOrUpdateVisible = true
+      // this.disabled = false
+      // this.$nextTick(() => {
+      //   this.$refs.addOrUpdate.UpdateState = false
+      //   this.$refs.addOrUpdate.dataFormShowDetails = val
+      //   this.$refs.addOrUpdate.init()
+      // })
+      // this.disabled = true
     },
     showDocument (val) {
       console.log(val)

From cb5eb60b65d27ca8e2cbc43eb9296980fab08267 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Mon, 18 Jul 2022 18:29:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8C=82=E6=8E=A5-?=
 =?UTF-8?q?=E5=BD=92=E5=B1=9E=E9=83=A8=E9=97=A8=E7=BB=99=E6=88=91=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putOnTheShelf/components/inputSelectCheckbox.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index b3b00168..380d7837 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -126,12 +126,12 @@ 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 => {

From 209183ec29b47fb48948a1bd379760c95b453e06 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 18 Jul 2022 18:43:53 +0800
Subject: [PATCH 4/4] ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6c82c9ed..95d963eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ back/dist-市局-后台管理.zip
 back/dist-市局-后台管理-v0.8.2.1.zip
 front/public/index.html
 back/dist-西海岸-后台管理-v0.8.2.1.zip
+back/dist-市局-后台管理-v0.8.2.3.zip