From ba037ac2cd49f1e749b2a65cbb1b5d2e8b9a1838 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Fri, 22 Aug 2025 22:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |   5 +-
 src/views/contract/division/index.vue       |   1 +
 src/views/contract/limitPrice/index.vue     |  31 ++--
 src/views/contract/limitPrice/indexEdit.vue |  48 ++++---
 src/views/out/outTable/index.vue            | 152 +++++++++-----------
 src/views/tender/bidd/index.vue             |   6 +-
 src/views/tender/plan/index.vue             |  29 ++--
 7 files changed, 137 insertions(+), 135 deletions(-)

diff --git a/.env.development b/.env.development
index 6e07116..b7dcd4d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,10 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+#朱银
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+#曾涛
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 
 # 无人机接口地址
 
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index fe7153c..f78dd09 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -25,6 +25,7 @@
           </el-table-column>
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
+          <el-table-column prop="price" label="限价" />
           <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
             <template #default="scope">
               <el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index c491091..090e53a 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -47,7 +47,7 @@
         <el-table-column prop="name" label="工程或费用名称" />
         <el-table-column prop="unit" label="单位" />
         <el-table-column prop="quantity" label="数量" />
-        <el-table-column prop="remark" label="单价" align="center">
+        <el-table-column prop="unitPrice" label="单价" align="center">
           <template #default="scope">
             <el-input-number
               :model-value="scope.row.unitPrice"
@@ -84,7 +84,7 @@
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
 import { listBillofquantitiesLimitList, obtainAllVersionNumbers, sheetList, updatePrice, importExcelFile } from '@/api/contract/index';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
 
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
@@ -97,6 +97,7 @@ const options = ref<any[]>([]);
 const sheets = ref<any[]>([]);
 const tableData = ref<any[]>([]);
 const isExpandAll = ref(false);
+const reviewStatus = ref('');
 
 //获取版本号
 const getVersionNums = async () => {
@@ -113,6 +114,7 @@ const getVersionNums = async () => {
       options.value = res.data;
       if (res.data.length > 0) {
         queryForm.value.versions = res.data[0].versions;
+        reviewStatus.value = res.data[0].status;
 
         getSheetName();
       } else {
@@ -138,11 +140,11 @@ const changeVersions = () => {
 
 //选择表名
 const changeSheet = () => {
-  getTableData(); 
+  getTableData();
 };
 
 //获取表名
-const getSheetName = async () => {  
+const getSheetName = async () => {
   try {
     const params = {
       projectId: currentProject.value?.id,
@@ -182,14 +184,10 @@ const getTableData = async () => {
     };
     const res = await listBillofquantitiesLimitList(params);
     if (res.code == 200) {
-      tableData.value = [res.data[0]];
+      tableData.value = res.data;
     }
   } catch (error) {
     console.log(error);
-    ElMessage({
-      message: '获取表格失败',
-      type: 'error'
-    });
     tableData.value = [];
     loading.value = false;
   } finally {
@@ -273,16 +271,19 @@ const handleExport = () => {
   );
 };
 // 审批
-function clickApprovalSheet() {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+const clickApprovalSheet = () => {
+  proxy.$tab.closePage(proxy?.$route);
+  proxy?.$router.push({
     path: `/approval/contractLimitPrice/indexEdit`,
     query: {
-      id: '',
-      type: 'update'
+      projectId: currentProject.value?.id,
+      versions: queryForm.value.versions,
+      sheet: queryForm.value.sheet,
+      type: 'update',
+      status: reviewStatus.value
     }
   });
-}
+};
 onUnmounted(() => {
   listeningProject();
 });
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
index c4571f2..d4e32da 100644
--- a/src/views/contract/limitPrice/indexEdit.vue
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -34,17 +34,25 @@
                   <el-form-item label="版本号" prop="formNo">
                     <el-input disabled v-model="form.versions" placeholder="请输入文件名称" />
                   </el-form-item>
+                  <el-form-item label="表名" prop="formNo">
+                    <el-input disabled v-model="form.sheet" placeholder="请输入文件名称" />
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
           </el-form>
-          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" default-expand-all border>
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="specification" label="规格" />
             <el-table-column prop="unit" label="单位" />
             <el-table-column prop="quantity" label="数量" />
-            <el-table-column prop="remark" label="备注" />
+            <el-table-column prop="unitPrice" label="单价" align="center" />
+            <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </el-card>
@@ -88,10 +96,10 @@ import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
 import { useUserStoreHook } from '@/store/modules/user';
 const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
-import { detailsMaterialAndEquipmentApproval } from '@/api/design/billofQuantities/index';
+import { listBillofquantitiesLimitList } from '@/api/contract/index';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -100,6 +108,7 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 //路由参数
 const routeParams = ref<Record<string, any>>({});
+
 const flowCode = ref<string>('');
 const status = ref<string>('');
 const dialogVisible = reactive<DialogOption>({
@@ -113,8 +122,8 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 //按钮组件
 const flowCodeOptions = [
   {
-    value: currentProject.value?.id + '_contractPriceLimit',
-    label: '合同限价审核'
+    value: currentProject.value?.id + '_xianjiayilan',
+    label: '合约限价审核'
   }
 ];
 
@@ -132,11 +141,9 @@ const submitFormData = ref<StartProcessBo>({
 const taskVariables = ref<Record<string, any>>({});
 
 const initFormData = {
-  id: undefined,
-  fileName: undefined,
-  fileUrl: undefined,
-  status: undefined,
-  originalName: undefined
+  versions: '',
+  sheet: '',
+  status: ''
 };
 const data = reactive({
   form: { ...initFormData },
@@ -162,13 +169,16 @@ const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    const res = await detailsMaterialAndEquipmentApproval(routeParams.value.id);
+    const res = await listBillofquantitiesLimitList({
+      projectId: routeParams.value?.id,
+      versions: routeParams.value.versions,
+      sheet: routeParams.value.sheet
+    });
     console.log('res.data', res.data);
-
-    Object.assign(form.value, res.data);
+    Object.assign(form.value, routeParams.value);
     console.log('form', form.value);
-
-    tableData.value = res.data.auditData;
+    tableData.value = res.data;
+    console.log('tableData', tableData.value);
     loading.value = false;
     buttonLoading.value = false;
   });
@@ -185,10 +195,10 @@ const submitFlow = async () => {
   dialogVisible.visible = false;
 };
 //提交申请
-const handleStartWorkFlow = async (data: LeaveForm) => {
+const handleStartWorkFlow = async (data: any) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.versions;
+    submitFormData.value.businessId = data.versions + '_xianjiayilan';
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -244,6 +254,8 @@ onMounted(() => {
     routeParams.value = proxy.$route.query;
     reset();
     loading.value = false;
+    console.log(routeParams.value);
+
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
       console.log('routeParams.value', routeParams.value);
diff --git a/src/views/out/outTable/index.vue b/src/views/out/outTable/index.vue
index acf57f8..7b2510e 100644
--- a/src/views/out/outTable/index.vue
+++ b/src/views/out/outTable/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">
@@ -13,70 +13,66 @@
             </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="totalValue" />
-        <el-table-column label="月预计产值" align="center" prop="monthlyEstimatedValue" />
-        <el-table-column label="完成产值(第一周)" align="center" prop="firstWeekCompletionValue" />
-        <el-table-column label="完成产值(第二周)" align="center" prop="secondWeekCompletionValue" />
-        <el-table-column label="完成产值(第三周)" align="center" prop="thirdWeekCompletionValue" />
-        <el-table-column label="完成产值(第四周)" align="center" prop="fourthWeekCompletionValue" />
-        <el-table-column label="完成产值(第五周)" align="center" prop="fifthWeekCompletionValue" />
-        <el-table-column label="完成产值月合计" align="center" prop="totalCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifference" />
-        <el-table-column label="预计累计产值" align="center" prop="estimatedAccumulatedValue" />
-        <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifferenceAccumulation" />
-        <el-table-column label="项目完成总进度" align="center" prop="totalCompletionProgress" />
-      </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="totalValue" />
+            <el-table-column label="月预计产值" align="center" prop="monthlyEstimatedValue" />
+            <el-table-column label="完成产值(第一周)" align="center" prop="firstWeekCompletionValue" />
+            <el-table-column label="完成产值(第二周)" align="center" prop="secondWeekCompletionValue" />
+            <el-table-column label="完成产值(第三周)" align="center" prop="thirdWeekCompletionValue" />
+            <el-table-column label="完成产值(第四周)" align="center" prop="fourthWeekCompletionValue" />
+            <el-table-column label="完成产值(第五周)" align="center" prop="fifthWeekCompletionValue" />
+            <el-table-column label="完成产值月合计" align="center" prop="totalCompletionValue" />
+            <el-table-column label="产值差额" align="center" prop="valueDifference" />
+            <el-table-column label="预计累计产值" align="center" prop="estimatedAccumulatedValue" />
+            <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
+            <el-table-column label="产值差额" align="center" prop="valueDifferenceAccumulation" />
+            <el-table-column label="项目完成总进度" align="center" prop="totalCompletionProgress" />
+          </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/outTable';
-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 queryFormRef = ref<ElFormInstance>();
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    projectId: currentProject.value?.id,
-    month: undefined
-  }
+const activeTab = ref('1');
+const queryParams = ref({
+  month: '',
+  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: '对乙施工报表'
+  }
+];
 
-/** 查询项目总产值分配列表 */
-const getList = async () => {
-  loading.value = true;
-
-  const res = await listOutTable(queryParams.value);
-  valueAllocationList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+//切换表单
+const handleTabChange = (tab) => {
+  activeTab.value = tab;
+  queryParams.value.month = '';
+  handleQuery();
 };
 
 /** 搜索按钮操作 */
@@ -87,38 +83,18 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
+  queryParams.value.month = '';
   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();
-});
 </script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue
index 8df76ed..540b9c8 100644
--- a/src/views/tender/bidd/index.vue
+++ b/src/views/tender/bidd/index.vue
@@ -27,7 +27,7 @@
                   class="upload-demo"
                   :http-request="importExcel"
                   :show-file-list="false"
-                  v-hasPermi="['tender:billofquantitiesLimitList:importExcelFile']"
+                  v-hasPermi="['tender:tenderPlanLimitList:importExcelFile']"
                 >
                   <template #trigger>
                     <el-button type="primary">导入excel</el-button>
@@ -35,7 +35,7 @@
                 </el-upload>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
+                <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:tenderPlanLimitList:export']">导出excel</el-button>
               </el-form-item>
             </el-form>
           </el-card>
@@ -70,7 +70,7 @@
                   size="small"
                   @click="handleSave(scope.row)"
                   v-if="scope.row.quantity && scope.row.quantity != 0"
-                  v-hasPermi="['tender:billofquantitiesLimitList:edit']"
+                  v-hasPermi="['tender:tenderPlanLimitList:edit']"
                   >确定</el-button
                 >
               </template>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index c378eea..4cf702f 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -14,7 +14,7 @@
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain :icon="Plus" @click="openDialog" v-hasPermi="['tender:segmentedIndicatorPlanning:add']">新增</el-button>
+              <el-button type="primary" plain :icon="Plus" @click="openDialog" v-hasPermi="['tender:biddingPlan:add']">新增</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -26,11 +26,10 @@
           </el-table-column>
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
+          <el-table-column prop="price" label="限价" />
           <el-table-column prop="bidd" label="招标文件">
             <template #default="scope">
-              <el-button type="primary" link v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']" @click="biddView(scope.row)"
-                >查看文件</el-button
-              >
+              <el-button type="primary" link v-hasPermi="['tender:biddingPlan:getAnnex']" @click="biddView(scope.row)">查看文件</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="winningBidder" label="中标单位" />
@@ -52,6 +51,7 @@
                 value-format="YYYY-MM-DD"
                 placeholder="选择时间"
                 :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:edit']"
               />
             </template>
           </el-table-column>
@@ -69,6 +69,7 @@
                 :step="1"
                 :controls="false"
                 :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:edit']"
               />
             </template>
           </el-table-column>
@@ -80,7 +81,7 @@
                 link
                 icon="FolderOpened"
                 @click="handleSave(scope.row)"
-                v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                v-hasPermi="['tender:biddingPlan:uploadBiddingDocuments']"
                 :disabled="scope.row.bidStatus == 1"
                 >招标上传
               </el-button>
@@ -89,7 +90,7 @@
                 link
                 icon="FolderOpened"
                 @click="handleWinTheBid(scope.row)"
-                v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                v-hasPermi="['tender:biddingPlan:uploadBiddingDocuments']"
                 :disabled="scope.row.bidStatus == 1"
                 >中标上传
               </el-button>
@@ -102,7 +103,7 @@
                 icon="View"
                 @click="handleDetail(scope.row)"
                 :disabled="scope.row.bidStatus == 1"
-                v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
+                v-hasPermi="['tender:biddingPlan:getMore']"
                 >详情</el-button
               >
               <el-button
@@ -111,7 +112,7 @@
                 icon="Delete"
                 @click="delHandle(scope.row)"
                 :disabled="scope.row.bidStatus == 1"
-                v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+                v-hasPermi="['tender:biddingPlan:remove']"
                 >删除</el-button
               >
               <el-button
@@ -120,7 +121,7 @@
                 icon="Lock"
                 @click="editStatusBtn(scope.row)"
                 :disabled="scope.row.bidStatus == 1"
-                v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+                v-hasPermi="['tender:biddingPlan:editStatus']"
                 >确定</el-button
               >
             </template>
@@ -232,7 +233,15 @@
         <el-table-column prop="price" label="操作" align="center">
           <template #default="scope">
             <el-button type="primary" link icon="View" @click="openPdf(scope.row.url)">查看</el-button>
-            <el-button type="primary" link icon="Delete" @click="delHandlebidd(scope.row)" v-if="scope.row.bidStatus != 1">删除</el-button>
+            <el-button
+              type="primary"
+              link
+              icon="Delete"
+              @click="delHandlebidd(scope.row)"
+              v-if="scope.row.bidStatus != 1"
+              v-hasPermi="['tender:biddingPlanAnnex:remove']"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>