n20-common-lib 2.11.2 → 2.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.11.2",
+  "version": "2.11.4",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -25,7 +25,7 @@
         </el-select>
         <el-select
           v-if="['31'].includes(item.cfgType)"
-          v-model="selectList"
+          v-model="item.selectList"
           multiple
           collapse-tags
           class="flex-item input-w"
@@ -44,7 +44,7 @@
         </el-radio-group>
         <el-checkbox-group
           v-if="item.cfgType === '32'"
-          v-model="checkList"
+          v-model="item.checkList"
           class="input-w"
           @change="(val) => changeFn(val, item)"
         >
@@ -90,20 +90,20 @@ export default {
     }
   },
   mounted() {
-    this.getData()
+    this.getData(this.otherAttDataA)
   },
   methods: {
-    getData() {
-      if (this.otherAttDataA.length) {
-        this.otherAttData = this.otherAttDataA
-        return
+    getData(data) {
+      if (data.length) {
+        this.otherAttData = data
+      }
+      if (this.taskId) {
+        axios.post(`/bems/admin/customization/${this.taskId}`, null, { loading: false }).then(({ data }) => {
+          if (data && data.length) {
+            this.otherAttData = data || []
+          }
+        })
       }
-      if (!this.taskId) return
-      axios.post(`/bems/admin/customization/${this.taskId}`, null, { loading: false }).then(({ data }) => {
-        if (data && data.length) {
-          this.otherAttData = data || []
-        }
-      })
     },
     changeFn(val, item) {
       if (['31', '32'].includes(item.cfgType)) {
@@ -125,8 +125,8 @@ export default {
         return {
           cfgName: item.cfgName,
           cfgKey: item.cfgKey,
-          cfgVal: item.cfgVal,
-          cfgText: item.cfgText,
+          cfgVal: Array.isArray(item.cfgVal) ? item.cfgVal.join(',') : item.cfgVal,
+          cfgText: Array.isArray(item.cfgText) ? item.cfgText.join(',') : item.cfgText,
           cfgHasRemark: item.cfgHasRemark,
           cfgRemark: item.cfgRemark
         }

package/src/components/HandlingAdvice/index.vue

@@ -24,12 +24,7 @@
             class="p-b-lg p-t-lg p-r-lg"
             style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
           >
-            <show-other-att-new
-              ref="showOtherAttNew"
-              :form="customizationList"
-              :other-att-data-a="otherAttDataA"
-              :task-id="processInstanceId || this.$route.query.processInstanceId"
-            />
+            <show-other-att-new ref="showOtherAttNew" :form="customizationList" :other-att-data-a="otherAttDataA" />
           </div>
         </el-form>
       </ExpandablePane>
@@ -68,10 +63,6 @@ export default {
     rows: {
       type: Number,
       default: 5
-    },
-    processInstanceId: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -82,7 +73,8 @@ export default {
       cb: null,
       reasonSelect: '',
       reason: '',
-      otherAttDataA: []
+      otherAttDataA: [],
+      procInstId: ''
     }
   },
   methods: {
@@ -90,7 +82,7 @@ export default {
      *
      * @param typeCode {String} 业务类型编码
      */
-    async getHandlingAdvice(typeCode) {
+    async getHandlingAdvice(typeCode, procInstId) {
       const { data, code } = await this.$axios.post(`/bems/activiti/admin/todo/isFlowStartWithOptions`, { typeCode })
       if (code === 200) {
         this.otherAttDataA = data.customizationList || []
@@ -105,6 +97,27 @@ export default {
           this.afterGetConf()
         }
       }
+      // 回显操作
+      if (procInstId) {
+        const { data } = await this.$axios.get(`/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`)
+        this.reason = data?.suggestion || ''
+        this.reasonSelect = data?.suggestion || ''
+        this.otherAttDataA = this.otherAttDataA.map((item) => {
+          const bcData = data.flowHistoryCfgs.find((item2) => {
+            return item2.cfgKey === item.cfgKey
+          })
+          return {
+            ...item,
+            cfgVal: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : bcData.cfgVal,
+            selectList: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
+            checkList: ['32'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
+            cfgHasRemark: bcData.cfgHasRemark,
+            cfgRemark: bcData.cfgRemark
+          }
+        })
+      }
+      // 重新执行一次 使数据更新
+      this.$refs.showOtherAttNew.getData(this.otherAttDataA)
     },
     changeReasonSelect(val) {
       this.reason = val