n20-common-lib 3.0.86 → 3.0.87

package/package.json

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

package/src/assets/css/table.scss

@@ -242,3 +242,14 @@ th.vxe-header--column {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+// badge图章样式
+.table-operate-btns__wrapper {
+  .el-badge__content {
+    position: absolute;
+    top: 6px;
+    right: 15px;
+    font-size: 10px;
+    height: 12px;
+    line-height: 12px;
+  }
+}

package/src/assets/css/v3/table.scss

@@ -287,6 +287,14 @@
       align-items: center;
       gap: 4px;
       white-space: nowrap;
+      .el-badge__content {
+        position: absolute;
+        top: 0;
+        right: 0;
+        font-size: 10px;
+        height: 12px;
+        line-height: 12px;
+      }
     }
 
     .hover-btns-more {
@@ -520,4 +528,15 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
+
+  .table-operate-btns__wrapper {
+    .el-badge__content {
+      position: absolute;
+      top: 6px;
+      right: 15px;
+      font-size: 10px;
+      height: 12px;
+      line-height: 12px;
+    }
+  }
 }

package/src/components/ApprovalButtons/index.vue

@@ -5,7 +5,7 @@
     <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'">
         <div
@@ -221,7 +221,7 @@
       <carboncopy-prop
         type="addtask"
         :carbon-copy-list="addTaskList"
-        @close="setAddtaskV = false"
+        @close="setAddtaskClose"
         @confirm="setAddtaskOk"
       />
     </cl-dialog>
@@ -454,6 +454,10 @@ export default {
     beforeDiscard: {
       type: Function,
       default: undefined
+    },
+    otherExpand: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -579,27 +583,8 @@ export default {
               noMsg: true
             }
           )
-          // addTaskTip 是否给出加签提示
-          if (res.code === 200 && res.data && res.data.addTaskTip) {
-            this.$confirm('请确定是否向后加签', $lc('提示'), {
-              confirmButtonText: $lc('确定'),
-              cancelButtonText: $lc('取消'),
-              type: 'warning'
-            }).then(() => {
-              // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
-              if (
-                res.code === 200 &&
-                res.data &&
-                (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)
-              ) {
-                this.setSpr = true
-                this.selectSprList = res.data
-              } else {
-                this.checkFlowFn()
-              }
-            })
-          } else {
-            // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
+          // 处理请求结果：showNextEgwOutgoingNodeName 或 showNextNodeAssignee 有一个为 true 时显示加签列表
+          const handleResult = () => {
             if (
               res.code === 200 &&
               res.data &&
@@ -608,9 +593,18 @@ export default {
               this.setSpr = true
               this.selectSprList = res.data
             } else {
+              this.nextEgwOutgoingNodeId = undefined
+              this.nextNodeApproveUnos = undefined
               this.checkFlowFn()
             }
           }
+          // addTaskTip 需要加签时，直接弹出加签弹窗选择被加签人
+          if (res.code === 200 && res.data && res.data.addTaskTip) {
+            this._pendingAddTaskTip = handleResult
+            this.setAddtaskV = true
+          } else {
+            handleResult()
+          }
         } catch (error) {
           console.log(error)
           this.checkFlowFn()
@@ -1143,6 +1137,14 @@ export default {
 
       this.setCarboncopyV = false
     },
+    setAddtaskClose() {
+      this.setAddtaskV = false
+      if (this._pendingAddTaskTip) {
+        const callback = this._pendingAddTaskTip
+        this._pendingAddTaskTip = null
+        callback()
+      }
+    },
     setAddtaskOk(list) {
       this.addTaskList = list
       if (this.addTaskList.length > 0 && !this.addTaskType) {
@@ -1154,6 +1156,23 @@ export default {
       }
 
       this.setAddtaskV = false
+
+      // 加签提示场景：未选择被加签人时，弹窗确认是否向后加签
+      if (this._pendingAddTaskTip) {
+        const callback = this._pendingAddTaskTip
+        this._pendingAddTaskTip = null
+        if (this.addTaskList.length === 0) {
+          this.$confirm('请检查是否向后加签', $lc('提示'), {
+            confirmButtonText: $lc('确定'),
+            cancelButtonText: $lc('取消'),
+            type: 'warning'
+          }).then(() => {
+            callback()
+          }).catch(() => {})
+        } else {
+          callback()
+        }
+      }
     },
     getFileDtos(fileList) {
       return fileList.map((file) => {

package/src/components/ApprovalButtons/selectSpr.vue

@@ -106,7 +106,22 @@ export default {
       this.selectCheck = this.selectSprList?.showNextNodeAssignee || false
     },
     personChange(list) {
+      const { nextNodeAssigneeMinnum: min = 0, nextNodeAssigneeMaxnum: max = 0 } = this.selectSprList || {}
+
+      // 校验最大值
+      if (max && list.length > max) {
+        this.$message.warning(`审批人数需小于或等于 ${max} 个`)
+        return
+      }
+
+      // 更新当前选中
       this.personList = list
+
+      // 校验最小值（仅提示，不强制拦截）
+      if (min && list.length < min) {
+        this.$message.info(`审批人数需大于或等于 ${min} 个`)
+        return
+      }
     },
     closeFn(item) {
       this.selectSprList = {

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -7,7 +7,8 @@
       clearable
       :multiple="multiple"
       collapse-tags
-      :placeholder="'常用审批意见，选择后将自动填充至下方输入框，您可在此基础上修改' | $lc"
+      :placeholder="'
+      ，选择后将自动填充至下方输入框，您可在此基础上修改' | $lc"
       @change="changeFn"
     >
       <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
@@ -77,6 +78,8 @@
             placeholder="请输入"
             size="normal"
             clearable
+            maxlength="500"
+            show-word-limit
             @change="row.appNoType = 'add'"
           />
         </vxe-column>
@@ -106,6 +109,7 @@ import ClTablePro from '../TablePro/index.vue'
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 export default {
+  name: 'ShowAppOpi',
   components: {
     clSecondaryTab,
     ClDialog,

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -1,33 +1,13 @@
 <template>
-  <div
-    class="w-100p flex-box"
-    style="
-      flex-wrap: wrap;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 16px;
-      padding: 0;
-      overflow-x: hidden;
-    "
-  >
-    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box flex-v" 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>
@@ -61,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>
@@ -93,13 +63,13 @@
         v-model="item.cfgVal"
         :type="'textarea'"
         placeholder="请输入"
-        class="w-100p m-r-ss m-b-s flex-1"
+        class="w-100p m-r-s m-b-s flex-1"
         clearable
       />
       <el-input
         v-if="item.cfgHasRemark === '1' && !['11', '12'].includes(item.cfgType)"
         v-model="item.cfgRemark"
-        class="w-100p m-r-ss m-b-s flex-1"
+        class="w-100p m-r-lg m-b-s flex-1"
         placeholder="请输入备注"
       />
     </div>
@@ -109,11 +79,8 @@
 <script>
 import axios from '../../utils/axios'
 export default {
+  name: 'ShowOtherAttrNew',
   props: {
-    labelWidth: {
-      type: String,
-      default: '12em'
-    },
     taskId: {
       type: [String, Number],
       default: ''
@@ -144,6 +111,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
@@ -156,6 +151,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,14 @@
                             >{{ '审查意见：' | $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 }}{{ s.cfgRemark }}</span>
                             </div>
                           </div>
                         </div>
@@ -266,9 +272,15 @@
                 >{{ '审查意见：' | $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>{{ s.cfgRemark }}</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' : ''"
+                >
+                  <span>{{ s.cfgName }}：{{ s.cfgName }}：</span>
+                  <span>{{ s.cfgText ? s.cfgText : s.cfgVal }}{{ s.cfgRemark }}</span>
                 </div>
               </div>
             </div>
@@ -412,6 +424,10 @@ export default {
     hideLoading: {
       type: Boolean,
       default: false
+    },
+    align: {
+      type: String,
+      default: 'left-right'
     }
   },
   data() {

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -17,7 +17,7 @@
       </symbol>
     </svg>
     <div ref="activiti-svg-wrap" class="activiti-svg-wrap"></div>
-    <div class="flex-box activiti-svg-zoom">
+    <div class="flex-box activiti-svg-zoom flex-v">
       <el-button type="text" icon="el-icon-zoom-out" style="font-size: 18px" @click="scaleMinus" />
       <el-slider
         v-model="zoomValue"
@@ -32,7 +32,27 @@
       <span class="m-l-s m-r-s" style="display: inline-block; width: 38px; line-height: 38px">{{
         zoomValue | zoomFormat
       }}</span>
-      <el-button type="text" icon="el-icon-full-screen" style="font-size: 16px" @click="scaleReset" />
+      <svg
+        style="font-size: 16px; width: 20px; height: 20px"
+        @click="scaleReset"
+        t="1773296357916"
+        class="icon pointer"
+        viewBox="0 0 1024 1024"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        p-id="39626"
+        width="200"
+        height="200"
+      >
+        <path
+          d="M896 85.333333a42.666667 42.666667 0 0 1 42.666667 42.666667v768a42.666667 42.666667 0 0 1-42.666667 42.666667H128a42.666667 42.666667 0 0 1-42.666667-42.666667V128a42.666667 42.666667 0 0 1 42.666667-42.666667h768z m-42.666667 85.333334H170.666667v682.666666h682.666666V170.666667z"
+          p-id="39627"
+        ></path>
+        <path
+          d="M751.125333 667.242667h-64.384v-176.234667l0.64-28.970667 1.045334-31.658666c-10.709333 10.688-18.133333 17.706667-22.293334 21.034666l-35.008 28.138667-31.04-38.762667 98.133334-78.122666h52.906666v304.576zM477.589333 637.44c0-11.648 3.114667-20.48 9.386667-26.453333 6.229333-5.973333 15.338667-8.96 27.264-8.96 11.52 0 20.416 3.072 26.666667 9.173333 6.4 6.122667 9.6 14.869333 9.6 26.24 0 10.986667-3.2 19.669333-9.6 26.069333-6.378667 6.250667-15.274667 9.365333-26.666667 9.365334-11.648 0-20.693333-3.050667-27.093333-9.173334-6.378667-6.250667-9.557333-14.997333-9.557334-26.24z m0-172.074667c0-11.648 3.114667-20.48 9.386667-26.453333 6.229333-5.973333 15.338667-8.96 27.264-8.96 11.52 0 20.416 3.050667 26.666667 9.173333 6.4 6.101333 9.6 14.869333 9.6 26.24 0 11.264-3.264 20.010667-9.813334 26.24-6.378667 6.122667-15.189333 9.173333-26.453333 9.173334-11.648 0-20.693333-3.050667-27.093333-9.173334-6.378667-6.08-9.557333-14.848-9.557334-26.24zM385.706667 667.242667h-64.362667v-176.234667l0.618667-28.970667 1.045333-31.658666c-10.709333 10.688-18.133333 17.706667-22.293333 21.034666l-34.986667 28.138667L234.666667 440.789333 332.8 362.666667h52.906667v304.576z"
+          p-id="39628"
+        ></path>
+      </svg>
     </div>
     <el-popover ref="title-pop" v-model="msgV" trigger="hover" placement="top">
       <div class="activiti-msg">
@@ -292,7 +312,7 @@ export default {
             detailList: assigneeEnd.map((item) => {
               return {
                 assignee: item.assignee,
-                optResult: item.optName,
+                optResult: item.optResult,
                 suggestion: item.suggestion,
                 endTime: item.endTime
               }

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
@@ -35,12 +36,12 @@
       <approvalImg class="text-c p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
     </el-dialog>
   </div>
-  <div v-else-if="approvalMode === 'title'">
+  <div v-else>
     <expandableWrap :title="'审批记录' | $lc">
       <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/FileUploadTable/index.vue

@@ -12,7 +12,7 @@
         <slot v-if="!readonly && showBatchUpload" name="batch-btn">
           <el-button size="mini" plain @click="handleBathUpload">{{ '批量上传' | $lc }}</el-button>
         </slot>
-        <slot v-if="!readonly && showBatchPrint" name="batch-btn">
+        <slot v-if="showBatchPrint" name="batch-btn">
           <el-button size="mini" plain @click="batchPrint">{{ '批量打印' | $lc }}</el-button>
         </slot>
         <slot name="down-btn">
@@ -248,7 +248,7 @@
         >
           <div class="flex-column flex-c flex-v" style="height: 100%">
             <i class="el-icon-s-release" style="font-size: 60px; color: #999"></i>
-            <span style="margin-top: 16px">
+            <span style="margin-top: 16px" class="flex-box flex-c flex-v">
               {{ '不支持在线预览，请' | $lc
               }}<el-link type="primary" class="color-primary" @click="downFile(seeRow)">{{ '下载' | $lc }}</el-link
               >{{ '到本地查看' | $lc }}
@@ -673,7 +673,8 @@ export default {
         })
       }
       if (this.batchPrintMethod) {
-        return this.batchPrintMethod(this.selectionList)
+        this.batchPrintMethod(this.selectionList)
+        return
       }
       const { code, data } = await axios.post(
         this.apiPrefix