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

# Conflicts:
#	back/src/views/modules/activiti/demo/comments.vue

back/src/views/modules/activiti/demo/comments.vue

@@ -7,13 +7,19 @@
         @keyup.enter.native="dataFormSubmitHandle()"
         :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
       >
+        <el-tooltip placement="bottom" :content="dataForm.comment">
+          <template #title>
+            <span>{{ dataForm.comment }}</span>
+          </template>
           <el-form-item label="评论内容">
             <el-input
+              type="textarea"
               v-model="dataForm.comment"
               :disabled="fieldDisabled"
               placeholder="评论内容"
             ></el-input>
           </el-form-item>
+        </el-tooltip>
       </el-form>
     </div>
     <!--  流程综合组件   -->
@@ -280,3 +286,9 @@ export default {
   }
 }
 </style>
+<style lang="scss" scoped>
+::v-deep .el-textarea__inner {
+  height: 100px;
+  resize: none;
+}
+</style>

back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue

@@ -136,15 +136,7 @@ export default {
         return this.$message.error(this.$t('task.detailError'))
       }
       this.getProcDefRouteSet(row, this.forwardDetail)
-    },
-    methodsThree () {
-      this.$http.get('/category/getCategoryTree').then((res) => {
-        localStorage.setItem('getCategoryTree', JSON.stringify(res.data.data))
-      })
     }
-  },
-  mounted () {
-    this.methodsThree()
   }
 }
 </script>

back/src/views/modules/myAgent/demo/ResourcesAndServices.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wrapper">
-    <el-form>
+    <el-form :model="dataView">
       <div v-for="(item, index) in dataView.children" :key="item">
         <!-- <div class="dataTitle">{{ item.name }}</div> -->
         <div v-for="itemson in item.children" :key="itemson.name">
@@ -234,68 +234,8 @@ export default {
       if (item) {
         this.dataList = item
       }
-    }
     },
-  computed: {},
+    insertList (val) {
-  methods: {
-    videoAndImg (link) {
-      if (link) {
-        window.open(link)
-      } else {
-        this.$message({
-          message: '未上传',
-          type: 'warning'
-        })
-      }
-    },
-    deptName () {
-      console.log(this.dataForm.deptId)
-      this.$http
-        .get(`/sys/dept/${this.dataForm.deptId}`)
-        .then(({ data: res }) => {
-          console.log(res.data.name, 'res')
-          this.unit = res.data.name
-        })
-    },
-    queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
-      if (this.dataForm.type === '组件服务') {
-        this.$http
-          .get(
-            '/dataResourceRel/queryApp4PartByKeyId' +
-              '?keyId=' +
-              this.dataForm.id
-          )
-          .then(({ data: res }) => {
-            this.dataView.children[index].children[indexSon].children[
-              indexSonSon
-            ].note1 = ''
-            res.data.map((item) => {
-              this.dataView.children[index].children[indexSon].children[
-                indexSonSon
-              ].note1 += item.name + ';'
-            })
-          })
-      } else {
-        this.$http
-          .get(
-            '/dataResourceRel/queryPart4AppByKeyId?keyId=' +
-              this.dataForm.id +
-              '&type=' +
-              '组件服务'
-          )
-          .then(({ data: res }) => {
-            this.dataView.children[index].children[indexSon].children[
-              indexSonSon
-            ].note1 = ''
-            res.data.map((item) => {
-              this.dataView.children[index].children[indexSon].children[
-                indexSonSon
-              ].note1 += item.name + ';'
-            })
-          })
-      }
-    },
-    insertListFunction (val) {
       if (val) {
         if (this.dataForm.type === '应用资源') {
           this.dataView = val.filter(
@@ -483,10 +423,69 @@ export default {
       }
     }
   },
+  computed: {},
+  methods: {
+    videoAndImg (link) {
+      if (link) {
+        window.open(link)
+      } else {
+        this.$message({
+          message: '未上传',
+          type: 'warning'
+        })
+      }
+    },
+    deptName () {
+      console.log(this.dataForm.deptId)
+      this.$http
+        .get(`/sys/dept/${this.dataForm.deptId}`)
+        .then(({ data: res }) => {
+          console.log(res.data.name, 'res')
+          this.unit = res.data.name
+        })
+    },
+    queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
+      if (this.dataForm.type === '组件服务') {
+        this.$http
+          .get(
+            '/dataResourceRel/queryApp4PartByKeyId' +
+              '?keyId=' +
+              this.dataForm.id
+          )
+          .then(({ data: res }) => {
+            this.dataView.children[index].children[indexSon].children[
+              indexSonSon
+            ].note1 = ''
+            res.data.map((item) => {
+              this.dataView.children[index].children[indexSon].children[
+                indexSonSon
+              ].note1 += item.name + ';'
+            })
+          })
+      } else {
+        this.$http
+          .get(
+            '/dataResourceRel/queryPart4AppByKeyId?keyId=' +
+              this.dataForm.id +
+              '&type=' +
+              '组件服务'
+          )
+          .then(({ data: res }) => {
+            this.dataView.children[index].children[indexSon].children[
+              indexSonSon
+            ].note1 = ''
+            res.data.map((item) => {
+              this.dataView.children[index].children[indexSon].children[
+                indexSonSon
+              ].note1 += item.name + ';'
+            })
+          })
+      }
+    }
+  },
   created () {},
   mounted () {
     this.deptName()
-    this.insertListFunction(this.insertList)
   }
 }
 </script>

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -135,16 +135,16 @@ export default {
     this.init()
     console.log('fromList', this.$router.currentRoute.params.businessKey)
     // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
-    // var callbacks = {
+    var callbacks = {
-    //   startProcessSuccessCallback: this.closeCurrentTab,
+      startProcessSuccessCallback: this.closeCurrentTab,
-    //   startProcessErrorCallback: this.startProcessErrorCallback,
+      startProcessErrorCallback: this.startProcessErrorCallback,
-    //   taskHandleSuccessCallback: this.closeCurrentTab,
+      taskHandleSuccessCallback: this.closeCurrentTab,
-    //   taskHandleErrorCallback: this.taskHandleErrorCallback,
+      taskHandleErrorCallback: this.taskHandleErrorCallback,
-    //   formSaveSuccessCallback: null,
+      formSaveSuccessCallback: null,
-    //   formSaveErrorCallback: null
+      formSaveErrorCallback: null
-    // }
+    }
-    // // 初始化综合组件
+    // 初始化综合组件
-    // this.initProcessMultiple(callbacks)
+    this.initProcessMultiple(callbacks)
   },
   mounted () {
     const businessKey = this.$router.currentRoute.params.businessKey
@@ -180,10 +180,9 @@ export default {
       this.input = ''
     },
     methodsThree () {
-      // this.$http.get('/category/getCategoryTree').then((res) => {
+      this.$http.get('/category/getCategoryTree').then((res) => {
-      //   this.insertList = res.data.data
+        this.insertList = res.data.data
-      // })
+      })
-      this.insertList = JSON.parse(localStorage.getItem('getCategoryTree'))
     },
     init () {
       this.visible = true

front/src/views/personalCenter/components/addApplication.vue

@@ -101,6 +101,12 @@
                 :rules="[{ required: true, message: '请选择应用领域' }]"
               >
                 <a-select
+                  :disabled="
+                    formName.detailsType === '应用资源' ||
+                    formName.detailsType === '组件服务'
+                      ? false
+                      : true
+                  "
                   v-model:value="formName.detailsField"
                   :options="applicationSceneOpthion"
                   mode="tags"