@ebiz/designer-components 0.1.122 → 0.1.124

package/package.json

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

package/src/components/EbizApprovalForm.vue

@@ -48,7 +48,18 @@
     <!-- 转审人员选择 -->
     <t-dialog header="选择转审人" :visible="showTransferDialog" :confirm-btn="{ content: '确定', theme: 'primary' }"
       :cancel-btn="{ content: '取消', theme: 'default' }" @confirm="confirmTransfer" @close="showTransferDialog = false">
-      <EbizEmployeeSelector v-model="transferApprover" :single="true"></EbizEmployeeSelector>
+      <ebiz-approval
+          workFlowKey=""
+          :required="true"
+          type="all"
+          limitedType="role"
+          :showRootOrg="true"
+          :childDeptEnable="false"
+          :showCC="false"
+          :canEdit="true"
+          v-model:approverList="transferApprover"
+          :limitedMap="[]"
+      ></ebiz-approval>
     </t-dialog>
 
     <!-- 转接待人选择 -->
@@ -58,19 +69,31 @@
     </t-dialog>
 
     <!-- 加签位置选择 -->
-    <t-dialog header="选择加签位置" :visible="showPositionDialog" :confirm-btn="{ content: '确定', theme: 'primary' }"
-      :cancel-btn="{ content: '取消', theme: 'default' }" @confirm="confirmPosition" @close="showPositionDialog = false">
-      <t-radio-group v-model="addSignPosition">
+    <t-dialog header="加签" :visible="showPositionDialog" :confirm-btn="{ content: '确定', theme: 'primary' }"
+      :cancel-btn="{ content: '取消', theme: 'default' }" @confirm="confirmAddSign" @close="showPositionDialog = false">
+      <t-radio-group v-model="addSignPosition" style="margin-bottom: 10px;">
         <t-radio value="before">往前加签</t-radio>
         <t-radio value="after">往后加签</t-radio>
       </t-radio-group>
+      <ebiz-approval
+          workFlowKey=""
+          :required="true"
+          type="all"
+          limitedType="role"
+          :showRootOrg="true"
+          :childDeptEnable="false"
+          :showCC="false"
+          :canEdit="true"
+          v-model:approverList="selectedAddSignUser"
+          :limitedMap="[]"
+      ></ebiz-approval>
     </t-dialog>
 
     <!-- 加签人员选择 -->
-    <t-dialog header="选择加签人员" :visible="showAddSignDialog" :confirm-btn="{ content: '确定', theme: 'primary' }"
+    <!-- <t-dialog header="选择加签人员" :visible="showAddSignDialog" :confirm-btn="{ content: '确定', theme: 'primary' }"
       :cancel-btn="{ content: '取消', theme: 'default' }" @confirm="confirmAddSign" @close="showAddSignDialog = false">
       <EbizEmployeeSelector v-model="selectedAddSignUser" :single="true"></EbizEmployeeSelector>
-    </t-dialog>
+    </t-dialog> -->
 
     <!-- 退回确认 -->
     <t-dialog header="退回确认" :visible="showReturnDialog" :confirm-btn="{ content: '确定退回', theme: 'danger' }"
@@ -149,7 +172,7 @@ const selectedCCList = ref([])
 
 // 转审相关
 const showTransferDialog = ref(false)
-const transferApprover = ref(null)
+const transferApprover = ref([])
 
 // 转接待人相关
 const showReceiverDialog = ref(false)
@@ -159,7 +182,7 @@ const selectedReceiver = ref(null)
 const showPositionDialog = ref(false)
 const showAddSignDialog = ref(false)
 const addSignPosition = ref('after')
-const selectedAddSignUser = ref(null)
+const selectedAddSignUser = ref([])
 
 // 退回相关
 const showReturnDialog = ref(false)
@@ -353,15 +376,19 @@ const handleReject = async () => {
 
 // 确认转审
 const confirmTransfer = async () => {
-  if (!transferApprover.value) {
+  if (transferApprover.value.length === 0) {
     MessagePlugin.warning('请选择转审人')
     return
   }
 
+  const toUserId = Array.isArray(transferApprover.value)
+    ? transferApprover.value[0]
+    : transferApprover.value
+
   try {
     const res = await request(
       {
-        toUserId: String(transferApprover.value),
+        toUserId: String(toUserId),
         comment: comments.value,
         attachments: attachments.value
       },
@@ -372,7 +399,7 @@ const confirmTransfer = async () => {
     if (res.success) {
       MessagePlugin.success(res.message || '转审成功')
       showTransferDialog.value = false
-      transferApprover.value = null
+      transferApprover.value = []
       emit('refresh')
     }
   } catch (err) {
@@ -425,7 +452,7 @@ const confirmPosition = () => {
 
 // 确认加签
 const confirmAddSign = async () => {
-  if (!selectedAddSignUser.value) {
+  if (selectedAddSignUser.value.length === 0) {
     MessagePlugin.warning('请选择加签人员')
     return
   }
@@ -433,7 +460,7 @@ const confirmAddSign = async () => {
   try {
     const res = await request(
       {
-        userIds: [selectedAddSignUser.value],
+        userIds: selectedAddSignUser.value,
         position: addSignPosition.value,
         comment: comments.value,
         attachments: attachments.value
@@ -445,7 +472,7 @@ const confirmAddSign = async () => {
     MessagePlugin.success('加签成功')
 
     showAddSignDialog.value = false
-    selectedAddSignUser.value = null
+    selectedAddSignUser.value = []
 
     /*     if (addSignPosition.value === 'before') {
           emit('refresh')