n20-common-lib 2.22.23 → 2.22.25

package/package.json

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

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -1,28 +1,13 @@
 <template>
-  <div
-    class="w-100p flex-box"
-    :style="{
-      display: 'grid',
-      flexWrap: 'wrap',
-      gridTemplateColumns: `repeat(${columns}, 1fr)`,
-      gap: '16px',
-      padding: '0',
-      overflowX: 'hidden'
-    }"
-  >
-    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box" style="width: 100%; padding: 0 20px">
+  <div class="w-100p">
+    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box m-l-m m-r-m">
       <el-form-item
         class="m-r-ss m-b-s"
-        :label-width="labelWidth"
         :class="item.cfgHasRemark === '1' ? 'flex-auto' : 'flex-1'"
         :label="item.cfgName"
       >
         <span slot="label">
-          <span
-            v-title="item.cfgName"
-            style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
-            :style="{ maxWidth: labelWidth }"
-          >
+          <span style="display: inline-block; white-space: wrap">
             <span v-if="required" style="color: red">*</span>
             {{ item.cfgName }}
           </span>
@@ -56,20 +41,10 @@
         >
           <el-option v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.value" :value="row.code" />
         </el-select>
-        <el-radio-group
-          v-if="item.cfgType === '22'"
-          v-model="item.cfgVal"
-          class="input-w"
-          @change="(val) => changeFn(val, item)"
-        >
+        <el-radio-group v-if="item.cfgType === '22'" v-model="item.cfgVal" @change="(val) => changeFn(val, item)">
           <el-radio v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.code">{{ row.value }}</el-radio>
         </el-radio-group>
-        <el-checkbox-group
-          v-if="item.cfgType === '32'"
-          v-model="item.checkList"
-          class="input-w"
-          @change="(val) => changeFn(val, item)"
-        >
+        <el-checkbox-group v-if="item.cfgType === '32'" v-model="item.checkList" @change="(val) => changeFn(val, item)">
           <el-checkbox v-for="(row, i) in JSON.parse(item.cfgJson || '[]')" :key="i" :label="row.code">{{
             row.value
           }}</el-checkbox>
@@ -105,18 +80,10 @@
 import axios from '../../utils/axios'
 export default {
   props: {
-    labelWidth: {
-      type: String,
-      default: '12em'
-    },
     taskId: {
       type: [String, Number],
       default: ''
     },
-    columns: {
-      type: Number,
-      default: 1
-    },
     form: {
       type: Object,
       default: () => ({})
@@ -143,6 +110,34 @@ export default {
     this.getData(this.otherAttDataA)
   },
   methods: {
+    setDefaultValue(item) {
+      const defaultTypes = ['22', '21', '31', '32']
+      // 不满足条件的直接返回
+      if (!defaultTypes.includes(item.cfgType) || item.cfgVal) return
+
+      try {
+        // 解析cfgJson，获取默认选项
+        const cfgJson = JSON.parse(item.cfgJson || '[]')
+        const defaultItems = cfgJson.filter((row) => row.isDefault === '1')
+        if (!defaultItems.length) return
+        // 获取默认选项的code值
+        const defaultCodes = defaultItems.map((row) => row.code)
+        if (['22', '21'].includes(item.cfgType)) {
+          item.cfgVal = defaultCodes[0]
+          item.cfgText = defaultItems[0]?.value
+        } else if (['31', '32'].includes(item.cfgType)) {
+          item.cfgVal = defaultCodes.join(',')
+          item.cfgText = defaultItems.map((row) => row.value).join(',')
+          if (item.cfgType === '31') {
+            item.selectList = defaultCodes
+          } else {
+            item.checkList = defaultCodes
+          }
+        }
+      } catch (e) {
+        // JSON解析失败时忽略
+      }
+    },
     getData(data) {
       if (data.length) {
         this.otherAttData = data
@@ -155,6 +150,10 @@ export default {
                 if (['32'].includes(item.cfgType)) {
                   item.checkList = item.checkList ? item.checkList : []
                 }
+                if (['31'].includes(item.cfgType)) {
+                  item.selectList = item.selectList ? item.selectList : []
+                }
+                this.setDefaultValue(item)
                 return item
               }) || []
           }

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

@@ -33,9 +33,9 @@
         </el-form-item>
       </el-form>
       <ExpandablePane v-if="otherAttDataA.length > 0" title="自定义项" :default-expand="true">
-        <el-form ref="approveBtnGroup" label-position="right" :label-width="labelWidth">
+        <el-form ref="approveBtnGroup" label-position="top">
           <div
-            class="p-b-lg p-t-lg p-r-lg"
+            class="p-b-s p-t-s"
             style="max-height: 350px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
           >
             <show-other-att-new
@@ -44,8 +44,6 @@
               :other-att-data-a="otherAttDataA"
               :proc-inst-id="procInstId || this.$route.query.processInstanceId"
               :required="true"
-              :columns="columns"
-              :label-width="labelWidth"
             />
           </div>
         </el-form>
@@ -71,14 +69,7 @@ export default {
       type: String,
       default: '85%'
     },
-    labelWidth: {
-      type: String,
-      default: '12em'
-    },
-    columns: {
-      type: Number,
-      default: 1
-    },
+
     afterGetConf: {
       type: Function,
       default: undefined
@@ -117,77 +108,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
     },