@ebiz/designer-components 0.1.50 → 0.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/EbizApprovalForm.vue

@@ -76,7 +76,6 @@
     <t-dialog header="退回确认" :visible="showReturnDialog" :confirm-btn="{ content: '确定退回', theme: 'danger' }"
       :cancel-btn="{ content: '取消', theme: 'default' }" @confirm="confirmReturn" @close="showReturnDialog = false">
       <p>确定要退回该审批吗？</p>
-      <t-input v-model="returnReason" placeholder="请输入退回原因" />
     </t-dialog>
   </div>
 </template>
@@ -311,7 +310,19 @@ const handlePass = async () => {
   }
 
   try {
-    await emit('pass', params)
+    //await emit('pass', params)
+
+    //通过审批申请
+    await request(
+      {
+        ...params
+      },
+      {},
+      `/tasks/${params.taskId}/complete`
+    )
+
+    emit('pass')
+
     comments.value = ''
     attachments.value = []
   } catch (err) {
@@ -322,7 +333,17 @@ const handlePass = async () => {
 // 拒绝审批
 const handleReject = async () => {
   try {
-    await emit('reject', comments.value)
+    //await emit('reject', comments.value)
+    await request(
+      {
+        taskId: props.taskId,
+        comment: comments.value,
+        approve: false
+      },
+      {},
+      `/tasks/${props.taskId}/complete`
+    )
+    emit('reject')
     comments.value = ''
     attachments.value = []
   } catch (err) {
@@ -341,7 +362,8 @@ const confirmTransfer = async () => {
     const res = await request(
       {
         toUserId: String(transferApprover.value),
-        rejectReason: '转审'
+        comment: comments.value,
+        attachments: attachments.value
       },
       {},
       `/tasks/${props.taskId}/transfer`
@@ -371,7 +393,9 @@ const confirmReceiver = async () => {
         saveData: {
           id: props.approvalDetail.variables.form.id,
           receiver: String(selectedReceiver.value),
-          taskId: props.taskId
+          taskId: props.taskId,
+          comment: comments.value,
+          attachments: attachments.value
         }
       },
       {
@@ -410,7 +434,9 @@ const confirmAddSign = async () => {
     const res = await request(
       {
         userIds: [selectedAddSignUser.value],
-        position: addSignPosition.value
+        position: addSignPosition.value,
+        comment: comments.value,
+        attachments: attachments.value
       },
       {},
       `/tasks/${props.taskId}/addSign`
@@ -421,9 +447,10 @@ const confirmAddSign = async () => {
     showAddSignDialog.value = false
     selectedAddSignUser.value = null
 
-    if (addSignPosition.value === 'before') {
-      emit('refresh')
-    }
+    /*     if (addSignPosition.value === 'before') {
+          emit('refresh')
+        } */
+    emit('refresh')
   } catch (err) {
     MessagePlugin.error(err.message || '加签失败')
   }
@@ -434,7 +461,8 @@ const confirmReturn = async () => {
   try {
     const res = await request(
       {
-        reason: returnReason.value || '驳回'
+        comment: comments.value,
+        attachments: attachments.value
       },
       {},
       `/tasks/${props.taskId}/return`

package/src/components/EbizEmployeeSelector.vue

@@ -147,7 +147,8 @@
                       </div>
                       <div class="employee-info">
                         <div class="employee-code">{{ item.no }} - </div>
-                        <div class="employee-name">{{ item.name }}</div>
+                        <div class="employee-name">{{ item.name }} <small style="color: #999;">[{{ item.deptName
+                            }}]</small></div>
                       </div>
                     </div>
                   </t-radio>

package/src/components/EbizSApprovalProcess.vue

@@ -71,14 +71,19 @@
                                 </div>
 
                                 <!-- 目标用户信息（转审、加签等操作） -->
-                                <div v-if="approver.targetUser && needShowTargetUser(approver)"
+                                <div v-if="approver.targetUsers && needShowTargetUser(approver)"
                                     class="target-user-info">
                                     <div class="target-label">{{ getTargetUserLabel(approver) }}</div>
-                                    <user-info :userId="approver.targetUser.userId"
-                                        :userInfo="getTargetUserInfo(approver)" avatar-size="small" name-size="small"
-                                        :show-department="false" />
+                                    <div style="display: flex; flex-direction: column; gap: 4px;">
+                                        <div v-for="targetUser in approver.targetUsers" :key="targetUser.userId">
+                                            <user-info :userId="targetUser.userId"
+                                                :userInfo="getTargetUserInfo(targetUser)" avatar-size="small"
+                                                name-size="small" :show-department="false" />
+                                        </div>
+                                    </div>
                                 </div>
 
+
                                 <!-- 评论信息 -->
                                 <div class="approver-comment">
                                     <div v-if="approver.comment">{{ approver.comment }}</div>
@@ -642,10 +647,11 @@ function onAddCcListConfirm(event) {
 
 // 判断是否需要显示目标用户
 const needShowTargetUser = (approver) => {
-    if (!approver.operation || !approver.targetUser) return false
+    if (!approver.operation || !approver.targetUsers) return false
 
-    const operationType = approver.operation.operationType
-    return ['TRANSFER', 'ADD_SIGN', 'RETURN'].includes(operationType)
+    return true;
+    // const operationType = approver.operation.operationType
+    // return ['TRANSFER', 'ADD_SIGN', 'RETURN'].includes(operationType)
 }
 
 // 获取目标用户标签
@@ -666,8 +672,8 @@ const getTargetUserLabel = (approver) => {
 }
 
 // 获取目标用户信息
-const getTargetUserInfo = (approver) => {
-    const targetUser = approver.targetUser
+const getTargetUserInfo = (targetUser) => {
+    // const targetUser = approver.targetUser
     return {
         userId: targetUser.userId,
         name: targetUser.userName,

package/src/components/EbizTree.vue

@@ -1,26 +1,10 @@
 <template>
-  <t-tree
-    ref="treeRef"
-    v-bind="$attrs"
-    :data="data"
-    :value="modelValue"
-    :expanded="expandedModel"
-    :actived="activedModel"
-    :transition="transition"
-    :disable-check="disableCheck"
-    :keys="keys"
-    @change="handleChange"
-    @expand="handleExpand"
-    @active="handleActive"
-    @select="$emit('select', $event)"
-    @drag-start="$emit('drag-start', $event)"
-    @drag-end="$emit('drag-end', $event)"
-    @drag-over="$emit('drag-over', $event)"
-    @drag-leave="$emit('drag-leave', $event)"
-    @drag-drop="$emit('drag-drop', $event)"
-    @click="$emit('click', $event)"
-    @load="$emit('load', $event)"
-  >
+  <t-tree ref="treeRef" v-bind="$attrs" :data="data" :value="modelValue" :actived="activedModel"
+    :transition="transition" :disable-check="disableCheck" checkStrictly :keys="keys" @change="handleChange"
+    @expand="handleExpand" @active="handleActive" @select="$emit('select', $event)"
+    @drag-start="$emit('drag-start', $event)" @drag-end="$emit('drag-end', $event)"
+    @drag-over="$emit('drag-over', $event)" @drag-leave="$emit('drag-leave', $event)"
+    @drag-drop="$emit('drag-drop', $event)" @click="$emit('click', $event)" @load="$emit('load', $event)">
     <template v-if="$slots.default" #default="slotProps">
       <slot :node="slotProps.node"></slot>
     </template>
@@ -44,7 +28,7 @@
 
 <script setup>
 import { Tree as TTree } from 'tdesign-vue-next';
-import { computed ,ref} from 'vue';
+import { computed, ref } from 'vue';
 
 // 定义组件属性
 const props = defineProps({
@@ -53,6 +37,10 @@ const props = defineProps({
     type: Array,
     default: () => []
   },
+  checkStrictly: {
+    type: Boolean,
+    default: false
+  },
   // 展开节点
   expanded: {
     type: Array,
@@ -92,14 +80,14 @@ const props = defineProps({
 const treeRef = ref();
 // 定义组件事件
 const emit = defineEmits([
-  'update:modelValue', 
-  'update:expanded', 
-  'update:actived', 
-  'change', 
-  'expand', 
-  'active', 
-  'select', 
-  'click', 
+  'update:modelValue',
+  'update:expanded',
+  'update:actived',
+  'change',
+  'expand',
+  'active',
+  'select',
+  'click',
   'load',
   'drag-start',
   'drag-end',
@@ -125,6 +113,7 @@ const activedModel = computed({
 
 // 值改变事件
 const handleChange = (val, context) => {
+  console.log('handleChange', val, context);
   emit('update:modelValue', val);
   emit('change', val, context);
 };
@@ -150,4 +139,4 @@ defineExpose({
 .t-tree {
   width: 100%;
 }
-</style> 
+</style>