From c7340572c9069823a9f0ac97af9ca1612efc6d8a Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Sat, 9 Aug 2025 18:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=80=BC=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/permission.ts                             |   2 -
 src/views/materials/orderEquipment/index.vue  |   1 -
 src/views/out/constructionValue/index.vue     |  10 +-
 src/views/out/designCompletion/index.vue      |   3 +-
 src/views/out/monthPlan/index.vue             |  28 +-
 src/views/out/monthPlan/indexAll.vue          |  30 ++
 src/views/out/monthPlanAudit/index.vue        |  16 +-
 src/views/out/outDesignTable/index.vue        |  11 +-
 src/views/out/outDesignTableVS/index.vue      |   3 -
 src/views/out/outTable/index.vue              |   3 -
 src/views/out/ownerSettlement/index.vue       |   3 -
 src/views/out/settlementValueOwner/index.vue  |  23 +-
 .../out/settlementValueSubcontract/index.vue  |  38 +--
 .../settlementValueSubcontract/indexAll.vue   |  30 ++
 src/views/out/valueAllocation/index.vue       |  10 +-
 .../BasicData/enterRoad/index.vue             |  34 +-
 .../BasicData/landBlock/index.vue             |  34 +-
 .../landTransferLedger/index.vue              | 130 +++++---
 .../landTransferLedgerFangzhen/index.vue      |  20 +-
 .../nonTransferLedger/index copy.vue          | 312 ++++++++++++++++++
 .../nonTransferLedger/index.vue               | 221 ++++++++-----
 22 files changed, 657 insertions(+), 307 deletions(-)
 create mode 100644 src/views/out/monthPlan/indexAll.vue
 create mode 100644 src/views/out/settlementValueSubcontract/indexAll.vue
 create mode 100644 src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index copy.vue

diff --git a/.env.development b/.env.development
index fe20df3..21892b7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.159:8898'
+VITE_APP_BASE_API = 'http://192.168.110.180:8898'
 
 # 无人机接口地址
 
diff --git a/src/permission.ts b/src/permission.ts
index 34ca0f5..c919be5 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -18,8 +18,6 @@ const isWhiteList = (path: string) => {
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
-  console.log(to);
-  console.log(getToken());
   if (to.path == '/indexEquipment') {
     next();
   } else if (getToken()) {
diff --git a/src/views/materials/orderEquipment/index.vue b/src/views/materials/orderEquipment/index.vue
index 2443a82..9233d24 100644
--- a/src/views/materials/orderEquipment/index.vue
+++ b/src/views/materials/orderEquipment/index.vue
@@ -339,7 +339,6 @@ const onShare = () => {
   const TokenKey = 'Admin-Token';
   const tokenStorage = useStorage<null | string>(TokenKey, null);
   const getToken = () => tokenStorage.value;
-  console.log(getToken());
   
   // 跳转新的地址 传token
   let url = `http://192.168.110.151:7788/indexEquipment?projectId=${encodeURIComponent(currentProject.value.id)}&token=${encodeURIComponent(getToken())}&batchNumber=${encodeURIComponent(form.value.batchNumber)}`;
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index fae29de..ca29361 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -22,19 +22,11 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:constructionValue:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['out:constructionValue:edit']"
-              >修改</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:constructionValue:remove']"
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:constructionValue:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -75,7 +67,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改施工产值对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionValueFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
           <el-cascader
diff --git a/src/views/out/designCompletion/index.vue b/src/views/out/designCompletion/index.vue
index 54fd1f4..b0bf8b0 100644
--- a/src/views/out/designCompletion/index.vue
+++ b/src/views/out/designCompletion/index.vue
@@ -63,11 +63,10 @@
           </template>
         </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>
     <!-- 添加或修改月度产值计划对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="所属项目" prop="projectId">
           <el-select v-model="form.projectId" placeholder="请选择所属项目">
diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue
index 88a00d5..d27a848 100644
--- a/src/views/out/monthPlan/index.vue
+++ b/src/views/out/monthPlan/index.vue
@@ -4,9 +4,6 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="计划产值" prop="planValue">
-              <el-input v-model="queryParams.planValue" placeholder="请输入计划产值" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="计划月份" prop="planMonth">
               <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
             </el-form-item>
@@ -30,19 +27,11 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:monthPlan:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['out:monthPlan:edit']"
-              >修改</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:monthPlan:remove']"
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:monthPlan:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -75,7 +64,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="计划产值" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" />
@@ -256,18 +245,6 @@ const handleAudit = async (row?: MonthPlanVO) => {
     type: 'update'
   });
 };
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/monthPlan/export',
-    {
-      ...queryParams.value
-    },
-    `monthPlan_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });
@@ -285,4 +262,7 @@ const listeningProject = watch(
 onUnmounted(() => {
   listeningProject();
 });
+defineExpose({
+  getList
+});
 </script>
diff --git a/src/views/out/monthPlan/indexAll.vue b/src/views/out/monthPlan/indexAll.vue
new file mode 100644
index 0000000..7000072
--- /dev/null
+++ b/src/views/out/monthPlan/indexAll.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="p-2">
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tab-pane label="月度产值计划" name="first">
+        <monthPlan ref="monthPlanChild"></monthPlan>
+      </el-tab-pane>
+      <el-tab-pane label="已通过月度计划" name="second">
+        <monthPlanAudit ref="monthPlanAuditChild"></monthPlanAudit>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="MonthPlan" lang="ts">
+import { ref, watch, computed } from 'vue';
+import monthPlan from './index.vue'; //子组件
+import monthPlanAudit from '../monthPlanAudit/index.vue'; //子组件
+// 引用子组件
+const activeName = ref('first');
+const monthPlanChild = ref<InstanceType<typeof monthPlan> | null>(null);
+const monthPlanAuditChild = ref<InstanceType<typeof monthPlanAudit> | null>(null);
+const handleClick = () => {
+  //   调用子组件方法
+  if (activeName.value == 'first') {
+    monthPlanChild.value.getList(); //子组件方法
+  } else if (activeName.value == 'second') {
+    monthPlanAuditChild.value.getList(); //子组件方法
+  }
+};
+</script>
diff --git a/src/views/out/monthPlanAudit/index.vue b/src/views/out/monthPlanAudit/index.vue
index 2f32d29..ccf43cf 100644
--- a/src/views/out/monthPlanAudit/index.vue
+++ b/src/views/out/monthPlanAudit/index.vue
@@ -26,9 +26,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:monthPlanAudit:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -218,16 +215,6 @@ const handleDelete = async (row?: MonthPlanAuditVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/monthPlanAudit/export',
-    {
-      ...queryParams.value
-    },
-    `monthPlanAudit_${new Date().getTime()}.xlsx`
-  );
-};
 
 onMounted(() => {
   getList();
@@ -246,4 +233,7 @@ const listeningProject = watch(
 onUnmounted(() => {
   listeningProject();
 });
+defineExpose({
+  getList
+});
 </script>
diff --git a/src/views/out/outDesignTable/index.vue b/src/views/out/outDesignTable/index.vue
index 2599207..9499392 100644
--- a/src/views/out/outDesignTable/index.vue
+++ b/src/views/out/outDesignTable/index.vue
@@ -9,7 +9,8 @@
             </el-form-item>
             <el-form-item label="产值类型" prop="valueType">
               <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
-                <el-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option label="设计" value="1" />
+                <el-option label="采购" value="2" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -23,9 +24,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:valueAllocation:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -57,14 +55,13 @@ const valueAllocationList = ref([]);
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
-const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
-
+var { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
 const queryFormRef = ref<ElFormInstance>();
 const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    valueType: undefined,
+    valueType: '1',
     projectId: currentProject.value.id,
     month: undefined
   }
diff --git a/src/views/out/outDesignTableVS/index.vue b/src/views/out/outDesignTableVS/index.vue
index 2c14553..feae3c1 100644
--- a/src/views/out/outDesignTableVS/index.vue
+++ b/src/views/out/outDesignTableVS/index.vue
@@ -23,9 +23,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:valueAllocation:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
diff --git a/src/views/out/outTable/index.vue b/src/views/out/outTable/index.vue
index 83f13b9..d34e7ed 100644
--- a/src/views/out/outTable/index.vue
+++ b/src/views/out/outTable/index.vue
@@ -18,9 +18,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:valueAllocation:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
diff --git a/src/views/out/ownerSettlement/index.vue b/src/views/out/ownerSettlement/index.vue
index 84fd8c2..f42f3fb 100644
--- a/src/views/out/ownerSettlement/index.vue
+++ b/src/views/out/ownerSettlement/index.vue
@@ -19,9 +19,6 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:valueAllocation:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
diff --git a/src/views/out/settlementValueOwner/index.vue b/src/views/out/settlementValueOwner/index.vue
index c672713..9a3c6ab 100644
--- a/src/views/out/settlementValueOwner/index.vue
+++ b/src/views/out/settlementValueOwner/index.vue
@@ -27,19 +27,11 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:settlementValueOwner:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['out:settlementValueOwner:edit']"
-              >修改</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:settlementValueOwner:remove']"
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:settlementValueOwner:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -88,7 +80,7 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="settlementValueOwnerFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="结算产值" prop="settlementValue">
-          <el-input v-model="form.settlementValue" placeholder="请输入结算产值" />
+          <el-input v-model="form.settlementValue" type="number" placeholder="请输入结算产值" />
         </el-form-item>
         <el-form-item label="产值类型" prop="valueType">
           <el-select v-model="form.valueType" placeholder="请选择产值类型">
@@ -261,16 +253,6 @@ const handleDelete = async (row?: SettlementValueOwnerVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/settlementValueOwner/export',
-    {
-      ...queryParams.value
-    },
-    `settlementValueOwner_${new Date().getTime()}.xlsx`
-  );
-};
 
 onMounted(() => {
   getList();
@@ -289,4 +271,7 @@ const listeningProject = watch(
 onUnmounted(() => {
   listeningProject();
 });
+defineExpose({
+  getList
+});
 </script>
diff --git a/src/views/out/settlementValueSubcontract/index.vue b/src/views/out/settlementValueSubcontract/index.vue
index 8a32ce4..5a437e6 100644
--- a/src/views/out/settlementValueSubcontract/index.vue
+++ b/src/views/out/settlementValueSubcontract/index.vue
@@ -28,17 +28,6 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:settlementValueSubcontract:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="Edit"
-              :disabled="single"
-              @click="handleUpdate()"
-              v-hasPermi="['out:settlementValueSubcontract:edit']"
-              >修改</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button
               type="danger"
@@ -50,11 +39,6 @@
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:settlementValueSubcontract:export']"
-              >导出</el-button
-            >
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -102,11 +86,10 @@
           </template>
         </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>
     <!-- 添加或修改结算产值登记（对乙）对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="settlementValueSubcontractFormRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="单据编码" prop="documentCode">
           <el-input v-model="form.documentCode" placeholder="请输入单据编码" />
@@ -132,7 +115,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="结算产值" prop="settlementValue">
-          <el-input v-model="form.settlementValue" placeholder="请输入结算产值" />
+          <el-input v-model="form.settlementValue" type="number" placeholder="请输入结算产值" />
         </el-form-item>
         <el-form-item label="说明" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入说明" />
@@ -143,9 +126,6 @@
         <el-form-item label="合同名称" prop="contractName">
           <el-input v-model="form.contractName" placeholder="请输入合同名称" />
         </el-form-item>
-        <el-form-item label="合同地址" prop="contractUrl">
-          <el-input v-model="form.contractUrl" placeholder="请输入合同地址" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -335,17 +315,6 @@ const handleDelete = async (row?: SettlementValueSubcontractVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/settlementValueSubcontract/export',
-    {
-      ...queryParams.value
-    },
-    `settlementValueSubcontract_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });
@@ -363,4 +332,7 @@ const listeningProject = watch(
 onUnmounted(() => {
   listeningProject();
 });
+defineExpose({
+  getList
+});
 </script>
diff --git a/src/views/out/settlementValueSubcontract/indexAll.vue b/src/views/out/settlementValueSubcontract/indexAll.vue
new file mode 100644
index 0000000..f99bd55
--- /dev/null
+++ b/src/views/out/settlementValueSubcontract/indexAll.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="p-2">
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tab-pane label="对甲-结算登记" name="second">
+        <settlementValueOwner ref="settlementValueOwnerChild"></settlementValueOwner>
+      </el-tab-pane>
+      <el-tab-pane label="对乙-结算登记" name="first">
+        <settlementValueSubcontract ref="settlementValueSubcontractChild"></settlementValueSubcontract>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="MonthPlan" lang="ts">
+import { ref, watch, computed } from 'vue';
+import settlementValueSubcontract from './index.vue'; //子组件
+import settlementValueOwner from '../settlementValueOwner/index.vue'; //子组件
+// 引用子组件
+const activeName = ref('second');
+const settlementValueSubcontractChild = ref<InstanceType<typeof settlementValueSubcontract> | null>(null);
+const settlementValueOwnerChild = ref<InstanceType<typeof settlementValueOwner> | null>(null);
+const handleClick = () => {
+  //   调用子组件方法
+  if (activeName.value == 'first') {
+    settlementValueSubcontractChild.value.getList(); //子组件方法
+  } else if (activeName.value == 'second') {
+    settlementValueOwnerChild.value.getList(); //子组件方法
+  }
+};
+</script>
diff --git a/src/views/out/valueAllocation/index.vue b/src/views/out/valueAllocation/index.vue
index c8e1493..e629dae 100644
--- a/src/views/out/valueAllocation/index.vue
+++ b/src/views/out/valueAllocation/index.vue
@@ -6,19 +6,11 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:valueAllocation:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['out:valueAllocation:edit']"
-              >修改</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:valueAllocation:remove']"
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['out:valueAllocation:export']">导出</el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -48,7 +40,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改项目总产值分配对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="valueAllocationFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="对甲总产值" prop="ownerTotalValue">
           <el-input v-model="form.ownerTotalValue" placeholder="请输入对甲总产值" />
diff --git a/src/views/project/landTransfer/BasicData/enterRoad/index.vue b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
index 16a4fa7..8305cc5 100644
--- a/src/views/project/landTransfer/BasicData/enterRoad/index.vue
+++ b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
@@ -4,9 +4,6 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
-            <el-form-item label="道路编号" prop="roadCode">
-              <el-input v-model="queryParams.roadCode" placeholder="请输入道路编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="道路名称" prop="roadName">
               <el-input v-model="queryParams.roadName" placeholder="请输入道路名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -38,15 +35,14 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <el-table v-loading="loading" :data="enterRoadList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="道路编号" align="center" prop="roadCode" />
         <el-table-column label="道路名称" align="center" prop="roadName" />
-        <el-table-column label="设计新建道路长度" align="center" prop="designCreateLength" />
-        <el-table-column label="设计改扩建长度" align="center" prop="designUpdateLength" />
-        <el-table-column label="需流转总长度" align="center" prop="changeLength" />
-        <el-table-column label="需要流转总面积" align="center" prop="changeArea" />
+        <el-table-column label="设计新建道路长度(米)" align="center" prop="designCreateLength" />
+        <el-table-column label="设计改扩建长度(米)" align="center" prop="designUpdateLength" />
+        <el-table-column label="需流转总长度(米)" align="center" prop="changeLength" />
+        <el-table-column label="需要流转总面积(亩)" align="center" prop="changeArea" />
         <el-table-column label="对应地块" align="center" prop="landName" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -59,29 +55,25 @@
           </template>
         </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>
     <!-- 添加或修改进场道路信息对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="enterRoadFormRef" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="道路编号" prop="roadCode">
-          <el-input v-model="form.roadCode" placeholder="请输入道路编号" />
-        </el-form-item>
+      <el-form ref="enterRoadFormRef" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="道路名称" prop="roadName">
           <el-input v-model="form.roadName" placeholder="请输入道路名称" />
         </el-form-item>
-        <el-form-item label="设计新建道路长度" prop="designCreateLength">
-          <el-input v-model="form.designCreateLength" placeholder="请输入设计新建道路长度" />
+        <el-form-item label="设计新建道路长度(米)" prop="designCreateLength">
+          <el-input v-model="form.designCreateLength" type="number" placeholder="请输入设计新建道路长度" />
         </el-form-item>
-        <el-form-item label="设计改扩建长度" prop="designUpdateLength">
-          <el-input v-model="form.designUpdateLength" placeholder="请输入设计改扩建长度" />
+        <el-form-item label="设计改扩建长度(米)" prop="designUpdateLength">
+          <el-input v-model="form.designUpdateLength" type="number" placeholder="请输入设计改扩建长度" />
         </el-form-item>
-        <el-form-item label="需流转总长度" prop="changeLength">
-          <el-input v-model="form.changeLength" placeholder="请输入需流转总长度" />
+        <el-form-item label="需流转总长度(米)" prop="changeLength">
+          <el-input v-model="form.changeLength" type="number" placeholder="请输入需流转总长度" />
         </el-form-item>
-        <el-form-item label="需要流转总面积" prop="changeArea">
-          <el-input v-model="form.changeArea" placeholder="请输入需要流转总面积" />
+        <el-form-item label="需要流转总面积(亩)" prop="changeArea">
+          <el-input v-model="form.changeArea" type="number" placeholder="请输入需要流转总面积" />
         </el-form-item>
         <el-form-item label="对应地块" prop="landBlockId">
           <el-select v-model="form.landBlockId" clearable placeholder="请选择对应地块">
diff --git a/src/views/project/landTransfer/BasicData/landBlock/index.vue b/src/views/project/landTransfer/BasicData/landBlock/index.vue
index de65ece..89fc8bc 100644
--- a/src/views/project/landTransfer/BasicData/landBlock/index.vue
+++ b/src/views/project/landTransfer/BasicData/landBlock/index.vue
@@ -13,14 +13,14 @@
             <el-form-item label="所属村委会" prop="villageCommittee">
               <el-input v-model="queryParams.villageCommittee" placeholder="请输入所属村委会" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="设计面积" prop="designArea">
-              <el-input v-model="queryParams.designArea" placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="设计面积(亩)" prop="designArea">
+              <el-input v-model="queryParams.designArea" type="number"  placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="地块数" prop="blockCount">
-              <el-input v-model="queryParams.blockCount" placeholder="请输入地块数" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="地块数(块)" prop="blockCount">
+              <el-input v-model="queryParams.blockCount" type="number" placeholder="请输入地块数" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="农户数" prop="farmerCount">
-              <el-input v-model="queryParams.farmerCount" placeholder="请输入农户数" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="农户数(户)" prop="farmerCount">
+              <el-input v-model="queryParams.farmerCount" type="number" placeholder="请输入农户数" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -50,9 +50,9 @@
         <el-table-column label="地块名称" align="center" prop="landName" />
         <el-table-column label="方阵" align="center" prop="unit" />
         <el-table-column label="所属村委会" align="center" prop="villageCommittee" />
-        <el-table-column label="设计面积" align="center" prop="designArea" />
-        <el-table-column label="地块数" align="center" prop="blockCount" />
-        <el-table-column label="农户数" align="center" prop="farmerCount" />
+        <el-table-column label="设计面积(亩)" align="center" prop="designArea" />
+        <el-table-column label="地块数(块)" align="center" prop="blockCount" />
+        <el-table-column label="农户数(户)" align="center" prop="farmerCount" />
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -72,23 +72,23 @@
     </el-card>
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="landBlockFormRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="地块编号" prop="landCode">
+        <!-- <el-form-item label="地块编号" prop="landCode">
           <el-input v-model="form.landCode" placeholder="请输入地块编号" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="地块名称" prop="landName">
           <el-input v-model="form.landName" placeholder="请输入地块名称" />
         </el-form-item>
         <el-form-item label="所属村委会" prop="villageCommittee">
           <el-input v-model="form.villageCommittee" placeholder="请输入所属村委会" />
         </el-form-item>
-        <el-form-item label="设计面积" prop="designArea">
-          <el-input v-model="form.designArea" placeholder="请输入设计面积" />
+        <el-form-item label="设计面积(亩)" prop="designArea">
+          <el-input type="number" v-model="form.designArea" placeholder="请输入设计面积" />
         </el-form-item>
-        <el-form-item label="地块数" prop="blockCount">
-          <el-input v-model="form.blockCount" placeholder="请输入地块数" />
+        <el-form-item label="地块数(块)" prop="blockCount">
+          <el-input type="number" v-model="form.blockCount" placeholder="请输入地块数" />
         </el-form-item>
-        <el-form-item label="农户数" prop="farmerCount">
-          <el-input v-model="form.farmerCount" placeholder="请输入农户数" />
+        <el-form-item label="农户数(户)" prop="farmerCount">
+          <el-input type="number" v-model="form.farmerCount" placeholder="请输入农户数" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index d127002..d399d15 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -9,13 +9,15 @@
                 <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="设计面积" prop="designArea">
-              <el-input v-model="queryParams.designArea" placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            <el-form-item label="流转台账状态" prop="transferStatus">
+              <el-select v-model="queryParams.transferStatus" placeholder="请选择流转台账状态" clearable>
+                <el-option label="待流转" :value="0"></el-option>
+                <el-option label="已流转" :value="1"></el-option> </el-select
+            ></el-form-item>
             <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-form-item label="预计完成时间" prop="expectedFinishDate">
               <el-date-picker
                 clearable
                 v-model="queryParams.expectedFinishDate"
@@ -23,7 +25,7 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择预计完成时间"
               />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -43,33 +45,28 @@
               >删除</el-button
             >
           </el-col>
-
           <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-column type="selection" width="55" align="center" />
-        <el-table-column label="土地类型" align="center" prop="landType" />
+        <el-table-column label="土地类型" align="center" prop="landTypeName" />
         <el-table-column label="地块" align="center" prop="landName" />
         <el-table-column label="进场道路" align="center" prop="roadName" />
-        <el-table-column label="设计面积" align="center" prop="designArea" />
+        <el-table-column label="设计面积(亩)" align="center" prop="designArea" width="180" />
         <el-table-column label="责任人" align="center" prop="responsiblePerson" />
-        <el-table-column label="预计完成时间" align="center" prop="expectedFinishDate" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.expectedFinishDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="已流转面积" align="center" prop="transferAea" />
-        <el-table-column label="流转比例" align="center" prop="transferRatio" />
-        <el-table-column label="土地租金" align="center" prop="landRent" />
-        <el-table-column label="青苗赔偿" align="center" prop="seedlingCompensation" />
-        <el-table-column label="总金额" align="center" prop="totalAmount" />
-        <el-table-column label="流转状态" align="center" prop="transferStatus" />
+        <el-table-column label="预计完成时间" align="center" prop="expectedFinishDate" width="180"> </el-table-column>
+        <el-table-column label="流转状态" align="center" prop="transferStatusName" />
+        <el-table-column label="已流转面积(亩)" align="center" prop="transferAea" width="180" />
+        <el-table-column label="流转比例(%)" align="center" prop="transferRatio" width="180" />
+        <el-table-column label="土地租金(元)" align="center" prop="landRent" width="180" />
+        <el-table-column label="青苗赔偿(元)" align="center" prop="seedlingCompensation" width="180" />
+        <el-table-column label="总金额(元)" align="center" prop="totalAmount" width="150" />
         <el-table-column label="状态说明" align="center" prop="statusDescription" />
         <el-table-column label="问题总结" align="center" prop="issueSummary" />
-        <el-table-column label="下一步策略" align="center" prop="nextStrategy" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column label="下一步策略" align="center" prop="nextStrategy" width="180" />
+        <!-- 固定列 -->
+        <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>
@@ -83,8 +80,8 @@
       <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="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
-      <el-form ref="landTransferLedgerFormRef" :model="form" :rules="rules" label-width="110px">
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form ref="landTransferLedgerFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="对应地块" prop="landBlockId">
@@ -92,7 +89,7 @@
                 <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
               </el-select> </el-form-item
           ></el-col>
-          <el-col :span="12" v-if="enterRoadList.length">
+          <el-col :span="12">
             <el-form-item label="进场道路" prop="enterRoadId">
               <el-select v-model="form.enterRoadId" clearable placeholder="请选择对应地块">
                 <el-option v-for="item in enterRoadList" :key="item.id" :label="item.roadName" :value="item.id" />
@@ -105,11 +102,17 @@
           ></el-col>
           <el-col :span="12">
             <el-form-item label="流转台账状态" prop="transferStatus">
-              <el-select v-model="form.transferStatus" placeholder="请选择流转台账状态" clearable>
-                <el-option v-for="dict in transfer_status" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select></el-form-item
+              <el-select v-model="form.transferStatus" :disabled="!form.id" placeholder="请选择流转台账状态" clearable>
+                <el-option
+                  v-for="dict in land_transfer_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                /> </el-select></el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="设计面积" prop="designArea"> <el-input v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
+            <el-form-item label="设计面积(亩)" prop="designArea">
+              <el-input type="number" v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
           ></el-col>
           <el-col :span="12"
             ><el-form-item label="责任人" prop="responsiblePerson">
@@ -120,34 +123,52 @@
               <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 :span="12"
-            ><el-form-item label="已流转面积" prop="transferAea">
-              <el-input v-model="form.transferAea" placeholder="请输入已流转面积" /> </el-form-item
+
+          <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
           ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="流转比例" prop="transferRatio">
-              <el-input v-model="form.transferRatio" placeholder="请输入流转比例" /> </el-form-item
+          <el-col v-if="form.transferStatus == '1'" :span="12"
+            ><el-form-item label="流转比例(%)" prop="transferRatio">
+              <el-input v-model="form.transferRatio" type="number" placeholder="请输入流转比例" /> </el-form-item
           ></el-col>
-          <el-col :span="12">
-            <el-form-item label="土地租金" prop="landRent"> <el-input v-model="form.landRent" placeholder="请输入土地租金" /> </el-form-item
+          <el-col v-if="form.transferStatus == '1'" :span="12">
+            <el-form-item label="土地租金(元)" prop="landRent">
+              <el-input type="number" v-model="form.landRent" placeholder="请输入土地租金" /> </el-form-item
           ></el-col>
-          <el-col :span="12">
-            <el-form-item label="青苗赔偿" prop="seedlingCompensation">
-              <el-input v-model="form.seedlingCompensation" placeholder="请输入青苗赔偿" /> </el-form-item
+          <el-col v-if="form.transferStatus == '1'" :span="12">
+            <el-form-item label="青苗赔偿(元)" prop="seedlingCompensation">
+              <el-input v-model="form.seedlingCompensation" type="number" placeholder="请输入青苗赔偿" /> </el-form-item
           ></el-col>
-          <el-col :span="12">
-            <el-form-item label="总金额" prop="totalAmount">
+          <el-col v-if="form.transferStatus == '1'" :span="12">
+            <el-form-item label="总金额(元)" prop="totalAmount">
               <el-input type="number" v-model="form.totalAmount" placeholder="请输入总金额" /> </el-form-item
           ></el-col>
-          <el-col :span="24"
+          <el-col v-if="form.transferStatus == '2'" :span="12"
+            ><el-form-item label="不签合同面积(亩)" prop="noContractArea">
+              <el-input v-model="form.noContractArea" type="number" placeholder="请输入不签合同面积" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '2'" :span="12">
+            <el-form-item label="不测量面积(亩)" prop="noSurveyArea">
+              <el-input v-model="form.noSurveyArea" type="number" placeholder="请输入不测量面积" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '2'" :span="24"
+            ><el-form-item label="不签合同原因" prop="noContractReason">
+              <el-input v-model="form.noContractReason" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '2'" :span="24"
+            ><el-form-item label="不流转原因" prop="nonTransferReason">
+              <el-input v-model="form.nonTransferReason" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="24"
             ><el-form-item label="状态说明" prop="statusDescription">
               <el-input v-model="form.statusDescription" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
-          <el-col :span="24"
+          <el-col v-if="form.transferStatus == '1'" :span="24"
             ><el-form-item label="问题总结" prop="issueSummary">
               <el-input v-model="form.issueSummary" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
-          <el-col :span="24">
+          <el-col v-if="form.transferStatus == '1'" :span="24">
             <el-form-item label="下一步策略" prop="nextStrategy">
               <el-input v-model="form.nextStrategy" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
@@ -192,14 +213,14 @@ const landBlockList = ref([]);
 const queryFormRef = ref<ElFormInstance>();
 const landTransferLedgerFormRef = ref<ElFormInstance>();
 const enterRoadList = ref([]);
-const { land_type, transfer_status } = toRefs<any>(proxy?.useDict('land_type', 'transfer_status'));
+const { land_type, land_transfer_status } = toRefs<any>(proxy?.useDict('land_type', 'land_transfer_status'));
 
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
-const initFormData: LandTransferLedgerForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProject.value.id,
   landType: undefined,
@@ -216,7 +237,11 @@ const initFormData: LandTransferLedgerForm = {
   transferStatus: undefined,
   statusDescription: undefined,
   issueSummary: undefined,
-  nextStrategy: undefined
+  nextStrategy: undefined,
+  noContractArea: undefined,
+  noContractReason: undefined,
+  noSurveyArea: undefined,
+  nonTransferReason: undefined
 };
 const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>({
   form: { ...initFormData },
@@ -239,7 +264,8 @@ const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>
     statusDescription: undefined,
     issueSummary: undefined,
     nextStrategy: undefined,
-    params: {}
+    params: {},
+    listType: 1
   },
   rules: {
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
@@ -261,8 +287,8 @@ const getList = async () => {
 
 /** 取消按钮 */
 const cancel = () => {
-  reset();
   dialog.visible = false;
+  reset();
 };
 
 /** 表单重置 */
@@ -293,16 +319,22 @@ const handleSelectionChange = (selection: LandTransferLedgerVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  form.value.transferStatus = '0';
   dialog.visible = true;
+  enterRoadList.value = [];
   dialog.title = '添加项目土地流转台账';
 };
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: LandTransferLedgerVO) => {
   reset();
+  form.value.landBlockId = row?.landBlockId;
+  getListRoad();
   const _id = row?.id || ids.value[0];
   const res = await getLandTransferLedger(_id);
   Object.assign(form.value, res.data);
+  console.log(form.value);
+
   dialog.visible = true;
   dialog.title = '修改项目土地流转台账';
 };
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
index 156f0a1..e5ac42c 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
@@ -52,26 +52,26 @@
           </template>
         </el-table-column>
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="土地类型" align="center" prop="landType" />
+        <el-table-column label="土地类型" align="center" prop="landTypeName" />
         <el-table-column label="地块" align="center" prop="landName" />
         <el-table-column label="进场道路" align="center" prop="roadName" />
-        <el-table-column label="设计面积" align="center" prop="designArea" />
+        <el-table-column label="设计面积(亩)" align="center" prop="designArea" width="180" />
         <el-table-column label="责任人" align="center" prop="responsiblePerson" />
         <el-table-column label="预计完成时间" align="center" prop="expectedFinishDate" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.expectedFinishDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="已流转面积" align="center" prop="transferAea" />
-        <el-table-column label="流转比例" align="center" prop="transferRatio" />
-        <el-table-column label="土地租金" align="center" prop="landRent" />
-        <el-table-column label="青苗赔偿" align="center" prop="seedlingCompensation" />
-        <el-table-column label="总金额" align="center" prop="totalAmount" />
-        <el-table-column label="流转状态" align="center" prop="transferStatus" />
+        <el-table-column label="流转状态" align="center" prop="transferStatusName" />
+        <el-table-column label="已流转面积(亩)" align="center" prop="transferAea" width="180" />
+        <el-table-column label="流转比例(%)" align="center" prop="transferRatio" width="180" />
+        <el-table-column label="土地租金(元)" align="center" prop="landRent" width="180" />
+        <el-table-column label="青苗赔偿(元)" align="center" prop="seedlingCompensation" width="180" />
+        <el-table-column label="总金额(元)" align="center" prop="totalAmount" width="150" />
         <el-table-column label="状态说明" align="center" prop="statusDescription" />
         <el-table-column label="问题总结" align="center" prop="issueSummary" />
-        <el-table-column label="下一步策略" align="center" prop="nextStrategy" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column label="下一步策略" align="center" prop="nextStrategy" width="180" />
+        <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>
diff --git a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index copy.vue b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index copy.vue
new file mode 100644
index 0000000..d39c499
--- /dev/null
+++ b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index copy.vue	
@@ -0,0 +1,312 @@
+<template>
+  <div class="p-2">
+    <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="对应地块" prop="landBlockId">
+              <el-select v-model="queryParams.landBlockId" clearable placeholder="请选择对应地块">
+                <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设计面积" prop="designArea">
+              <el-input v-model="queryParams.designArea" placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
+            </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">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['land:nonTransferLedger:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:nonTransferLedger:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="nonTransferLedgerList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" 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" />
+        <el-table-column label="设计面积" align="center" prop="designArea" />
+        <el-table-column label="不签合同面积" align="center" prop="noContractArea" />
+        <el-table-column label="不签合同原因" align="center" prop="noContractReason" />
+        <el-table-column label="不测量面积" align="center" prop="noSurveyArea" />
+        <el-table-column label="不流转原因" align="center" prop="nonTransferReason" />
+        <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="['land:nonTransferLedger:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['land:nonTransferLedger:remove']"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </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>
+    <!-- 添加或修改不流转台账对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
+      <el-form ref="nonTransferLedgerFormRef" :model="form" :rules="rules" label-width="110px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="对应地块" prop="landBlockId">
+              <el-select v-model="form.landBlockId" clearable placeholder="请选择对应地块" @change="handleLandBlockChange">
+                <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="12" v-if="enterRoadList.length">
+            <el-form-item label="进场道路" prop="enterRoadId">
+              <el-select v-model="form.enterRoadId" clearable placeholder="请选择对应地块">
+                <el-option v-for="item in enterRoadList" :key="item.id" :label="item.roadName" :value="item.id" />
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="土地类型" prop="landType">
+              <el-select v-model="form.landType" placeholder="请选择土地类型" clearable>
+                <el-option v-for="dict in land_type" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select></el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="设计面积" prop="designArea"> <el-input v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="不签合同面积" prop="noContractArea">
+              <el-input v-model="form.noContractArea" placeholder="请输入不签合同面积" /> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="不测量面积" prop="noSurveyArea">
+              <el-input v-model="form.noSurveyArea" placeholder="请输入不测量面积" /> </el-form-item
+          ></el-col>
+          <el-col :span="24"
+            ><el-form-item label="不签合同原因" prop="noContractReason">
+              <el-input v-model="form.noContractReason" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
+          <el-col :span="24"
+            ><el-form-item label="不流转原因" prop="nonTransferReason">
+              <el-input v-model="form.nonTransferReason" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="NonTransferLedger" lang="ts">
+import {
+  listNonTransferLedger,
+  getNonTransferLedger,
+  delNonTransferLedger,
+  addNonTransferLedger,
+  updateNonTransferLedger
+} from '@/api/system/landTransfer/nonTransferLedger';
+import { NonTransferLedgerVO, NonTransferLedgerQuery, NonTransferLedgerForm } from '@/api/system/landTransfer/nonTransferLedger/types';
+import { listEnterRoad } from '@/api/system/landTransfer/enterRoad';
+import { listLandBlock } from '@/api/system/landTransfer/landBlock';
+import { useUserStoreHook } from '@/store/modules/user';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const nonTransferLedgerList = ref<NonTransferLedgerVO[]>([]);
+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 landBlockList = ref([]);
+const enterRoadList = ref([]);
+const queryFormRef = ref<ElFormInstance>();
+const nonTransferLedgerFormRef = ref<ElFormInstance>();
+const { land_type } = toRefs<any>(proxy?.useDict('land_type', 'transfer_status'));
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: NonTransferLedgerForm = {
+  id: undefined,
+  projectId: currentProject.value.id,
+  landType: undefined,
+  landBlockId: undefined,
+  enterRoadId: undefined,
+  designArea: undefined,
+  noContractArea: undefined,
+  noContractReason: undefined,
+  noSurveyArea: undefined,
+  nonTransferReason: undefined
+};
+const data = reactive<PageData<NonTransferLedgerForm, NonTransferLedgerQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value.id,
+    landType: undefined,
+    landBlockId: undefined,
+    enterRoadId: undefined,
+    designArea: undefined,
+    noContractArea: undefined,
+    noContractReason: undefined,
+    noSurveyArea: undefined,
+    nonTransferReason: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+    landType: [{ required: true, message: '土地类型不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询不流转台账列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listNonTransferLedger(queryParams.value);
+  nonTransferLedgerList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  nonTransferLedgerFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: NonTransferLedgerVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加不流转台账';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: NonTransferLedgerVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getNonTransferLedger(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改不流转台账';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  nonTransferLedgerFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateNonTransferLedger(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addNonTransferLedger(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: NonTransferLedgerVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除不流转台账编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delNonTransferLedger(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+/** 查询地块信息列表 */
+const getListLand = async () => {
+  const res = await listLandBlock({
+    pageNum: 1,
+    pageSize: 10000,
+    projectId: currentProject.value.id
+  });
+  landBlockList.value = res.rows;
+};
+/** 查询进场道路信息列表 */
+const getListRoad = async () => {
+  const res = await listEnterRoad({ pageNum: 1, pageSize: 10000, projectId: currentProject.value.id, landBlockId: form.value.landBlockId });
+  enterRoadList.value = res.rows;
+};
+// 选择地块
+const handleLandBlockChange = (val) => {
+  console.log(val);
+  getListRoad();
+};
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value.id,
+  (nid, oid) => {
+    queryParams.value.projectId = nid;
+    getListLand();
+    getList();
+  }
+);
+
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  getListLand();
+  getList();
+});
+</script>
diff --git a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
index 3a84b24..e622060 100644
--- a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
@@ -3,14 +3,14 @@
     <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 ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
             <el-form-item label="对应地块" prop="landBlockId">
               <el-select v-model="queryParams.landBlockId" clearable placeholder="请选择对应地块">
                 <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="设计面积" prop="designArea">
-              <el-input v-model="queryParams.designArea" placeholder="请输入设计面积" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="责任人" prop="responsiblePerson">
+              <el-input v-model="queryParams.responsiblePerson" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,25 +20,15 @@
         </el-card>
       </div>
     </transition>
-
     <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="['land:nonTransferLedger:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:nonTransferLedger:remove']"
-              >删除</el-button
-            >
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
-      <el-table v-loading="loading" :data="nonTransferLedgerList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="landTransferLedgerList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="土地类型" align="center" prop="landType" />
+        <el-table-column label="土地类型" align="center" prop="landTypeName" />
         <el-table-column label="地块" align="center" prop="landName" />
         <el-table-column label="进场道路" align="center" prop="roadName" />
         <el-table-column label="设计面积" align="center" prop="designArea" />
@@ -46,29 +36,22 @@
         <el-table-column label="不签合同原因" align="center" prop="noContractReason" />
         <el-table-column label="不测量面积" align="center" prop="noSurveyArea" />
         <el-table-column label="不流转原因" align="center" prop="nonTransferReason" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" fixed="right" width="200">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['land:nonTransferLedger:edit']"></el-button>
+              <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['land:landTransferLedger:edit']">编辑</el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['land:nonTransferLedger:remove']"
-              ></el-button>
+              <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['land:landTransferLedger:remove']">删除</el-button>
             </el-tooltip>
           </template>
         </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>
-    <!-- 添加或修改不流转台账对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
-      <el-form ref="nonTransferLedgerFormRef" :model="form" :rules="rules" label-width="110px">
+    <!-- 添加或修改项目土地流转台账对话框 -->
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form ref="landTransferLedgerFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="对应地块" prop="landBlockId">
@@ -76,7 +59,7 @@
                 <el-option v-for="item in landBlockList" :key="item.id" :label="item.landName" :value="item.id" />
               </el-select> </el-form-item
           ></el-col>
-          <el-col :span="12" v-if="enterRoadList.length">
+          <el-col :span="12">
             <el-form-item label="进场道路" prop="enterRoadId">
               <el-select v-model="form.enterRoadId" clearable placeholder="请选择对应地块">
                 <el-option v-for="item in enterRoadList" :key="item.id" :label="item.roadName" :value="item.id" />
@@ -88,24 +71,77 @@
                 <el-option v-for="dict in land_type" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select></el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="设计面积" prop="designArea"> <el-input v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="不签合同面积" prop="noContractArea">
-              <el-input v-model="form.noContractArea" placeholder="请输入不签合同面积" /> </el-form-item
+            <el-form-item label="流转台账状态" prop="transferStatus">
+              <el-select v-model="form.transferStatus" :disabled="!form.id" placeholder="请选择流转台账状态" clearable>
+                <el-option
+                  v-for="dict in land_transfer_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                /> </el-select></el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="不测量面积" prop="noSurveyArea">
-              <el-input v-model="form.noSurveyArea" placeholder="请输入不测量面积" /> </el-form-item
+            <el-form-item label="设计面积(亩)" prop="designArea">
+              <el-input type="number" v-model="form.designArea" placeholder="请输入设计面积" /> </el-form-item
           ></el-col>
-          <el-col :span="24"
+          <el-col :span="12"
+            ><el-form-item label="责任人" prop="responsiblePerson">
+              <el-input v-model="form.responsiblePerson" placeholder="请输入责任人" /> </el-form-item
+          ></el-col>
+          <el-col :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
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="12"
+            ><el-form-item label="流转比例(%)" prop="transferRatio">
+              <el-input v-model="form.transferRatio" type="number" placeholder="请输入流转比例" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="12">
+            <el-form-item label="土地租金(元)" prop="landRent">
+              <el-input type="number" v-model="form.landRent" placeholder="请输入土地租金" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="12">
+            <el-form-item label="青苗赔偿(元)" prop="seedlingCompensation">
+              <el-input v-model="form.seedlingCompensation" type="number" placeholder="请输入青苗赔偿" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="12">
+            <el-form-item label="总金额(元)" prop="totalAmount">
+              <el-input type="number" v-model="form.totalAmount" placeholder="请输入总金额" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '2'" :span="12"
+            ><el-form-item label="不签合同面积(亩)" prop="noContractArea">
+              <el-input v-model="form.noContractArea" type="number" placeholder="请输入不签合同面积" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '2'" :span="12">
+            <el-form-item label="不测量面积(亩)" prop="noSurveyArea">
+              <el-input v-model="form.noSurveyArea" type="number" placeholder="请输入不测量面积" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '2'" :span="24"
             ><el-form-item label="不签合同原因" prop="noContractReason">
               <el-input v-model="form.noContractReason" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
-          <el-col :span="24"
+          <el-col v-if="form.transferStatus == '2'" :span="24"
             ><el-form-item label="不流转原因" prop="nonTransferReason">
               <el-input v-model="form.nonTransferReason" type="textarea" placeholder="请输入内容" /> </el-form-item
           ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="24"
+            ><el-form-item label="状态说明" prop="statusDescription">
+              <el-input v-model="form.statusDescription" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="24"
+            ><el-form-item label="问题总结" prop="issueSummary">
+              <el-input v-model="form.issueSummary" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
+          <el-col v-if="form.transferStatus == '1'" :span="24">
+            <el-form-item label="下一步策略" prop="nextStrategy">
+              <el-input v-model="form.nextStrategy" type="textarea" placeholder="请输入内容" /> </el-form-item
+          ></el-col>
         </el-row>
       </el-form>
       <template #footer>
@@ -118,24 +154,24 @@
   </div>
 </template>
 
-<script setup name="NonTransferLedger" lang="ts">
+<script setup name="LandTransferLedger" lang="ts">
 import {
-  listNonTransferLedger,
-  getNonTransferLedger,
-  delNonTransferLedger,
-  addNonTransferLedger,
-  updateNonTransferLedger
-} from '@/api/system/landTransfer/nonTransferLedger';
-import { NonTransferLedgerVO, NonTransferLedgerQuery, NonTransferLedgerForm } from '@/api/system/landTransfer/nonTransferLedger/types';
+  listLandTransferLedger,
+  getLandTransferLedger,
+  delLandTransferLedger,
+  addLandTransferLedger,
+  updateLandTransferLedger
+} from '@/api/system/landTransfer/landTransferLedger';
 import { listEnterRoad } from '@/api/system/landTransfer/enterRoad';
-import { listLandBlock } from '@/api/system/landTransfer/landBlock';
+import { LandTransferLedgerVO, LandTransferLedgerQuery, LandTransferLedgerForm } from '@/api/system/landTransfer/landTransferLedger/types';
 import { useUserStoreHook } from '@/store/modules/user';
+import { listLandBlock } from '@/api/system/landTransfer/landBlock';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const nonTransferLedgerList = ref<NonTransferLedgerVO[]>([]);
+const landTransferLedgerList = ref<LandTransferLedgerVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -144,29 +180,40 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const landBlockList = ref([]);
-const enterRoadList = ref([]);
 const queryFormRef = ref<ElFormInstance>();
-const nonTransferLedgerFormRef = ref<ElFormInstance>();
-const { land_type } = toRefs<any>(proxy?.useDict('land_type', 'transfer_status'));
+const landTransferLedgerFormRef = ref<ElFormInstance>();
+const enterRoadList = ref([]);
+const { land_type, land_transfer_status } = toRefs<any>(proxy?.useDict('land_type', 'land_transfer_status'));
 
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
-const initFormData: NonTransferLedgerForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProject.value.id,
   landType: undefined,
   landBlockId: undefined,
   enterRoadId: undefined,
   designArea: undefined,
+  responsiblePerson: undefined,
+  expectedFinishDate: undefined,
+  transferAea: undefined,
+  transferRatio: undefined,
+  landRent: undefined,
+  seedlingCompensation: undefined,
+  totalAmount: undefined,
+  transferStatus: undefined,
+  statusDescription: undefined,
+  issueSummary: undefined,
+  nextStrategy: undefined,
   noContractArea: undefined,
   noContractReason: undefined,
   noSurveyArea: undefined,
   nonTransferReason: undefined
 };
-const data = reactive<PageData<NonTransferLedgerForm, NonTransferLedgerQuery>>({
+const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -176,11 +223,19 @@ const data = reactive<PageData<NonTransferLedgerForm, NonTransferLedgerQuery>>({
     landBlockId: undefined,
     enterRoadId: undefined,
     designArea: undefined,
-    noContractArea: undefined,
-    noContractReason: undefined,
-    noSurveyArea: undefined,
-    nonTransferReason: undefined,
-    params: {}
+    responsiblePerson: undefined,
+    expectedFinishDate: undefined,
+    transferAea: undefined,
+    transferRatio: undefined,
+    landRent: undefined,
+    seedlingCompensation: undefined,
+    totalAmount: undefined,
+    transferStatus: undefined,
+    statusDescription: undefined,
+    issueSummary: undefined,
+    nextStrategy: undefined,
+    params: {},
+    listType: 2
   },
   rules: {
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
@@ -191,25 +246,25 @@ const data = reactive<PageData<NonTransferLedgerForm, NonTransferLedgerQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询不流转台账列表 */
+/** 查询项目土地流转台账列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listNonTransferLedger(queryParams.value);
-  nonTransferLedgerList.value = res.rows;
+  const res = await listLandTransferLedger(queryParams.value);
+  landTransferLedgerList.value = res.rows;
   total.value = res.total;
   loading.value = false;
 };
 
 /** 取消按钮 */
 const cancel = () => {
-  reset();
   dialog.visible = false;
+  reset();
 };
 
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
-  nonTransferLedgerFormRef.value?.resetFields();
+  landTransferLedgerFormRef.value?.resetFields();
 };
 
 /** 搜索按钮操作 */
@@ -225,7 +280,7 @@ const resetQuery = () => {
 };
 
 /** 多选框选中数据 */
-const handleSelectionChange = (selection: NonTransferLedgerVO[]) => {
+const handleSelectionChange = (selection: LandTransferLedgerVO[]) => {
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
@@ -234,29 +289,35 @@ const handleSelectionChange = (selection: NonTransferLedgerVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  form.value.transferStatus = '0';
   dialog.visible = true;
-  dialog.title = '添加不流转台账';
+  enterRoadList.value = [];
+  dialog.title = '添加项目土地流转台账';
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: NonTransferLedgerVO) => {
+const handleUpdate = async (row?: LandTransferLedgerVO) => {
   reset();
+  form.value.landBlockId = row?.landBlockId;
+  getListRoad();
   const _id = row?.id || ids.value[0];
-  const res = await getNonTransferLedger(_id);
+  const res = await getLandTransferLedger(_id);
   Object.assign(form.value, res.data);
+  console.log(form.value);
+
   dialog.visible = true;
-  dialog.title = '修改不流转台账';
+  dialog.title = '修改项目土地流转台账';
 };
 
 /** 提交按钮 */
 const submitForm = () => {
-  nonTransferLedgerFormRef.value?.validate(async (valid: boolean) => {
+  landTransferLedgerFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateNonTransferLedger(form.value).finally(() => (buttonLoading.value = false));
+        await updateLandTransferLedger(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addNonTransferLedger(form.value).finally(() => (buttonLoading.value = false));
+        await addLandTransferLedger(form.value).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
@@ -264,15 +325,18 @@ const submitForm = () => {
     }
   });
 };
-
 /** 删除按钮操作 */
-const handleDelete = async (row?: NonTransferLedgerVO) => {
+const handleDelete = async (row?: LandTransferLedgerVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除不流转台账编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delNonTransferLedger(_ids);
+  await proxy?.$modal.confirm('是否确认删除项目土地流转台账编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delLandTransferLedger(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
+// 选择地块
+const handleLandBlockChange = (val) => {
+  getListRoad();
+};
 /** 查询地块信息列表 */
 const getListLand = async () => {
   const res = await listLandBlock({
@@ -287,11 +351,6 @@ const getListRoad = async () => {
   const res = await listEnterRoad({ pageNum: 1, pageSize: 10000, projectId: currentProject.value.id, landBlockId: form.value.landBlockId });
   enterRoadList.value = res.rows;
 };
-// 选择地块
-const handleLandBlockChange = (val) => {
-  console.log(val);
-  getListRoad();
-};
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value.id,
@@ -306,7 +365,7 @@ onUnmounted(() => {
   listeningProject();
 });
 onMounted(() => {
-  getListLand();
   getList();
+  getListLand();
 });
 </script>