gemercheung 1 год назад
Родитель
Сommit
343f7f71a0

+ 2 - 2
src/api/scene/model.ts

@@ -91,8 +91,8 @@ export interface collaborateParam {
   userName: string;
 }
 export interface unCollaborateParam {
-  numList: string[];
-  id: string;
+  detailIds: string[];
+  contractorId: string;
 }
 export interface collaborateDetailParam {
   id: string;

+ 2 - 1
src/views/corporation/contractorList.vue

@@ -30,7 +30,7 @@
         />
       </template>
     </BasicTable>
-    <unAssistantModal @register="registerUnAssistantModal" />
+    <unAssistantModal @register="registerUnAssistantModal" @submit="reload" />
   </div>
 </template>
 <script lang="ts">
@@ -216,6 +216,7 @@
         handleCreate,
         handleUnAssistantModal,
         registerUnAssistantModal,
+        reload,
       };
     },
   });

+ 19 - 5
src/views/corporation/unAssistantModal.vue

@@ -27,7 +27,11 @@
             :actions="[
               {
                 label: t('routes.scenes.unAssistant'),
-                onClick: handleUnAssistant.bind(null, record),
+                // onClick: handleUnAssistant.bind(null, record),
+                popConfirm: {
+                  title: t('routes.scenes.unAssistantConfirm'),
+                  confirm: handleUnAssistant.bind(null, record),
+                },
               },
             ]"
           />
@@ -56,6 +60,12 @@
       defaultHidden: true,
     },
     {
+      title: t('routes.scenes.sceneName'),
+      dataIndex: 'title',
+      ellipsis: false,
+      width: 120,
+    },
+    {
       title: t('routes.scenes.num'),
       dataIndex: 'num',
       ellipsis: false,
@@ -102,18 +112,22 @@
         reload();
       }
       const handleSubmit = async () => {
+        clearSelectedRowKeys();
         emit('submit');
+        closeModal();
       };
 
       function handleClose() {
         // resetFields();
         clearSelectedRowKeys();
+        emit('submit');
+        closeModal();
       }
       const handleUnAssistant = async (record: Recordable) => {
         console.log('record', record);
         await unCollaborateApi({
-          id: record.id,
-          numList: [record.num],
+          contractorId: searchInfo.value.id,
+          detailIds: [record.id],
         });
         createMessage.success(t('common.optSuccess'));
         clearSelectedRowKeys();
@@ -129,8 +143,8 @@
             onOk: async () => {
               try {
                 await unCollaborateApi({
-                  id: searchInfo.value.id,
-                  numList: keys,
+                  contractorId: searchInfo.value.id,
+                  detailIds: keys,
                 });
                 createMessage.success(t('common.optSuccess'));
                 clearSelectedRowKeys();