n20-common-lib 2.22.25 → 2.22.27

package/package.json

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

package/src/assets/css/table.scss

@@ -136,11 +136,11 @@
   line-height: 16px !important;
   vertical-align: middle !important;
   cursor: pointer;
-
+  padding-right: 4px !important;
   .vxe-sort--asc-btn,
   .vxe-sort--desc-btn {
     width: 6px;
-    height: 10px;
+    height: 12px !important;
     color: #333;
     border: none;
     font-style: normal;

package/src/components/ApprovalButtons/index.vue

@@ -5,9 +5,9 @@
     <ExpandablePane
       v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
       title="自定义项"
-      :default-expand="false"
+      :default-expand="otherExpand"
     >
-      <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+      <el-form ref="approveBtnGroup" label-position="right" label-width="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"
@@ -27,7 +27,7 @@
       </div>
     </div>
     <!-- 抄送加签 -->
-    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '12em'">
+    <el-form ref="addEndorseForm" label-position="right" :label-width="_lang === 'zh' ? '6em' : '12em'">
       <div v-if="taskId && showBtn" class="flex-box">
         <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
           <el-input
@@ -454,6 +454,10 @@ export default {
     beforeDiscard: {
       type: Function,
       default: undefined
+    },
+    otherExpand: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -595,24 +599,24 @@ export default {
             }
           }
           // addTaskTip 是否给出加签提示
-          if (res.code === 200 && res.data && res.data.addTaskTip) {
-            this.$confirm('请确定是否向后加签', $lc('提示'), {
+          if (res.code === 200 && res.data && res.data.addTaskTip && !this.addTaskList.length) {
+            this.$confirm('请检查是否向后加签', $lc('提示'), {
               confirmButtonText: $lc('确定'),
               cancelButtonText: $lc('取消'),
               type: 'warning'
-            }).then(handleResult)
+            })
+              .then(handleResult)
+              .catch(() => {})
           } else {
             handleResult()
           }
         } catch (error) {
-          console.log(error)
           this.checkFlowFn()
         }
       })
     },
     // 选择审批人
     selectSprListFn(data) {
-      console.log(data)
       this.nextEgwOutgoingNodeId = data.nextEgwOutgoingNodeId
       this.nextNodeApproveUnos = data.nextNodeApproveUnos
       this.setSpr = false
@@ -636,7 +640,6 @@ export default {
           this.IsShowUploadWidget = data
         }
       }
-      console.log(code, data)
     },
     // 意见是否必填
     getConfiguration() {
@@ -644,13 +647,11 @@ export default {
         .then(({ opinionRequired, showApproveTo }) => {
           this.requiredC = opinionRequired ?? this.required
           this.showApproveTo = showApproveTo ?? true
-          // 读取该工作流是否意见必填
-          if (this.$route.query.remarkIsMust !== undefined) {
-            this.requiredC = this.$route.query.remarkIsMust === '1'
-          }
         })
         .catch(() => {
           this.requiredC = this.required
+        })
+        .finally(() => {
           // 读取该工作流是否意见必填
           if (this.$route.query.remarkIsMust !== undefined) {
             this.requiredC = this.$route.query.remarkIsMust === '1'
@@ -658,15 +659,20 @@ export default {
         })
     },
     getTodoList() {
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const dto = JSON.parse(sessionStorage.getItem(`approvalDto`))
-        axios.post('/bems/activiti/admin/todo/todo', dto).then(({ data, code }) => {
-          if (code === 200) {
-            const { list } = data
-            this.todoList = list || []
+        axios
+          .post('/bems/activiti/admin/todo/todo', dto)
+          .then(({ data, code }) => {
+            if (code === 200) {
+              const { list } = data
+              this.todoList = list || []
+            }
             resolve({ data, code })
-          }
-        })
+          })
+          .catch(() => {
+            resolve({ data: {}, code: -1 })
+          })
       })
     },
     // 获取加签方式的模式
@@ -828,8 +834,24 @@ export default {
     setParam(obj) {
       Object.assign(this.otherAtt, obj)
     },
-    // 提交后的提示
-    thenMsg(data = {}, str = $lc('操作')) {
+    // 提交前统一校验：意见是否必填、加签审批方式是否选择
+    validateBeforeSubmit() {
+      if (this.authList.includes('isShowOtherAtt')) {
+        const valid = this.$refs['showOtherAttNew']?.validate()
+        if (!valid) return false
+      }
+      if (this.requiredC && !this.messageC) {
+        this.errMsgFn(this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准'))
+        return false
+      }
+      if (this.addTaskList.length > 0 && !this.addTaskType) {
+        this.addErrFn()
+        return false
+      }
+      return true
+    },
+    // 处理提交响应中的失败信息，返回 true 表示有失败
+    _handleFailMsg(data = {}, str = $lc('操作')) {
       let { failCount, failList = {} } = data
       if (failCount > 0) {
         if (Array.isArray(failList)) {
@@ -845,7 +867,13 @@ export default {
         } else {
           this.$message.error(str + $lc('失败'))
         }
-      } else {
+        return true
+      }
+      return false
+    },
+    // 提交后的提示
+    thenMsg(data = {}, str = $lc('操作')) {
+      if (!this._handleFailMsg(data, str)) {
         this.$emit('afterFn', str)
         this.$message.success(str + $lc('成功'))
         setTimeout(this.goFrom, 300)
@@ -869,8 +897,17 @@ export default {
       if (!bFn) {
         callFn()
       } else {
-        let F = bFn(callFn)
-        F.then && F.then(callFn)
+        let called = false
+        let wrappedCallFn = () => {
+          if (!called) {
+            called = true
+            callFn()
+          }
+        }
+        let F = bFn(wrappedCallFn)
+        if (F && F.then && typeof F.then === 'function') {
+          F.then(wrappedCallFn)
+        }
       }
     },
     // 查询是否配置 允许不重走流程
@@ -887,7 +924,6 @@ export default {
         )
         return code === 200 && data
       } catch (error) {
-        console.error('查询是否配置允许不重走流程接口错误:', error)
         return false
       }
     },
@@ -962,14 +998,7 @@ export default {
     },
 
     async checkFlowFn() {
-      if (this.requiredC && !this.messageC) {
-        return this.errMsgFn(
-          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
-        )
-      }
-      if (this.addTaskList.length > 0 && !this.addTaskType) {
-        return this.addErrFn()
-      }
+      if (!this.validateBeforeSubmit()) return
       let { isCheck, taskId, appNo, groupNo, typeCode, orderId, isAgentcy } = this.$route.query
       this.isWyfk = ['PUBLIC_PAYMENT', 'BATCH_PERSON_PAYMENT'].includes(typeCode)
       if (isCheck === '1' && this.isCheck) {
@@ -1025,14 +1054,7 @@ export default {
     },
     // 审批
     approvalFn() {
-      if (this.requiredC && !this.messageC) {
-        return this.errMsgFn(
-          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
-        )
-      }
-      if (this.addTaskList.length > 0 && !this.addTaskType) {
-        return this.addErrFn()
-      }
+      if (!this.validateBeforeSubmit()) return
       axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
         this.thenMsg(
           data,
@@ -1041,33 +1063,11 @@ export default {
       })
     },
     approvalNext() {
-      if (this.requiredC && !this.messageC) {
-        return this.errMsgFn(
-          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
-        )
-      }
-      if (this.addTaskList.length > 0 && !this.addTaskType) {
-        return this.addErrFn()
-      }
+      if (!this.validateBeforeSubmit()) return
 
       this.beforeFn(this.beforeRatify, () => {
         axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
-          let { failCount, failList = {} } = data
-          if (failCount > 0) {
-            if (Array.isArray(failList)) {
-              let _failList = {}
-              failList.forEach((f = {}) => {
-                Object.assign(_failList, f)
-              })
-              failList = _failList
-            }
-            let errArr = Object.values(failList)
-            if (errArr.length > 0) {
-              this.$message.error(errArr.join('、'))
-            } else {
-              this.$message.error($lc('审批失败'))
-            }
-          } else {
+          if (!this._handleFailMsg(data, $lc('审批'))) {
             this.$message.success($lc('审批成功'))
             closeTagsForBackPage()
             this.getTodoList().finally(() => {

package/src/components/ApprovalButtons/indexApp.vue

@@ -893,6 +893,10 @@ export default {
     },
 
     async checkFlowFn() {
+      if (this.authList.includes('isShowOtherAtt')) {
+        const valid = this.$refs['showOtherAttNew']?.validate()
+        if (!valid) return
+      }
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
@@ -956,6 +960,10 @@ export default {
     },
     // 审批
     approvalFn() {
+      if (this.authList.includes('isShowOtherAtt')) {
+        const valid = this.$refs['showOtherAttNew']?.validate()
+        if (!valid) return
+      }
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
@@ -972,6 +980,10 @@ export default {
       })
     },
     approvalNext() {
+      if (this.authList.includes('isShowOtherAtt')) {
+        const valid = this.$refs['showOtherAttNew']?.validate()
+        if (!valid) return
+      }
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -21,6 +21,14 @@
           class="input-w"
           clearable
         />
+        <el-input
+          v-if="['12'].includes(item.cfgType)"
+          v-model="item.cfgVal"
+          :type="'textarea'"
+          placeholder="请输入"
+          class="input-w"
+          clearable
+        />
         <el-select
           v-if="['21'].includes(item.cfgType)"
           v-model="item.cfgVal"
@@ -58,20 +66,17 @@
           placeholder="选择日期"
         />
       </el-form-item>
-      <el-input
-        v-if="['12'].includes(item.cfgType)"
-        v-model="item.cfgVal"
-        :type="'textarea'"
-        placeholder="请输入"
-        class="w-100p m-r-s m-b-s flex-1"
-        clearable
-      />
-      <el-input
+      <el-form-item
         v-if="item.cfgHasRemark === '1' && !['11', '12'].includes(item.cfgType)"
-        v-model="item.cfgRemark"
-        class="w-100p m-r-lg m-b-s flex-1"
-        placeholder="请输入备注"
-      />
+        class="m-r-ss m-b-s flex-1"
+        label="备注"
+      >
+        <el-input
+          v-model="item.cfgRemark"
+          class="input-w"
+          placeholder="请输入备注"
+        />
+      </el-form-item>
     </div>
   </div>
 </template>
@@ -79,6 +84,7 @@
 <script>
 import axios from '../../utils/axios'
 export default {
+  name: 'ShowOtherAttrNew',
   props: {
     taskId: {
       type: [String, Number],
@@ -109,19 +115,45 @@ export default {
   mounted() {
     this.getData(this.otherAttDataA)
   },
+  watch: {
+    otherAttDataA: {
+      handler(val) {
+        this.getData(val)
+      },
+      deep: true
+    }
+  },
   methods: {
+    initItem(item) {
+      if (['32'].includes(item.cfgType)) {
+        this.$set(item, 'checkList', item.checkList || [])
+      }
+      if (['31'].includes(item.cfgType)) {
+        this.$set(item, 'selectList', item.selectList || [])
+      }
+      if (item.cfgHasRemark === '1' && item.cfgRemark === undefined) {
+        this.$set(item, 'cfgRemark', '')
+      }
+      if (item.cfgVal === undefined) {
+        this.$set(item, 'cfgVal', '')
+      }
+      this.setDefaultValue(item)
+      return item
+    },
     setDefaultValue(item) {
       const defaultTypes = ['22', '21', '31', '32']
       // 不满足条件的直接返回
-      if (!defaultTypes.includes(item.cfgType) || item.cfgVal) return
-
+      if (!defaultTypes.includes(item.cfgType) || item.cfgVal) {
+        item.cfgVal = item.cfgVal || ''
+        return
+      }
       try {
         // 解析cfgJson，获取默认选项
         const cfgJson = JSON.parse(item.cfgJson || '[]')
         const defaultItems = cfgJson.filter((row) => row.isDefault === '1')
-        if (!defaultItems.length) return
+        if (!defaultItems?.length) return
         // 获取默认选项的code值
-        const defaultCodes = defaultItems.map((row) => row.code)
+        const defaultCodes = defaultItems?.map((row) => row.code)
         if (['22', '21'].includes(item.cfgType)) {
           item.cfgVal = defaultCodes[0]
           item.cfgText = defaultItems[0]?.value
@@ -135,27 +167,17 @@ export default {
           }
         }
       } catch (e) {
-        // JSON解析失败时忽略
+        console.error('解析cfgJson失败', e)
       }
     },
     getData(data) {
-      if (data.length) {
-        this.otherAttData = data
+      if (data?.length) {
+        this.otherAttData = data.map((item) => this.initItem(item))
       }
       if (this.taskId) {
         axios.post(`/bems/admin/customization/${this.taskId}`, null, { loading: false }).then(({ data }) => {
           if (data && data.length) {
-            this.otherAttData =
-              data?.map((item) => {
-                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
-              }) || []
+            this.otherAttData = data?.map((item) => this.initItem(item)) || []
           }
         })
       }
@@ -186,6 +208,33 @@ export default {
           cfgRemark: item.cfgRemark
         }
       })
+    },
+    validate() {
+      if (!this.required) return true
+      for (const item of this.otherAttData) {
+        let isEmpty = false
+        if (['11', '12', '21', '22', '33'].includes(item.cfgType)) {
+          isEmpty = !item.cfgVal && item.cfgVal !== 0
+        } else if (item.cfgType === '31') {
+          isEmpty = !item.selectList || item.selectList?.length === 0
+        } else if (item.cfgType === '32') {
+          isEmpty = !item.checkList || item.checkList?.length === 0
+        }
+        if (isEmpty) {
+          this.$message.warning(`请填写${item.cfgName}`)
+          return false
+        }
+        if (
+          item.cfgHasRemark === '1' &&
+          !['11', '12'].includes(item.cfgType) &&
+          !item.cfgRemark &&
+          item.cfgRemark !== 0
+        ) {
+          this.$message.warning(`请填写${item.cfgName}备注`)
+          return false
+        }
+      }
+      return true
     }
   }
 }

package/src/components/ApprovalCard/index.vue

@@ -198,7 +198,8 @@
                               :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>
+                              <span>{{ s.cfgName }}：</span
+                              ><span>{{ s.cfgText ? s.cfgText : s.cfgVal }}{{ s.cfgRemark }}</span>
                             </div>
                           </div>
                         </div>
@@ -278,10 +279,8 @@
                   :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>
+                  <span>{{ s.cfgName }}：{{ s.cfgName }}：</span>
+                  <span>{{ s.cfgText ? s.cfgText : s.cfgVal }}{{ s.cfgRemark }}</span>
                 </div>
               </div>
             </div>

package/src/components/TablePro/index.js

@@ -121,33 +121,7 @@ vxeTable.formats.mixin({
     }
   }
 })
-// 创建一个简单的输入框筛选
-/* vxeTable.renderer.add('FilterInput', {
-  // 筛选模板
-  renderFilter(h, renderOpts, params) {
-    const { data } = params
-    return <el-input v-model='data' placeholder='' size='mini'></el-input>
-  },
-  // 重置数据方法
-  filterResetMethod({ options }) {
-    options.forEach((option) => {
-      option.data = ''
-    })
-  },
-  // 重置筛选复原方法（当未点击确认时，该选项将被恢复为默认值）
-  filterRecoverMethod({ option }) {
-    option.data = ''
-  },
-  // 筛选方法
-  filterMethod({ option, row, column }) {
-    const { data } = option
-    const cellValue = row[column.property]
-    if (cellValue) {
-      return cellValue.indexOf(data) > -1
-    }
-    return false
-  }
-}) */
+
 function install(Vue) {
   Vue.use(vxeTable)
 }

package/src/components/TablePro/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%; position: relative">
+  <div class="v2-table-pro-wrapper" style="height: 100%; position: relative">
     <vxe-table
       ref="vxeTable"
       :key="colsKey"
@@ -472,8 +472,8 @@ export default {
       let canCheck = true
       if (typeof this.forbidSelect === 'function') {
         const forbidResult = this.forbidSelect({ row })
-        // 只有当 forbidSelect 明确返回 true 时，才禁止勾选
-        canCheck = forbidResult !== true
+        // 只有当 forbidSelect 明确返回 true 时才允许勾选
+        canCheck = forbidResult !== false
       }
 
       if (canCheck) {