Merge branch 'main' of http://123.132.248.154:10000/gitY/TianWangHuiYan

src/views/demo/usertask/DetailModal.vue

@@ -119,7 +119,10 @@
           setModalProps({ confirmLoading: true });
           closeModal();
           emit('success');
+          form.value.remark = null;
           return createMessage.success('创建成功');
+
+
         } else {
           return createMessage.error('创建失败');
         }
@@ -129,6 +132,7 @@
           setModalProps({ confirmLoading: true });
           closeModal();
           emit('success');
+          form.value.remark = null;
           return createMessage.success('编辑成功');
         } else {
           return createMessage.error('编辑失败');
@@ -153,6 +157,7 @@
           if(res){
             closeModal();
             emit('success');
+            form.value.remark = null;
             createMessage.success("操作成功!")
           }else{
             createMessage.error("操作失败!");
@@ -171,6 +176,7 @@ const handleSubmitTask = async ()=>{
     if(res){
       closeModal();
       emit('success');
+      form.value.remark = null;
       createMessage.success("操作成功!")
     }else{
       createMessage.error("操作失败!");

src/views/demo/usertask/dept.data.ts

@@ -39,7 +39,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '任务名称',
     component: 'Input',
     colProps: { span: 8 },
-  },
+  }
 ];
 
 export const formGroupSchema: FormSchema[] = [

src/views/demo/usertask/index.vue

@@ -1,7 +1,13 @@
 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
     <!-- <DeptTree ref="childRef" class="w-1/4 xl:w-1/5" @select="handleSelect" /> -->
-    <BasicTable class="w-4/4 xl:w-5/5" @register="registerTable" :searchInfo="searchInfo">
+    <BasicTable class="w-4/4 xl:w-5/5" @register="registerTable" :searchInfo="searchInfo" >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'tubanNum'">
+          {{ record.tubanNum  }} ({{ record.beginNum }} - {{ record.endNum }})
+        </template>
+      </template>
+
       <template #toolbar>
         <!-- <a-button type="primary" @click="handleCreate"> 新增任务 </a-button> -->
         <!-- <a-button type="primary" @click="handlePoGroup"> 任务关联职级组 </a-button> -->
@@ -41,7 +47,7 @@
   const [registerModal, { openModal: openDeptModal }] = useModal();
   const [registerDetailModal,{openModal:openDetailModal}] = useModal();
   const [registerPosGroupModal, { openModal: openPosGroupModal }] = useModal();
-  const searchInfo = reactive<Recordable>({});
+  const searchInfo = reactive<Recordable>({userId:localStorage.getItem("userid")});
 
   const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
     title: '任务列表',
@@ -53,10 +59,9 @@
       schemas: searchFormSchema,
     },
     rowSelection: {
-      //多选框
-      // type: 'checkbox',
       type: 'radio',
     },
+
     useSearchForm: true,
     showIndexColumn: false,
     showTableSetting: true,
@@ -89,12 +94,7 @@
     if (rows.length == 0) {
       return createMessage.warn('请选择一个任务进行编辑');
     }
-    // const record = rows[0];
-
     const record =await getPersonTaskDetail({id:rows[0].id});
-
-    console.log("record",record);
-
     openDeptModal(true, {
         record,
         isUpdate: true,
@@ -108,9 +108,6 @@
       return createMessage.warn('请选择一个任务进行查看');
     }
 
-
-    // const record = rows[0];
-
     const record = await getPersonTaskDetail({taskGroupId:rows[0].taskGroupId});
     
     openDetailModal(true, {