n20-common-lib 3.2.47 → 3.2.48

package/package.json

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

package/src/components/MdmSelect/index.vue

@@ -100,20 +100,10 @@ export default {
     },
     getOptionLabel(option) {
       if (this.labelMode === 'code-value') {
-        if (this.type === TYPE_CASH_FLOW_DIRECTION) {
-          return `${option.label}（${option.code}）`
-        }
         return `${option.code} - ${option.label}`
       }
       return option.label
     },
-    getPaymentCategoryOptions() {
-      return [
-        { code: 1, label: $lc('收入'), raw: { label: $lc("收入"), value: 1 } },
-        { code: 0, label: $lc('支出'), raw: { label: $lc("支出"), value: 0 } },
-        { code: 2, label: $lc('净额'), raw: { label: $lc("净额"), value: 2 } }
-      ]
-    },
     normalizeResponse(response) {
       if (Array.isArray(response)) return response
       if (response && Array.isArray(response.data)) return response.data
@@ -132,16 +122,23 @@ export default {
           raw: item
         }))
     },
+    flattenTreeOptions(list) {
+      const result = []
+      const flatten = items => {
+        items.forEach(item => {
+          result.push(item)
+          if (Array.isArray(item.children) && item.children.length) {
+            flatten(item.children)
+          }
+        })
+      }
+      flatten(Array.isArray(list) ? list : [])
+      return result
+    },
     async loadOptions() {
       const requestSequence = ++this.requestSequence
       this.options = []
 
-      if (this.type === TYPE_PAYMENT_CATEGORY) {
-        this.loading = false
-        this.options = this.getPaymentCategoryOptions()
-        return
-      }
-
       this.loading = true
       try {
         let response
@@ -150,12 +147,20 @@ export default {
 
         if (this.type === TYPE_CASH_FLOW_DIRECTION) {
           response = await this.$axios.get(
-            '/bems/1.0/cashflow/fieldinfo/MDM_G_CASHFLOWflowDir',
-            {},
+            '/bems/1.0/cashflow',
+            { resultType: 1, flowDir: '' },
+            { loading: false, noMsg: true }
+          )
+          codeKey = 'flowNo'
+          labelKey = 'flowName'
+        } else if (this.type === TYPE_PAYMENT_CATEGORY) {
+          response = await this.$axios.get(
+            '/bems/1.0/paymentCategory',
+            { resultType: 1 },
             { loading: false, noMsg: true }
           )
-          codeKey = 'dbdata'
-          labelKey = 'otherdata'
+          codeKey = 'paymentCategoryNo'
+          labelKey = 'paymentCategoryName'
         } else if (this.type === TYPE_PAY_BANK) {
           response = await this.$axios.get('/bems/1.0/bank', { isEnable: 1 }, { loading: false, noMsg: true })
           codeKey = 'bankNo'
@@ -163,7 +168,11 @@ export default {
         }
 
         if (requestSequence !== this.requestSequence) return
-        this.options = this.normalizeOptions(this.normalizeResponse(response), codeKey, labelKey)
+        let list = this.normalizeResponse(response)
+        if (this.type === TYPE_CASH_FLOW_DIRECTION) {
+          list = this.flattenTreeOptions(list)
+        }
+        this.options = this.normalizeOptions(list, codeKey, labelKey)
       } catch (error) {
         if (requestSequence !== this.requestSequence) return
         this.options = []