diff --git a/src/api/tender/index.ts b/src/api/tender/index.ts
index 2ebb22b..65a71a6 100644
--- a/src/api/tender/index.ts
+++ b/src/api/tender/index.ts
@@ -42,3 +42,52 @@ export const importExcelFile = (query: any, data: any): AxiosPromise<any> => {
     data
   });
 };
+
+//招标计划列表
+
+export const tenderPlanList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan/list',
+    method: 'get',
+    params: query
+  });
+};
+//新增招标计划
+export const addTenderPlan = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan',
+    method: 'post',
+    data: query
+  });
+};
+//删除招标计划
+export const delTenderPlan = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan/' + query.ids,
+    method: 'delete'
+  });
+};
+//修改招标计划
+export const updateTenderPlan = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan',
+    method: 'put',
+    data: query
+  });
+};
+//弹窗数据
+export const treeList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/tenderPlanLimitList/getTree',
+    method: 'get',
+    params: query
+  });
+};
+//获取招标计划详情
+export const getTenderPlanDetail = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan/getMore',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index 8f5b608..21233d1 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -3,11 +3,11 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <el-card shadow="always">
         <el-form :model="queryForm" :inline="true">
-          <!-- <el-form-item label="版本号" prop="versions">
+          <el-form-item label="版本号" prop="versions">
             <el-select v-model="queryForm.versions" placeholder="选择版本号" @change="changeVersions">
               <el-option v-for="item in options" :key="item" :label="item" :value="item" />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item label="表名" prop="sheet">
             <el-select v-model="queryForm.sheet" placeholder="选择表名" @change="changeSheet">
               <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
@@ -100,6 +100,7 @@ const getVersionNums = async () => {
   try {
     const params = {
       projectId: currentProject.value?.id,
+      workOrderType: '1',
       pageSize: 1000,
       pageNum: 1
     };
@@ -140,8 +141,8 @@ const changeSheet = () => {
 const getSheetName = async () => {
   try {
     const params = {
-      projectId: currentProject.value?.id
-      // versions: queryForm.value.versions
+      projectId: currentProject.value?.id,
+      versions: queryForm.value.versions
     };
     const res = await sheetList(params);
     if (res.code == 200) {
@@ -268,8 +269,8 @@ onUnmounted(() => {
   listeningProject();
 });
 onMounted(() => {
-  // getVersionNums();
-  getSheetName();
+  getVersionNums();
+  // getSheetName();
 });
 </script>
 
diff --git a/src/views/largeScreen/components/optionList.ts b/src/views/largeScreen/components/optionList.ts
index eb269bc..822fd94 100644
--- a/src/views/largeScreen/components/optionList.ts
+++ b/src/views/largeScreen/components/optionList.ts
@@ -304,7 +304,10 @@ export const getLineOption = (lineData: any) => {
         show: false
       },
       axisTick: {
-        show: true
+        show: false
+      },
+      splitLine: {
+        show: false
       },
       axisLabel: {
         textStyle: {
@@ -317,7 +320,7 @@ export const getLineOption = (lineData: any) => {
       type: 'value',
       max: maxData,
       splitLine: {
-        show: true,
+        show: false,
         lineStyle: {
           type: 'solid',
           color: 'rgba(73, 169, 191, 0.2)'
@@ -694,16 +697,16 @@ export const getBarOptions = (data: any) => {
   const option = {
     backgroundColor: '',
     grid: {
-      left: '7%',
+      left: '8%',
       top: '4%',
-      bottom: '25%',
+      bottom: '8%',
       right: '2%'
     },
     tooltip: {
       show: true,
       backgroundColor: '',
       trigger: 'axis',
-      formatter: '{b0}：{c0}元',
+      formatter: '{b0}：{c0}万元',
       textStyle: {
         color: '#fff'
       }
@@ -728,7 +731,7 @@ export const getBarOptions = (data: any) => {
           // show: true,
         },
         splitLine: {
-          show: true,
+          show: false,
           lineStyle: {
             color: 'rgba(108, 128, 151, 0.3)',
             type: 'dashed'
@@ -740,9 +743,7 @@ export const getBarOptions = (data: any) => {
       {
         axisLabel: {
           formatter: function (value) {
-            if (value >= 1000) {
-              value = (value / 1000).toFixed(1) + 'k'; // 大于等于1000的数字显示为1k、2.5k等
-            }
+            value = value + '万';
             return value;
           },
           color: 'rgba(255, 255, 255, 0.8)'
@@ -756,7 +757,7 @@ export const getBarOptions = (data: any) => {
           }
         },
         splitLine: {
-          show: true,
+          show: false,
           lineStyle: {
             color: 'rgba(108, 128, 151, 0.3)',
             type: 'dashed'
@@ -764,24 +765,25 @@ export const getBarOptions = (data: any) => {
         }
       }
     ],
-    dataZoom: [
-      {
-        // show: true,
-        start: 0,
-        end: 30,
-        bottom: 2, // 下滑块距离x轴底部的距离
-        height: 23
-      },
-      {
-        type: 'inside'
-      }
-    ],
+    // dataZoom: [
+    //   {
+    //     // show: true,
+    //     start: 0,
+    //     end: 30,
+    //     bottom: 2, // 下滑块距离x轴底部的距离
+    //     height: 23
+    //   },
+    //   {
+    //     type: 'inside'
+    //   }
+    // ],
     series: [
       {
         type: 'bar',
-        data: data.value,
-        stack: '合并',
-        barWidth: '15',
+        data: data.value[0],
+        // stack: '合并',
+        barWidth: '5',
+        barGap: '100%',
         itemStyle: {
           color: new echarts.graphic.LinearGradient(
             0,
@@ -791,22 +793,60 @@ export const getBarOptions = (data: any) => {
             [
               {
                 offset: 0,
-                color: 'rgba(0, 111, 255, 0)' // 0% 处的颜色
+                color: ' rgba(29, 214, 255, 1)' // 0% 处的颜色
               },
               {
                 offset: 0.7,
-                color: 'rgba(0, 111, 255, 0.5)' // 0% 处的颜色
+                color: ' rgba(29, 214, 255, 0.5)' // 0% 处的颜色
               },
               {
                 offset: 1,
-                color: 'rgba(0, 111, 255, 1)' // 100% 处的颜色
+                color: ' rgba(29, 214, 255, 0.1)' // 100% 处的颜色
               }
             ],
             false
           )
         },
         label: {
-          show: true,
+          show: false,
+          formatter: '{c}',
+          position: 'top',
+          color: '#fff',
+          fontSize: 10
+          // padding: 5
+        }
+      },
+      {
+        type: 'bar',
+        data: data.value[1],
+        // stack: '合并',
+        barWidth: '5',
+        barGap: '100%',
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: ' rgba(255, 77, 79, 1)' // 0% 处的颜色
+              },
+              {
+                offset: 0.7,
+                color: ' rgba(255, 77, 79, 0.5)' // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: ' rgba(255, 77, 79, 0.1)' // 100% 处的颜色
+              }
+            ],
+            false
+          )
+        },
+        label: {
+          show: false,
           formatter: '{c}',
           position: 'top',
           color: '#fff',
@@ -814,15 +854,6 @@ export const getBarOptions = (data: any) => {
           // padding: 5
         }
       }
-      // {
-      //   type: 'bar',
-      //   stack: '合并',
-      //   data: topData,
-      //   barWidth: '15',
-      //   itemStyle: {
-      //     color: 'rgba(252, 217, 18, 1)'
-      //   }
-      // }
     ]
   };
   return option;
diff --git a/src/views/largeScreen/components/rightPage.vue b/src/views/largeScreen/components/rightPage.vue
index a87ed17..0df2f6d 100644
--- a/src/views/largeScreen/components/rightPage.vue
+++ b/src/views/largeScreen/components/rightPage.vue
@@ -8,6 +8,32 @@
     </div>
     <div class="cashFlow">
       <TitleComponent :title="'现金流概述'" />
+      <div class="inflowData">
+        <div class="inflow">
+          <div class="title">现金流入</div>
+          <div class="number">1000000</div>
+          <div class="unit">万元</div>
+        </div>
+        <div class="inflow">
+          <div class="title">现金流出</div>
+          <div class="number">1000000</div>
+          <div class="unit">万元</div>
+        </div>
+        <div class="inflow">
+          <div class="title">净现金流</div>
+          <div class="number">1000000</div>
+          <div class="unit">万元</div>
+        </div>
+      </div>
+      <div class="inflow_echarts">
+        <EchartBox :option="barOption" />
+      </div>
+      <div class="progress">
+        <div class="progress_item">
+          <div class="title">项目进度</div>
+          <div class="number">100%</div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -18,6 +44,8 @@ import EchartBox from '@/components/EchartBox/index.vue';
 import { getLineOption, getBarOptions } from './optionList';
 
 const lineOption = ref();
+const barOption = ref();
+
 const getCapitalData = (data?: any) => {
   // const xData = data.map((item) => item.time);
   // const yData = data.map((item) => item.content);
@@ -33,8 +61,26 @@ const getCapitalData = (data?: any) => {
   };
   lineOption.value = getLineOption(lineData);
 };
+const getTurnoverList = (data?: any) => {
+  // const xData = data.map((item) => item.time);
+  // const yData = data.map((item) => {
+  //   // 先将content转换为数字，再调用toFixed
+  //   const num = Number(item.content);
+  //   return isNaN(num) ? 0 : Number(num.toFixed(2));
+  // });
+
+  const barData = {
+    name: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+    value: [
+      [2, 5, 15, 30, 25, 35, 40, 35, 45, 50, 40, 55],
+      [4, 3, 6, 11, 15, 22, 30, 14, 48, 22, 25, 60]
+    ]
+  };
+  barOption.value = getBarOptions(barData);
+};
 onMounted(() => {
   getCapitalData();
+  getTurnoverList();
 });
 
 //资金KPI
@@ -57,7 +103,7 @@ onMounted(() => {
 }
 .funds_echarts {
   width: 100%;
-  height: 35vh;
+  height: 25vh;
   padding: 10px 0 0 0;
 }
 .cashFlow {
@@ -68,4 +114,52 @@ onMounted(() => {
   padding: 10px 5px;
   margin-top: 20px;
 }
+.inflowData {
+  width: 100%;
+  height: 12vh;
+  // background: #fff;
+  padding-top: 20px;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-gap: 10px;
+  .inflow {
+    width: 100%;
+    height: 100%;
+    // background: #f5f5f5;
+    padding: 10px;
+    box-sizing: border-box;
+    background: rgba(29, 214, 255, 0.1);
+    border-left: 1px solid rgba(29, 214, 255, 1);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    .title {
+      font-size: 14px;
+      // font-weight: 500;
+      color: #fff;
+      padding-bottom: 10px;
+    }
+    .number {
+      font-size: 24px;
+      // font-weight: 500;
+      color: #fff;
+      padding-bottom: 10px;
+    }
+    .unit {
+      font-size: 12px;
+      // font-weight: 500;
+      color: rgba(255, 255, 255, 0.5);
+    }
+  }
+}
+.inflow_echarts {
+  width: 100%;
+  height: 25vh;
+  margin-top: 20px;
+}
+.progress {
+  width: 100%;
+}
 </style>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 22c8fd0..bb7f880 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -251,6 +251,7 @@
             </template>
           </el-table-column>
         </el-table>
+<<<<<<< HEAD
         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize" @pagination="getList" />
         </el-tab-pane>
@@ -305,6 +306,81 @@
                 </el-table-column>
                 <el-table-column prop="unitPrice" label="单价" align="center" />
                 <!-- <el-table-column prop="price" label="总价" align="center">
+=======
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog title="新增" v-model="dialogVisible" width="75%" draggable>
+      <el-row>
+        <el-col :span="11">
+          <el-form :model="form" :rules="rules" ref="formRef" label-width="80px">
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" clearable />
+            </el-form-item>
+            <el-form-item label="内容" prop="content">
+              <el-input v-model="form.content" placeholder="请输入内容" type="textarea" clearable :rows="4" />
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 20px">
+        <el-col :span="24">
+          <el-card shadow="never">
+            <el-form :model="treeForm" :inline="true">
+              <el-form-item label="版本号" prop="versions">
+                <el-select v-model="treeForm.versions" placeholder="选择版本号" @change="changeVersions">
+                  <el-option v-for="item in options" :key="item.versions" :label="item.versions" :value="item.versions" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="表名" prop="sheet">
+                <el-select v-model="treeForm.sheet" placeholder="选择表名" @change="changeSheet">
+                  <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+          <el-table
+            :data="treeData"
+            ref="treeTableRef"
+            v-loading="treeLoading"
+            row-key="id"
+            border
+            lazy
+            default-expand-all
+            @selection-change="handleSelection"
+          >
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="num" label="编号" />
+            <el-table-column prop="name" label="工程或费用名称" />
+            <el-table-column prop="unit" label="单位" />
+            <!-- <el-table-column prop="quantity" label="数量" /> -->
+            <el-table-column prop="selectNum" label="选择数量" align="center">
+              <template #default="scope">
+                <el-input-number
+                  :model-value="scope.row.selectNum"
+                  @change="
+                    (val) => {
+                      scope.row.selectNum = val;
+                      handleNumberChange(scope.row);
+                    }
+                  "
+                  :precision="2"
+                  :step="1"
+                  :controls="false"
+                  :max="Math.floor(scope.row.quantity)"
+                  v-if="scope.row.quantity && scope.row.quantity != 0"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" align="center" />
+            <!-- <el-table-column prop="price" label="总价" align="center">
+>>>>>>> f01487dc504b5118697a1f47b1c22d662f0ad48c
               <template #default="scope">
                 {{ scope.row.price }}
               </template>
@@ -461,7 +537,16 @@
 import { getDicts } from '@/api/system/dict/data';
 import { Plus } from '@element-plus/icons-vue';
 import { FormInstance } from 'element-plus';
-import { treeList, sheetList, segmentedIndicatorPlanning, getPlanningList, updatePlanning, delPlanning, getDetailsList } from '@/api/contract/index';
+import {
+  sheetList,
+  tenderPlanList,
+  addTenderPlan,
+  delTenderPlan,
+  updateTenderPlan,
+  treeList,
+  getTenderPlanDetail,
+  obtainAllVersionNumbers
+} from '@/api/tender/index';
 
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
@@ -490,6 +575,9 @@ const rules = ref({
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
 });
 const loading = ref(false);
+const planType = computed(() => {
+  return activeTab.value == '2' ? '3' : '2';
+});
 
 //字典获取数据
 const getTabsList = async () => {
@@ -513,9 +601,10 @@ const getList = async () => {
       projectId: currentProject.value?.id,
       ...queryParams.value,
       ...queryForm.value,
-      dictName: activeTab.value
+      dictName: activeTab.value,
+      type: planType.value
     };
-    const res = await getPlanningList(params);
+    const res = await tenderPlanList(params);
     if (res.code == 200) {
       tableData.value = res.rows;
       total.value = res.total;
@@ -661,7 +750,7 @@ const handleTabChange = (tabs: any) => {
 
 const openDialog = () => {
   dialogVisible.value = true;
-  getSheetName();
+  getVersionNums();
 };
 const closeDialog = () => {
   dialogVisible.value = false;
@@ -673,19 +762,50 @@ const closeDialog = () => {
 };
 const treeData = ref<any[]>([]);
 const treeForm = ref({
-  sheet: ''
+  sheet: '',
+  versions: ''
 });
 const sheets = ref<any[]>([]);
 const treeTableRef = ref();
 const isExpandAll = ref(false);
 const treeLoading = ref(false);
 const selectionData = ref<any>([]);
+const options = ref([]);
+//切换版本
+const changeVersions = () => {
+  getSheetName();
+};
+//获取版本号
+const getVersionNums = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      workOrderType: planType.value,
+      pageSize: 1000,
+      pageNum: 1
+    };
+
+    const res = await obtainAllVersionNumbers(params);
+    if (res.code == 200) {
+      options.value = res.data;
+      if (res.data.length > 0) {
+        treeForm.value.versions = res.data[0].versions;
+        getSheetName();
+      } else {
+        treeForm.value.versions = '';
+        getSheetName();
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
 //获取表名
 const getSheetName = async () => {
   try {
     const params = {
-      projectId: currentProject.value?.id
-      // versions: queryForm.value.versions
+      projectId: currentProject.value?.id,
+      versions: treeForm.value.versions
     };
     const res = await sheetList(params);
     if (res.code == 200) {
@@ -760,7 +880,9 @@ const getTreeList = async () => {
     treeLoading.value = true;
     const params = {
       projectId: currentProject.value?.id,
-      sheet: treeForm.value.sheet
+      sheet: treeForm.value.sheet,
+      versions: treeForm.value.versions,
+      type: planType.value
     };
     const res = await treeList(params);
     if (res.code == 200) {
@@ -808,10 +930,10 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           ...form.value,
           dictName: activeTab.value,
           limitListBos,
-          type: activeTab.value == '2' ? '3' : '2'
+          type: planType.value
         };
-        return;
-        const res = await segmentedIndicatorPlanning(params);
+
+        const res = await addTenderPlan(params);
         if (res.code == 200) {
           ElMessage({
             message: '新增成功',
@@ -838,7 +960,7 @@ const handleSave = (row: any) => {
       });
       return;
     }
-    updatePlanning(row).then((res) => {
+    updateTenderPlan({ ...row, type: planType.value }).then((res) => {
       if (res.code == 200) {
         ElMessage({
           message: '修改成功',
@@ -859,7 +981,7 @@ const handleSave = (row: any) => {
 const delHandle = (row: any) => {
   try {
     const params = { ids: row.id };
-    delPlanning(params).then((res) => {
+    delTenderPlan(params).then((res) => {
       if (res.code == 200) {
         ElMessage({
           message: '删除成功',
@@ -886,7 +1008,7 @@ const handleDetail = (row: any) => {
   getDetails(row);
 };
 const getDetails = (row: any) => {
-  getDetailsList({ id: row.id }).then((res) => {
+  getTenderPlanDetail({ id: row.id }).then((res) => {
     if (res.code == 200) {
       detailData.value = res.data;
 >>>>>>> aab67593ebb8d9116738d0d867a6119ba61615c8