n20-common-lib 2.22.22 → 2.22.24

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -115,6 +115,10 @@ export default {
     filterId: {
       type: String,
       default: ''
+    },
+    beforeFilterList: {
+      type: Function,
+      default: (data) => data
     }
   },
   data() {
@@ -363,9 +367,9 @@ export default {
     /**
      * 获取筛选条件
      */
-    getFilterList() {
-      axios
-        .post(
+    async getFilterList() {
+      try {
+        const { data } = await axios.post(
           `/bems/prod_1.0/user/pageHabit/list?t=${Date.now()}`,
           {
             userNo: this.userNo,
@@ -373,53 +377,55 @@ export default {
           },
           { loading: false, noMsg: true }
         )
-        .then(({ data }) => {
-          let _data = JSON.parse(data)
-          if (_data && _data.length > 0) {
-            this.GroupData = _data.map((item) => {
-              for (let i = 0; i < this.filterList.length; i++) {
-                const originItem = this.filterList[i]
-                if (originItem[this.onlyKey] === item[this.onlyKey]) {
-                  item.label = originItem.label
-                  if (item.options && originItem.options) {
-                    item.options = originItem.options
-                  }
+
+        const _data = JSON.parse(data)
+
+        await Promise.resolve(this.beforeFilterList(_data))
+
+        if (_data && _data.length > 0) {
+          this.GroupData = _data.map((item) => {
+            for (let i = 0; i < this.filterList.length; i++) {
+              const originItem = this.filterList[i]
+              if (originItem[this.onlyKey] === item[this.onlyKey]) {
+                item.label = originItem.label
+                if (item.options && originItem.options) {
+                  item.options = originItem.options
                 }
               }
-              return item
+            }
+            return item
+          })
+        } else {
+          if (this.removeLoad) {
+            this.GroupData = this.filterList.filter((item) => {
+              if (item.isDefault) {
+                return item
+              }
             })
           } else {
-            if (this.removeLoad) {
-              this.GroupData = this.filterList.filter((item) => {
-                if (item.isDefault) {
-                  return item
-                }
-              })
-            } else {
-              this.GroupData = []
-            }
+            this.GroupData = []
           }
-          this.checkList = this.GroupData.map((res) => res.id)
-          this.cancelCheck = XEUtils.clone(this.checkList, true)
-          // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
-          this.filterList = this.filterList.sort((a, b) => {
-            if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {
-              return -1
-            }
-            if (!this.checkList.includes(a[this.onlyKey]) && this.checkList.includes(b[this.onlyKey])) {
-              return 1
-            }
-            return 0
-          })
-        })
-        .finally(() => {
-          for (const key in getOptionsMap()) {
-            if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
-              const data = getOptionsMap()[key]
-              this.setChoices(key, data)
-            }
+        }
+        this.checkList = this.GroupData.map((res) => res.id)
+        this.cancelCheck = XEUtils.clone(this.checkList, true)
+        // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
+        this.filterList = this.filterList.sort((a, b) => {
+          if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {
+            return -1
+          }
+          if (!this.checkList.includes(a[this.onlyKey]) && this.checkList.includes(b[this.onlyKey])) {
+            return 1
           }
+          return 0
         })
+      } finally {
+        for (const key in getOptionsMap()) {
+          if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
+            const data = getOptionsMap()[key]
+            this.setChoices(key, data)
+          }
+        }
+      }
     }
   }
 }

package/src/components/ApprovalCard/index.vue

@@ -192,8 +192,13 @@
                             >{{ '审查意见：' | $lc }} <i class="n20-icon-shouqizhedie f-s-m"></i
                           ></span>
                           <div v-show="showFlowHistoryChild" class="n20-description-bgc p-a-s">
-                            <div v-for="(s, i) in row.flowHistoryCfgs" :key="i">
-                              {{ s.cfgName }}：{{ s.cfgText ? s.cfgText : s.cfgVal }}
+                            <div
+                              v-for="(s, i) in row.flowHistoryCfgs"
+                              :key="i"
+                              :class="{ 'flex-box': align === 'left-right' }"
+                              :style="align === 'left-right' ? 'justify-content: space-between' : ''"
+                            >
+                              <span>{{ s.cfgName }}：</span><span>{{ s.cfgText ? s.cfgText : s.cfgVal }}</span>
                             </div>
                           </div>
                         </div>
@@ -266,8 +271,16 @@
                 >{{ '审查意见：' | $lc }}<i class="n20-icon-shouqizhedie f-s-m"></i
               ></span>
               <div v-show="showFlowHistory" class="n20-description-bgc p-a-s">
-                <div v-for="(s, i) in item.flowHistoryCfgs" :key="i" class="p-b-s">
-                  <div>{{ s.cfgName }}：{{ s.cfgText ? s.cfgText : s.cfgVal }}</div>
+                <div
+                  v-for="(s, i) in item.flowHistoryCfgs"
+                  :key="i"
+                  class="p-b-s"
+                  :class="{ 'flex-box': align === 'left-right' }"
+                  :style="align === 'left-right' ? 'justify-content: space-between' : ''"
+                >
+                  <div>
+                    <span>{{ s.cfgName }}：</span><span>{{ s.cfgText ? s.cfgText : s.cfgVal }}</span>
+                  </div>
                   <div>{{ s.cfgRemark }}</div>
                 </div>
               </div>
@@ -412,6 +425,10 @@ export default {
     hideLoading: {
       type: Boolean,
       default: false
+    },
+    align: {
+      type: String,
+      default: 'left-right'
     }
   },
   data() {

package/src/components/ApprovalRecord/index.vue

@@ -21,6 +21,7 @@
         class="p-a"
         :proc-inst-id="procInstIdC"
         style="height: 70vh; overflow: auto"
+        :align="align"
       />
     </el-dialog>
     <el-dialog
@@ -40,7 +41,7 @@
       <template slot="tips">
         <el-button size="mini" plain @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
       </template>
-      <approvalCard :api-prefix="apiPrefix" :proc-inst-id="procInstIdC" />
+      <approvalCard :api-prefix="apiPrefix" :proc-inst-id="procInstIdC" :align="align" />
       <el-dialog
         v-drag
         :title="'查看流程' | $lc"
@@ -80,6 +81,10 @@ export default {
     buttonMode: {
       type: Boolean,
       default: true
+    },
+    align: {
+      type: String,
+      default: 'left-right'
     }
   },
   data() {

package/src/components/HandlingAdvice/index.vue

@@ -117,77 +117,108 @@ export default {
   },
   methods: {
     /**
-     *
-     * @param typeCode {String} 业务类型编码
+     * 获取办理意见配置
+     * @param {String} typeCode - 业务类型编码
+     * @param {String} procInstId - 流程实例ID，用于回显历史数据
      */
     async getHandlingAdvice(typeCode, procInstId) {
       try {
-        const { code, data } = await axios.post(
-          `/bems/activiti/admin/todo/isFlowStartWithOptions`,
-          { typeCode },
-          {
-            noMsg: true
-          }
-        )
-        // data.whether = true
-        // data.optionsRequired = true
-
-        if (code === 200) {
-          this.otherAttDataA = data.customizationList || []
-          this.whether = data.whether
-          this.optionsRequired = data.optionsRequired
-          if (data.optionsRequired) {
-            this.placeholder = '请选择或输入意见（必填）'
-          } else {
-            this.placeholder = '请选择或输入意见（选填）'
-          }
-          this.visible = data.whether === true || this.otherAttDataA.length > 0
-          this.flowOptions = data?.opinions?.map((d) => {
-            return {
-              label: d,
-              value: d
-            }
-          })
-          if (!data.whether && this.afterGetConf && this.otherAttDataA.length === 0) {
-            this.afterGetConf()
-          }
-        }
-        // 回显操作
+        // 1. 获取办理意见配置
+        await this.fetchHandlingAdviceConfig(typeCode)
+
+        // 2. 回显历史数据（编辑场景）
         if (procInstId) {
-          const { data: data1 } = await axios.get(
-            `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
-            {},
-            {
-              noMsg: true
-            }
-          )
-          this.reason = data1?.suggestion || ''
-          this.reasonSelect = data1?.suggestion || ''
-          if (data1 && data1.flowHistoryCfgs && data1.flowHistoryCfgs.length > 0) {
-            this.otherAttDataA = this.otherAttDataA.map((item) => {
-              const bcData = data1.flowHistoryCfgs.find((item2) => {
-                return item2.cfgKey === item.cfgKey
-              })
-              return {
-                ...item,
-                cfgVal: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : bcData.cfgVal,
-                cfgText: ['31'].includes(item.cfgType) ? bcData.cfgText && bcData.cfgText.split(',') : bcData.cfgText,
-                selectList: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
-                checkList: ['32'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
-                cfgHasRemark: bcData.cfgHasRemark,
-                cfgRemark: bcData.cfgRemark
-              }
-            })
-          }
+          await this.loadFlowHistory(procInstId)
         }
-        // 重新执行一次 使数据更新
-        this.$refs.showOtherAttNew && this.$refs.showOtherAttNew.getData(this.otherAttDataA)
+
+        // 3. 更新子组件数据
+        this.updateOtherAttData()
       } catch (error) {
-        if (this.afterGetConf) {
-          this.afterGetConf()
-        }
+        // 异常时执行回调
+        this.afterGetConf?.()
       }
     },
+
+    /** 获取办理意见配置接口 */
+    async fetchHandlingAdviceConfig(typeCode) {
+      const { code, data } = await axios.post(
+        `/bems/activiti/admin/todo/isFlowStartWithOptions`,
+        { typeCode },
+        { noMsg: true }
+      )
+
+      if (code !== 200) return
+
+      // 设置自定义项列表
+      this.otherAttDataA = data.customizationList || []
+      // 是否显示意见输入
+      this.whether = data.whether
+      // 意见是否必填
+      this.optionsRequired = data.optionsRequired
+
+      // 设置占位提示
+      this.placeholder = data.optionsRequired ? '请选择或输入意见（必填）' : '请选择或输入意见（选填）'
+      // 显示弹窗条件：需要输入意见 或 存在自定义项
+      this.visible = data.whether === true || this.otherAttDataA.length > 0
+      // 转换意见选项为下拉格式
+      this.flowOptions = data?.opinions?.map((d) => ({ label: d, value: d })) || []
+
+      // 无需弹窗时直接执行回调
+      if (!data.whether && this.afterGetConf && this.otherAttDataA.length === 0) {
+        this.afterGetConf()
+      }
+    },
+
+    /** 加载流程历史数据用于回显 */
+    async loadFlowHistory(procInstId) {
+      const { data: historyData } = await axios.get(
+        `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
+        {},
+        { noMsg: true }
+      )
+
+      // 回显意见内容
+      this.reason = historyData?.suggestion || ''
+      this.reasonSelect = historyData?.suggestion || ''
+
+      // 回显自定义项数据
+      if (historyData?.flowHistoryCfgs?.length > 0) {
+        this.otherAttDataA = this.mergeHistoryToCustomization(historyData.flowHistoryCfgs)
+      }
+    },
+
+    /** 将历史数据合并到自定义项配置 */
+    mergeHistoryToCustomization(flowHistoryCfgs) {
+      const CFG_TYPE = {
+        MULTI_SELECT: '31', // 多选下拉
+        CHECKBOX: '32' // 复选框
+      }
+
+      return this.otherAttDataA.map((item) => {
+        const historyItem = flowHistoryCfgs.find((h) => h.cfgKey === item.cfgKey)
+        if (!historyItem) return item
+
+        const isMultiSelect = item.cfgType === CFG_TYPE.MULTI_SELECT
+        const isCheckbox = item.cfgType === CFG_TYPE.CHECKBOX
+        const cfgValArray = historyItem.cfgVal?.split(',') || []
+        const cfgTextArray = historyItem.cfgText?.split(',') || []
+
+        return {
+          ...item,
+          cfgVal: isMultiSelect ? cfgValArray : historyItem.cfgVal,
+          cfgText: isMultiSelect ? cfgTextArray : historyItem.cfgText,
+          selectList: isMultiSelect ? cfgValArray : undefined,
+          checkList: isCheckbox ? cfgValArray : undefined,
+          cfgHasRemark: historyItem.cfgHasRemark,
+          cfgRemark: historyItem.cfgRemark
+        }
+      })
+    },
+
+    /** 更新子组件数据 */
+    updateOtherAttData() {
+      this.$refs.showOtherAttNew?.getData(this.otherAttDataA)
+    },
     changeReasonSelect(val) {
       this.reason = val
     },