提交

.env.development

@@ -6,14 +6,15 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
 # 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.209:8899'
+#屈展航
+VITE_APP_BASE_API = 'http://192.168.110.210:8899'
 # VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 无人机接口地址
 

src/api/progress/progressCategory/index.ts

@@ -61,3 +61,12 @@ export const delProgressCategory = (id: string | number | Array<string | number>
     method: 'delete'
   });
 };
+
+//下载
+export const downloadProgressCategory = (data) => {
+  return request({
+    url: '/progress/progressCategory/export',
+    method: 'post',
+    data
+  });
+};

src/utils/request.ts

@@ -176,7 +176,7 @@ service.interceptors.response.use(
   }
 );
 // 通用下载方法
-export function download(url: string, params: any, fileName: string) {
+export function download(url: string, params: any, fileName: string, isHeader) {
   downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
   // prettier-ignore
   return service.post(url, params, {
@@ -186,7 +186,7 @@ export function download(url: string, params: any, fileName: string) {
           return tansParams(params);
         }
       ],
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      headers: isHeader?{}:{ 'Content-Type': 'application/x-www-form-urlencoded' },
       responseType: 'blob'
     }).then(async (resp: any) => {
       const isLogin = blobValidate(resp);

src/views/progress/progressCategory/index.vue

@@ -8,6 +8,7 @@
               <!-- <el-input v-model="queryParams.pid" placeholder="请选择" clearable /> -->
               <el-cascader
                 :options="matrixOptions"
+                ref="treeRef"
                 placeholder="请选择"
                 @change="handleChange"
                 :props="{ value: 'matrixId', label: 'name' }"
@@ -29,6 +30,9 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Export" @click="handleExport">导出</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
@@ -144,10 +148,12 @@ import {
   getProgressCategory,
   delProgressCategory,
   addProgressCategory,
-  updateProgressCategory
+  updateProgressCategory,
+  downloadProgressCategory
 } from '@/api/progress/progressCategory';
 import { ProgressCategoryVO, ProgressCategoryQuery, ProgressCategoryForm } from '@/api/progress/progressCategory/types';
 import { useUserStoreHook } from '@/store/modules/user';
+import { download } from '@/utils/request';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { progress_unit_type, progress_work_type } = toRefs<any>(proxy?.useDict('progress_unit_type', 'progress_work_type'));
@@ -161,7 +167,7 @@ type ProgressCategoryOption = {
   name: string;
   children?: ProgressCategoryOption[];
 };
-
+const treeRef = ref();
 const matrixOptions = ref([]);
 
 const progressCategoryList = ref<ProgressCategoryVO[]>([]);
@@ -236,6 +242,7 @@ const data = reactive<PageData<ProgressCategoryForm, ProgressCategoryQuery>>({
 });
 
 const { queryParams, form, rules } = toRefs(data);
+const matrixIdList = ref([]);
 
 /** 查询分项工程单价列表 */
 const getList = async () => {
@@ -252,7 +259,6 @@ const getList = async () => {
       });
       if (!matrixValue.value) matrixValue.value = matrixList[0].id;
       matrixOptions.value = matrixList;
-      console.log('🚀 ~ getList ~ matrixList:', matrixList);
       queryParams.value.matrixId = matrixList[0].children[0].matrixId;
       form.value.projectId = matrixList[0].projectId;
       form.value.matrixId = matrixList[0].children[0].matrixId;
@@ -300,9 +306,7 @@ const reset = () => {
 const handleChange = (value: number) => {
   form.value.matrixId = value[1];
   form.value.projectId = value[0];
-
   queryParams.value.matrixId = value[1];
-
   getList();
 };
 
@@ -361,6 +365,13 @@ const handleUpdate = async (row: ProgressCategoryVO) => {
   dialog.title = '修改分项工程单价';
 };
 
+const handleExport = async () => {
+  const ids = treeRef.value.getCheckedNodes()[0].pathNodes[0].childrenData.map((item) => item.matrixId);
+  const res = await downloadProgressCategory({ ids });
+  download('/progress/progressCategory/export', { ids }, '方阵.xlsx', true);
+  // window.open(res.data);
+};
+
 /** 提交按钮 */
 const submitForm = () => {
   progressCategoryFormRef.value?.validate(async (valid: boolean) => {

src/views/tender/bidd/index.vue

@@ -37,6 +37,9 @@
               <el-form-item>
                 <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
               </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="handleAudit()">审核</el-button>
+              </el-form-item>
             </el-form>
           </el-card>
         </transition>
@@ -104,6 +107,8 @@ const queryForm = ref({
   sheet: ''
 });
 
+const versionsData = ref({});
+
 const activeTab = ref('2');
 const sheets = ref([]);
 const options = ref([]);
@@ -118,7 +123,8 @@ const handleTabChange = (tab: string) => {
   getVersionNums();
 };
 //切换版本
-const changeVersions = () => {
+const changeVersions = (value) => {
+  versionsData.value = options.value.find((item) => item.versions == value);
   getSheetName();
 };
 //切换表格
@@ -148,6 +154,8 @@ const getVersionNums = async () => {
       options.value = res.data;
       if (res.data.length > 0) {
         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 = '';
@@ -261,6 +269,15 @@ const handleSave = (row: any) => {
     loading.value = false;
   }
 };
+
+/** 审核按钮操作 */
+const handleAudit = async () => {
+  proxy?.$tab.openPage('/approval/tenderPlan/indexEdit', '审核招标一览', {
+    id: queryForm.value.versions,
+    type: 'update'
+  });
+};
+
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,

src/views/tender/bidd/indexEdit.vue

@@ -0,0 +1,358 @@
+<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.id"
+          :status="form.auditStatus"
+          :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-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
+            <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="remark" label="单价" align="center">
+              <template #default="scope">
+                <el-input-number
+                  :model-value="scope.row.unitPrice"
+                  @change="(val) => (scope.row.unitPrice = val)"
+                  :precision="2"
+                  :step="0.1"
+                  :controls="false"
+                  v-if="scope.row.quantity && scope.row.quantity != 0"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price }}
+              </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 ComponentInternalInstance;
+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 { getConstructionValue } from '@/api/out/constructionValue';
+import { workScheduleListDetail } from '@/api/progress/plan';
+// 获取用户 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 + '_constructionValue',
+    label: '施工产值审批'
+  }
+];
+
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const tableData = ref([]);
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  matrixName: undefined,
+  progressCategoryName: undefined,
+  artificialNum: undefined,
+  planNum: undefined,
+  planDate: undefined,
+  uavNum: undefined,
+  confirmNum: undefined,
+  outValue: undefined,
+  reportDate: undefined,
+  reportDateId: undefined,
+  auditStatus: undefined
+};
+const data = reactive({
+  form: { ...initFormData },
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getConstructionValue(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+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: LeaveForm) => {
+  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.auditStatus === '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;
+    console.log('🚀 ~ proxy.$route.query:', proxy.$route.query);
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+    }
+  });
+});
+</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

@@ -94,6 +94,7 @@
                 v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
                 >详情</el-button
               >
+
               <el-button
                 type="primary"
                 link
@@ -242,7 +243,7 @@ import {
   biddViewLook,
   delBiddView
 } from '@/api/tender/index';
-
+const { proxy } = getCurrentInstance();
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const tabList = ref<any[]>([]);