n20-common-lib 2.22.25 → 2.22.26

package/package.json

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

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() {
@@ -594,13 +598,10 @@ export default {
               this.checkFlowFn()
             }
           }
-          // addTaskTip 是否给出加签提示
+          // addTaskTip 需要加签时，直接弹出加签弹窗选择被加签人
           if (res.code === 200 && res.data && res.data.addTaskTip) {
-            this.$confirm('请确定是否向后加签', $lc('提示'), {
-              confirmButtonText: $lc('确定'),
-              cancelButtonText: $lc('取消'),
-              type: 'warning'
-            }).then(handleResult)
+            this._pendingAddTaskTip = handleResult
+            this.setAddtaskV = true
           } else {
             handleResult()
           }
@@ -1136,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) {
@@ -1147,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/showOtherAttrNew.vue

@@ -79,6 +79,7 @@
 <script>
 import axios from '../../utils/axios'
 export default {
+  name: 'ShowOtherAttrNew',
   props: {
     taskId: {
       type: [String, Number],

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>