Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

.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

back/src/views/modules/ability/bsabilityai.vue

@@ -118,7 +118,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
@@ -334,15 +334,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.addOrUpdateVisible = true
-      this.disabled = false
+      // this.disabled = false
-      this.$nextTick(() => {
+      // this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false
+      //   this.$refs.addOrUpdate.UpdateState = false
-        this.$refs.addOrUpdate.dataFormShowDetails = val
+      //   this.$refs.addOrUpdate.dataFormShowDetails = val
-        this.$refs.addOrUpdate.init()
+      //   this.$refs.addOrUpdate.init()
-      })
+      // })
-      this.disabled = true
+      // this.disabled = true
     },
     showDocument (val) {
       window.open(

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
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
-      this.disabled = false
+      // this.addOrUpdateVisible = true
-      this.$nextTick(() => {
+      // this.disabled = false
-        this.$refs.addOrUpdate.UpdateState = false
+      // this.$nextTick(() => {
-        this.$refs.addOrUpdate.dataFormShowDetails = val
+      //   this.$refs.addOrUpdate.UpdateState = false
-        this.$refs.addOrUpdate.init()
+      //   this.$refs.addOrUpdate.dataFormShowDetails = val
-      })
+      //   this.$refs.addOrUpdate.init()
-      this.disabled = true
+      // })
+      // this.disabled = true
     },
     showDocument (val) {
       console.log(val)

back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

@@ -126,12 +126,12 @@ export default {
             dataList.push(element)
           })
           this.options = dataList
-          // if (!this.data.note1) {
+          if (!this.data.note1) {
-          //   this.$http.get('/sys/user/info').then(({ data: res }) => {
+            this.$http.get('/sys/user/info').then(({ data: res }) => {
-          //     console.log(res.data)
+              console.log(res.data)
-          //     this.data.note1 = res.data.deptId
+              this.data.note1 = res.data.deptId
-          //   })
+            })
-          // }
+          }
         })
       } else if (this.data.name === '部门联系人') {
         // this.$http.get('/sys/dept/all').then(res => {

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)
       }