diff --git a/package.json b/package.json
index 6f04eed..2d0547f 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
     "eslint-define-config": "^1.7.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.4.0",
+    "highlight.js": "^11.11.1",
     "less": "^4.1.3",
     "postcss": "^8.4.39",
     "prettier": "^2.7.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fcf1008..a7c01d7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -186,6 +186,9 @@ importers:
       eslint-plugin-vue:
         specifier: ^9.4.0
         version: 9.33.0(eslint@8.57.1)
+      highlight.js:
+        specifier: ^11.11.1
+        version: 11.11.1
       less:
         specifier: ^4.1.3
         version: 4.4.2
diff --git a/src/api/pwl/pwlProject/index.ts b/src/api/pwl/pwlProject/index.ts
index 9e32a32..0d1a607 100644
--- a/src/api/pwl/pwlProject/index.ts
+++ b/src/api/pwl/pwlProject/index.ts
@@ -104,3 +104,28 @@ export async function getPwlProject(id: number) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+export async function pwlProjectCount() {
+  const res = await request.get('/pwl/pwl-project/');
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+/**
+ * 文章批量导入
+ */
+export async function importPwlProject(file: File) {
+  const formData = new FormData();
+  formData.append('file', file);
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/pwl/pwl-project/import',
+    formData
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/pwl/pwlProject/model/index.ts b/src/api/pwl/pwlProject/model/index.ts
index 44ebbeb..fb8b9af 100644
--- a/src/api/pwl/pwlProject/model/index.ts
+++ b/src/api/pwl/pwlProject/model/index.ts
@@ -105,5 +105,7 @@ export interface PwlProject {
  */
 export interface PwlProjectParam extends PageParam {
   id?: number;
+  type?: string;
+  itemYear?: string;
   keywords?: string;
 }
diff --git a/src/views/pwl/pwlProject/components/pwlProjectEdit.vue b/src/views/pwl/pwlProject/components/pwlProjectEdit.vue
index 8cacd9a..02bd654 100644
--- a/src/views/pwl/pwlProject/components/pwlProjectEdit.vue
+++ b/src/views/pwl/pwlProject/components/pwlProjectEdit.vue
@@ -1,11 +1,11 @@
 <!-- 编辑弹窗 -->
 <template>
   <ele-modal
-    :width="800"
+    :width="1000"
     :visible="visible"
     :maskClosable="false"
     :maxable="maxable"
-    :title="isUpdate ? '编辑卫兰的项目项目系统' : '添加卫兰的项目项目系统'"
+    :title="isUpdate ? '编辑项目' : '添加项目'"
     :body-style="{ paddingBottom: '28px' }"
     @update:visible="updateVisible"
     @ok="save"
@@ -19,9 +19,28 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
-      <a-form-item label="审计单位" name="name">
+      <a-form-item label="项目类型" name="type">
+        <DictSelect
+          dict-code="Type"
+          :width="200"
+          :show-search="true"
+          placeholder="项目类型"
+          v-model:value="form.type"
+          @done="chooseType"
+        />
+      </a-form-item>
+      <a-form-item label="报告时间" name="expirationTime">
         <a-input
           allow-clear
+          style="width: 200px"
+          placeholder="请输入报告时间"
+          v-model:value="form.expirationTime"
+        />
+      </a-form-item>
+      <a-form-item label="被审计单位" name="name">
+        <a-input
+          allow-clear
+          style="width: 400px"
           placeholder="请输入审计单位"
           v-model:value="form.name"
         />
@@ -29,257 +48,209 @@
       <a-form-item label="报告编号" name="code">
         <a-input
           allow-clear
+          style="width: 400px"
           placeholder="请输入报告编号"
           v-model:value="form.code"
         />
       </a-form-item>
-      <a-form-item label="上级id, 0是顶级" name="parentId">
+      <a-divider orientation="left" style="margin-top: 50px">项目信息</a-divider>
+      <a-form-item label="开票单位/汇款人" name="itemName">
         <a-input
           allow-clear
-          placeholder="请输入上级id, 0是顶级"
-          v-model:value="form.parentId"
+          style="width: 400px"
+          placeholder="请输入项目信息-开票单位/汇款人"
+          v-model:value="form.itemName"
         />
       </a-form-item>
-      <a-form-item label="项目类型" name="type">
-        <a-input
+      <a-form-item label="所属年度" name="itemYear">
+        <a-input-number
           allow-clear
-          placeholder="请输入项目类型"
-          v-model:value="form.type"
+          style="width: 200px"
+          placeholder="请输入项目信息-年度"
+          v-model:value="form.itemYear"
         />
       </a-form-item>
-        <a-form-item
-          label="项目图标"
-          name="image">
-          <SelectFile
-            :placeholder="`请选择图片`"
-            :limit="1"
-            :data="images"
-            @done="chooseImage"
-            @del="onDeleteItem"
-          />
-        </a-form-item>
-      <a-form-item label="二维码" name="qrcode">
+      <a-form-item label="类型" name="itemType">
         <a-input
           allow-clear
-          placeholder="请输入二维码"
-          v-model:value="form.qrcode"
+          style="width: 200px"
+          placeholder="请输入类型"
+          v-model:value="form.itemType"
         />
       </a-form-item>
-      <a-form-item label="链接地址" name="url">
+      <a-form-item label="审计意见" name="itemOpinion">
         <a-input
           allow-clear
-          placeholder="请输入链接地址"
-          v-model:value="form.url"
-        />
-      </a-form-item>
-      <a-form-item label="应用截图" name="images">
-        <a-input
-          allow-clear
-          placeholder="请输入应用截图"
-          v-model:value="form.images"
-        />
-      </a-form-item>
-      <a-form-item label="底稿情况" name="files">
-        <a-input
-          allow-clear
-          placeholder="请输入底稿情况"
-          v-model:value="form.files"
-        />
-      </a-form-item>
-      <a-form-item label="应用介绍" name="content">
-        <a-input
-          allow-clear
-          placeholder="请输入应用介绍"
-          v-model:value="form.content"
+          style="width: 200px"
+          placeholder="请输入审计意见"
+          v-model:value="form.itemOpinion"
         />
       </a-form-item>
       <a-form-item label="年末资产总额(万元)" name="totalAssets">
-        <a-input
+        <a-input-number
           allow-clear
+          style="width: 200px"
           placeholder="请输入年末资产总额(万元)"
           v-model:value="form.totalAssets"
         />
       </a-form-item>
       <a-form-item label="合同金额" name="contractPrice">
-        <a-input
+        <a-input-number
           allow-clear
+          style="width: 200px"
           placeholder="请输入合同金额"
           v-model:value="form.contractPrice"
         />
       </a-form-item>
       <a-form-item label="实收金额" name="payPrice">
-        <a-input
+        <a-input-number
           allow-clear
+          style="width: 200px"
           placeholder="请输入实收金额"
           v-model:value="form.payPrice"
         />
       </a-form-item>
-      <a-form-item label="软件定价" name="price">
+      <a-divider orientation="left" style="margin-top: 50px">到账信息</a-divider>
+      <a-form-item label="银行" name="bankName">
         <a-input
           allow-clear
-          placeholder="请输入软件定价"
-          v-model:value="form.price"
-        />
-      </a-form-item>
-      <a-form-item label="是否推荐" name="recommend">
-        <a-input
-          allow-clear
-          placeholder="请输入是否推荐"
-          v-model:value="form.recommend"
-        />
-      </a-form-item>
-      <a-form-item label="到期时间" name="expirationTime">
-        <a-input
-          allow-clear
-          placeholder="请输入到期时间"
-          v-model:value="form.expirationTime"
-        />
-      </a-form-item>
-      <a-form-item label="项目信息-开票单位/汇款人" name="itemName">
-        <a-input
-          allow-clear
-          placeholder="请输入项目信息-开票单位/汇款人"
-          v-model:value="form.itemName"
-        />
-      </a-form-item>
-      <a-form-item label="项目信息-年度" name="itemYear">
-        <a-input
-          allow-clear
-          placeholder="请输入项目信息-年度"
-          v-model:value="form.itemYear"
-        />
-      </a-form-item>
-      <a-form-item label="项目信息-类型" name="itemType">
-        <a-input
-          allow-clear
-          placeholder="请输入项目信息-类型"
-          v-model:value="form.itemType"
-        />
-      </a-form-item>
-      <a-form-item label="项目信息-审计意见" name="itemOpinion">
-        <a-input
-          allow-clear
-          placeholder="请输入项目信息-审计意见"
-          v-model:value="form.itemOpinion"
-        />
-      </a-form-item>
-      <a-form-item label="到账信息-银行名称" name="bankName">
-        <a-input
-          allow-clear
-          placeholder="请输入到账信息-银行名称"
+          style="width: 200px"
+          placeholder="请输入银行名称"
           v-model:value="form.bankName"
         />
       </a-form-item>
-      <a-form-item label="到账日期" name="bankPayTime">
+      <a-form-item label="日期" name="bankPayTime">
         <a-input
           allow-clear
+          style="width: 200px"
           placeholder="请输入到账日期"
           v-model:value="form.bankPayTime"
         />
       </a-form-item>
-      <a-form-item label="到账金额" name="bankPrice">
-        <a-input
+      <a-form-item label="金额" name="bankPrice">
+        <a-input-number
           allow-clear
+          style="width: 200px"
           placeholder="请输入到账金额"
           v-model:value="form.bankPrice"
         />
       </a-form-item>
-      <a-form-item label="发票类型" name="invoiceType">
-        <a-input
-          allow-clear
-          placeholder="请输入发票类型"
-          v-model:value="form.invoiceType"
-        />
-      </a-form-item>
-      <a-form-item label="开票日期" name="invoiceTime">
+      <a-divider orientation="left" style="margin-top: 50px">开票信息</a-divider>
+      <a-form-item label="日期" name="invoiceTime">
         <a-input
           allow-clear
+          style="width: 200px"
           placeholder="请输入开票日期"
           v-model:value="form.invoiceTime"
         />
       </a-form-item>
-      <a-form-item label="开票金额" name="invoicePrice">
-        <a-input
+      <a-form-item label="金额" name="invoicePrice">
+        <a-input-number
           allow-clear
+          style="width: 200px"
           placeholder="请输入开票金额"
           v-model:value="form.invoicePrice"
         />
       </a-form-item>
+      <a-form-item label="类型" name="invoiceType">
+        <DictSelect
+          dict-code="InvoiceType"
+          :width="200"
+          :show-search="true"
+          placeholder="项目类型"
+          v-model:value="form.invoiceType"
+        />
+      </a-form-item>
+      <a-divider orientation="left" style="margin-top: 50px">其他设置</a-divider>
       <a-form-item label="报告份数" name="reportNum">
         <a-input
           allow-clear
+          style="width: 200px"
           placeholder="请输入报告份数"
           v-model:value="form.reportNum"
         />
       </a-form-item>
       <a-form-item label="底稿人员" name="draftUserId">
-        <a-input
-          allow-clear
-          placeholder="请输入底稿人员"
+        <a-select
+          show-search
+          :allow-clear="true"
+          optionFilterProp="label"
           v-model:value="form.draftUserId"
-        />
+          mode="tags"
+          style="width: 100%"
+          placeholder="选择底稿人员"
+          :options="userList"
+          @search="handleSearch"
+          @change="handleDraftUserId"
+        ></a-select>
       </a-form-item>
-      <a-form-item label="底稿人员" name="draftUser">
-        <a-input
-          allow-clear
-          placeholder="请输入底稿人员"
-          v-model:value="form.draftUser"
-        />
-      </a-form-item>
-      <a-form-item label="参与成员" name="userIds">
-        <a-input
-          allow-clear
-          placeholder="请输入参与成员"
+      <a-form-item label="参与成员" name="userIds" extra="配置项目权限->参与成员可见">
+        <a-select
+          show-search
+          :allow-clear="true"
+          optionFilterProp="label"
           v-model:value="form.userIds"
-        />
-      </a-form-item>
-      <a-form-item label="参与成员" name="users">
-        <a-input
-          allow-clear
-          placeholder="请输入参与成员"
-          v-model:value="form.users"
-        />
+          mode="tags"
+          style="width: 100%"
+          placeholder="选择参与成员"
+          :options="userList"
+          @change="handleUsers"
+        ></a-select>
       </a-form-item>
       <a-form-item label="签字注会" name="signUserId">
-        <a-input
-          allow-clear
-          placeholder="请输入签字注会"
+        <a-select
+          show-search
+          :allow-clear="true"
+          optionFilterProp="label"
           v-model:value="form.signUserId"
-        />
-      </a-form-item>
-      <a-form-item label="签字注会" name="signUser">
-        <a-input
-          allow-clear
-          placeholder="请输入签字注会"
-          v-model:value="form.signUser"
-        />
+          mode="tags"
+          style="width: 100%"
+          placeholder="选择参与成员"
+          :options="userList"
+          @change="handleSignUser"
+        ></a-select>
       </a-form-item>
       <a-form-item label="展业人员" name="saleUserId">
-        <a-input
-          allow-clear
-          placeholder="请输入展业人员"
+        <a-select
+          show-search
+          :allow-clear="true"
+          optionFilterProp="label"
           v-model:value="form.saleUserId"
-        />
-      </a-form-item>
-      <a-form-item label="展业人员" name="saleUser">
-        <a-input
-          allow-clear
-          placeholder="请输入展业人员"
-          v-model:value="form.saleUser"
-        />
-      </a-form-item>
-      <a-form-item label="纸质底稿完成情况" name="paper">
-        <a-input
-          allow-clear
-          placeholder="请输入纸质底稿完成情况"
-          v-model:value="form.paper"
-        />
+          mode="tags"
+          style="width: 100%"
+          placeholder="选择参与成员"
+          :options="userList"
+          @change="handleSaleUser"
+        ></a-select>
       </a-form-item>
       <a-form-item label="电子底稿完成情况" name="electron">
-        <a-input
-          allow-clear
-          placeholder="请输入电子底稿完成情况"
-          v-model:value="form.electron"
+        <a-space direction="vertical">
+          <a-radio-group v-model:value="form.electron">
+            <a-radio :value="1">未完成</a-radio>
+            <a-radio :value="0">已完成</a-radio>
+          </a-radio-group>
+        </a-space>
+      </a-form-item>
+      <a-form-item label="纸质底稿完成情况" name="paper">
+        <a-space direction="vertical">
+          <a-radio-group v-model:value="form.paper">
+            <a-radio :value="1">未完成</a-radio>
+            <a-radio :value="0">已完成</a-radio>
+          </a-radio-group>
+        </a-space>
+      </a-form-item>
+      <a-form-item label="报告完成状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="1">未完成</a-radio>
+          <a-radio :value="0">已完成</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
         />
       </a-form-item>
       <a-form-item label="备注" name="comments">
@@ -290,231 +261,374 @@
           v-model:value="form.comments"
         />
       </a-form-item>
-      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
-        <a-input-number
-          :min="0"
-          :max="9999"
-          class="ele-fluid"
-          placeholder="请输入排序号"
-          v-model:value="form.sortNumber"
-        />
-      </a-form-item>
-      <a-form-item label="状态, 0正常, 1冻结" name="status">
-        <a-radio-group v-model:value="form.status">
-          <a-radio :value="0">显示</a-radio>
-          <a-radio :value="1">隐藏</a-radio>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="是否删除, 0否, 1是" name="deleted">
-        <a-input
-          allow-clear
-          placeholder="请输入是否删除, 0否, 1是"
-          v-model:value="form.deleted"
-        />
-      </a-form-item>
-      <a-form-item label="客户ID" name="userId">
-        <a-input
-          allow-clear
-          placeholder="请输入客户ID"
-          v-model:value="form.userId"
-        />
-      </a-form-item>
-      <a-form-item label="修改时间" name="updateTime">
-        <a-input
-          allow-clear
-          placeholder="请输入修改时间"
-          v-model:value="form.updateTime"
-        />
-      </a-form-item>
-      <a-form-item label="知识库ID" name="kbId">
-        <a-input
-          allow-clear
-          placeholder="请输入知识库ID"
-          v-model:value="form.kbId"
-        />
-      </a-form-item>
     </a-form>
   </ele-modal>
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form, message } from 'ant-design-vue';
-  import { assignObject, uuid } from 'ele-admin-pro';
-  import { addPwlProject, updatePwlProject } from '@/api/pwl/pwlProject';
-  import { PwlProject } from '@/api/pwl/pwlProject/model';
-  import { useThemeStore } from '@/store/modules/theme';
-  import { storeToRefs } from 'pinia';
-  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
-  import { FormInstance } from 'ant-design-vue/es/form';
-  import { FileRecord } from '@/api/system/file/model';
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject, uuid} from 'ele-admin-pro';
+import {addPwlProject, updatePwlProject} from '@/api/pwl/pwlProject';
+import {PwlProject} from '@/api/pwl/pwlProject/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+import DictSelect from "@/components/DictSelect/index.vue";
+import {DictData} from "@/api/system/dict-data/model";
+import {pageUsers} from "@/api/system/user";
+import {User} from "@/api/system/user/model";
+import {hasRole} from "@/utils/permission";
 
-  // 是否是修改
-  const isUpdate = ref(false);
-  const useForm = Form.useForm;
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
 
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: PwlProject | null;
-  }>();
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: PwlProject | null;
+}>();
 
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
 
-  // 提交状态
-  const loading = ref(false);
-  // 是否显示最大化切换按钮
-  const maxable = ref(true);
-  // 表格选中数据
-  const formRef = ref<FormInstance | null>(null);
-  const images = ref<ItemType[]>([]);
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+const userList = ref<User[]>([]);
+const draftUser = ref<any[]>([]);
+const users = ref<any[]>([]);
+const signUser = ref<any[]>([]);
+const saleUser = ref<any[]>([]);
+const keywords = ref<string>();
 
-  // 用户信息
-  const form = reactive<PwlProject>({
-    id: undefined,
-    name: undefined,
-    code: undefined,
-    parentId: undefined,
-    type: undefined,
-    image: undefined,
-    qrcode: undefined,
-    url: undefined,
-    images: undefined,
-    files: undefined,
-    content: undefined,
-    totalAssets: undefined,
-    contractPrice: undefined,
-    payPrice: undefined,
-    price: undefined,
-    recommend: undefined,
-    expirationTime: undefined,
-    itemName: undefined,
-    itemYear: undefined,
-    itemType: undefined,
-    itemOpinion: undefined,
-    bankName: undefined,
-    bankPayTime: undefined,
-    bankPrice: undefined,
-    invoiceType: undefined,
-    invoiceTime: undefined,
-    invoicePrice: undefined,
-    reportNum: undefined,
-    draftUserId: undefined,
-    draftUser: undefined,
-    userIds: undefined,
-    users: undefined,
-    signUserId: undefined,
-    signUser: undefined,
-    saleUserId: undefined,
-    saleUser: undefined,
-    paper: undefined,
-    electron: undefined,
-    comments: undefined,
-    sortNumber: undefined,
-    status: undefined,
-    deleted: undefined,
-    userId: undefined,
-    tenantId: undefined,
-    createTime: undefined,
-    updateTime: undefined,
-    kbId: undefined,
-    pwlProjectId: undefined,
-    pwlProjectName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
-  });
+// 用户信息
+const form = reactive<PwlProject>({
+  id: undefined,
+  name: undefined,
+  code: undefined,
+  parentId: undefined,
+  type: undefined,
+  image: undefined,
+  qrcode: undefined,
+  url: undefined,
+  images: undefined,
+  files: undefined,
+  content: undefined,
+  totalAssets: undefined,
+  contractPrice: undefined,
+  payPrice: undefined,
+  price: undefined,
+  recommend: undefined,
+  expirationTime: undefined,
+  itemName: undefined,
+  itemYear: undefined,
+  itemType: undefined,
+  itemOpinion: undefined,
+  bankName: undefined,
+  bankPayTime: undefined,
+  bankPrice: undefined,
+  invoiceType: undefined,
+  invoiceTime: undefined,
+  invoicePrice: undefined,
+  reportNum: undefined,
+  draftUserId: [],
+  draftUser: [],
+  userIds: [],
+  users: [],
+  signUserId: [],
+  signUser: [],
+  saleUserId: [],
+  saleUser: [],
+  comments: undefined,
+  electron: undefined,
+  paper: undefined,
+  status: undefined,
+  deleted: undefined,
+  userId: undefined,
+  tenantId: undefined,
+  createTime: undefined,
+  updateTime: undefined,
+  sortNumber: 100
+});
 
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
 
-  // 表单验证规则
-  const rules = reactive({
-    pwlProjectName: [
-      {
-        required: true,
-        type: 'string',
-        message: '请填写卫兰的项目项目系统名称',
-        trigger: 'blur'
-      }
-    ]
-  });
-
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
-  const { resetFields } = useForm(form, rules);
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
+// 表单验证规则
+const rules = reactive({
+  type: [
+    {
+      required: true,
+      type: 'string',
+      message: '请选择项目类型',
+      trigger: 'change'
     }
-    formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
-        const formData = {
-          ...form
-        };
-        const saveOrUpdate = isUpdate.value ? updatePwlProject : addPwlProject;
-        saveOrUpdate(formData)
-          .then((msg) => {
-            loading.value = false;
-            message.success(msg);
-            updateVisible(false);
-            emit('done');
-          })
-          .catch((e) => {
-            loading.value = false;
-            message.error(e.message);
-          });
-      })
-      .catch(() => {});
-  };
+  ],
+  name: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写项目名称',
+      trigger: 'blur'
+    }
+  ],
+  draftUserId: [
+    {
+      required: true,
+      type: 'array',
+      message: '请选择底稿人员',
+      trigger: 'change'
+    }
+  ],
+  userIds: [
+    {
+      required: true,
+      type: 'array',
+      message: '请选择参与成员',
+      trigger: 'change'
+    }
+  ],
+  saleUserId:[
+    {
+      required: true,
+      type: 'array',
+      message: '请选择展业人员',
+      trigger: 'change'
+    }
+  ],
+  electron: [
+    {
+      required: true,
+      type: 'number',
+      message: '电子底稿是否已完成',
+      trigger: 'change'
+    }
+  ],
+  paper: [
+    {
+      required: true,
+      type: 'number',
+      message: '纸质底稿是否已完成',
+      trigger: 'change'
+    }
+  ],
+  status: [
+    {
+      required: true,
+      type: 'number',
+      message: '请选择项目状态',
+      trigger: 'change'
+    }
+  ]
+});
 
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        images.value = [];
-        if (props.data) {
-          assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
-          isUpdate.value = true;
-        } else {
-          isUpdate.value = false;
-        }
-      } else {
-        resetFields();
+const chooseType = (data: DictData) => {
+  console.log(data);
+  form.type = data.dictDataName;
+}
+// const chooseImage = (data: FileRecord) => {
+//   images.value.push({
+//     uid: data.id,
+//     url: data.path,
+//     status: 'done'
+//   });
+//   form.image = data.path;
+// };
+//
+// const onDeleteItem = (index: number) => {
+//   images.value.splice(index, 1);
+//   form.image = '';
+// };
+
+const handleSearch = (item) => {
+  keywords.value = item
+  fetchUsers();
+}
+
+const handleDraftUserId = (userId: number, item: User[]) => {
+  draftUser.value = [];
+  item.map(d => {
+    draftUser.value.push(d.realName);
+  });
+  console.log(userId)
+}
+
+const handleUsers = (userId: number, item: User[]) => {
+  users.value = [];
+  item.map(d => {
+    users.value.push(d.realName);
+  });
+  console.log(userId)
+}
+const handleSignUser = (userId: number, item: User[]) => {
+  signUser.value = [];
+  item.map(d => {
+    signUser.value.push(d.realName);
+  });
+  console.log(userId)
+}
+const handleSaleUser = (userId: number, item: User[]) => {
+  saleUser.value = [];
+  item.map(d => {
+    saleUser.value.push(d.realName);
+  });
+  console.log(userId)
+}
+const fetchUsers = () => {
+  pageUsers({keywords: keywords.value,limit: 100}).then(res => {
+    userList.value = res?.list.map(d => {
+      d.label = d.realName;
+      d.value = d.userId;
+      return d;
+    }) || [];
+  })
+};
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form,
+        draftUserId: JSON.stringify(form.draftUserId),
+        draftUser: JSON.stringify(Array.from(new Set(draftUser.value))),
+        userIds: JSON.stringify(form.userIds),
+        users: JSON.stringify(Array.from(new Set(users.value))),
+        signUserId: JSON.stringify(form.signUserId),
+        signUser: JSON.stringify(Array.from(new Set(signUser.value))),
+        saleUserId: JSON.stringify(form.saleUserId),
+        saleUser: JSON.stringify(Array.from(new Set(saleUser.value))),
+      };
+      if (!hasRole('superAdmin')) {
+        form.payPrice = undefined;
       }
-    },
-    { immediate: true }
-  );
+      if (!hasRole('admin')) {
+        form.contractPrice = undefined;
+        form.bankName = undefined;
+        form.bankPayTime = undefined;
+        form.bankPrice = undefined;
+        form.invoiceType = undefined;
+        form.invoiceTime = undefined;
+        form.invoicePrice = undefined;
+      }
+      console.log(formData);
+      const saveOrUpdate = isUpdate.value ? updatePwlProject : addPwlProject;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+watch(
+  () => props.visible,
+  (visible) => {
+    fetchUsers();
+    if (visible) {
+      images.value = [];
+      if (props.data) {
+        assignObject(form, props.data);
+        if (props.data.image) {
+          images.value.push({
+            uid: uuid(),
+            url: props.data.image,
+            status: 'done'
+          })
+        }
+        if (props.data.draftUserId) {
+          form.draftUserId = JSON.parse(props.data.draftUserId);
+        }else {
+          form.draftUserId = [];
+        }
+        // 清空所有用户数组，避免数据累积
+        draftUser.value = [];
+        users.value = [];
+        signUser.value = [];
+        saleUser.value = [];
+
+        if (props.data.draftUser) {
+          const arr = JSON.parse(props.data.draftUser) || [];
+          draftUser.value = [...arr]; // 直接赋值，避免push累积
+        }
+
+        if (props.data.userIds) {
+          form.userIds = JSON.parse(props.data.userIds) || [];
+        }else {
+          form.userIds = [];
+        }
+        if (props.data.users) {
+          const arr = JSON.parse(props.data.users) || [];
+          users.value = [...arr]; // 直接赋值，避免push累积
+        }
+
+        if (props.data.signUserId) {
+          form.signUserId = JSON.parse(props.data.signUserId) || [];
+        }else {
+          form.signUserId = [];
+        }
+        if (props.data.signUser) {
+          const arr = JSON.parse(props.data.signUser) || [];
+          signUser.value = [...arr]; // 直接赋值，避免push累积
+        }
+
+        if (props.data.saleUserId) {
+          form.saleUserId = JSON.parse(props.data.saleUserId) || [];
+        }else {
+          form.saleUserId = [];
+        }
+        if (props.data.saleUser) {
+          const arr = JSON.parse(props.data.saleUser) || [];
+          saleUser.value = [...arr]; // 直接赋值，避免push累积
+        }
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+        // 新增时也要清空用户数组
+        draftUser.value = [];
+        users.value = [];
+        signUser.value = [];
+        saleUser.value = [];
+      }
+    } else {
+      resetFields();
+      // 弹窗关闭时清空所有用户数组
+      draftUser.value = [];
+      users.value = [];
+      signUser.value = [];
+      saleUser.value = [];
+    }
+  },
+  {immediate: true}
+);
 </script>
diff --git a/src/views/pwl/pwlProject/components/search.vue b/src/views/pwl/pwlProject/components/search.vue
index 82fea9d..a309315 100644
--- a/src/views/pwl/pwlProject/components/search.vue
+++ b/src/views/pwl/pwlProject/components/search.vue
@@ -3,40 +3,229 @@
   <a-space :size="10" style="flex-wrap: wrap">
     <a-button type="primary" class="ele-btn-icon" @click="add">
       <template #icon>
-        <PlusOutlined />
+        <PlusOutlined/>
       </template>
       <span>添加</span>
     </a-button>
+    <a-button
+      danger
+      v-if="hasRole('superAdmin')"
+      type="primary"
+      class="ele-btn-icon"
+      :disabled="selection?.length === 0"
+      @click="removeBatch"
+    >
+      <template #icon>
+        <DeleteOutlined/>
+      </template>
+      <span>批量删除</span>
+    </a-button>
+    <DictSelect
+      dict-code="Type"
+      :width="200"
+      :show-search="true"
+      placeholder="项目类型"
+      v-model:value="where.type"
+      @done="chooseType"
+    />
+    <a-date-picker v-model:value="where.itemYear" value-format="YYYY" picker="year" @change="onYear" />
+    <a-input-search
+      allow-clear
+      placeholder="请输入关键词"
+      v-model:value="where.keywords"
+      @pressEnter="search"
+      @search="search"
+    />
+    <a-button @click="reset">重置</a-button>
+    <a-button type="text" v-if="hasRole('superAdmin')" @click="handleExport">导出xls</a-button>
+    <a-button type="text" v-if="hasRole('superAdmin')" @click="openImport">导入xls</a-button>
   </a-space>
+
+  <!-- 导入弹窗 -->
+  <Import v-model:visible="showImport" @done="search"/>
 </template>
 
 <script lang="ts" setup>
-  import { PlusOutlined } from '@ant-design/icons-vue';
-  import type { GradeParam } from '@/api/user/grade/model';
-  import { watch } from 'vue';
+import {DeleteOutlined, PlusOutlined} from '@ant-design/icons-vue';
+import type {GradeParam} from '@/api/user/grade/model';
+import {watch, ref} from 'vue';
+import {hasRole} from "@/utils/permission";
+import dayjs from 'dayjs';
+import {message} from 'ant-design-vue';
+import {utils, writeFile} from 'xlsx';
+import {PwlProject, PwlProjectParam} from "@/api/pwl/pwlProject/model";
+import useSearch from "@/utils/use-search";
+import {listPwlProject} from "@/api/pwl/pwlProject";
+import Import from "./Import.vue";
+import DictSelect from "@/components/DictSelect/index.vue";
 
-  const props = withDefaults(
-    defineProps<{
-      // 选中的角色
-      selection?: [];
-    }>(),
-    {}
-  );
+const props = withDefaults(
+  defineProps<{
+    // 选中的角色
+    selection?: [];
+  }>(),
+  {}
+);
 
-  const emit = defineEmits<{
-    (e: 'search', where?: GradeParam): void;
-    (e: 'add'): void;
-    (e: 'remove'): void;
-    (e: 'batchMove'): void;
-  }>();
+const emit = defineEmits<{
+  (e: 'search', where?: GradeParam): void;
+  (e: 'add'): void;
+  (e: 'remove'): void;
+  (e: 'batchMove'): void;
+}>();
 
-  // 新增
-  const add = () => {
-    emit('add');
-  };
+// 新增
+const add = () => {
+  emit('add');
+};
+// 日期范围选择
+const dateRange = ref<[string, string]>(['', '']);
+const loading = ref(false);
+const projectList = ref<PwlProject[]>([]);
+const xlsFileName = ref<string>();
+// 是否显示用户导入弹窗
+const showImport = ref(false);
+// 表单数据
+const {where,resetFields} = useSearch<PwlProjectParam>({
+  id: undefined,
+  type: undefined,
+  itemYear: undefined,
+  keywords: undefined
+});
 
-  watch(
-    () => props.selection,
-    () => {}
-  );
+/* 打开编辑弹窗 */
+const openImport = () => {
+  showImport.value = true;
+};
+
+const chooseType = (e) => {
+  console.log(e,'yyyy')
+  where.type = e.label;
+  search();
+}
+
+// 批量删除
+const removeBatch = () => {
+  emit('remove');
+};
+
+const onYear = (date: any, dateString: string) => {
+  where.itemYear = dateString;
+  search();
+};
+
+/* 搜索 */
+const search = () => {
+  const [d1, d2] = dateRange.value ?? [];
+  emit('search', {
+    ...where,
+    createTimeStart: d1 ? d1 + ' 00:00:00' : '',
+    createTimeEnd: d2 ? d2 + ' 23:59:59' : ''
+  });
+};
+
+/*  重置 */
+const reset = () => {
+  resetFields();
+  search();
+};
+
+// 导出
+const handleExport = async () => {
+  loading.value = true;
+  const array: (string | number)[][] = [
+    [
+      '报告时间',
+      '审计单位',
+      '报告编号',
+      '项目信息-开票单位/汇款人',
+      '项目信息-所属年度',
+      '项目信息-类型',
+      '项目信息-审计意见',
+      '年末资产总额(万元)',
+      '合同金额',
+      '实收金额',
+      '到账信息-银行',
+      '到账信息-日期',
+      '到账信息-金额',
+      '开票信息-日期',
+      '开票信息-金额',
+      '开票信息-发票类型',
+      '报告份数',
+      '底稿人员',
+      '参与人员',
+      '签字注会',
+      '展业人员',
+      '底稿情况'
+    ]
+  ];
+
+  // 按搜索结果导出
+  where.sceneType = 'Content';
+  await listPwlProject(where)
+    .then((list) => {
+      projectList.value = list;
+      list?.forEach((d: PwlProject) => {
+        array.push([
+          `${d.expirationTime || ''}`,
+          `${d.name || ''}`,
+          `${d.code || ''}`,
+          `${d.itemName || ''}`,
+          `${d.itemYear || ''}`,
+          `${d.itemType || ''}`,
+          `${d.itemOpinion || ''}`,
+          `${d.totalAssets || ''}`,
+          // `${d.comments || ''}`,
+          `${d.contractPrice || ''}`,
+          `${d.payPrice || ''}`,
+          `${d.bankName || ''}`,
+          `${d.bankPayTime || ''}`,
+          `${d.bankPrice || ''}`,
+          `${d.invoiceTime || ''}`,
+          `${d.invoicePrice || ''}`,
+          `${d.invoiceType || ''}`,
+          `${d.reportNum || ''}`,
+          `${d.draftUser ? JSON.parse(d.draftUser).join(',') : ''}`,
+          `${d.users ? JSON.parse(d.users).join(',') : ''}`,
+          `${d.signUser ? JSON.parse(d.signUser).join(',') : ''}`,
+          `${d.saleUser ? JSON.parse(d.saleUser).join(',') : ''}`,
+          `${d.files || ''}`,
+        ]);
+      });
+      const sheetName = `导出项目列表${dayjs(new Date()).format('YYYYMMDD')}`;
+      const workbook = {
+        SheetNames: [sheetName],
+        Sheets: {}
+      };
+      const sheet = utils.aoa_to_sheet(array);
+      workbook.Sheets[sheetName] = sheet;
+      // 设置列宽
+      sheet['!cols'] = [
+
+      ];
+      message.loading('正在导出...');
+      setTimeout(() => {
+        writeFile(
+          workbook,
+          `${
+            where.createTimeEnd ? xlsFileName.value + '_' : ''
+          }${sheetName}.xlsx`
+        );
+        loading.value = false;
+      }, 1000);
+    })
+    .catch((msg) => {
+      message.error(msg);
+      loading.value = false;
+    })
+    .finally(() => {
+    });
+
+};
+
+watch(
+  () => props.selection,
+  () => {
+  }
+);
 </script>
diff --git a/src/views/pwl/pwlProject/index.vue b/src/views/pwl/pwlProject/index.vue
index ebe372e..cb612ab 100644
--- a/src/views/pwl/pwlProject/index.vue
+++ b/src/views/pwl/pwlProject/index.vue
@@ -1,479 +1,457 @@
 <template>
-  <div class="page">
-    <div class="ele-body">
-      <a-card :bordered="false" :body-style="{ padding: '16px' }">
-        <ele-pro-table
-          ref="tableRef"
-          row-key="pwlProjectId"
-          :columns="columns"
-          :datasource="datasource"
-          :customRow="customRow"
-          tool-class="ele-toolbar-form"
-          class="sys-org-table"
-        >
-          <template #toolbar>
-            <search
-              @search="reload"
-              :selection="selection"
-              @add="openEdit"
-              @remove="removeBatch"
-              @batchMove="openMove"
-            />
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+    <template #extra>
+      <Extra/>
+    </template>
+    <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <ele-pro-table
+        ref="tableRef"
+        row-key="id"
+        :columns="columns"
+        :datasource="datasource"
+        :customRow="customRow"
+        :scroll="{ x: 4000 }"
+        tool-class="ele-toolbar-form"
+        class="sys-org-table"
+        bordered
+      >
+        <template #toolbar>
+          <search
+            @search="reload"
+            :selection="selection"
+            @add="openEdit"
+            @remove="removeBatch"
+            @batchMove="openMove"
+          />
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'image'">
+            <a-image v-if="record.image" :src="record.image" :width="50"/>
           </template>
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'image'">
-              <a-image :src="record.image" :width="50" />
-            </template>
-            <template v-if="column.key === 'status'">
-              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
-              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
-            </template>
-            <template v-if="column.key === 'action'">
+          <template v-if="column.key === 'status'">
+            <a-tag v-if="record.status === 0" color="green">已完成</a-tag>
+            <a-tag v-if="record.status === 1" color="red">未完成</a-tag>
+          </template>
+          <template v-if="column.key === 'draftUser'">
+            <a-space direction="vertical" v-if="record.draftUser">
+              <a-tag v-for="(item,index) in JSON.parse(record.draftUser)" :key="index">{{ item }}</a-tag>
+            </a-space>
+          </template>
+          <template v-if="column.key === 'users'">
+            <a-space direction="vertical" v-if="record.users">
+              <a-tag v-for="(item,index) in JSON.parse(record.users)" :key="index">{{ item }}</a-tag>
+            </a-space>
+          </template>
+          <template v-if="column.key === 'signUser'">
+            <a-space direction="vertical" v-if="record.signUser">
+              <a-tag v-for="(item,index) in JSON.parse(record.signUser)" :key="index">{{ item }}</a-tag>
+            </a-space>
+          </template>
+          <template v-if="column.key === 'saleUser'">
+            <a-space direction="vertical" v-if="record.saleUser">
+              <a-tag v-for="(item,index) in JSON.parse(record.saleUser)" :key="index">{{ item }}</a-tag>
+            </a-space>
+          </template>
+          <template v-if="column.key === 'electron'">
+            <span>电子：</span>
+            <a-tag v-if="record.electron === 0" color="green">已完成</a-tag>
+            <a-tag v-else color="red">未完成</a-tag>
+            <span>纸质：</span>
+            <a-tag v-if="record.paper === 0" color="green">已完成</a-tag>
+            <a-tag v-else color="red">未完成</a-tag>
+          </template>
+          <template v-if="column.key === 'createTime'">
+            <a-tooltip :title="`创建于：${record.createTime}`" class="flex flex-col">
               <a-space>
-                <a @click="openEdit(record)">修改</a>
-                <a-divider type="vertical" />
-                <a-popconfirm
-                  title="确定要删除此记录吗？"
-                  @confirm="remove(record)"
-                >
-                  <a class="ele-text-danger">删除</a>
-                </a-popconfirm>
+                <span>{{ record.createTime }}</span>
+                <a-avatar :src="record.avatar" size="small" />
               </a-space>
-            </template>
+            </a-tooltip>
           </template>
-        </ele-pro-table>
-      </a-card>
+          <template v-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(record)">修改</a>
+              <a-divider type="vertical"/>
+              <a-popconfirm
+                title="确定要删除此记录吗？"
+                @confirm="remove(record)"
+              >
+                <a class="ele-text-danger">删除</a>
+              </a-popconfirm>
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
 
-      <!-- 编辑弹窗 -->
-      <PwlProjectEdit v-model:visible="showEdit" :data="current" @done="reload" />
-    </div>
-  </div>
+    <!-- 编辑弹窗 -->
+    <PwlProjectEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+  </a-page-header>
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro';
-  import { toDateString } from 'ele-admin-pro';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from './components/search.vue';
-  import PwlProjectEdit from './components/pwlProjectEdit.vue';
-  import { pagePwlProject, removePwlProject, removeBatchPwlProject } from '@/api/pwl/pwlProject';
-  import type { PwlProject, PwlProjectParam } from '@/api/pwl/pwlProject/model';
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import PwlProjectEdit from './components/pwlProjectEdit.vue';
+import {pagePwlProject, removePwlProject, removeBatchPwlProject} from '@/api/pwl/pwlProject';
+import type {PwlProject, PwlProjectParam} from '@/api/pwl/pwlProject/model';
+import {getPageTitle} from "@/utils/common";
+import Extra from "./components/extra.vue";
 
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
-  // 表格选中数据
-  const selection = ref<PwlProject[]>([]);
-  // 当前编辑数据
-  const current = ref<PwlProject | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示批量移动弹窗
-  const showMove = ref(false);
-  // 加载状态
-  const loading = ref(true);
+// 表格选中数据
+const selection = ref<PwlProject[]>([]);
+// 当前编辑数据
+const current = ref<PwlProject | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// const draftUser = ref<string[]>([]);
+// const users = ref<string[]>([]);
+// const signUser = ref<string[]>([]);
+// const saleUser = ref<string[]>([]);
+// 加载状态
+const loading = ref(true);
 
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders
+                                        }) => {
+
+  return pagePwlProject({
+    ...where,
+    ...orders,
     page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    if (filters) {
-      where.status = filters.status;
-    }
-    return pagePwlProject({
-      ...where,
-      ...orders,
-      page,
-      limit
-    });
-  };
+    limit
+  });
+};
 
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: 'ID',
-      dataIndex: 'id',
-      key: 'id',
-      align: 'center',
-      width: 90,
-    },
-    {
-      title: '审计单位',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-    },
-    {
-      title: '报告编号',
-      dataIndex: 'code',
-      key: 'code',
-      align: 'center',
-    },
-    {
-      title: '上级id, 0是顶级',
-      dataIndex: 'parentId',
-      key: 'parentId',
-      align: 'center',
-    },
-    {
-      title: '项目类型',
-      dataIndex: 'type',
-      key: 'type',
-      align: 'center',
-    },
-    {
-      title: '项目图标',
-      dataIndex: 'image',
-      key: 'image',
-      align: 'center',
-    },
-    {
-      title: '二维码',
-      dataIndex: 'qrcode',
-      key: 'qrcode',
-      align: 'center',
-    },
-    {
-      title: '链接地址',
-      dataIndex: 'url',
-      key: 'url',
-      align: 'center',
-    },
-    {
-      title: '应用截图',
-      dataIndex: 'images',
-      key: 'images',
-      align: 'center',
-    },
-    {
-      title: '底稿情况',
-      dataIndex: 'files',
-      key: 'files',
-      align: 'center',
-    },
-    {
-      title: '应用介绍',
-      dataIndex: 'content',
-      key: 'content',
-      align: 'center',
-    },
-    {
-      title: '年末资产总额(万元)',
-      dataIndex: 'totalAssets',
-      key: 'totalAssets',
-      align: 'center',
-    },
-    {
-      title: '合同金额',
-      dataIndex: 'contractPrice',
-      key: 'contractPrice',
-      align: 'center',
-    },
-    {
-      title: '实收金额',
-      dataIndex: 'payPrice',
-      key: 'payPrice',
-      align: 'center',
-    },
-    {
-      title: '软件定价',
-      dataIndex: 'price',
-      key: 'price',
-      align: 'center',
-    },
-    {
-      title: '是否推荐',
-      dataIndex: 'recommend',
-      key: 'recommend',
-      align: 'center',
-    },
-    {
-      title: '到期时间',
-      dataIndex: 'expirationTime',
-      key: 'expirationTime',
-      align: 'center',
-    },
-    {
-      title: '项目信息-开票单位/汇款人',
-      dataIndex: 'itemName',
-      key: 'itemName',
-      align: 'center',
-    },
-    {
-      title: '项目信息-年度',
-      dataIndex: 'itemYear',
-      key: 'itemYear',
-      align: 'center',
-    },
-    {
-      title: '项目信息-类型',
-      dataIndex: 'itemType',
-      key: 'itemType',
-      align: 'center',
-    },
-    {
-      title: '项目信息-审计意见',
-      dataIndex: 'itemOpinion',
-      key: 'itemOpinion',
-      align: 'center',
-    },
-    {
-      title: '到账信息-银行名称',
-      dataIndex: 'bankName',
-      key: 'bankName',
-      align: 'center',
-    },
-    {
-      title: '到账日期',
-      dataIndex: 'bankPayTime',
-      key: 'bankPayTime',
-      align: 'center',
-    },
-    {
-      title: '到账金额',
-      dataIndex: 'bankPrice',
-      key: 'bankPrice',
-      align: 'center',
-    },
-    {
-      title: '发票类型',
-      dataIndex: 'invoiceType',
-      key: 'invoiceType',
-      align: 'center',
-    },
-    {
-      title: '开票日期',
-      dataIndex: 'invoiceTime',
-      key: 'invoiceTime',
-      align: 'center',
-    },
-    {
-      title: '开票金额',
-      dataIndex: 'invoicePrice',
-      key: 'invoicePrice',
-      align: 'center',
-    },
-    {
-      title: '报告份数',
-      dataIndex: 'reportNum',
-      key: 'reportNum',
-      align: 'center',
-    },
-    {
-      title: '底稿人员',
-      dataIndex: 'draftUserId',
-      key: 'draftUserId',
-      align: 'center',
-    },
-    {
-      title: '底稿人员',
-      dataIndex: 'draftUser',
-      key: 'draftUser',
-      align: 'center',
-    },
-    {
-      title: '参与成员',
-      dataIndex: 'userIds',
-      key: 'userIds',
-      align: 'center',
-    },
-    {
-      title: '参与成员',
-      dataIndex: 'users',
-      key: 'users',
-      align: 'center',
-    },
-    {
-      title: '签字注会',
-      dataIndex: 'signUserId',
-      key: 'signUserId',
-      align: 'center',
-    },
-    {
-      title: '签字注会',
-      dataIndex: 'signUser',
-      key: 'signUser',
-      align: 'center',
-    },
-    {
-      title: '展业人员',
-      dataIndex: 'saleUserId',
-      key: 'saleUserId',
-      align: 'center',
-    },
-    {
-      title: '展业人员',
-      dataIndex: 'saleUser',
-      key: 'saleUser',
-      align: 'center',
-    },
-    {
-      title: '纸质底稿完成情况',
-      dataIndex: 'paper',
-      key: 'paper',
-      align: 'center',
-    },
-    {
-      title: '电子底稿完成情况',
-      dataIndex: 'electron',
-      key: 'electron',
-      align: 'center',
-    },
-    {
-      title: '备注',
-      dataIndex: 'comments',
-      key: 'comments',
-      align: 'center',
-    },
-    {
-      title: '排序(数字越小越靠前)',
-      dataIndex: 'sortNumber',
-      key: 'sortNumber',
-      align: 'center',
-    },
-    {
-      title: '状态, 0正常, 1冻结',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-    },
-    {
-      title: '是否删除, 0否, 1是',
-      dataIndex: 'deleted',
-      key: 'deleted',
-      align: 'center',
-    },
-    {
-      title: '客户ID',
-      dataIndex: 'userId',
-      key: 'userId',
-      align: 'center',
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      sorter: true,
-      ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
-    },
-    {
-      title: '修改时间',
-      dataIndex: 'updateTime',
-      key: 'updateTime',
-      align: 'center',
-    },
-    {
-      title: '知识库ID',
-      dataIndex: 'kbId',
-      key: 'kbId',
-      align: 'center',
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 180,
-      fixed: 'right',
-      align: 'center',
-      hideInSetting: true
-    }
-  ]);
-
-  /* 搜索 */
-  const reload = (where?: PwlProjectParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where: where });
-  };
-
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: PwlProject) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
-
-  /* 打开批量移动弹窗 */
-  const openMove = () => {
-    showMove.value = true;
-  };
-
-  /* 删除单个 */
-  const remove = (row: PwlProject) => {
-    const hide = message.loading('请求中..', 0);
-    removePwlProject(row.pwlProjectId)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
-    }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        removeBatchPwlProject(selection.value.map((d) => d.pwlProjectId))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
-
-  /* 查询 */
-  const query = () => {
-    loading.value = true;
-  };
-
-  /* 自定义行属性 */
-  const customRow = (record: PwlProject) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: '序号',
+    key: 'index',
+    width: 48,
+    fixed: 'left',
+    align: 'center',
+    customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
+  },
+  {
+    title: '被审计单位',
+    dataIndex: 'name',
+    key: 'name',
+    width: 240,
+    fixed: 'left',
+    align: 'center',
+  },
+  {
+    title: '报告编号',
+    dataIndex: 'code',
+    key: 'code',
+    width: 240,
+    sorter: true,
+    align: 'center',
+  },
+  {
+    title: '项目完成进度',
+    dataIndex: 'status',
+    key: 'status',
+    width: 120,
+    align: 'center'
+  },
+  {
+    title: '报告时间',
+    dataIndex: 'expirationTime',
+    key: 'expirationTime',
+    align: 'center',
+    width: 120
+  },
+  // {
+  //   title: '类型',
+  //   dataIndex: 'type',
+  //   key: 'type',
+  //   align: 'center',
+  //   customRender: ({text}) => ['审字', '专审', '验证', '咨询'][text]
+  // },
+  {
+    title: '项目信息',
+    dataIndex: 'itemName',
+    key: 'itemName',
+    align: 'center',
+    children: [
+      {
+        title: '开票单位/汇款人',
+        dataIndex: 'itemName',
+        key: 'itemName',
+        align: 'center',
+        width: 180
       },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
+      {
+        title: '所属年度',
+        dataIndex: 'itemYear',
+        key: 'itemYear',
+        align: 'center',
+      },
+      {
+        title: '类型',
+        dataIndex: 'itemType',
+        key: 'itemType',
+        align: 'center',
+      },
+      {
+        title: '审计意见',
+        dataIndex: 'itemOpinion',
+        key: 'itemOpinion',
+        align: 'center',
+      },
+    ]
+  },
+  {
+    title: '年末资产总额(万元)',
+    dataIndex: 'totalAssets',
+    key: 'totalAssets',
+    align: 'center',
+    width: 170
+  },
+  {
+    title: '合同金额',
+    dataIndex: 'contractPrice',
+    key: 'contractPrice',
+    align: 'center',
+  },
+  {
+    title: '实收金额',
+    dataIndex: 'payPrice',
+    key: 'payPrice',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '到账信息',
+    dataIndex: 'itemName',
+    key: 'itemName',
+    align: 'center',
+    children: [
+      {
+        title: '银行',
+        dataIndex: 'bankName',
+        key: 'bankName',
+        align: 'center',
+        width: 120,
+      },
+      {
+        title: '日期',
+        dataIndex: 'bankPayTime',
+        key: 'bankPayTime',
+        align: 'center',
+        width: 120
+      },
+      {
+        title: '金额',
+        dataIndex: 'bankPrice',
+        key: 'bankPrice',
+        align: 'center',
+        width: 120,
+      },
+    ],
+  },
+  {
+    title: '开票信息',
+    dataIndex: 'invoice',
+    key: 'invoice',
+    align: 'center',
+    children: [
+      {
+        title: '日期',
+        dataIndex: 'invoiceTime',
+        key: 'invoiceTime',
+        align: 'center',
+        width: 120
+      },
+      {
+        title: '金额',
+        dataIndex: 'invoicePrice',
+        key: 'invoicePrice',
+        align: 'center',
+        width: 120,
+      },
+      {
+        title: '发票类型',
+        dataIndex: 'invoiceTypeName',
+        key: 'invoiceTypeName',
+        align: 'center',
+        width: 120,
+      },
+    ],
+  },
+
+  {
+    title: '报告份数',
+    dataIndex: 'reportNum',
+    key: 'reportNum',
+    align: 'center',
+    width: 90,
+  },
+  {
+    title: '底稿人员',
+    dataIndex: 'draftUser',
+    key: 'draftUser',
+    align: 'center',
+    width: 90
+  },
+  {
+    title: '参与成员',
+    dataIndex: 'users',
+    key: 'users',
+    align: 'center',
+    width: 180
+  },
+  {
+    title: '签字注会',
+    dataIndex: 'signUser',
+    key: 'signUser',
+    align: 'center',
+    width: 90,
+  },
+  {
+    title: '展业人员',
+    dataIndex: 'saleUser',
+    key: 'saleUser',
+    align: 'center',
+    width: 90
+  },
+  {
+    title: '底稿完成情况',
+    dataIndex: 'electron',
+    key: 'electron',
+    align: 'center',
+    width: 120,
+  },
+  {
+    title: '备注',
+    dataIndex: 'comments',
+    key: 'comments',
+    align: 'center',
+    width: 180,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    width: 180,
+    ellipsis: true,
+    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: PwlProjectParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: PwlProject) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: PwlProject) => {
+  const hide = message.loading('请求中..', 0);
+  removePwlProject(row.id)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
+    });
+};
+
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchPwlProject(selection.value.map((d) => d.id))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
+    }
+  });
+};
+
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
+
+/* 自定义行属性 */
+const customRow = (record: PwlProject) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
   };
-  query();
+};
+query();
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'PwlProject'
-  };
+export default {
+  name: 'PwlProject'
+};
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/user/chat-message/components/chatMessageEdit.vue b/src/views/user/chat-message/components/chatMessageEdit.vue
index 1e40fb1..a98c974 100644
--- a/src/views/user/chat-message/components/chatMessageEdit.vue
+++ b/src/views/user/chat-message/components/chatMessageEdit.vue
@@ -69,187 +69,167 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form, message } from 'ant-design-vue';
-  import { assignObject } from 'ele-admin-pro';
-  import {
-    addBatchChatMessage,
-    addChatMessage,
-    updateChatMessage
-  } from '@/api/system/chatMessage';
-  import { ChatMessage } from '@/api/system/chatMessage/model';
-  import { useThemeStore } from '@/store/modules/theme';
-  import { storeToRefs } from 'pinia';
-  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
-  import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
+import { ref, reactive, watch } from 'vue';
+import { Form, message } from 'ant-design-vue';
+import { assignObject } from 'ele-admin-pro';
+import {
+  addBatchChatMessage,
+  addChatMessage,
+  updateChatMessage
+} from '@/api/system/chatMessage';
+import { ChatMessage } from '@/api/system/chatMessage/model';
+import { useThemeStore } from '@/store/modules/theme';
+import { storeToRefs } from 'pinia';
+import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
 
-  import 'bytemd/dist/index.min.css';
-  import 'github-markdown-css/github-markdown-light.css';
-  // // 链接、删除线、复选框、表格等的插件
-  import gfm from '@bytemd/plugin-gfm';
-  // // 插件的中文语言文件
-  import zh_HansGfm from '@bytemd/plugin-gfm/locales/zh_Hans.json';
-  // 中文语言文件
-  import zh_Hans from 'bytemd/locales/zh_Hans.json';
-  import 'bytemd/dist/index.min.css';
-  import highlight from '@bytemd/plugin-highlight-ssr';
-  import 'highlight.js/styles/default.css';
-  import { User } from '@/api/system/user/model';
+import 'bytemd/dist/index.min.css';
+import 'github-markdown-css/github-markdown-light.css';
+// // 链接、删除线、复选框、表格等的插件
+import gfm from '@bytemd/plugin-gfm';
+// // 插件的中文语言文件
+import zh_HansGfm from '@bytemd/plugin-gfm/locales/zh_Hans.json';
+// 中文语言文件
+import zh_Hans from 'bytemd/locales/zh_Hans.json';
+import 'bytemd/dist/index.min.css';
+import highlight from '@bytemd/plugin-highlight-ssr';
+import 'highlight.js/styles/default.css';
+import { ShopMerchantAccount } from '@/api/shop/shopMerchantAccount/model';
+import { User } from '@/api/system/user/model';
 
-  // 是否是修改
-  const isUpdate = ref(false);
-  const useForm = Form.useForm;
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const { styleResponsive } = storeToRefs(themeStore);
 
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: ChatMessage | null;
-  }>();
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: ChatMessage | null;
+}>();
 
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
 
-  // 提交状态
-  const loading = ref(false);
-  // 是否显示最大化切换按钮
-  const maxable = ref(true);
-  const content = ref('');
-  // 表格选中数据
-  const formRef = ref<FormInstance | null>(null);
-  const images = ref<ItemType[]>([]);
-  const merchantAccount = ref<any[]>([]);
-  const formDataBatch = ref<ChatMessage[]>([]);
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+const content = ref('');
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+const merchantAccount = ref<ShopMerchantAccount[]>([]);
+const formDataBatch = ref<ChatMessage[]>([]);
 
-  // 用户信息
-  const form = reactive<ChatMessage>({
-    formUserId: undefined,
-    toUserId: undefined,
-    toUserIds: undefined,
-    type: 'text',
-    content: '',
-    sideTo: undefined,
-    sideFrom: undefined,
-    withdraw: undefined,
-    fileInfo: undefined,
-    hasContact: undefined,
-    status: 0,
-    formUserName: '',
-    createTime: ''
-  });
+// 用户信息
+const form = reactive<ChatMessage>({
+  formUserId: undefined,
+  toUserId: undefined,
+  toUserIds: undefined,
+  type: 'text',
+  content: '',
+  sideTo: undefined,
+  sideFrom: undefined,
+  withdraw: undefined,
+  fileInfo: undefined,
+  hasContact: undefined,
+  status: 0,
+  formUserName: '',
+  createTime: ''
+});
 
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
 
-  // 表单验证规则
-  const rules = reactive({
-    toUserIds: [
-      {
-        required: true,
-        type: 'any',
-        message: '请选择用户',
-        trigger: 'blur'
-      }
-    ],
-    type: [
-      {
-        required: true,
-        type: 'string',
-        message: '请选择消息类型',
-        trigger: 'blur'
-      }
-    ],
-    content: [
-      {
-        required: true,
-        type: 'string',
-        message: '请填写消息内容',
-        trigger: 'blur',
-        validator: async (_rule: RuleObject, value: string) => {
-          if (content.value == '') {
-            return Promise.reject('请填写消息内容');
-          }
-          return Promise.resolve();
-        }
-      }
-    ]
-  });
-
-  // 插件
-  const plugins = ref([
-    gfm({
-      locale: zh_HansGfm
-    }),
-    highlight()
-  ]);
-
-  const onToUser = (item: User) => {
-    form.toUserIds = [item.phone];
-    form.toUserName = [item.phone];
-    console.log(form);
-    // form.toUserId = item.userId;
-    // form.toUserName = item.nickname;
-  };
-
-  const chooseType = (item: any) => {
-    form.type = 'text';
-  };
-
-  const { resetFields } = useForm(form, rules);
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
+// 表单验证规则
+const rules = reactive({
+  toUserIds: [
+    {
+      required: true,
+      type: 'any',
+      message: '请选择用户',
+      trigger: 'blur'
     }
-    formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
-        if (!isUpdate.value) {
-          merchantAccount.value.map((d) => {
-            formDataBatch.value.push({
-              toUserId: d.userId,
-              type: form.type,
-              content: content.value
-            });
-          });
-          addBatchChatMessage(formDataBatch.value)
-            .then((msg) => {
-              loading.value = false;
-              form.toUserIds = [];
-              formDataBatch.value = [];
-              merchantAccount.value = [];
-              form.toUserName = undefined;
-              message.success(msg);
-              updateVisible(false);
-              emit('done');
-            })
-            .catch((e) => {
-              loading.value = false;
-              message.error(e.message);
-            });
-          return;
+  ],
+  type: [
+    {
+      required: true,
+      type: 'string',
+      message: '请选择消息类型',
+      trigger: 'blur'
+    }
+  ],
+  content: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写消息内容',
+      trigger: 'blur',
+      validator: async (_rule: RuleObject, value: string) => {
+        if (content.value == '') {
+          return Promise.reject('请填写消息内容');
         }
-        const formData = {
-          ...form,
-          status: isUpdate.value ? 1 : 0,
-          content: content.value
-        };
-        const saveOrUpdate = isUpdate.value
-          ? updateChatMessage
-          : addChatMessage;
-        saveOrUpdate(formData)
-          .then(() => {
+        return Promise.resolve();
+      }
+    }
+  ]
+});
+
+// 插件
+const plugins = ref([
+  gfm({
+    locale: zh_HansGfm
+  }),
+  highlight()
+]);
+
+const onToUser = (item: User) => {
+  form.toUserIds = [item.phone];
+  form.toUserName = [item.phone];
+  console.log(form);
+  // form.toUserId = item.userId;
+  // form.toUserName = item.nickname;
+};
+
+const chooseType = (item: any) => {
+  form.type = 'text';
+};
+
+const { resetFields } = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      if (!isUpdate.value) {
+        merchantAccount.value.map((d) => {
+          formDataBatch.value.push({
+            toUserId: d.userId,
+            type: form.type,
+            content: content.value
+          });
+        });
+        addBatchChatMessage(formDataBatch.value)
+          .then((msg) => {
             loading.value = false;
+            form.toUserIds = [];
+            formDataBatch.value = [];
+            merchantAccount.value = [];
             form.toUserName = undefined;
+            message.success(msg);
             updateVisible(false);
             emit('done');
           })
@@ -257,42 +237,63 @@
             loading.value = false;
             message.error(e.message);
           });
-      })
-      .catch(() => {});
-  };
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        images.value = [];
-        content.value = '';
-        if (props.data) {
-          assignObject(form, props.data);
-          // 标记已读
-          updateChatMessage({ id: props.data.id, status: 1 });
-          emit('done');
-          isUpdate.value = true;
-        } else {
-          isUpdate.value = false;
-        }
-      } else {
-        resetFields();
+        return;
       }
-    },
-    { immediate: true }
-  );
+      const formData = {
+        ...form,
+        status: isUpdate.value ? 1 : 0,
+        content: content.value
+      };
+      const saveOrUpdate = isUpdate.value
+        ? updateChatMessage
+        : addChatMessage;
+      saveOrUpdate(formData)
+        .then(() => {
+          loading.value = false;
+          form.toUserName = undefined;
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {});
+};
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      images.value = [];
+      content.value = '';
+      if (props.data) {
+        assignObject(form, props.data);
+        // 标记已读
+        updateChatMessage({ id: props.data.id, status: 1 });
+        emit('done');
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  { immediate: true }
+);
 </script>
 
 <style lang="less" scoped>
-  .user-content {
-    max-width: 100%;
-    border-radius: 8px !important;
-    background-color: #a2ec71;
-    border: none;
-  }
-  .admin-content {
-    border-radius: 8px !important;
-    border: 3px solid #f1f1f1;
-  }
+.user-content {
+  max-width: 100%;
+  border-radius: 8px !important;
+  background-color: #a2ec71;
+  border: none;
+}
+.admin-content {
+  border-radius: 8px !important;
+  border: 3px solid #f1f1f1;
+}
 </style>