n20-common-lib 2.19.14 → 2.19.15-sc

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -108,22 +108,12 @@
           ref="msg-input"
           v-model="messageC"
           type="textarea"
-          :placeholder="`${$lc('请输入操作意见（')}${messageMax}${
-            requiredC
-              ? $lc('字以内），批准该意见为必填，驳回/作废该意见为必填！')
-              : $lc('字以内），批准该意见为非必填，驳回/作废该意见为必填！')
-          }`"
+          :placeholder="messagePlaceholder"
           :maxlength="messageMax"
           show-word-limit
           :autosize="{ minRows: 2 }"
         />
-        <template v-if="taskId && showBtn">
-          <show-app-opi
-            v-if="opiAndUser || authList.includes('showAppOpi')"
-            :task-id="taskId"
-            :message.sync="messageC"
-            :and-user="opiAndUser"
-          />
+        <!-- <template v-if="taskId && showBtn">
           <show-other-att
             v-if="authList.includes('showOtherAtt')"
             class="flex-1 m-l"
@@ -131,7 +121,7 @@
             :other-att="otherAtt"
             style="width: 18%"
           />
-        </template>
+        </template> -->
       </el-form-item>
       <el-form-item v-if="fileKitT">
         <span slot="label">
@@ -350,13 +340,12 @@ import ClUpload from '../Upload'
 import dCloumn from './getDCloumn'
 import CarboncopyProp from './setCarboncopyProp.vue'
 import RejectToProp from './setRejectToProp.vue'
-import ShowAppOpi from './showAppOpi.vue'
 import ShowOtherAtt from './showOtherAttr.vue'
 import ShowOtherAttNew from './showOtherAttrNew.vue'
 import ExpandablePane from '../Expandable/main.vue'
 import { toExaminePath } from './specialHandle'
 const prefixCls = 'n20-approval-Button'
-// window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'appOpi.queryAppOpiAndUser.exist': undefined, 'card.countermand.suggestion': false }
+// window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'card.countermand.suggestion': false }
 if (!window._approvalExtend) window._approvalExtend = {}
 if (!window._approvalExtend['addtask.chdUserInfo.extend']) {
   window._approvalExtend['addtask.chdUserInfo.extend'] = window._isAddtask_get_userlist_extend_data_ || {}
@@ -370,7 +359,6 @@ export default {
     ClUpload,
     CarboncopyProp,
     RejectToProp,
-    ShowAppOpi,
     ShowOtherAtt,
     ShowOtherAttNew,
     ExpandablePane
@@ -485,7 +473,6 @@ export default {
       rejectToV: false,
       approvalToV: false,
       showApprovalTo: false,
-      opiAndUser: false,
       addTaskMode: '0',
       otherAtt: {},
       customizationDtos: {},
@@ -521,6 +508,24 @@ export default {
     }
   },
   computed: {
+    messagePlaceholder() {
+      // 提示与实际按钮保持一致：普通审批只提示驳回，支持作废的审核同时提示作废。
+      const showDiscard = this.authList.includes('byAddTask')
+        ? this.addTaskList.length === 0
+        : this.authList.includes('discard')
+      let opinionTip
+      // 保留流程配置的批准必填规则，避免提示与提交校验不一致。
+      if (showDiscard) {
+        opinionTip = this.requiredC
+          ? $lc('字以内），批准该意见为必填，驳回/作废该意见为必填！')
+          : $lc('字以内），批准该意见为非必填，驳回/作废该意见为必填！')
+      } else {
+        opinionTip = this.requiredC
+          ? $lc('字以内），批准该意见为必填，驳回该意见为必填！')
+          : $lc('字以内），批准该意见为非必填，驳回该意见为必填！')
+      }
+      return `${$lc('请输入审批意见（')}${this.messageMax}${opinionTip}`
+    },
     messageC: {
       get() {
         return this.msgisSync ? this.message : this.messageIn
@@ -551,7 +556,6 @@ export default {
     this.getBtns()
     this.getAddTaskMode()
     this.getShowApprovalTo()
-    this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
     this.getConfiguration()
     this.getIsShowUploadWidget()
@@ -743,24 +747,6 @@ export default {
         this.preAddTask = window._approvalExtend['appOpi.addTaskWay.exist']
       }
     },
-    // 刺探审批意见接口是否存在
-    getHasQueryAppOpiAndUser() {
-      if (this.showBtn && window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] === undefined) {
-        axios
-          .post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, {
-            loading: false,
-            noMsg: true
-          })
-          .then(() => {
-            this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = true
-          })
-          .catch(() => {
-            window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = false
-          })
-      } else {
-        this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist']
-      }
-    },
     // 获取提交参数
     getParam() {
       let { typeCode, taskId, groupNo, isAgentcy, isCheck } = this.$route.query

package/src/i18n.json

@@ -2879,20 +2879,35 @@
     "th": "แนบการอัปโหลด",
     "vi": "Tải lên đính kèm"
   },
+  "请输入审批意见（": {
+    "en": "Please enter approval comments (up to ",
+    "th": "โปรดระบุความคิดเห็นในการอนุมัติ (ไม่เกิน ",
+    "vi": "Vui lòng nhập ý kiến phê duyệt (tối đa "
+  },
+  "字以内），批准该意见为非必填，驳回该意见为必填！": {
+    "en": " characters). Comments are optional for approval and required for rejection!",
+    "th": "ตัวอักษร) ไม่จำเป็นต้องระบุความคิดเห็นเมื่ออนุมัติ แต่จำเป็นเมื่อปฏิเสธ!",
+    "vi": " ký tự). Ý kiến không bắt buộc khi phê duyệt, nhưng bắt buộc khi từ chối!"
+  },
+  "字以内），批准该意见为必填，驳回该意见为必填！": {
+    "en": " characters). Comments are required for both approval and rejection!",
+    "th": "ตัวอักษร) จำเป็นต้องระบุความคิดเห็นทั้งเมื่ออนุมัติและเมื่อปฏิเสธ!",
+    "vi": " ký tự). Ý kiến là bắt buộc khi phê duyệt và khi từ chối!"
+  },
   "请输入操作意见（": {
     "en": "Please input operation comments(",
     "th": "โปรดใส่ความคิดเห็นการดำเนินการ (",
     "vi": "Vui lòng nhập ý kiến về thao tác ("
   },
   "字以内），批准该意见为非必填，驳回/作废该意见为必填！": {
-    "en": "within words),approve this opinion is not required, reject/void this opinion is required!",
-    "th": "ภายในคำ), การอนุมัติความคิดเห็นนี้ไม่จำเป็น, การปฏิเสธ/ยกเลิกความคิดเห็นนี้จำเป็น!",
-    "vi": "trong từ), không yêu cầu phê duyệt ý kiến này, phải yêu cầu từ chối/hủy ý kiến này!"
+    "en": " characters). Comments are optional for approval and required for rejection/voiding!",
+    "th": "ตัวอักษร) ไม่จำเป็นต้องระบุความคิดเห็นเมื่ออนุมัติ แต่จำเป็นเมื่อปฏิเสธ/ยกเลิก!",
+    "vi": " ký tự). Ý kiến không bắt buộc khi phê duyệt, nhưng bắt buộc khi từ chối/hủy!"
   },
   "字以内），批准该意见为必填，驳回/作废该意见为必填！": {
-    "en": "within words), approve this opinion is required, reject/void this opinion is required!",
-    "th": "ภายในคำ), การอนุมัติความคิดเห็นนี้จำเป็น, การปฏิเสธ/ยกเลิกความคิดเห็นนี้จำเป็น!",
-    "vi": "trong từ), phê duyệt ý kiến này là bắt buộc, từ chối/hủy ý kiến này là bắt buộc!"
+    "en": " characters). Comments are required for approval, rejection and voiding!",
+    "th": "ตัวอักษร) จำเป็นต้องระบุความคิดเห็นเมื่ออนุมัติ ปฏิเสธ หรือยกเลิก!",
+    "vi": " ký tự). Ý kiến là bắt buộc khi phê duyệt, từ chối hoặc hủy!"
   },
   "批准至": {
     "en": "Approved to",