From 31c21c7bb5c666df7bebf593968b0ab27494ca0a Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Sat, 23 Aug 2025 03:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/out/outDesignTable/index.vue   | 103 ++++++++------
 src/views/out/outDesignTableVS/index.vue | 165 +++++++++++------------
 2 files changed, 139 insertions(+), 129 deletions(-)

diff --git a/src/views/out/outDesignTable/index.vue b/src/views/out/outDesignTable/index.vue
index dff39c3..ae8a4f0 100644
--- a/src/views/out/outDesignTable/index.vue
+++ b/src/views/out/outDesignTable/index.vue
@@ -1,44 +1,54 @@
 <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="month">
-              <el-date-picker v-model="queryParams.month" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
-            </el-form-item>
-            <el-form-item label="产值类型" prop="valueType">
-              <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
-                <el-option label="设计" value="1" />
-                <el-option label="采购" value="2" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label" :name="item.value">
+        <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="month">
+                  <el-date-picker v-model="queryParams.month" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+                </el-form-item>
+                <el-form-item label="产值类型" prop="valueType">
+                  <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
+                    <el-option label="设计" value="1" />
+                    <el-option label="采购" value="2" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-form>
+            </el-card>
+          </div>
+        </transition>
+        <el-card shadow="never">
+          <template #header>
+            <el-row :gutter="10" class="mb8">
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+            </el-row>
+          </template>
 
-      <el-table v-loading="loading" :data="valueAllocationList">
-        <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="月预计产值" align="center" prop="monthEstimatedValue" />
-        <el-table-column label="完成产值月合计" align="center" prop="monthCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifference" />
-        <el-table-column label="项目总产值" align="center" prop="totalValue" />
-        <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
-        <el-table-column label="项目完成率" align="center" prop="projectCompletionRate" />
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
+          <el-table v-loading="loading" :data="valueAllocationList">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="月预计产值" align="center" prop="monthEstimatedValue" />
+            <el-table-column label="完成产值月合计" align="center" prop="monthCompletionValue" />
+            <el-table-column label="产值差额" align="center" prop="valueDifference" />
+            <el-table-column label="项目总产值" align="center" prop="totalValue" />
+            <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
+            <el-table-column label="项目完成率" align="center" prop="projectCompletionRate" />
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -66,8 +76,23 @@ const data = reactive({
     month: undefined
   }
 });
-
+const activeTab = ref('1');
 const { queryParams } = toRefs(data);
+const tabList = [
+  {
+    value: '1',
+    label: '对甲采购设计报表'
+  },
+  {
+    value: '2',
+    label: '对乙采购设计报表'
+  }
+];
+const handleTabChange = (tab) => {
+  activeTab.value = tab;
+  data.queryParams.valueType = '1';
+  data.queryParams.month = '';
+};
 
 /** 查询项目总产值分配列表 */
 const getList = async () => {
diff --git a/src/views/out/outDesignTableVS/index.vue b/src/views/out/outDesignTableVS/index.vue
index eb4b502..13b6b18 100644
--- a/src/views/out/outDesignTableVS/index.vue
+++ b/src/views/out/outDesignTableVS/index.vue
@@ -1,7 +1,7 @@
 <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-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label" :name="item.value">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="计划月份" prop="month">
@@ -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>
@@ -18,68 +19,74 @@
             </el-form-item>
           </el-form>
         </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="valueAllocationList">
-        <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
-        <el-table-column label="累计结算产值" align="center" prop="totalSettlementOutputValue" />
-        <el-table-column label="完工未结算额" align="center" prop="completionUnsettledAmount" />
-        <el-table-column label="完工未结算比例" align="center" prop="completionUnsettledRatio" />
-        <el-table-column label="操作" align="center">
-          <template #default="scope">
-            <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
-          </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-card shadow="never">
+          <el-table v-loading="loading" :data="tableData">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
+            <el-table-column label="分包结算金额" align="center" prop="subTotalSettlementOutputValue" />
+            <el-table-column label="业主结算金额" align="center" prop="ownerTotalSettlementOutputValue" />
+            <el-table-column label="业主结算-分包结算" align="center" prop="differenceValue" />
+            <el-table-column label="操作" align="center">
+              <template #default="scope">
+                <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
+              </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-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
-<script setup name="ValueAllocation" lang="ts">
-import { listOutTable } from '@/api/out/outDesignTableVS';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+<script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-import { dayjs } from 'element-plus';
-// 获取用户 store
 const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-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'));
+const activeTab = ref('1');
+const queryParams = ref({
+  month: '',
+  valueType: '1',
 
-const queryFormRef = ref<ElFormInstance>();
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    valueType: '1',
-    projectId: currentProject.value?.id,
-    month: undefined
-  }
+  pageNum: 1,
+  pageSize: 10
 });
+const total = ref(0);
+const tableData = ref([]);
+const loading = ref(false);
 
-const { queryParams } = toRefs(data);
+const tabList = [
+  {
+    value: '1',
+    label: '对乙产值和对乙结算'
+  },
+  {
+    value: '2',
+    label: '对甲产值和对乙结算'
+  },
+  {
+    value: '3',
+    label: '对甲产值和对甲结算'
+  },
+  {
+    value: '4',
+    label: '对甲产值和对乙产值'
+  }
+];
 
-/** 查询项目总产值分配列表 */
-const getList = async () => {
-  loading.value = true;
+//切换表单
+const handleTabChange = (tab) => {
+  activeTab.value = tab;
+  queryParams.value.month = '';
+  queryParams.value.valueType = '';
 
-  const res = await listOutTable(queryParams.value);
-  valueAllocationList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  handleQuery();
 };
 
 /** 搜索按钮操作 */
@@ -88,45 +95,23 @@ const handleQuery = () => {
   getList();
 };
 
-/** 联查分包结算 */
-const handleEdit = (row: any) => {
-  proxy?.$tab.openPage('/out/settlementValueSubcontract');
-};
-
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
+  queryParams.value.month = '';
+  queryParams.value.valueType = '';
+
   handleQuery();
 };
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/valueAllocation/export',
-    {
-      ...queryParams.value
-    },
-    `valueAllocation_${new Date().getTime()}.xlsx`
-  );
+// 获取列表
+const getList = async () => {
+  const params = {
+    ...queryParams.value,
+    projectId: currentProject.value?.id,
+    activeTab: activeTab.value
+  };
+  console.log(params);
 };
-
-onMounted(() => {
-  // 也可以使用字符串格式（例如 YYYY-MM）
-  const currentMonthString = ref(dayjs().format('YYYY-MM'));
-  queryParams.value.month = currentMonthString.value;
-  getList();
-});
-
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    queryParams.value.projectId = nid;
-    getList();
-  }
-);
-
-onUnmounted(() => {
-  listeningProject();
-});
+const handleEdit = (row: any) => {};
 </script>
+
+<style scoped lang="scss"></style>