n20-common-lib 2.10.21 → 2.10.23

package/package.json

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

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -74,6 +74,12 @@ export default {
     form: {
       type: Object,
       default: () => ({})
+    },
+    otherAttDataA: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   data() {
@@ -88,6 +94,11 @@ export default {
   },
   methods: {
     getData() {
+      if (this.otherAttDataA.length) {
+        this.otherAttData = this.otherAttDataA
+        return
+      }
+      if (!this.taskId) return
       axios.post(`/bems/admin/customization/${this.taskId}`, null, { loading: false }).then(({ data }) => {
         if (data && data.length) {
           this.otherAttData = data || []

package/src/components/HandlingAdvice/index.vue

@@ -18,6 +18,16 @@
           />
         </el-form-item>
       </el-form>
+      <ExpandablePane v-if="otherAttDataA.length > 0" title="自定义项" :default-expand="true">
+        <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+          <div
+            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" :otherAttDataA="otherAttDataA" />
+          </div>
+        </el-form>
+      </ExpandablePane>
       <span slot="footer">
         <el-button type="primary" @click="submit">{{ $lc('提交') }}</el-button>
         <el-button plain @click="visible = false">{{ $lc('取消') }}</el-button>
@@ -28,6 +38,8 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
+import ShowOtherAttNew from '../ApprovalButtons/showOtherAttrNew.vue'
+import ExpandablePane from '../Expandable/main.vue'
 export default {
   name: 'HandlingAdvice',
   props: {
@@ -52,13 +64,16 @@ export default {
       default: 5
     }
   },
+  components: { ShowOtherAttNew, ExpandablePane },
   data() {
     return {
+      customizationList: {},
       visible: false,
       flowOptions: [],
       cb: null,
       reasonSelect: '',
-      reason: ''
+      reason: '',
+      otherAttDataA: []
     }
   },
   methods: {
@@ -70,13 +85,14 @@ export default {
       const { data, code } = await this.$axios.post(`/bems/activiti/admin/todo/isFlowStartWithOptions`, { typeCode })
       if (code === 200) {
         this.visible = data.whether ?? false
+        this.otherAttDataA = data.customizationList || []
         this.flowOptions = data?.opinions?.map((d) => {
           return {
             label: d,
             value: d
           }
         })
-        if (!data.whether && this.afterGetConf) {
+        if (!data.whether && this.afterGetConf && this.otherAttDataA.length === 0) {
           this.afterGetConf()
         }
       }
@@ -85,11 +101,12 @@ export default {
       this.reason = val
     },
     submit() {
+      const getOtherAttData = this.$refs['showOtherAttNew'] && this.$refs['showOtherAttNew']?.getOtherAttData()
       this.visible = false
       if (this.beforeSubmit) {
-        this.beforeSubmit(this.reason)
+        this.beforeSubmit(this.reason, getOtherAttData)
       }
-      this.$emit('submit', this.reason)
+      this.$emit('submit', this.reason, getOtherAttData)
     }
   }
 }