合并

src/api/formalities/formalitiesAreConsolidated/index.ts

@@ -1,6 +1,10 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { FormalitiesAreConsolidatedVO, FormalitiesAreConsolidatedForm, FormalitiesAreConsolidatedQuery } from '@/api/formalities/formalitiesAreConsolidated/types';
+import {
+  FormalitiesAreConsolidatedVO,
+  FormalitiesAreConsolidatedForm,
+  FormalitiesAreConsolidatedQuery
+} from '@/api/formalities/formalitiesAreConsolidated/types';
 
 /**
  * 查询合规性手续合账列表
@@ -61,3 +65,15 @@ export const delFormalitiesAreConsolidated = (id: string | number | Array<string
     method: 'delete'
   });
 };
+
+/**
+ * 编辑状态
+ * @param data
+ */
+export const editStatus = (data: FormalitiesAreConsolidatedForm) => {
+  return request({
+    url: '/formalities/formalitiesAreConsolidated/editStatus',
+    method: 'put',
+    data: data
+  });
+};

src/components/FileUpload/index.vue

@@ -20,6 +20,7 @@
       :auto-upload="autoUpload"
       :on-change="handleChange"
       :on-remove="handleRemove"
+      :method="method"
     >
       <slot>
         <div>
@@ -120,6 +121,9 @@ const props = defineProps({
     type: Function as PropType<(files: any[], res: any) => void>,
     default: undefined
   },
+  // 上传方法
+  method: propTypes.string.def('post'),
+
   // 失败回调
   onUploadError: {
     type: Function as PropType<(err: any, file: any, fileList: any) => void>,

src/store/modules/notice.ts

@@ -15,6 +15,7 @@ export const useNoticeStore = defineStore('notice', () => {
   });
 
   const addNotice = (notice: NoticeItem) => {
+    console.log('🚀 ~ addNotice ~ notice:', notice);
     state.notices.push(notice);
   };
 

src/utils/websocket.ts

@@ -32,6 +32,8 @@ export const initWebSocket = (url: any) => {
       console.log('websocket已经断开');
     },
     onMessage: (_, e) => {
+      console.log('websocket收到消息', e);
+
       if (e.data.indexOf('ping') > 0) {
         return;
       }

src/views/formalities/formalitiesAreConsolidated/index.vue

@@ -3,13 +3,13 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="手续办理清单模板父id" prop="formalitiesPid">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <!-- <el-form-item label="手续办理清单模板父id" prop="formalitiesPid">
               <el-input v-model="queryParams.formalitiesPid" placeholder="请输入手续办理清单模板父id" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="手续办理清单模板id" prop="formalitiesId">
               <el-input v-model="queryParams.formalitiesId" placeholder="请输入手续办理清单模板id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="计划开始时间" prop="planTheStartTime">
               <el-date-picker
                 clearable
@@ -46,11 +46,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['formalities:formalitiesAreConsolidated:add']"
-              >新增</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button
               type="success"
@@ -62,30 +57,14 @@
               >修改</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['formalities:formalitiesAreConsolidated:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['formalities:formalitiesAreConsolidated:export']"
-              >导出</el-button
-            >
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="formalitiesAreConsolidatedList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="手续办理清单模板父id" align="center" prop="formalitiesPid" />
-        <el-table-column label="手续办理清单模板id" align="center" prop="formalitiesId" />
+        <el-table-column label="手续办理清单模板父级" align="center" prop="formalitiesPname" />
+        <el-table-column label="手续办理清单模板" align="center" prop="formalitiesName" />
         <el-table-column label="计划开始时间" align="center" prop="planTheStartTime" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.planTheStartTime, '{y}-{m}-{d}') }}</span>
@@ -98,28 +77,26 @@
           </template>
         </el-table-column>
         <el-table-column label="办理状态" align="center" prop="processingStatus" />
-        <el-table-column label="手续材料" align="center" prop="formalitiesUrl" />
+        <el-table-column label="手续材料" align="center" prop="formalitiesUrl" width="180">
+          <template #default="scope">
+            <el-link type="primary" :underline="false" :href="scope.row.formalitiesUrl" target="_blank" v-if="scope.row.formalitiesUrl">查看</el-link>
+          </template>
+        </el-table-column>
+
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-              ></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:remove']"
-              ></el-button>
-            </el-tooltip>
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
+              >修改</el-button
+            >
+            <el-button
+              link
+              type="primary"
+              icon="EditPen"
+              @click="handleUpdateStatus(scope.row)"
+              v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
+              >修改状态</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -129,41 +106,28 @@
     <!-- 添加或修改合规性手续合账对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="formalitiesAreConsolidatedFormRef" :model="form" :rules="rules" label-width="160px">
-        <el-form-item label="手续办理清单模板父id" prop="formalitiesPid">
-          <el-input v-model="form.formalitiesPid" placeholder="请输入手续办理清单模板父id" />
-        </el-form-item>
-        <el-form-item label="手续办理清单模板id" prop="formalitiesId">
-          <el-input v-model="form.formalitiesId" placeholder="请输入手续办理清单模板id" />
-        </el-form-item>
         <el-form-item label="计划开始时间" prop="planTheStartTime">
-          <el-date-picker
-            clearable
-            v-model="form.planTheStartTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择计划开始时间"
-          >
+          <el-date-picker clearable v-model="form.planTheStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="负责人" prop="head">
           <el-input v-model="form.head" placeholder="请输入负责人" />
         </el-form-item>
-        <el-form-item label="实际完成时间" prop="actualCompletionTime">
-          <el-date-picker
-            clearable
-            v-model="form.actualCompletionTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择实际完成时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="手续材料" prop="formalitiesUrl">
-          <el-input v-model="form.formalitiesUrl" placeholder="请输入手续材料" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
+        <el-form-item label="上传文件" prop="processingStatus">
+          <file-upload
+            v-model="file"
+            ref="uploadRef"
+            uploadUrl="/formalities/formalitiesAreConsolidated/edit"
+            :data="{ ...form }"
+            :auto-upload="false"
+            showFileList
+            method="put"
+            :onUploadSuccess="handleUploadSuccess"
+          />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -181,7 +145,8 @@ import {
   getFormalitiesAreConsolidated,
   delFormalitiesAreConsolidated,
   addFormalitiesAreConsolidated,
-  updateFormalitiesAreConsolidated
+  updateFormalitiesAreConsolidated,
+  editStatus
 } from '@/api/formalities/formalitiesAreConsolidated';
 import {
   FormalitiesAreConsolidatedVO,
@@ -189,6 +154,7 @@ import {
   FormalitiesAreConsolidatedForm
 } from '@/api/formalities/formalitiesAreConsolidated/types';
 import { useUserStoreHook } from '@/store/modules/user';
+import { json } from 'stream/consumers';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // 获取用户 store
@@ -203,7 +169,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const uploadRef = ref();
 const queryFormRef = ref<ElFormInstance>();
 const formalitiesAreConsolidatedFormRef = ref<ElFormInstance>();
 
@@ -211,18 +177,12 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-
+const file = ref(null);
 const initFormData: FormalitiesAreConsolidatedForm = {
   id: undefined,
   projectId: currentProject.value?.id,
-  formalitiesPid: undefined,
-  formalitiesId: undefined,
   planTheStartTime: undefined,
-  head: undefined,
-  actualCompletionTime: undefined,
-  processingStatus: undefined,
-  formalitiesUrl: undefined,
-  remark: undefined
+  head: undefined
 };
 const data = reactive<PageData<FormalitiesAreConsolidatedForm, FormalitiesAreConsolidatedQuery>>({
   form: { ...initFormData },
@@ -303,23 +263,36 @@ const handleUpdate = async (row?: FormalitiesAreConsolidatedVO) => {
   dialog.title = '修改合规性手续合账';
 };
 
+const handleUpdateStatus = async (row?: FormalitiesAreConsolidatedVO) => {
+  await proxy?.$modal.confirm('是否确认修改状态？').finally(() => (loading.value = false));
+
+  await editStatus({ id: row?.id, projectId: currentProject.value?.id });
+
+  proxy?.$modal.msgSuccess('修改成功');
+  await getList();
+};
+
 /** 提交按钮 */
 const submitForm = () => {
   formalitiesAreConsolidatedFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateFormalitiesAreConsolidated(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addFormalitiesAreConsolidated(form.value).finally(() => (buttonLoading.value = false));
+      for (const key in form.value) {
+        if (form.value[key] === null) {
+          delete form.value[key];
+        }
       }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
+      const res = uploadRef.value.submitUpload();
+      console.log(res);
     }
   });
 };
 
+const handleUploadSuccess = async () => {
+  proxy?.$modal.msgSuccess('上传成功');
+  dialog.visible = false;
+  await getList();
+};
+
 /** 删除按钮操作 */
 const handleDelete = async (row?: FormalitiesAreConsolidatedVO) => {
   const _ids = row?.id || ids.value;
@@ -344,6 +317,11 @@ onMounted(() => {
   getList();
 });
 
+const formData = new FormData();
+let arr = [];
+formData.append('file', JSON.stringify(arr));
+formData.append('bo', JSON.stringify({}));
+
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,

src/views/formalities/listOfFormalities/index.vue

@@ -52,7 +52,7 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="listOfFormalitiesList" @selection-change="handleSelectionChange" row-key="id">
+      <el-table v-loading="loading" :data="listOfFormalitiesList" @selection-change="handleSelectionChange" row-key="id" default-expand-all>
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="名称" prop="name" />
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/materials/appointment/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="p-6 bg-gray-50 pt-50">
-    <div class="appWidth mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+  <div class="p-6 bg-gray-50 h100%">
+    <div class="appWidth mx-auto mt-50 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <!-- 表单标题区域 -->
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>