合并

.env.development

@@ -12,7 +12,7 @@ VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
 # VITE_APP_BASE_API = 'http://192.168.110.213:8899'
 # 朱银
-# 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.171:8899'
 

src/api/contract/index.ts

@@ -91,3 +91,11 @@ export const getDetailsList = (query: any): AxiosPromise<any> => {
     params: query
   });
 };
+
+//获取版本详情
+export const getVersionDetails = (id: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/tenderPlanLimitList/getVersionDetail/' + id,
+    method: 'get'
+  });
+};

src/api/tender/index.ts

@@ -122,11 +122,10 @@ export const editStatus = (query: any): AxiosPromise<any> => {
     data: query
   });
 };
-//获取审核状态
+//获取版本详情
-export const getApproval = (id) => {
+export const getVersionDetail = (id: any) => {
   return request({
-    url: '/tender/tenderPlanLimitList/getVersionDetail',
+    url: '/tender/tenderPlanLimitList/getVersionDetail/' + id,
-    method: 'get',
+    method: 'get'
-    params: { versions: id }
   });
 };

src/views/biddingManagemen/biddingLimit/indexEdit.vue

@@ -19,13 +19,35 @@
           <h3 class="text-lg font-semibold text-gray-800">成本核算清单</h3>
         </div>
         <div class="p-6">
-          <el-form ref="leaveFormRef" disabled :model="form" :rules="rules" label-width="100px" class="space-y-4">
+          <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="100px" class="space-y-4">
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-4" v-for="item in sheets" :key="item">
+            <div class="grid grid-cols-1 gap-4">
-              <el-form-item label="表格文件">
+              <el-row>
-                <span style="color: #8d8d8d">{{ item }}</span>
+                <el-col :span="12">
-              </el-form-item>
+                  <el-form-item label="版本号" prop="formNo">
+                    <el-input :disabled="true" v-model="form.versions" placeholder="请输入文件名称" />
+                  </el-form-item>
+                  <el-form-item label="表名" prop="sheet">
+                    <el-select v-model="form.sheet" placeholder="选择表名" @change="changeSheet">
+                      <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+                    </el-select>
+                  </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" 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="unitPrice" label="单价" align="center" />
+            <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </el-card>
       <!-- 提交组件 -->
@@ -68,9 +90,9 @@ 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';
-import { getVersionDetail, sheetList } from '@/api/bidding/biddingLimit';
+import { getVersionDetail, sheetList, getTreeLimit } from '@/api/bidding/biddingLimit';
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -99,7 +121,6 @@ const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 //按钮组件
 const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
-const sheets = ref([]);
 const versions = ref({});
 const leaveFormRef = ref<ElFormInstance>();
 const dialog = reactive({
@@ -124,7 +145,10 @@ const initFormData = {
   fileSuffix: undefined,
   originalName: undefined,
   remark: undefined,
-  fileId: undefined
+  fileId: undefined,
+  status: undefined,
+  versions: undefined,
+  sheet: undefined
 };
 const data = reactive({
   form: { ...initFormData },
@@ -150,24 +174,46 @@ const getInfo = () => {
   buttonLoading.value = false;
   nextTick(async () => {
     const res = await getVersionDetail(routeParams.value.id);
+    console.log(res);
     Object.assign(form.value, res.data);
-    getSheetName(res.data.versions);
     loading.value = false;
     buttonLoading.value = false;
+    getSheetName();
   });
 };
+const sheets = ref([]);
 //获取表名
-const getSheetName = async (versions) => {
+const getSheetName = async () => {
-  const params = {
+  try {
-    projectId: currentProject.value?.id,
+    const params = {
-    versions
+      projectId: currentProject.value?.id,
-  };
+      versions: form.value.versions
-  const res = await sheetList(params);
+    };
-  if (res.code == 200) {
+    const res = await sheetList(params);
-    sheets.value = res.data;
+    if (res.code == 200) {
-    if (res.data.length > 0) {
       sheets.value = res.data;
+      if (res.data.length > 0) {
+        form.value.sheet = res.data[0];
+      }
+      getListTable();
     }
+  } catch (error) {}
+};
+//选择表名
+const changeSheet = () => {
+  getListTable();
+};
+const tableData = ref([]);
+
+//获取列表
+const getListTable = async () => {
+  const res = await getTreeLimit({
+    projectId: currentProject.value?.id,
+    versions: form.value.versions,
+    sheet: form.value.sheet
+  });
+  if (res.code == 200) {
+    tableData.value = res.data;
   }
 };
 /** 提交按钮 */
@@ -185,7 +231,7 @@ const submitFlow = async () => {
 const handleStartWorkFlow = async (data: LeaveForm) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.versions + '_abc';
+    submitFormData.value.businessId = data.id;
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -203,7 +249,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(form.value.versions + '_abc');
+  approvalRecordRef.value.init(form.value.id);
 };
 //提交回调
 const submitCallback = async () => {
@@ -242,9 +288,10 @@ onMounted(() => {
     reset();
     routeParams.value = proxy.$route.query;
     loading.value = false;
-    // if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
-    getInfo();
+      getInfo();
-    // }
+      console.log('routeParams.value', routeParams.value);
+    }
   });
 });
 </script>

src/views/contract/bidCost/index.vue

@@ -38,7 +38,7 @@
               v-if="versionObj.status == 'draft'"
               icon="Edit"
               @click="handleAudit"
-              v-hasPermi="['desibiddinggn:biddingLimitList:query']"
+              v-hasPermi="['bidding:biddingLimitList:getVersionDetail']"
               >审核</el-button
             >
           </el-form-item>
@@ -47,7 +47,7 @@
               type="primary"
               icon="view"
               @click="handleViewInfo"
-              v-hasPermi="['desibiddinggn:biddingLimitList:query']"
+              v-hasPermi="['bidding:biddingLimitList:getVersionDetail']"
               v-if="versionObj.status != 'draft'"
               >查看流程</el-button
             >
@@ -76,10 +76,10 @@
         </el-table-column>
         <el-table-column prop="price" label="总价" align="center">
           <template #default="scope">
-            {{ scope.row.price }}
+            {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
           </template>
         </el-table-column>
-        <el-table-column prop="price" label="操作" align="center">
+        <el-table-column prop="operate" label="操作" align="center">
           <template #default="scope">
             <el-button
               type="primary"
@@ -174,7 +174,8 @@ const getTableData = async () => {
   loading.value = true;
   const params = {
     projectId: currentProject.value?.id,
-    sheet: queryForm.value.sheet
+    sheet: queryForm.value.sheet,
+    versions: queryForm.value.versions
   };
   const res = await getTreeLimit(params);
   loading.value = false;
@@ -267,7 +268,7 @@ const handleAudit = () => {
     path: `/approval/biddingLimit/indexEdit`,
     query: {
       id,
-      type: 'add',
+      type: 'update',
       sheets: sheets.value,
       versions: versionObj.value
     }

src/views/contract/limitPrice/index.vue

@@ -36,10 +36,22 @@
             <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" v-if="reviewStatus == 'draft'" @click="clickApprovalSheet()">审核</el-button>
+            <el-button
+              type="primary"
+              v-if="reviewStatus == 'draft'"
+              @click="clickApprovalSheet()"
+              v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+              >审核</el-button
+            >
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" v-if="reviewStatus != 'draft'" @click="clickApprovalSheet()">查看流程</el-button>
+            <el-button
+              type="primary"
+              v-if="reviewStatus != 'draft'"
+              @click="clickApprovalSheet()"
+              v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+              >查看流程</el-button
+            >
           </el-form-item>
         </el-form>
       </el-card>
@@ -55,7 +67,11 @@
             <el-input-number
               :disabled="reviewStatus != 'draft'"
               :model-value="scope.row.unitPrice"
-              @change="(val) => (scope.row.unitPrice = val)"
+              @change="
+                (val) => {
+                  scope.row.unitPrice = val;
+                }
+              "
               :precision="2"
               :step="0.1"
               :controls="false"
@@ -66,10 +82,12 @@
         </el-table-column>
         <el-table-column prop="price" label="总价" align="center">
           <template #default="scope">
-            {{ scope.row.price }}
+            <!-- {{ scope.row.children.length > 0 ? scope.row.children.reduce((sum, child) => sum + child.price, 0) : scope.row.price }} -->
+            {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+            <!-- {{ scope.row.price }} -->
           </template>
         </el-table-column>
-        <el-table-column prop="price" label="操作" align="center">
+        <el-table-column prop="operate" label="操作" align="center">
           <template #default="scope">
             <el-button
               type="primary"
@@ -104,7 +122,8 @@ const sheets = ref<any[]>([]);
 const tableData = ref<any[]>([]);
 const isExpandAll = ref(false);
 const reviewStatus = ref('');
-
+const versionObj: any = ref({});
+const versionMap = new Map();
 //获取版本号
 const getVersionNums = async () => {
   try {
@@ -119,9 +138,11 @@ const getVersionNums = async () => {
     if (res.code == 200) {
       options.value = res.data;
       if (res.data.length > 0) {
+        res.data.forEach((item: any) => {
+          versionMap.set(item.versions, item);
+        });
         queryForm.value.versions = res.data[0].versions;
         reviewStatus.value = res.data[0].status;
-
         getSheetName();
       } else {
         queryForm.value.versions = '';
@@ -284,20 +305,19 @@ const handleExport = () => {
 // 审批
 const clickApprovalSheet = () => {
   proxy.$tab.closePage(proxy?.$route);
+  let id = versionMap.get(queryForm.value.versions).id;
   proxy?.$router.push({
     path: `/approval/contractLimitPrice/indexEdit`,
     query: {
-      projectId: currentProject.value?.id,
+      id: id,
-      versions: queryForm.value.versions,
-      sheet: queryForm.value.sheet,
       type: 'update',
-      status: reviewStatus.value
+      sheets: queryForm.value.sheet
     }
   });
 };
 onUnmounted(() => {
   listeningProject();
-  console.log(11111111);
+  // console.log(11111111);
 });
 onMounted(() => {
   getVersionNums();

src/views/contract/limitPrice/indexEdit.vue

@@ -16,26 +16,20 @@
       <!-- 表单区域 -->
       <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
-          <h3 class="text-lg font-semibold text-gray-800">合同限价审核</h3>
+          <h3 class="text-lg font-semibold text-gray-800">合约限价审核</h3>
         </div>
         <div class="p-6">
-          <el-form
+          <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="100px" class="space-y-4">
-            ref="leaveFormRef"
-            v-loading="loading"
-            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
-            :model="form"
-            :rules="rules"
-            label-width="100px"
-            class="space-y-4"
-          >
             <div class="grid grid-cols-1 gap-4">
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="版本号" prop="formNo">
-                    <el-input disabled v-model="form.versions" placeholder="请输入文件名称" />
+                    <el-input :disabled="true" v-model="form.versions" placeholder="请输入文件名称" />
                   </el-form-item>
-                  <el-form-item label="表名" prop="formNo">
+                  <el-form-item label="表名" prop="sheet">
-                    <el-input disabled v-model="form.sheet" placeholder="请输入文件名称" />
+                    <el-select v-model="form.sheet" placeholder="选择表名" @change="changeSheet">
+                      <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+                    </el-select>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -50,7 +44,7 @@
             <el-table-column prop="unitPrice" label="单价" align="center" />
             <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
-                {{ scope.row.price }}
+                {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
               </template>
             </el-table-column>
           </el-table>
@@ -95,7 +89,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 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 { listBillofquantitiesLimitList } from '@/api/contract/index';
+import { listBillofquantitiesLimitList, getVersionDetails, sheetList } from '@/api/contract/index';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -139,7 +133,8 @@ const taskVariables = ref<Record<string, any>>({});
 const initFormData = {
   versions: '',
   sheet: '',
-  status: ''
+  status: '',
+  id: ''
 };
 const data = reactive({
   form: { ...initFormData },
@@ -165,21 +160,47 @@ const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    const res = await listBillofquantitiesLimitList({
+    const res = await getVersionDetails(routeParams.value.id);
-      projectId: routeParams.value?.id,
+    console.log(res);
-      versions: routeParams.value.versions,
+    Object.assign(form.value, res.data);
-      sheet: routeParams.value.sheet
-    });
-    console.log('res.data', res.data);
-    Object.assign(form.value, routeParams.value);
-    console.log('form', form.value);
-    tableData.value = res.data;
-    console.log('tableData', tableData.value);
     loading.value = false;
     buttonLoading.value = false;
+    getSheetName();
   });
 };
-
+const sheets = ref([]);
+//获取表名
+const getSheetName = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      versions: form.value.versions
+    };
+    const res = await sheetList(params);
+    if (res.code == 200) {
+      sheets.value = res.data;
+      if (res.data.length > 0) {
+        form.value.sheet = res.data[0];
+      }
+      getListTable();
+    }
+  } catch (error) {}
+};
+//选择表名
+const changeSheet = () => {
+  getListTable();
+};
+//获取列表
+const getListTable = async () => {
+  const res = await listBillofquantitiesLimitList({
+    projectId: currentProject.value?.id,
+    versions: form.value.versions,
+    sheet: form.value.sheet
+  });
+  if (res.code == 200) {
+    tableData.value = res.data;
+  }
+};
 /** 提交按钮 */
 const submitForm = (status1: string) => {
   status.value = status1;
@@ -194,7 +215,7 @@ const submitFlow = async () => {
 const handleStartWorkFlow = async (data: any) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.versions + '_xianjiayilan';
+    submitFormData.value.businessId = data.id;
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -212,7 +233,7 @@ const handleStartWorkFlow = async (data: any) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(form.value.versions);
+  approvalRecordRef.value.init(form.value.id);
 };
 //提交回调
 const submitCallback = async () => {
@@ -251,7 +272,6 @@ onMounted(() => {
     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);

src/views/tender/bidd/index.vue

@@ -38,8 +38,16 @@
                 <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:tenderPlanLimitList:export']">导出excel</el-button>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" @click="handleAudit('update')" v-if="versionsData.status == 'draft'">审核</el-button>
+                <el-button
-                <el-button type="warning" @click="handleAudit('view')" v-else>查看流程</el-button>
+                  type="primary"
+                  @click="handleAudit()"
+                  v-if="versionsData.status == 'draft'"
+                  v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+                  >审核</el-button
+                >
+                <el-button type="warning" @click="handleAudit()" v-else v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+                  >查看流程</el-button
+                >
               </el-form-item>
             </el-form>
           </el-card>
@@ -65,10 +73,10 @@
             </el-table-column>
             <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
-                {{ scope.row.price }}
+                {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
               </template>
             </el-table-column>
-            <el-table-column prop="price" label="操作" align="center">
+            <el-table-column prop="operate" label="操作" align="center">
               <template #default="scope">
                 <el-button
                   type="primary"
@@ -76,6 +84,7 @@
                   @click="handleSave(scope.row)"
                   v-if="scope.row.quantity && scope.row.quantity != 0"
                   v-hasPermi="['tender:tenderPlanLimitList:edit']"
+                  :disabled="versionsData.status != 'draft'"
                   >确定</el-button
                 >
               </template>
@@ -118,6 +127,7 @@ const tableData = ref([]);
 const tableRef = ref();
 const isExpandAll = ref(false);
 const loading = ref(false);
+const versionMap = new Map();
 
 // 切换tab
 const handleTabChange = (tab: string) => {
@@ -155,9 +165,11 @@ const getVersionNums = async () => {
     if (res.code == 200) {
       options.value = res.data;
       if (res.data.length > 0) {
+        res.data.forEach((item: any) => {
+          versionMap.set(item.versions, item);
+        });
         queryForm.value.versions = res.data[0].versions;
         versionsData.value = options.value.find((item) => item.versions == queryForm.value.versions);
-        console.log('🚀 ~ changeVersions ~ versionsData.value:', versionsData.value);
         getSheetName();
       } else {
         queryForm.value.versions = '';
@@ -273,13 +285,21 @@ const handleSave = (row: any) => {
 };
 
 /** 审核按钮操作 */
-const handleAudit = async (type) => {
+const handleAudit = async () => {
-  proxy?.$tab.openPage('/approval/tenderBidd/indexEdit', '审核招标一览', {
+  let id = versionMap.get(queryForm.value.versions).id;
-    id: queryForm.value.versions,
+  console.log(id);
-    type,
+  if (activeTab.value == '2') {
-    activeTab: activeTab.value,
+    proxy?.$tab.openPage('/approval/tenderBidd/indexEdit', '招采工程量清单审核', {
-    status: versionsData.value.status
+      id: id,
-  });
+      type: 'update'
+    });
+  }
+  if (activeTab.value == '3') {
+    proxy?.$tab.openPage('/approval/tenderBidd/indexEdit2', '物资设备清单审核', {
+      id: id,
+      type: 'update'
+    });
+  }
 };
 
 //监听项目id刷新数据

src/views/tender/bidd/indexEdit.vue

@@ -8,7 +8,7 @@
           @approvalVerifyOpen="approvalVerifyOpen"
           @handleApprovalRecord="handleApprovalRecord"
           :buttonLoading="buttonLoading"
-          :id="form.id"
+          :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
         />
@@ -16,26 +16,20 @@
       <!-- 表单区域 -->
       <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
-          <h3 class="text-lg font-semibold text-gray-800">招标一览</h3>
+          <h3 class="text-lg font-semibold text-gray-800">招采工程量清单审核</h3>
         </div>
         <div class="p-6">
-          <el-form
+          <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="100px" class="space-y-4">
-            ref="leaveFormRef"
-            v-loading="loading"
-            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
-            :model="form"
-            :rules="rules"
-            label-width="100px"
-            class="space-y-4"
-          >
             <div class="grid grid-cols-1 gap-4">
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="版本号" prop="formNo">
-                    <el-input disabled v-model="form.versions" placeholder="请输入文件名称" />
+                    <el-input :disabled="true" v-model="form.versions" placeholder="请输入文件名称" />
                   </el-form-item>
-                  <el-form-item label="表名" prop="formNo">
+                  <el-form-item label="表名" prop="sheet">
-                    <el-input disabled v-model="form.sheet" placeholder="请输入文件名称" />
+                    <el-select v-model="form.sheet" placeholder="选择表名" @change="changeSheet">
+                      <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+                    </el-select>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -43,13 +37,14 @@
           </el-form>
           <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="name" label="名称" />
+            <el-table-column prop="specification" label="规格" />
             <el-table-column prop="unit" label="单位" />
             <el-table-column prop="quantity" label="数量" />
             <el-table-column prop="unitPrice" label="单价" align="center" />
             <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
-                {{ scope.row.price }}
+                {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
               </template>
             </el-table-column>
           </el-table>
@@ -98,11 +93,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 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 { getKnowledgeDocument } from '@/api/design/technicalStandard';
+import { obtainAllVersionNumbers, sheetList, getTableList, updatePrice, importExcelFile, getVersionDetail } from '@/api/tender/index';
-import { getConstructionValue } from '@/api/out/constructionValue';
-import { workScheduleListDetail } from '@/api/progress/plan';
-import { sheetList } from '@/api/contract';
-import { getApproval, getTableList } from '@/api/tender';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -126,21 +117,16 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const flowCodeOptions = [
   {
     value: currentProject.value?.id + '_bLimitEquipmentList',
-    label: '招标一览审批'
+    label: '招采工程量清单审核'
   }
 ];
-const sheets = ref([]);
+
-const queryForm = ref({
-  versions: '',
-  sheet: ''
-});
 const leaveFormRef = ref<ElFormInstance>();
 const dialog = reactive({
   visible: false,
   title: '',
   isEdit: false
 });
-const tableData = ref([]);
 const submitFormData = ref<StartProcessBo>({
   businessId: '',
   flowCode: '',
@@ -149,15 +135,14 @@ const submitFormData = ref<StartProcessBo>({
 const taskVariables = ref<Record<string, any>>({});
 
 const initFormData = {
-  id: undefined,
+  versions: '',
-  projectId: currentProject.value?.id,
+  sheet: '',
-  versions: undefined,
+  status: '',
-  sheet: undefined,
+  id: ''
-  type: undefined,
-  status: undefined
 };
 const data = reactive({
   form: { ...initFormData },
+  tableData: [],
   rules: {}
 });
 
@@ -166,57 +151,61 @@ const handleClose = () => {
   flowCode.value = '';
   buttonLoading.value = false;
 };
-const { form, rules } = toRefs(data);
+const { form, rules, tableData } = toRefs(data);
 
 /** 表单重置 */
-const reset = () => {
+// const reset = () => {
-  form.value = { ...initFormData };
+//   form.value = { ...initFormData };
-  leaveFormRef.value?.resetFields();
+//   leaveFormRef.value?.resetFields();
-};
+// };
 
 /** 获取详情 */
-const getInfo = async () => {
+const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    try {
+    const res = await getVersionDetail(routeParams.value.id);
-      const params = {
+    console.log(res);
-        projectId: currentProject.value?.id,
+    Object.assign(form.value, res.data);
-        versions: form.value.versions
-      };
-      const res = await sheetList(params);
-      if (res.code == 200) {
-        sheets.value = res.data;
-        if (res.data.length > 0) {
-          queryForm.value.sheet = res.data[0];
-        } else {
-          queryForm.value.sheet = '';
-        }
-        try {
-          const res = await getTableList(form.value);
-          if (res.code == 200) {
-            tableData.value = res.data;
-          }
-        } catch (error) {
-          console.log(error);
-        }
-      }
-    } catch (error) {
-      console.log(error);
-    }
-    getApproval(form.value.versions).then((res) => {
-      form.value.status = res.data.status;
-    });
-    if (routeParams.value.type === 'approval') {
-      form.value.id = routeParams.value.id;
-    } else {
-      form.value.id = routeParams.value.id + '_' + routeParams.value.activeTab;
-    }
     loading.value = false;
     buttonLoading.value = false;
+    getSheetName();
   });
 };
-
+const sheets = ref([]);
+//获取表名
+const getSheetName = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      versions: form.value.versions
+    };
+    const res = await sheetList(params);
+    if (res.code == 200) {
+      sheets.value = res.data;
+      if (res.data.length > 0) {
+        form.value.sheet = res.data[0];
+      }
+      getListTable();
+    }
+  } catch (error) {}
+};
+//选择表名
+const changeSheet = () => {
+  getListTable();
+};
+//获取列表
+const getListTable = async () => {
+  const res = await getTableList({
+    projectId: currentProject.value?.id,
+    versions: form.value.versions,
+    sheet: form.value.sheet,
+    type: '2'
+  });
+  if (res.code == 200) {
+    tableData.value = res.data;
+  }
+};
 /** 提交按钮 */
 const submitForm = (status1: string) => {
   status.value = status1;
@@ -231,7 +220,7 @@ const submitFlow = async () => {
 const handleStartWorkFlow = async (data: any) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.versions + '_xianjiayilan';
+    submitFormData.value.businessId = data.id;
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -285,20 +274,11 @@ const submit = async (status, data) => {
 onMounted(() => {
   nextTick(async () => {
     routeParams.value = proxy.$route.query;
-    console.log('🚀 ~ proxy.$route.query:', proxy.$route.query);
-    reset();
     loading.value = false;
     console.log(routeParams.value);
-
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
-      if (routeParams.value.type === 'approval') {
-        form.value.versions = routeParams.value.id.split('_')[0];
-        form.value.type = routeParams.value.id.split('_')[1];
-      } else {
-        form.value.versions = routeParams.value.id;
-        form.value.type = routeParams.value.activeTab;
-      }
       getInfo();
+      console.log('routeParams.value', routeParams.value);
     }
   });
 });

src/views/tender/bidd/indexEdit2.vue

@@ -0,0 +1,389 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.versions"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">物资工程量清单审核</h3>
+        </div>
+        <div class="p-6">
+          <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="100px" class="space-y-4">
+            <div class="grid grid-cols-1 gap-4">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="版本号" prop="formNo">
+                    <el-input :disabled="true" v-model="form.versions" placeholder="请输入文件名称" />
+                  </el-form-item>
+                  <el-form-item label="表名" prop="sheet">
+                    <el-select v-model="form.sheet" placeholder="选择表名" @change="changeSheet">
+                      <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+                    </el-select>
+                  </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" 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="unitPrice" label="单价" align="center" />
+            <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+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 any;
+import { useUserStoreHook } from '@/store/modules/user';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+import { obtainAllVersionNumbers, sheetList, getTableList, updatePrice, importExcelFile, getVersionDetail } from '@/api/tender/index';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+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>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_wuziyilan',
+    label: '物资工程量清单审核'
+  }
+];
+
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  versions: '',
+  sheet: '',
+  status: '',
+  id: ''
+};
+const data = reactive({
+  form: { ...initFormData },
+  tableData: [],
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules, tableData } = toRefs(data);
+
+/** 表单重置 */
+// const reset = () => {
+//   form.value = { ...initFormData };
+//   leaveFormRef.value?.resetFields();
+// };
+
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getVersionDetail(routeParams.value.id);
+    console.log(res);
+    Object.assign(form.value, res.data);
+    loading.value = false;
+    buttonLoading.value = false;
+    getSheetName();
+  });
+};
+const sheets = ref([]);
+//获取表名
+const getSheetName = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      versions: form.value.versions
+    };
+    const res = await sheetList(params);
+    if (res.code == 200) {
+      sheets.value = res.data;
+      if (res.data.length > 0) {
+        form.value.sheet = res.data[0];
+      }
+      getListTable();
+    }
+  } catch (error) {}
+};
+//选择表名
+const changeSheet = () => {
+  getListTable();
+};
+//获取列表
+const getListTable = async () => {
+  const res = await getTableList({
+    projectId: currentProject.value?.id,
+    versions: form.value.versions,
+    sheet: form.value.sheet,
+    type: '3'
+  });
+  if (res.code == 200) {
+    tableData.value = res.data;
+  }
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: any) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    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);
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>

src/views/tender/plan/index.vue

@@ -26,18 +26,26 @@
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
           <el-table-column prop="price" label="限价" />
-          <el-table-column prop="bidd" label="招标文件">
+          <el-table-column prop="bidd">
+            <template #header> <span style="color: red">*</span>招标文件 </template>
             <template #default="scope">
               <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="中标单位" />
+          <el-table-column prop="winningBidder">
-          <el-table-column prop="bidFileName" label="中标文件">
+            <template #header> <span style="color: red">*</span>中标单位 </template>
+            <template #default="scope">
+              {{ scope.row.winningBidder }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="bidFileName">
+            <template #header> <span style="color: red">*</span>中标文件 </template>
             <template #default="scope">
               <el-button type="primary" link @click="openPdf(scope.row.bidFile)">{{ scope.row.bidFileName }} </el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center" width="250">
+          <el-table-column prop="plannedBiddingTime" align="center" width="250">
+            <template #header> <span style="color: red">*</span>计划招标时间 </template>
             <template #default="scope">
               <el-date-picker
                 v-model="scope.row.plannedBiddingTime"
@@ -54,7 +62,8 @@
               />
             </template>
           </el-table-column>
-          <el-table-column prop="contractPrice" label="合同金额" align="center" width="200">
+          <el-table-column prop="contractPrice" align="center" width="200">
+            <template #header> <span style="color: red">*</span>合同金额 </template>
             <template #default="scope">
               <el-input-number
                 :model-value="scope.row.contractPrice"