优化

src/views/design/drawing/index.vue

@@ -83,33 +83,17 @@
 </template>
 
 <script setup name="VolumeCatalog" lang="ts">
-import {
+import { listVolumeCatalog, addVolumeCatalog, updateVolumeCatalog } from '@/api/design/volumeCatalog';
-  listVolumeCatalog,
-  getVolumeCatalog,
-  delVolumeCatalog,
-  addVolumeCatalog,
-  updateVolumeCatalog,
-  uploadVolumeFile,
-  getVolumeCatafileList,
-  lookViewerFile
-} from '@/api/design/volumeCatalog';
 import { VolumeCatalogVO } from '@/api/design/volumeCatalog/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import { volumeFileViewer, volumeFileViewerList } from '@/api/design/drawing';
 const fileList = ref([]);
-import { designUserList } from '@/api/design/appointment';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
-import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
 const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
-const dialogHistory = ref(false);
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -130,32 +114,6 @@ const uploadForm = reactive({
   fileList: [],
   cancellationIds: [] // 用于存储已作废的文件ID
 });
-const examineForm = ref({
-  audit: '',
-  auditDate: '',
-  auditId: '',
-  designer: '',
-  executionOpinion: '',
-  executor: '',
-  executorDate: '',
-  executorId: '',
-  id: '1',
-  num: '',
-  professional: '',
-  projectId: '',
-  projectName: '',
-  proofreading: '',
-  proofreadingDate: '',
-  proofreadingId: '',
-  stage: '',
-  subprojectId: '',
-  subprojectName: '',
-  verificationContent: '',
-  verificationOpinion: '',
-  volume: ''
-});
-const userList = ref([]);
-const userAppList = ref([]); //人事任命的用户
 const initFormData: any = {
   design: undefined,
   projectId: currentProject.value?.id || '',
@@ -198,35 +156,6 @@ const getList = async () => {
     loading.value = false;
   }
 };
-const getUserAppList = async () => {
-  const res = await designUserList({ projectId: currentProject.value?.id });
-  if (res.code === 200) {
-    console.log(res.rows);
-
-    res.rows.forEach((item: any) => {
-      if (item.userType == 2) {
-        //设计人员
-        userAppList.value.push(item);
-      }
-    });
-  }
-};
-const getDetails = async (id) => {
-  let res = await drawingreviewReceiptsDetail(id);
-  examineForm.value = res.data;
-};
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  volumeCatalogFormRef.value?.resetFields();
-};
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -239,38 +168,14 @@ const resetQuery = () => {
   handleQuery();
 };
 
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: VolumeCatalogVO[]) => {
-  ids.value = selection.map((item) => item.design);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加设计出图计划';
-};
-
 const handleView = (row?: any) => {
   fileList.value = row.fileVoList;
 
   viewVisible.value = true;
 };
 
-/** 上传文件按钮操作 */
-const uploadVisible = ref(false);
 const viewVisible = ref(false);
 const viewVisible1 = ref(false);
-const handleUpload = async (row?: any) => {
-  resetUploadForm();
-  uploadForm.volumeCatalogId = row.design;
-  userList.value = row.noViewerList;
-  const res = await getVolumeCatafileList(row.design);
-  uploadForm.fileList = res.data.filter((item) => item.status == '1') || [];
-  uploadVisible.value = true;
-};
 /** 重置上传表单 */
 const resetUploadForm = () => {
   uploadForm.userIds = [];
@@ -313,74 +218,7 @@ const handleViewHis = async (row) => {
     histroyList.value = res.rows;
   }
 };
-/** 上传文件提交 */
-const onSubmit = async () => {
-  buttonLoading.value = true;
-  let obj = {
-    volumeCatalogId: uploadForm.volumeCatalogId,
-    fileIds: uploadForm.fileId.split(','),
-    explainText: ''
-  };
-  try {
-    await uploadVolumeFile(obj);
-    proxy?.$modal.msgSuccess('文件上传成功');
-    uploadVisible.value = false;
-    await getList();
-  } catch (error) {
-    console.error('上传文件失败:', error);
-  } finally {
-    buttonLoading.value = false;
-  }
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: VolumeCatalogVO) => {
-  const _ids = row?.design || ids.value;
-  await proxy?.$modal.confirm('是否确认删除卷册目录编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delVolumeCatalog(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-const handleUploadSuccess = async (flieList: any, res: any) => {
-  proxy?.$modal.msgSuccess('文件上传成功');
-  getList();
-};
-
-/** 审核按钮操作 */
-const handleAudit = async (row) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
-    path: `/design-management/drawingreview/indexEdit`,
-    query: {
-      id: row.design,
-      type: 'update'
-    }
-  });
-};
-/** 查看按钮操作 */
-const handleAuditView = async (row) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
-    path: `/design-management/drawingreview/indexEdit`,
-    query: {
-      id: row.design,
-      type: 'view'
-    }
-  });
-};
-/** 修改按钮操作 */
-const handleUpdate = async (row?: VolumeCatalogVO) => {
-  reset();
-  const _id = row?.design || ids.value[0];
-  const res = await getVolumeCatalog(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改设计出图计划';
-};
-
 onMounted(() => {
-  getUserAppList();
   getList();
 });
 
@@ -390,7 +228,6 @@ const listeningProject = watch(
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
-    getUserAppList();
     getList();
   }
 );
@@ -399,53 +236,3 @@ onUnmounted(() => {
   listeningProject();
 });
 </script>
-<style lang="scss">
-.volumeCatalog_box {
-  /* .upload-demo {
-    width: 100% !important;
-  } */
-  table {
-    border-collapse: collapse; //合并为一个单一的边框
-    border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可
-  }
-  thead {
-    tr {
-      th {
-        background-color: rgba(247, 247, 247, 1); //设置表格标题背景色
-        height: 35px; //设置单元格最小高度
-        text-align: center;
-        letter-spacing: 5px;
-        padding: 15px;
-      }
-      td {
-        text-align: left;
-        height: 35px; //设置单元格最小高度
-        padding: 15px;
-      }
-      .th-bg {
-        background-color: rgba(247, 247, 247, 1);
-      }
-    }
-  }
-  tbody {
-    tr {
-      td {
-        text-align: left;
-        height: 40px; //设置单元格最小高度
-        padding: 15px;
-      }
-      th {
-        height: 35px; //设置单元格最小高度
-        text-align: center;
-        letter-spacing: 5px;
-        padding: 15px;
-      }
-    }
-  }
-  .table-content {
-    box-shadow: 0px 0px 10px #ddd;
-    padding: 20px;
-    position: relative;
-  }
-}
-</style>

src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue

@@ -118,12 +118,11 @@
             ><el-form-item label="责任人" prop="responsiblePerson">
               <el-input v-model="form.responsiblePerson" placeholder="请输入责任人" /> </el-form-item
           ></el-col>
-          <el-col :span="12"
+          <el-col v-if="form.transferStatus != '2'" :span="12"
             ><el-form-item label="预计完成日期" prop="expectedFinishDate">
               <el-date-picker clearable v-model="form.expectedFinishDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择预计完成时间">
               </el-date-picker> </el-form-item
           ></el-col>
-
           <el-col v-if="form.transferStatus == '1'" :span="12"
             ><el-form-item label="已流转面积(亩)" prop="transferAea">
               <el-input v-model="form.transferAea" type="number" placeholder="请输入已流转面积" /> </el-form-item

src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <el-card shadow="never">
-      <div v-show="showSearch" class="mb-[10px]">
+      <template #header>
-        <el-card shadow="hover">
+        <el-row :gutter="10" class="mb8">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
             <el-form-item label="对应地块" prop="landBlockId">
               <el-select v-model="queryParams.landBlockId" clearable placeholder="请选择对应地块">
@@ -15,31 +15,16 @@
             <el-form-item label="责任人" prop="responsiblePerson">
               <el-input v-model="queryParams.responsiblePerson" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="预计完成时间" prop="expectedFinishDate">
-              <el-date-picker
-                clearable
-                v-model="queryParams.expectedFinishDate"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择预计完成时间"
-              />
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
-        </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="landTransferLedgerList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="landTransferLedgerList">
         <!-- 二级表格 -->
         <el-table-column type="expand">
           <template #default="scope">
@@ -51,7 +36,7 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="60" align="center" />
         <el-table-column label="土地类型" align="center" prop="landTypeName" />
         <el-table-column label="地块" align="center" prop="landName" />
         <el-table-column label="进场道路" align="center" prop="roadName" />
@@ -71,7 +56,7 @@
         <el-table-column label="状态说明" align="center" prop="statusDescription" />
         <el-table-column label="问题总结" align="center" prop="issueSummary" />
         <el-table-column label="下一步策略" align="center" prop="nextStrategy" width="180" />
-        <el-table-column label="操作" fixed="right" align="center" width="200">
+        <!-- <el-table-column label="操作" fixed="right" align="center" width="200">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['land:landTransferLedger:edit']">编辑</el-button>
@@ -80,7 +65,7 @@
               <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['land:landTransferLedger:remove']">删除</el-button>
             </el-tooltip>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>

src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue

@@ -39,7 +39,7 @@
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['land:landTransferLedger:edit']">编辑</el-button>
+              <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['land:landTransferLedger:query']">查看</el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['land:landTransferLedger:remove']">删除</el-button>
@@ -49,9 +49,8 @@
       </el-table>
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改项目土地流转台账对话框 -->
+    <el-dialog draggable title="查看信息" v-model="dialog.visible" width="900px" append-to-body>
-    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form disabled ref="landTransferLedgerFormRef" :model="form" :rules="rules" label-width="120px">
-      <el-form ref="landTransferLedgerFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="对应地块" prop="landBlockId">