合并

.env.development

@@ -5,10 +5,16 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-#朱银
+# 李陈杰 209
+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.149:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.171:8899'
 
 # 无人机接口地址
 

src/api/ctr/incomeContract/index.ts

@@ -71,4 +71,16 @@ export const getFileList = (data) => {
     method: 'get',
     params: data
   })
+}
+
+/**
+ * 查看收入合同附件列表
+ * @param id
+ */
+export const getInfoByProjectId = (data) => {
+  return request({
+    url: '/bidding/listOfWinningBids/getInfoByProjectId',
+    method: 'get',
+    params: data
+  })
 }

src/api/materials/batchPlan/index.ts

@@ -143,3 +143,20 @@ export const getDictList = (query: any): AxiosPromise<any[]> => {
     params: query
   });
 };
+export const coryEngineeringList = (query: any): AxiosPromise<any[]> => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/coryEngineeringList',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 获取到物资状态为已完成的版本
+ */
+export const obtainTheVersion = (query: any) => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/obtainTheVersion',
+    method: 'get',
+    params: query
+  });
+};

src/api/materials/materialIssue/index.ts

@@ -61,3 +61,10 @@ export const delMaterialIssue = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
+//获取一起名称
+export const getMaterialName = (id: any) => {
+  return request({
+    url: '/materials/materials/inventoryNumber/' + id,
+    method: 'get'
+  });
+};

src/api/out/monthPlan/index.ts

@@ -98,3 +98,26 @@ export const getMonthInfo = (query): AxiosPromise<MonthPlanVO> => {
     params: query
   });
 };
+/**
+ * 修改采购完工产值对甲
+
+ * @param id
+ */
+export const purchaseValueAup = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueAup',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 采购完工产值对甲
+ * @param id
+ */
+export const purchaseValueA = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueA',
+    method: 'get',
+    params: query
+  });
+};

src/api/out/outDesignTableVS/index.ts

@@ -7,3 +7,19 @@ export function listOutTable(query: any) {
     params: query
   });
 }
+// 对甲产值和对乙产值
+export function comparisonOfOutputValue(query: any) {
+  return request({
+    url: '/out/table/outCompare',
+    method: 'get',
+    params: query
+  });
+}
+// 对甲结算和对乙结算
+export function comparisonOfSettlementValue(query: any) {
+  return request({
+    url: '/out/table/comparisonOfOwnerAndSub',
+    method: 'get',
+    params: query
+  });
+}

src/api/out/purchase/index.ts

@@ -0,0 +1,24 @@
+import request from '@/utils/request';
+/**
+ * 修改采购完工产值对甲
+
+ * @param id
+ */
+export const purchaseValueAup = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueAup',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 采购完工产值对甲
+ * @param id
+ */
+export const purchaseValueA = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueA',
+    method: 'get',
+    params: query
+  });
+};

src/api/progress/constructionSchedulePlan/index.ts

@@ -61,3 +61,13 @@ export const delConstructionSchedulePlan = (id: string | number | Array<string |
     method: 'delete'
   });
 };
+/**
+ * 获取项目结构
+ * @param id
+ */
+export const getProjectStructure = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/project/project/projectStructure/' + id,
+    method: 'get'
+  });
+};

src/api/progress/progressCategory/types.ts

@@ -84,10 +84,10 @@ export interface ProgressCategoryVO {
    */
   remark: string;
 
-    /**
+  /**
-     * 子对象
+   * 子对象
-     */
+   */
-    children: ProgressCategoryVO[];
+  children: ProgressCategoryVO[];
 }
 
 export interface ProgressCategoryForm extends BaseEntity {
@@ -95,7 +95,8 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
-
+  constructionPrice?: string | number;
+  ownerPrice?: string | number;
   /**
    * 父类别id
    */
@@ -175,11 +176,9 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface ProgressCategoryQuery {
-
   /**
    * 父类别id
    */
@@ -255,11 +254,8 @@ export interface ProgressCategoryQuery {
    */
   status?: string;
 
-    /**
+  /**
-     * 日期范围参数
+   * 日期范围参数
-     */
+   */
-    params?: any;
+  params?: any;
 }
-
-
-

src/components/Editor/index.vue

@@ -1,28 +1,14 @@
 <template>
   <div>
-    <el-upload
+    <el-upload v-if="type === 'url'" :action="upload.url" :before-upload="handleBeforeUpload"
-      v-if="type === 'url'"
+      :on-success="handleUploadSuccess" :on-error="handleUploadError" class="editor-img-uploader" name="file"
-      :action="upload.url"
+      :show-file-list="false" :headers="upload.headers">
-      :before-upload="handleBeforeUpload"
-      :on-success="handleUploadSuccess"
-      :on-error="handleUploadError"
-      class="editor-img-uploader"
-      name="file"
-      :show-file-list="false"
-      :headers="upload.headers"
-    >
       <i ref="uploadRef"></i>
     </el-upload>
   </div>
   <div class="editor">
-    <quill-editor
+    <quill-editor ref="quillEditorRef" v-model:content="content" content-type="html" :options="options" :style="styles"
-      ref="quillEditorRef"
+      @text-change="(e: any) => $emit('update:modelValue', content)" />
-      v-model:content="content"
-      content-type="html"
-      :options="options"
-      :style="styles"
-      @text-change="(e: any) => $emit('update:modelValue', content)"
-    />
   </div>
 </template>
 
@@ -47,7 +33,9 @@ const props = defineProps({
   /* 上传文件大小限制(MB) */
   fileSize: propTypes.number.def(5),
   /* 类型（base64格式、url格式） */
-  type: propTypes.string.def('url')
+  type: propTypes.string.def('url'),
+  /* 占位符 */
+  placeholder: propTypes.string.def('请输入内容'),
 });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -90,7 +78,7 @@ const options = ref<any>({
       }
     }
   },
-  placeholder: '请输入内容',
+  placeholder: props.placeholder,
   readOnly: props.readOnly
 });
 
@@ -166,77 +154,96 @@ const handleUploadError = (err: any) => {
 .editor-img-uploader {
   display: none;
 }
+
 .editor,
 .ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
 }
+
 .quill-img {
   display: none;
 }
+
 .ql-snow .ql-tooltip[data-mode='link']::before {
   content: '请输入链接地址:';
 }
+
 .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
   border-right: 0;
   content: '保存';
   padding-right: 0;
 }
+
 .ql-snow .ql-tooltip[data-mode='video']::before {
   content: '请输入视频地址:';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
   content: '14px';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
   content: '10px';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
   content: '18px';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
   content: '32px';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
   content: '文本';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
   content: '标题1';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
   content: '标题2';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
   content: '标题3';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
   content: '标题4';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
   content: '标题5';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
   content: '标题6';
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
   content: '标准字体';
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
   content: '衬线字体';
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
   content: '等宽字体';

src/views/biddingManagemen/biddingLimit/indexEdit.vue

@@ -70,7 +70,7 @@ 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';
-import { getVersionDetail } from '@/api/bidding/biddingLimit';
+import { getVersionDetail, sheetList } from '@/api/bidding/biddingLimit';
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -82,8 +82,8 @@ const loading = ref(true);
 const routeParams = ref<Record<string, any>>({});
 const flowCodeOptions = [
   {
-    value: currentProject.value?.id + '_costAccounting',
+    value: currentProject.value?.id + '_biddingLimitList',
-    label: '成本核算清单审批'
+    label: '投标一览审核'
   }
 ];
 
@@ -151,11 +151,25 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getVersionDetail(routeParams.value.id);
     Object.assign(form.value, res.data);
+    getSheetName(res.data.versions);
     loading.value = false;
     buttonLoading.value = false;
   });
 };
-
+//获取表名
+const getSheetName = async (versions) => {
+  const params = {
+    projectId: currentProject.value?.id,
+    versions
+  };
+  const res = await sheetList(params);
+  if (res.code == 200) {
+    sheets.value = res.data;
+    if (res.data.length > 0) {
+      sheets.value = res.data;
+    }
+  }
+};
 /** 提交按钮 */
 const submitForm = (status1: string) => {
   status.value = status1;
@@ -171,7 +185,7 @@ const submitFlow = async () => {
 const handleStartWorkFlow = async (data: LeaveForm) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.id;
+    submitFormData.value.businessId = data.versions + '_abc';
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -189,7 +203,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(form.value.id);
+  approvalRecordRef.value.init(form.value.versions + '_abc');
 };
 //提交回调
 const submitCallback = async () => {
@@ -227,13 +241,10 @@ onMounted(() => {
   nextTick(async () => {
     reset();
     routeParams.value = proxy.$route.query;
-    sheets.value = routeParams.value.sheets;
-    versions.value = routeParams.value.versions;
-    Object.assign(form.value, versions.value);
     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();
-    }
+    // }
   });
 });
 </script>

src/views/biddingManagemen/listOfWinningBids/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="p-4 bg-gray-50 min-h-screen">
     <!-- 卡片容器：控制最大宽度+居中+圆角阴影 -->
-    <el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0" style="background-color: #ffffff">
+    <el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0"
+      style="background-color: #ffffff">
       <!-- 卡片头部：项目信息展示区 -->
       <template #header>
         <div class="bg-blue-50 px-6 rounded-t-xl" style="padding: 10px 20px">
@@ -55,62 +56,17 @@
             </div>
           </div>
         </div>
-        <div class="mt-4 mb-6">
+        <!-- <div class="mt-4 mb-6">
-          <el-button @click="isDisabled = false" type="primary" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
+          <el-button @click="isDisabled = false" type="primary"
+            class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
             点击编辑
           </el-button>
-        </div>
+        </div> -->
       </template>
       <!-- 中标信息表单区域 -->
-      <el-form
+      <el-form :disabled="isDisabled" ref="listOfWinningBidsFormRef" :model="form" :rules="rules" label-width="150px"
-        :disabled="isDisabled"
+        class="p-6 pt-4" style="background-color: #ffffff">
-        ref="listOfWinningBidsFormRef"
-        :model="form"
-        :rules="rules"
-        label-width="150px"
-        class="p-6 pt-4"
-        style="background-color: #ffffff"
-      >
         <el-row :gutter="32">
-          <!-- 是否中标（必填） -->
-          <el-col :span="12">
-            <el-form-item label="是否中标" prop="whetherBid" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-radio-group v-model="form.whetherBid">
-                <el-radio label="0" border>中标</el-radio>
-                <el-radio label="1" border>未中标</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!-- 中标价（必填，仅中标时显示） -->
-          <el-col :span="12" v-if="form.whetherBid == '0'">
-            <el-form-item label="中标价(人民币)" prop="bidPrice" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.bidPrice" type="number" placeholder="请输入中标价" />
-            </el-form-item>
-          </el-col>
-          <!-- 中标通知书（必填，仅中标时显示） -->
-          <el-col :span="12" v-if="form.whetherBid == '0'">
-            <el-form-item label="中标通知书" prop="bidFileId" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <!-- <el-upload
-                ref="upload"
-                class="upload-demo"
-                action="http://192.168.110.149:8899/resource/oss/upload"
-                :limit="1"
-                :on-exceed="handleExceed"
-                :on-success="handleUploadSuccess"
-                :file-list="fileList"
-                :auto-upload="true"
-                :headers="headers"
-              >
-                <template #trigger>
-                  <el-button type="primary">上传文件</el-button>
-                </template>
-                <template #tip>
-                  <div class="el-upload__tip text-red">上传pdf文件，仅支持.pdf文件</div>
-                </template>
-              </el-upload> -->
-              <file-upload @onUploadSuccess="handleUploadSuccess" v-model="form.bidFileId" :limit="1" :file-type="['pdf']" :file-size="50" />
-            </el-form-item>
-          </el-col>
           <!-- 招标代理机构 -->
           <el-col :span="12">
             <el-form-item label="招标代理机构" prop="biddingAgency" class="rounded-lg border border-gray-100 p-1 mb-5">
@@ -123,29 +79,18 @@
               <el-input v-model="form.tenderer" placeholder="请输入招标人" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"></el-col>
           <!-- 投标截止时间 -->
           <el-col :span="12">
             <el-form-item label="投标截止时间" prop="biddingDeadline" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-date-picker
+              <el-date-picker v-model="form.biddingDeadline" format="YYYY-MM-DD HH:mm:ss"
-                v-model="form.biddingDeadline"
+                value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择投标截止时间" />
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="datetime"
-                placeholder="请选择投标截止时间"
-              />
             </el-form-item>
           </el-col>
           <!-- 开标时间 -->
           <el-col :span="12">
             <el-form-item label="开标时间" prop="bidopeningTime" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-date-picker
+              <el-date-picker v-model="form.bidopeningTime" format="YYYY-MM-DD HH:mm:ss"
-                v-model="form.bidopeningTime"
+                value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择开标时间" />
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="datetime"
-                placeholder="请选择开标时间"
-              />
             </el-form-item>
           </el-col>
 
@@ -163,52 +108,81 @@
           </el-col>
           <!-- 答疑截止时间 -->
           <el-col :span="12">
-            <el-form-item label="答疑截止时间" prop="answeringDeadlineTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+            <el-form-item label="答疑截止时间" prop="answeringDeadlineTime"
-              <el-date-picker
+              class="rounded-lg border border-gray-100 p-1 mb-5">
-                v-model="form.answeringDeadlineTime"
+              <el-date-picker v-model="form.answeringDeadlineTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择答疑截止时间" />
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择答疑截止时间"
-              />
             </el-form-item>
           </el-col>
           <!-- 澄清截止时间 -->
           <el-col :span="12">
             <el-form-item label="澄清截止时间" prop="clarifyDeadlineTime" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-date-picker
+              <el-date-picker format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss "
-                format="YYYY-MM-DD HH:mm:ss"
+                v-model="form.clarifyDeadlineTime" type="datetime" placeholder="请选择澄清截止时间" />
-                value-format="YYYY-MM-DD HH:mm:ss "
-                v-model="form.clarifyDeadlineTime"
-                type="datetime"
-                placeholder="请选择澄清截止时间"
-              />
             </el-form-item>
           </el-col>
           <!-- 项目概况 -->
           <el-col :span="24">
             <el-form-item label="项目概况" prop="projectOverview" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectOverview" type="textarea" rows="3" placeholder="请输入项目概况" />
+              <el-input v-model="form.projectOverview" type="textarea" placeholder="请输入项目概况" />
             </el-form-item>
           </el-col>
         </el-row>
         <!-- 操作按钮区域 -->
-        <el-row v-if="!isDisabled" class="mt-8">
+        <el-row v-if="!form.id" class="mt-4">
           <el-col :span="24" class="text-center">
-            <el-button
+            <el-button :loading="buttonLoading" type="primary" @click="submitForm"
-              :loading="buttonLoading"
+              v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']" class="rounded-full px-8"
-              type="primary"
+              size="large">
-              @click="submitForm"
-              v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
-              class="rounded-full px-8"
-              size="large"
-            >
               确认提交
             </el-button>
             <el-button type="default" @click="resetForm" class="ml-6 rounded-full px-8" size="large"> 重置 </el-button>
           </el-col>
         </el-row>
       </el-form>
+      <div style="margin-top: 20px;" v-if="form.id">
+        <span style=" color: rgb(38 153 255);
+    display: inline-block;
+    margin-left: 40px;
+    font-weight: 700;">是否中标配置</span>
+        <el-form ref="listOfWinningBidsFormRef" :disabled="iswhetherBid" :model="form" :rules="rules"
+          label-width="150px" class="p-6 pt-4" style="background-color: #ffffff">
+          <el-row>
+            <!-- 是否中标（必填） -->
+            <el-col :span="12">
+              <el-form-item label="是否中标" prop="whetherBid" class="rounded-lg border border-gray-100 p-1 mb-5">
+                <el-radio-group v-model="form.whetherBid">
+                  <el-radio label="0" border>中标</el-radio>
+                  <el-radio label="1" border>未中标</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <!-- 中标价（必填，仅中标时显示） -->
+            <el-col :span="12" v-if="form.whetherBid == '0'">
+              <el-form-item label="中标价(人民币)" prop="bidPrice" class="rounded-lg border border-gray-100 p-1 mb-5">
+                <el-input v-model="form.bidPrice" type="number" placeholder="请输入中标价" />
+              </el-form-item>
+            </el-col>
+            <!-- 中标通知书（必填，仅中标时显示） -->
+            <!-- <el-col :span="12" v-if="form.whetherBid == '0'">
+              <el-form-item label="中标通知书" prop="bidFileId" class="rounded-lg border border-gray-100 p-1 mb-5">
+                <el-input v-if="form.bidFileName" v-model="form.bidFileName" disabled placeholder="请输入中标通知书" />
+                <file-upload v-else v-model="form.bidFileId" :limit="1" :file-type="['pdf']" :file-size="50" />
+              </el-form-item>
+            </el-col> -->
+          </el-row>
+          <!-- 操作按钮区域 -->
+          <el-row class="mt-4" v-if="!iswhetherBid && form.whetherBid == '0'">
+            <el-col :span="24" class="text-center">
+              <el-button :loading="buttonLoading1" type="primary" @click="submitForm"
+                v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
+                class="rounded-full px-8" size="large">
+                中标
+              </el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </el-card>
   </div>
 </template>
@@ -229,6 +203,7 @@ const headers = ref(globalHeaders());
 const fileList = ref([]);
 // 用户状态管理与当前项目
 const userStore = useUserStoreHook();
+const iswhetherBid = ref(false); // 是否中标
 const currentProject = computed(() => userStore.selectedProject);
 // const realUploadUrl = computed(() => {
 //   const search = new URLSearchParams().toString();
@@ -254,6 +229,7 @@ const projectInfo = reactive({
 // 表单核心变量
 const listOfWinningBidsFormRef = ref<ElFormInstance>();
 const buttonLoading = ref(false);
+const buttonLoading1 = ref(false);
 const isDisabled = ref(false);
 const fileObj = ref({
   bidFile: undefined,
@@ -347,10 +323,6 @@ const getDictLabel = (dictList: any[], value: any) => {
   const dictItem = dictList.find((item) => item.value === value);
   return dictItem ? dictItem.label : '';
 };
-const handleUploadSuccess = (val) => {
-  fileObj.value.bidFile = val.url;
-  fileObj.value.bidFileName = val.fileName;
-};
 const upload = ref<UploadInstance>();
 
 const handleExceed: UploadProps['onExceed'] = (files) => {
@@ -370,6 +342,11 @@ const initData = async () => {
       if (res.code === 200) {
         resetForm();
         if (res.data) {
+          if (res.data.bidPrice) {
+            iswhetherBid.value = true;
+          } else {
+            iswhetherBid.value = false;
+          }
           Object.assign(form.value, res.data);
           isDisabled.value = true;
         } else {
@@ -394,7 +371,9 @@ const submitForm = async () => {
         // 1. 同步项目ID和名称
         form.value.projectId = currentProject.value?.id;
         form.value.projectName = projectInfo.projectName;
+        delete projectInfo.id;
         await addListOfWinningBids({ ...form.value, ...projectInfo });
+        initData();
         // 4. 提交成功后切换为查看状态
         isDisabled.value = true;
         ElMessage.success('提交成功');
@@ -495,6 +474,7 @@ onUnmounted(() => {
 .el-button {
   transition: all 0.2s ease;
 }
+
 .el-button:hover {
   transform: translateY(-1px);
 }
@@ -503,6 +483,7 @@ onUnmounted(() => {
 .el-form-item {
   transition: all 0.2s ease;
 }
+
 .el-form-item:hover {
   border-color: #e6f7ff;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
@@ -513,6 +494,7 @@ onUnmounted(() => {
   .grid {
     display: grid;
   }
+
   .grid-cols-1 {
     grid-template-columns: repeat(1, minmax(0, 1fr));
   }
@@ -522,6 +504,7 @@ onUnmounted(() => {
   .md\:grid-cols-2 {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
+
   .md\:col-span-2 {
     grid-column: span 2 / span 2;
   }
@@ -531,6 +514,7 @@ onUnmounted(() => {
   .lg\:grid-cols-3 {
     grid-template-columns: repeat(3, minmax(0, 1fr));
   }
+
   .lg\:col-span-3 {
     grid-column: span 3 / span 3;
   }
@@ -540,18 +524,23 @@ onUnmounted(() => {
 .gap-6 {
   gap: 1.5rem;
 }
+
 .mb-5 {
   margin-bottom: 1.25rem;
 }
+
 .mb-6 {
   margin-bottom: 1.5rem;
 }
+
 .mt-4 {
   margin-top: 1rem;
 }
+
 .mt-6 {
   margin-top: 1.5rem;
 }
+
 .mt-8 {
   margin-top: 2rem;
 }

src/views/contract/bidCost/index.vue

@@ -0,0 +1,301 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <el-card shadow="always">
+        <el-form :model="queryForm" :inline="true">
+          <el-form-item label="版本号" prop="versions">
+            <el-select v-model="queryForm.versions" placeholder="选择版本号" @change="changeVersions">
+              <el-option v-for="item in options" :key="item.id" :label="item.versions" :value="item.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="表名" prop="sheet">
+            <el-select v-model="queryForm.sheet" placeholder="选择表名" @change="changeSheet">
+              <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-upload
+              ref="uploadRef"
+              class="upload-demo"
+              :http-request="importExcel"
+              :show-file-list="false"
+              v-hasPermi="['bidding:biddingLimitList:importExcelFile']"
+            >
+              <template #trigger>
+                <el-button type="primary">导入excel</el-button>
+              </template>
+            </el-upload>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              v-if="versionObj.status == 'draft'"
+              icon="Edit"
+              @click="handleAudit"
+              v-hasPermi="['desibiddinggn:biddingLimitList:query']"
+              >审核</el-button
+            >
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="view"
+              @click="handleViewInfo"
+              v-hasPermi="['desibiddinggn:biddingLimitList:query']"
+              v-if="versionObj.status != 'draft'"
+              >查看流程</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </el-card>
+    </transition>
+    <el-card shadow="never" class="mb8">
+      <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
+              :disabled="versionObj.status != 'draft'"
+              :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-column prop="price" label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              size="small"
+              :disabled="versionObj.status != 'draft'"
+              @click="handleSave(scope.row)"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+              v-hasPermi="['bidding:biddingLimitList:edit']"
+              >确定</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useUserStoreHook } from '@/store/modules/user';
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList, obtainAllVersionNumbers } from '@/api/bidding/biddingLimit';
+const { proxy } = getCurrentInstance() as any;
+
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const queryForm = ref({
+  versions: '',
+  sheet: ''
+});
+const loading = ref(false);
+const options = ref<any[]>([]);
+const sheets = ref<any[]>([]);
+const tableData = ref<any[]>([]);
+const isExpandAll = ref(true);
+const versionObj: any = ref({});
+const versionMap = new Map();
+//获取版本号
+const getVersionNums = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      pageSize: 1000,
+      pageNum: 1
+    };
+    const res = await obtainAllVersionNumbers(params);
+    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;
+        versionObj.value = res.data[0];
+        getSheetName();
+      } else {
+        queryForm.value.versions = '';
+        versionObj.value = {};
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
+//选择版本号
+const changeVersions = (val) => {
+  getSheetName();
+};
+
+//选择表名
+const changeSheet = () => {
+  getTableData();
+};
+
+//获取表名
+const getSheetName = async () => {
+  const params = {
+    projectId: currentProject.value?.id,
+    versions: queryForm.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 = '';
+    }
+    getTableData();
+  }
+};
+//获取表格
+const getTableData = async () => {
+  loading.value = true;
+  const params = {
+    projectId: currentProject.value?.id,
+    sheet: queryForm.value.sheet
+  };
+  const res = await getTreeLimit(params);
+  loading.value = false;
+  if (res.code == 200) {
+    if (res.data && res.data.length > 0) {
+      tableData.value = [res.data[0]];
+    } else {
+      tableData.value = [];
+    }
+  }
+};
+//修改单价
+const handleSave = (row: any) => {
+  try {
+    if (!row.unitPrice) {
+      ElMessage({
+        message: '请输入单价',
+        type: 'warning'
+      });
+      return;
+    }
+    loading.value = true;
+    biddingLimitListUpdate(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getTableData();
+      }
+    });
+  } catch (error) {
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+const tableRef = ref<any>();
+
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
+
+  tableData.value.forEach((row) => {
+    tableRef.value.toggleRowExpansion(row, isExpandAll.value);
+  });
+};
+//导入
+const importExcel = (options: any): any => {
+  let formData = new FormData();
+  formData.append('file', options.file);
+  loading.value = true;
+  BiddingImportExcelFile({ projectId: currentProject.value?.id }, formData)
+    .then((res) => {
+      const { code } = res;
+      if (code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getTableData();
+      }
+    })
+    .catch((err) => {})
+    .finally(() => {
+      loading.value = false;
+    });
+};
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    getVersionNums();
+    // getSheetName();
+  }
+);
+const handleExport = () => {
+  proxy?.download(
+    '/bidding/biddingLimitList/export',
+    {
+      projectId: currentProject.value?.id,
+      sheet: queryForm.value.sheet
+    },
+    `限价一览表${queryForm.value.sheet}.xlsx`
+  );
+};
+// 审核
+const handleAudit = () => {
+  proxy.$tab.closePage(proxy.$route);
+  let id = versionMap.get(queryForm.value.versions).id;
+  proxy.$router.push({
+    path: `/approval/biddingLimit/indexEdit`,
+    query: {
+      id,
+      type: 'add',
+      sheets: sheets.value,
+      versions: versionObj.value
+    }
+  });
+};
+// 查看审核
+const handleViewInfo = () => {
+  proxy.$tab.closePage(proxy.$route);
+  let id = versionMap.get(queryForm.value.versions).id;
+  console.log(versionObj.value);
+
+  proxy.$router.push({
+    path: `/approval/biddingLimit/indexEdit`,
+    query: {
+      id,
+      type: 'view',
+      sheets: sheets.value,
+      versions: versionObj.value
+    }
+  });
+};
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  getVersionNums();
+  // getSheetName();
+});
+</script>
+
+<style scoped></style>

src/views/contract/bidCost/indexEdit.vue

@@ -0,0 +1,343 @@
+<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.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" disabled :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">
+              <el-form-item label="表格文件">
+                <span style="color: #8d8d8d">{{ item }}</span>
+              </el-form-item>
+            </div>
+          </el-form>
+        </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 } 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';
+import { getVersionDetail } from '@/api/bidding/biddingLimit';
+
+// 获取用户 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 flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_biddingLimitList',
+    label: '成本核算清单审批'
+  }
+];
+
+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 approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+const sheets = ref([]);
+const versions = ref({});
+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 = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  versionNumber: undefined,
+  fileName: undefined,
+  fileUrl: undefined,
+  fileType: undefined,
+  fileSuffix: undefined,
+  originalName: undefined,
+  remark: undefined,
+  fileId: 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 getVersionDetail(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  buttonLoading.value = true;
+  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.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';
+    }
+    console.log(data);
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    reset();
+    routeParams.value = proxy.$route.query;
+    sheets.value = routeParams.value.sheets;
+    versions.value = routeParams.value.versions;
+    Object.assign(form.value, versions.value);
+    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/contract/limitPrice/index.vue

@@ -53,6 +53,7 @@
         <el-table-column prop="unitPrice" label="单价" align="center">
           <template #default="scope">
             <el-input-number
+              :disabled="reviewStatus != 'draft'"
               :model-value="scope.row.unitPrice"
               @change="(val) => (scope.row.unitPrice = val)"
               :precision="2"
@@ -73,6 +74,7 @@
             <el-button
               type="primary"
               size="small"
+              :disabled="reviewStatus != 'draft'"
               @click="handleSave(scope.row)"
               v-if="scope.row.quantity && scope.row.quantity != 0"
               v-hasPermi="['tender:billofquantitiesLimitList:edit']"

src/views/ctr/expensesContract/index.vue

@@ -15,9 +15,9 @@
               <el-input v-model="queryParams.contractSupplier" placeholder="请输入供应商" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="合同金额" prop="amount">
+            <!-- <el-form-item label="合同金额" prop="amount">
               <el-input v-model="queryParams.amount" placeholder="请输入合同金额" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
 
             <!-- <el-form-item label="招标Id" prop="tenderId">
               <el-input v-model="queryParams.tenderId" placeholder="请输入招标Id" clearable @keyup.enter="handleQuery" />
@@ -60,12 +60,18 @@
         <el-table-column type="index" width="50" label="序号" />
         <!-- <el-table-column label="项目ID" align="center" prop="projectId" /> -->
         <el-table-column label="合同编号" align="center" prop="contractCode" />
-        <el-table-column label="合同类型" align="center" prop="contractType" />
+        <!-- <el-table-column label="合同类型" align="center" prop="contractType" /> -->
         <el-table-column label="合同类型" align="center" prop="contractType">
           <template #default="scope">
             <dict-tag :options="expenses_contract_type" :value="scope.row.contractType" />
           </template>
         </el-table-column>
+        <el-table-column label="支付方式" align="center" prop="payType">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.payType == '1'">月结算</el-tag>
+            <el-tag type="primary" v-else-if="scope.row.payType == '2'">形象节点</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="contractSupplier" />
         <!-- <el-table-column label="分包内容" align="center" prop="contractedContent" /> -->
         <el-table-column label="合同金额" align="center" prop="amount" />
@@ -85,9 +91,13 @@
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['ctr:expensesContract:remove']"></el-button>
             </el-tooltip> -->
-            <el-tooltip content="查看附件列表" placement="top">
+
+            <div>
+              <el-button link type="success" icon="View" @click="handleShowDetail(scope.row)">查看分包内容</el-button>
+            </div>
+            <div>
               <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
-            </el-tooltip>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -128,7 +138,17 @@
       </template>
     </el-dialog>
     <FileList v-model="fileListVisible" :fileList="fileList" />
+    <el-dialog v-model="detailVisible" title="分包内容详情" width="45%">
+      <editor :model-value="detailContent" :min-height="192" readOnly placeholder="" />
 
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="detailVisible = false">
+            关闭
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -156,6 +176,8 @@ const userStore = useUserStore();
 const queryFormRef = ref<ElFormInstance>();
 const expensesContractFormRef = ref<ElFormInstance>();
 const currentProject = computed(() => userStore.selectedProject);
+const detailContent = ref('');
+const detailVisible = ref(false); // 控制承包内容详情对话框的显示
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -299,7 +321,10 @@ const handleShowFileList = async (row: ExpensesContractVO) => {
   });
 
 }
-
+const handleShowDetail = (data) => {
+  detailContent.value = data.contractedContent
+  detailVisible.value = true;
+}
 onMounted(() => {
   getList();
 });

src/views/ctr/incomeContract/index.vue

@@ -15,9 +15,9 @@
               <el-input v-model="queryParams.contractOwner" placeholder="请输入业主单位" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="合同金额" prop="amount">
+            <!-- <el-form-item label="合同金额" prop="amount">
               <el-input v-model="queryParams.amount" placeholder="请输入合同金额" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -61,6 +61,12 @@
             <dict-tag :options="income_contract_type" :value="scope.row.contractType" />
           </template>
         </el-table-column>
+        <el-table-column label="支付方式" align="center" prop="payType">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.payType == '1'">月结算</el-tag>
+            <el-tag type="primary" v-else-if="scope.row.payType == '2'">形象节点</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="业主单位" align="center" prop="contractOwner" />
         <!-- <el-table-column label="承包内容" align="center" prop="contractedContent" /> -->
         <el-table-column label="合同金额" align="center" prop="amount" />
@@ -82,10 +88,17 @@
             <!-- <el-tooltip content="查看承包内容" placement="top">
               <el-button link type="primary" icon="View" @click="handleDetail(scope.row)">详情</el-button>
             </el-tooltip> -->
-            <el-tooltip content="查看附件列表" placement="top">
+            <div>
-              <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
+              <el-button link type="primary" icon="edit" @click="handleEdit(scope.row)"
-            </el-tooltip>
+                v-if="scope.row.isUpdate">修改合同</el-button>
+            </div>
+            <div>
+              <el-button link type="success" icon="View" @click="handleShowDetail(scope.row)">查看合同内容</el-button>
 
+            </div>
+            <div>
+              <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -123,17 +136,31 @@
       </template>
     </el-dialog>
     <FileList v-model="fileListVisible" :fileList="fileList" />
+    <el-dialog v-model="detailVisible" title="合同内容详情" width="45%">
+      <editor :model-value="detailContent" :min-height="192" readOnly placeholder="" />
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="detailVisible = false">
+            关闭
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="IncomeContract" lang="ts">
-import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList } from '@/api/ctr/incomeContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList, getInfoByProjectId } from '@/api/ctr/incomeContract';
 import { IncomeContractVO, IncomeContractQuery, IncomeContractForm } from '@/api/ctr/incomeContract/types';
 import FileList from '@/components/FileList/index.vue';
 import useUserStore from '@/store/modules/user';
+import { useRouter } from 'vue-router'
+
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
 const currentProject = computed(() => userStore.selectedProject);
+const router = useRouter();
 
 const { expenses_contract_type, income_contract_type } = toRefs(
   proxy?.useDict('income_contract_type', 'expenses_contract_type')
@@ -154,7 +181,8 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-
+const detailVisible = ref(false); // 控制承包内容详情对话框的显示
+const detailContent = ref('');
 const initFormData: IncomeContractForm = {
   id: undefined,
   projectId: undefined,
@@ -292,7 +320,20 @@ const handleShowFileList = async (row: IncomeContractVO) => {
   });
 
 }
+const handleEdit = (row: IncomeContractVO) => {
+  // console.log(router);
 
+  router.push({
+    path: "/ctr/update",
+    query: {
+      id: row.id,
+    }
+  })
+}
+const handleShowDetail = (data) => {
+  detailContent.value = data.contractedContent
+  detailVisible.value = true;
+}
 onMounted(() => {
   getList();
 });

src/views/ctr/index.vue

@@ -31,9 +31,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="业主单位" prop="contractOwner">
-                            <el-input v-model="form.contractOwner" placeholder="请输入业主单位" />
+                            <el-input disabled v-model="form.contractOwner" placeholder="请输入业主单位" />
                         </el-form-item>
-                        <el-form-item label="承包内容">
+                        <el-form-item label="承包内容" v-if="contract_type !== 'income'">
+                            <editor v-model="form.contractedContent" :min-height="192" />
+                        </el-form-item>
+                        <el-form-item label="合同内容" v-else">
                             <editor v-model="form.contractedContent" :min-height="192" />
                         </el-form-item>
                         <el-form-item label="合同金额" prop="amount">
@@ -86,7 +89,7 @@
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="form.remark" placeholder="请输入备注" />
                         </el-form-item>
-                        <el-form-item label="附件">
+                        <el-form-item label="合同附件">
                             <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
                                 :ref="fileRef" :defaultFileList="tempFileList" />
                         </el-form-item>
@@ -153,8 +156,9 @@
 <script setup>
 import FileUpload from '@/components/FileUpload';
 import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
-import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getInfoByProjectId } from '@/api/ctr/incomeContract';
 import { useUserStore } from '@/store/modules/user';
+
 const active = ref(0);
 const contract_type = ref("")
 const form = ref({ payType: 1 })
@@ -287,6 +291,7 @@ const resetForm = () => {
         localStorage.removeItem("tempContractForm");
     }, 0);
 };
+
 const submitForm = async () => {
     await payMentRef.value.validate(async (valid) => {
         if (valid) {
@@ -316,7 +321,12 @@ const submitForm = async () => {
             }
             resetForm();
             ElMessage.success('合同提交成功');
-            active.value = 0; // 重置步骤
+            // active.value = 0; // 重置步骤
+            if (contract_type.value === 'income') {
+                proxy.$router.push('/ctr/incomeContract');
+            } else {
+                proxy.$router.push('/ctr/expensesContract');
+            }
         } else {
             ElMessage.error('请填写完整的付款信息');
         }
@@ -383,7 +393,15 @@ watch(form, (val) => {
 watch(fileList, (val) => {
     localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val }));
 }, { deep: true });
+// 获取投标列表
+const getInfoByProjectIdList = async () => {
+    const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id, });
+    console.log(res);
+    form.value.contractOwner = res.data.planDuration;
+}
 onMounted(() => {
+    getInfoByProjectIdList();
+
     const tempForm = localStorage.getItem("tempContractForm");
     if (tempForm) {
         ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {

src/views/ctr/update/index.vue

@@ -0,0 +1,328 @@
+<template>
+    <div class="container">
+        <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+            <el-step title="选择合同类型" />
+            <el-step title="修改合同内容" />
+            <el-step title="修改收款方式" />
+        </el-steps>
+        <div class="content">
+            <template v-if="active == 1">
+                <h1>修改收入合同</h1>
+                <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
+                    <!-- <el-form-item label="项目名称">
+                            <el-input :model-value="project.name" disabled />
+                        </el-form-item> -->
+                    <el-form-item label="合同编号" prop="contractCode">
+                        <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+                    </el-form-item>
+                    <el-form-item label="合同类型" prop="contractType">
+                        <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                            <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
+                                :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="业主单位" prop="contractOwner">
+                        <el-input v-model="form.contractOwner" placeholder="请输入业主单位" disabled />
+                    </el-form-item>
+                    <el-form-item label="承包内容" v-if="contract_type !== 'income'">
+                        <editor v-model="form.contractedContent" :min-height="192" />
+                    </el-form-item>
+                    <el-form-item label="合同内容" v-else>
+                        <editor v-model="form.contractedContent" :min-height="192" />
+                    </el-form-item>
+                    <el-form-item label="合同金额" prop="amount">
+                        <el-input v-model="form.amount" placeholder="请输入合同金额"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item label="备注" prop="remark">
+                        <el-input v-model="form.remark" placeholder="请输入备注" />
+                    </el-form-item>
+                    <el-form-item label="附件">
+                        <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
+                            :ref="fileRef" :defaultFileList="tempFileList" />
+                    </el-form-item>
+                </el-form>
+                <div>
+                    <el-button type="primary" @click="next">下一步</el-button>
+                </div>
+            </template>
+            <template v-else-if="active == 2">
+                <h1>修改收入合同</h1>
+                <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
+                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+                        <el-select v-model="form.payType">
+                            <el-option :value="1" label="月结算">月结算</el-option>
+                            <el-option :value="2" label="形象节点">形象节点</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+                        <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+                        <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+                        <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="付款比例（%）" prop="payRatio">
+                        <el-input-number v-model="payRatioComputed" disabled />
+                    </el-form-item>
+                    <el-form-item>
+                        <div>
+                            <el-button @click="back(false)">上一步</el-button>
+                            <el-button type="success" @click="submitForm">提交</el-button>
+                        </div>
+                    </el-form-item>
+                </el-form>
+            </template>
+        </div>
+    </div>
+</template>
+<script setup>
+import FileUpload from '@/components/FileUpload';
+import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+import { useUserStore } from '@/store/modules/user';
+const active = ref(1);
+const contract_type = ref("income")
+const form = ref({ payType: 1 })
+const fileList = ref([])
+const tempFileList = ref([])
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+const planList = ref([]);
+const dialogVisible = ref(false);
+const route = useRoute();
+const router = useRouter();
+const { expenses_contract_type, income_contract_type } = toRefs(
+    proxy?.useDict('income_contract_type', 'expenses_contract_type')
+);
+const fileRef = ref(null);
+const incomeContractFormRef = ref(null);
+const expensesContractFormRef = ref(null);
+const payMentRef = ref(null);
+const incomeContractFormRules = {
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+    contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+};
+const expensesContractFormRules = {
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+
+    contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+};
+const payMentRules = {
+    payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+    advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+    balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+    assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
+
+};
+
+const project = computed(() => {
+    return JSON.parse(localStorage.getItem("selectedProject"))
+});
+
+const payRatioComputed = computed({
+    get: () => {
+        const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+        const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+        // form.value.payRatio = total;
+        return total;
+    },
+    // 只读
+    set: () => { }
+});
+
+const onUploadSuccess = (data) => {
+    fileList.value = data
+}
+
+const next = async () => {
+    if (contract_type.value === 'income') {
+        await incomeContractFormRef.value.validate((valid) => {
+            if (valid) {
+                active.value++;
+            } else {
+                ElMessage.error('请填写完整的收入合同信息');
+            }
+        });
+    } else if (contract_type.value === 'expenses') {
+        await expensesContractFormRef.value.validate((valid) => {
+            if (valid) {
+                active.value++;
+            } else {
+                ElMessage.error('请填写完整的支出合同信息');
+            }
+        });
+    }
+    console.log(active.value);
+
+    form.value.step = active.value;
+};
+const submitForm = async () => {
+    await payMentRef.value.validate(async (valid) => {
+        if (valid) {
+
+            if (payRatioComputed.value < 0) {
+
+                ElMessage.error('四项付款比例之和必须等于100%');
+                return;
+            }
+            form.value.payRatio = payRatioComputed.value;
+
+            // 提交付款信息逻辑
+            console.log('提交付款信息', form.value, fileList.value);
+            // 这里可以调用API提交数据
+            form.value.projectId = project.value.id;
+            form.value.fileList = fileList.value.map((data) => {
+                return {
+                    ...data,
+                    fileName: data.name,
+                    fileUrl: data.url,
+                }
+            })
+            if (contract_type.value === 'income') {
+                await updateIncomeContract({ ...form.value });
+            }
+            ElMessage.success('合同修改成功');
+        } else {
+            ElMessage.error('请填写完整的付款信息');
+        }
+    });
+
+}
+const handleChoose = async () => {
+    if (!form.value.contractType) {
+        ElMessage.error('请先选择合同类型');
+        return;
+    }
+    const formData = {
+        projectId: userStore.selectedProject.id,
+        dictName: form.value.contractType,
+        status: 1,
+    }
+    const { data } = await getTenderPlan(formData)
+    if (data.length === 0) {
+        ElMessage.warning('当前没有招标计划，请先创建招标计划');
+        return;
+    }
+    planList.value = data
+    dialogVisible.value = true;
+
+}
+
+onMounted(async () => {
+    // const id = route.query.id;
+    // if (id) {
+    //     const { data } = await getIncomeContract(id);
+    //     form.value.id = data.id;
+    //     form.value.contractOwner = data.contractOwner
+    // } else {
+    //     router.push('/ctr/incomeContract');
+    // }
+
+    proxy?.download(
+        '/progress/progressCategory/export',
+        {
+            "ids": [
+                "1951552037761114114",
+                "1951552037811445761",
+                "1951552037811445762",
+                "1951552037811445763",
+                "1951552037811445764",
+                "1951552037811445765",
+                "1951552037811445766",
+                "1951552037811445767",
+                "1951552037865971713",
+                "1951552037865971714",
+                "1951552037865971715",
+                "1951552037865971716",
+                "1951552037865971717",
+                "1951552037865971718",
+                "1951552037865971719",
+                "1951552037865971720",
+                "1951552037865971721",
+                "1951552037865971722",
+                "1951552037865971723",
+                "1951552037865971724",
+                "1951552037865971725",
+                "1951552037924691969",
+                "1951552037924691970",
+                "1951552037924691971",
+                "1951552037924691972",
+                "1951552037924691973",
+                "1951552037924691974",
+                "1951552037924691975",
+                "1951552037924691976",
+                "1951552037924691977",
+                "1951552037962440706",
+                "1951552037962440707",
+                "1951552037962440708",
+                "1951552037962440709",
+                "1951552037962440710",
+                "1951552037962440711",
+                "1951552037962440712",
+                "1951552038004383745",
+                "1951552038004383746",
+                "1951552038004383747",
+                "1951552038004383748",
+                "1951552038004383749",
+                "1951552038004383750",
+                "1951552038004383751",
+                "1951552038004383752",
+                "1951552038004383753",
+                "1951552038004383754",
+                "1951552038058909698",
+                "1951552038058909699",
+                "1951552038058909700",
+                "1951552038058909701",
+                "1951552038058909702",
+                "1951552038058909703",
+                "1951552038058909704",
+                "1951552038096658434",
+                "1951552038096658435",
+                "1951552038096658436",
+                "1951552038096658437",
+                "1951552038096658438",
+                "1951552038096658439",
+                "1951552038096658440",
+                "1951552038096658441",
+                "1951552038096658442",
+                "1951552038096658443",
+                "1951552038096658444",
+                "1951552038146990081",
+                "1951552038146990082",
+                "1951552038146990083",
+                "1951552038146990084",
+                "1951552038146990085",
+                "1951552038188933122",
+                "1951552038188933123",
+                "1951552038188933124"
+            ]
+        },
+        `1.xlsx`
+    );
+})
+</script>
+<style scoped lang="scss">
+.container {
+    padding: 20px;
+
+    .content {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 30px;
+        flex-direction: column;
+    }
+}
+</style>

src/views/design/designChange/index.vue

@@ -74,14 +74,14 @@
               link
               icon="Upload"
               @click="handleAddChange(scope.row)"
-              v-if="scope.row.status == 'draft' || scope.row.status == 'back'"
+              v-if="(scope.row.status == 'finish' || scope.row.costEstimation == '0') && scope.row.auditStatus == 'draft'"
               >上传</el-button
             >
             <el-button
               type="success"
               link
               icon="View"
-              v-if="scope.row.status != 'draft'"
+              v-if="scope.row.auditStatus != 'draft'"
               v-hasPermi="['design:designChange:query']"
               @click="handleViewInfo(scope.row)"
               >查看</el-button
@@ -238,6 +238,7 @@ const handleViewInfo = (row) => {
     path: `/approval/drawing/indexEdit`,
     query: {
       id: row.id,
+      costEstimation: row.costEstimation,
       type: 'view'
     }
   });

src/views/design/designChange/indexEdit.vue

@@ -1,25 +1,21 @@
 <template>
-  <div class="p-4 bg-gray-50 designChangeForm">
+  <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.status" :pageType="routeParams.type" />
+      </el-card>
       <!-- 表单区域 -->
-      <div v-if="routeParams.type == 'view'" style="width: 100%; text-align: right; margin-bottom: 10px">
+      <el-card
-        <el-button @click="goBack" size="large" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+        class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
-          >返回</el-button
-        >
-      </div>
-      <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" :disabled="routeParams.type === 'view' || form.status == 'waiting'" :model="form"
-            ref="leaveFormRef"
+            :rules="rules" label-width="100px" class="space-y-4">
-            :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">
@@ -29,27 +25,14 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="工程名称" prop="projectName">
-                    <el-input v-model="form.projectName" placeholder="请输入工程名称" /> </el-form-item
+                    <el-input v-model="form.projectName" placeholder="请输入工程名称" /> </el-form-item></el-col>
-                ></el-col>
                 <el-col :span="12">
                   <el-form-item label="原卷册号" prop="volumeNo">
-                    <el-select
+                    <el-select id="projectSelect" v-model="form.volumeNo" placeholder="请选择原卷册号" clearable filterable
-                      id="projectSelect"
+                      @change="handleSelect" style="width: 150px; margin-right: 20px">
-                      v-model="form.volumeNo"
+                      <el-option v-for="project in volumeCatalogList" :key="project.volumeNumber"
-                      placeholder="请选择原卷册号"
+                        :label="project.volumeNumber" :value="project.volumeNumber" />
-                      clearable
+                    </el-select> </el-form-item></el-col>
-                      filterable
-                      @change="handleSelect"
-                      style="width: 150px; margin-right: 20px"
-                    >
-                      <el-option
-                        v-for="project in volumeCatalogList"
-                        :key="project.volumeNumber"
-                        :label="project.volumeNumber"
-                        :value="project.volumeNumber"
-                      />
-                    </el-select> </el-form-item
-                ></el-col>
                 <el-col :span="12">
                   <el-form-item label="提出单位" prop="submitUnit">
                     <el-input v-model="form.submitUnit" placeholder="请输入提出单位" />
@@ -62,16 +45,16 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="提出日期" prop="submitDate">
-                    <el-date-picker clearable v-model="form.submitDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择提出日期">
+                    <el-date-picker clearable v-model="form.submitDate" type="date" value-format="YYYY-MM-DD HH:mm:ss"
-                    </el-date-picker> </el-form-item
+                      placeholder="请选择提出日期">
-                ></el-col>
+                    </el-date-picker> </el-form-item></el-col>
                 <!-- <el-col :span="12">
                   <el-form-item label="卷册名称" prop="volumeName"> <el-input v-model="form.volumeName" placeholder="请输入卷册名称" /> </el-form-item
                 ></el-col> -->
                 <el-col :span="12">
                   <el-form-item label="子项名称" prop="subName">
-                    <el-input disabled v-model="form.extendDetail.subName" placeholder="请输入子项名称" /> </el-form-item
+                    <el-input disabled v-model="form.extendDetail.subName" placeholder="请输入子项名称" />
-                ></el-col>
+                  </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="原设计处置" prop="designDisposal">
                     <el-radio-group v-model="form.extendDetail.designDisposal" @change="handleRadio">
@@ -79,8 +62,7 @@
                       <el-radio value="2" :disabled="!designId" size="large">原图保留，部分修改</el-radio>
                       <el-radio value="3" size="large">原图保留，补充设计</el-radio>
                     </el-radio-group>
-                  </el-form-item></el-col
+                  </el-form-item></el-col>
-                >
                 <el-col :span="24" v-if="form.extendDetail.designDisposal == 2">
                   <el-form-item label="保留文件" prop="saveFile">
                     <el-checkbox-group v-model="form.saveFile">
@@ -88,20 +70,17 @@
                         {{ dict.fileName }}
                       </el-checkbox>
                     </el-checkbox-group>
-                  </el-form-item></el-col
+                  </el-form-item></el-col>
-                >
                 <el-col :span="12">
                   <el-form-item label="设计阶段" prop="designPhase">
-                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item
+                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item></el-col>
-                ></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更类别" prop="changeCategory">
                     <el-radio-group v-model="form.extendDetail.changeCategory">
                       <el-radio value="1" size="large">重大设计变更</el-radio>
                       <el-radio value="2" size="large">一般设计变更</el-radio>
                     </el-radio-group>
-                  </el-form-item></el-col
+                  </el-form-item></el-col>
-                >
                 <el-col :span="24">
                   <el-form-item label="实施程序" prop="ImpProcedure">
                     <el-radio-group v-model="form.extendDetail.ImpProcedure">
@@ -109,15 +88,14 @@
                       <el-radio value="2" size="large">建设单位送原施工图审查机构审查、建设主管部分备案后交付实施</el-radio>
                       <el-radio value="3" size="large">建设单位确认后交付实施</el-radio>
                     </el-radio-group>
-                  </el-form-item></el-col
+                  </el-form-item></el-col>
-                >
                 <el-col :span="12">
                   <el-form-item label="更改相关专业" prop="involvingProfessions">
-                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" /> </el-form-item
+                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" />
-                ></el-col>
+                  </el-form-item></el-col>
                 <el-col :span="24">
-                  <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic" :fileSize="100" /> </el-form-item
+                  <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic"
-                ></el-col>
+                      :fileSize="100" /> </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更原因" prop="changeReason">
                     <el-checkbox-group v-model="form.changeReason">
@@ -125,78 +103,107 @@
                         {{ dict.label }}
                       </el-checkbox>
                     </el-checkbox-group>
-                  </el-form-item></el-col
+                  </el-form-item></el-col>
-                >
                 <el-col :span="24">
                   <el-form-item label="变更内容" prop="changeContent">
-                    <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" /> </el-form-item
+                    <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" />
-                ></el-col>
+                  </el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="费用" prop="costEstimation">
-                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
+                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" />
-                ></el-col>
+                  </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更费用估算表" label-width="110px" prop="costEstimationFile">
-                    <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item
+                    <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item></el-col>
-                ></el-col>
                 <!-- <el-col :span="24">
                   <el-form-item label="变更文件" prop="fileId"> <file-upload v-model="form.fileId" :fileSize="100" /> </el-form-item
                 ></el-col> -->
-                <el-col :span="24"
+                <el-col :span="24"><el-form-item label="备注" prop="remark">
-                  ><el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item></el-col>
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item
-                ></el-col>
               </el-row>
             </div>
           </el-form>
         </div>
-        <div class="flex justify-center gap-4 mt-8">
-          <el-button
-            v-if="routeParams.type != 'view'"
-            @click="goBack"
-            size="large"
-            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"
-            size="large"
-            v-if="routeParams.type != 'view'"
-            @click="submitForm"
-            class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
-            >确认</el-button
-          >
-        </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 } 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';
-import { addDesignChange, getDesignChange, catalogList, blueprintList } from '@/api/design/designChange';
+import { getDrawing } from '@/api/design/drawing';
+import { updateDesignChange, getDesignChange, catalogList, blueprintList, addDesignChange } from '@/api/design/designChange';
 const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
-const route = useRoute();
+
-const router = useRouter();
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const buttonLoading = ref(false);
-const volumeCatalogList = ref([]);
+const loading = ref(true);
-const blueprintListAll = ref([]);
-let volumeMap = new Map();
 //路由参数
 const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_designchangeddoc',
+    label: '设计变更下发审批'
+  }
+];
+
+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 approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+
 const leaveFormRef = ref<ElFormInstance>();
 const dialog = reactive({
   visible: false,
   title: '',
   isEdit: false
 });
-const fileVoList = ref([]);
+const submitFormData = ref<StartProcessBo>({
-const designId = ref('');
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
 const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
@@ -243,55 +250,35 @@ const data = reactive({
   rules: {
     // 卷册号
     volumeNo: [{ required: true, message: '请请选择卷册号', trigger: 'change' }],
-    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }]
+    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }],
+    costEstimation: [{ required: true, message: '费用不能为空', trigger: 'change' }]
   }
 });
 
 const { form, rules } = toRefs(data);
-
+const handleClose = () => {
-/** 表单重置 */
+  dialogVisible.visible = false;
-const reset = () => {
+  flowCode.value = '';
-  form.value = { ...initFormData };
+  buttonLoading.value = false;
-  leaveFormRef.value?.resetFields();
 };
 
-//返回
+const fileVoList = ref([]);
-const goBack = () => {
+const designId = ref('');
-  proxy.$tab.closePage(route);
+let volumeMap = new Map();
-  router.go(-1);
+
-};
+const handleSelect = (val) => {
-/** 提交按钮 */
+  let obj = volumeMap.get(val);
-const submitForm = () => {
+  console.log('🚀 ~ handleSelect ~ obj:', obj);
-  var changeReason = '';
+
-  if (form.value.changeReason && form.value.changeReason.length > 0) {
+  fileVoList.value = obj.fileVoList;
-    changeReason = form.value.changeReason.join(',');
+  designId.value = obj.design;
-  }
+  form.value.volumeName = obj.volumeName;
-  var saveFile = '';
+  form.value.specialty = obj.specialty;
-  if (form.value.saveFile && form.value.saveFile.length > 0) {
+  form.value.specialtyName = obj.specialtyName;
-    saveFile = form.value.saveFile.join(',');
+  form.value.extendDetail.subName = obj.designSubitem;
-  }
-  leaveFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      var res;
-      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
-      if (res.code == 200) {
-        ElMessage.success('通知成功');
-        goBack();
-      } else {
-        ElMessage.error(res.msg);
-      }
-    }
-  });
-};
-/** 查询卷册目录列表 */
-const getList = async () => {
-  const res = await catalogList(currentProject.value?.id);
-  volumeCatalogList.value = res.data;
-  volumeCatalogList.value.forEach((e) => {
-    volumeMap.set(e.volumeNumber, e);
-  });
 };
 // 获取图纸列表
+const blueprintListAll = ref([]);
 const getBlueprintList = async () => {
   const res = await blueprintList(designId.value);
   blueprintListAll.value = res.data;
@@ -302,17 +289,17 @@ const handleRadio = (val) => {
     getBlueprintList();
   }
 };
-const handleSelect = (val) => {
+
-  let obj = volumeMap.get(val);
+/** 表单重置 */
-  fileVoList.value = obj.fileVoList;
+const reset = () => {
-  designId.value = obj.design;
+  form.value = { ...initFormData };
-  form.value.volumeName = obj.volumeName;
+  leaveFormRef.value?.resetFields();
-  form.value.specialty = obj.specialty;
-  form.value.specialtyName = obj.specialtyName;
-  form.value.extendDetail.subName = obj.designSubitem;
 };
+const volumeCatalogList = ref([]);
+
 /** 获取详情 */
 const getInfo = () => {
+  loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
     const res = await getDesignChange(routeParams.value.id);
@@ -320,27 +307,127 @@ const getInfo = () => {
     if (form.value.changeReason.length > 0) {
       form.value.changeReason = form.value.changeReason.split(',');
     }
+    loading.value = false;
     buttonLoading.value = false;
   });
 };
+//返回
+const goBack = () => {
+  proxy.$tab.closePage(route);
+  router.go(-1);
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  if (routeParams.value.type == 'add') {
+    var changeReason = '';
+    if (form.value.changeReason && form.value.changeReason.length > 0) {
+      changeReason = form.value.changeReason.join(',');
+    }
+    var saveFile = '';
+    if (form.value.saveFile && form.value.saveFile.length > 0) {
+      saveFile = form.value.saveFile.join(',');
+    }
+  }
+  leaveFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      var res;
+      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
+      if (res.code == 200) {
+        if (form.value.costEstimation == '0') {
+          ElMessage.success('通知成功');
+          goBack();
+        } else {
+          submit(status.value, res.data);
+        }
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }
+  });
+};
+
+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(route);
+  router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  // submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const route = useRoute();
+const router = useRouter();
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(route);
+    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';
+    }
+    console.log(data);
+    await handleStartWorkFlow(data);
+  }
+};
 
 onMounted(() => {
   nextTick(async () => {
-    routeParams.value = proxy.$route.query;
+    routeParams.value = route.query;
     reset();
-    getList();
+    loading.value = false;
-    if (routeParams.value.type != 'add') {
+    const res = await catalogList(currentProject.value?.id);
+    volumeCatalogList.value = res.data;
+    volumeCatalogList.value.forEach((e) => {
+      volumeMap.set(e.volumeNumber, e);
+    });
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
     }
   });
 });
 </script>
 <style scoped lang="scss">
-.designChangeForm {
-  .el-select {
-    width: 300px !important;
-  }
-}
 /* 全局样式 */
 :root {
   --primary: #409eff;

src/views/design/designChange/indexEdit1.vue

@@ -0,0 +1,446 @@
+<template>
+  <div class="p-4 bg-gray-50 designChangeForm">
+    <div class="max-w-4xl mx-auto">
+      <!-- 表单区域 -->
+      <div v-if="routeParams.type == 'view'" style="width: 100%; text-align: right; margin-bottom: 10px">
+        <el-button @click="goBack" size="large" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+          >返回</el-button
+        >
+      </div>
+      <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"
+            :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 v-model="form.formNo" placeholder="请输入申请单编号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="工程名称" prop="projectName">
+                    <el-input v-model="form.projectName" placeholder="请输入工程名称" /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="原卷册号" prop="volumeNo">
+                    <el-select
+                      id="projectSelect"
+                      v-model="form.volumeNo"
+                      placeholder="请选择原卷册号"
+                      clearable
+                      filterable
+                      @change="handleSelect"
+                      style="width: 150px; margin-right: 20px"
+                    >
+                      <el-option
+                        v-for="project in volumeCatalogList"
+                        :key="project.volumeNumber"
+                        :label="project.volumeNumber"
+                        :value="project.volumeNumber"
+                      />
+                    </el-select> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="提出单位" prop="submitUnit">
+                    <el-input v-model="form.submitUnit" placeholder="请输入提出单位" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="专业" prop="specialtyName">
+                    <el-input disabled v-model="form.specialtyName" placeholder="请输入专业" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="提出日期" prop="submitDate">
+                    <el-date-picker clearable v-model="form.submitDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择提出日期">
+                    </el-date-picker> </el-form-item
+                ></el-col>
+                <!-- <el-col :span="12">
+                  <el-form-item label="卷册名称" prop="volumeName"> <el-input v-model="form.volumeName" placeholder="请输入卷册名称" /> </el-form-item
+                ></el-col> -->
+                <el-col :span="12">
+                  <el-form-item label="子项名称" prop="subName">
+                    <el-input disabled v-model="form.extendDetail.subName" placeholder="请输入子项名称" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="原设计处置" prop="designDisposal">
+                    <el-radio-group v-model="form.extendDetail.designDisposal" @change="handleRadio">
+                      <el-radio value="1" size="large">原图作废</el-radio>
+                      <el-radio value="2" :disabled="!designId" size="large">原图保留，部分修改</el-radio>
+                      <el-radio value="3" size="large">原图保留，补充设计</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24" v-if="form.extendDetail.designDisposal == 2">
+                  <el-form-item label="保留文件" prop="saveFile">
+                    <el-checkbox-group v-model="form.saveFile">
+                      <el-checkbox v-for="dict in blueprintListAll" :key="dict.id" :value="dict.id">
+                        {{ dict.fileName }}
+                      </el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="12">
+                  <el-form-item label="设计阶段" prop="designPhase">
+                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更类别" prop="changeCategory">
+                    <el-radio-group v-model="form.extendDetail.changeCategory">
+                      <el-radio value="1" size="large">重大设计变更</el-radio>
+                      <el-radio value="2" size="large">一般设计变更</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24">
+                  <el-form-item label="实施程序" prop="ImpProcedure">
+                    <el-radio-group v-model="form.extendDetail.ImpProcedure">
+                      <el-radio value="1" size="large">建设单位重新申报初步设计审批</el-radio>
+                      <el-radio value="2" size="large">建设单位送原施工图审查机构审查、建设主管部分备案后交付实施</el-radio>
+                      <el-radio value="3" size="large">建设单位确认后交付实施</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="12">
+                  <el-form-item label="更改相关专业" prop="involvingProfessions">
+                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic" :fileSize="100" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更原因" prop="changeReason">
+                    <el-checkbox-group v-model="form.changeReason">
+                      <el-checkbox v-for="dict in design_change_reason_type" :key="dict.value" :value="dict.value">
+                        {{ dict.label }}
+                      </el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24">
+                  <el-form-item label="变更内容" prop="changeContent">
+                    <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="费用" prop="costEstimation">
+                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更费用估算表" label-width="110px" prop="costEstimationFile">
+                    <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item
+                ></el-col>
+                <!-- <el-col :span="24">
+                  <el-form-item label="变更文件" prop="fileId"> <file-upload v-model="form.fileId" :fileSize="100" /> </el-form-item
+                ></el-col> -->
+                <el-col :span="24"
+                  ><el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item
+                ></el-col>
+              </el-row>
+            </div>
+          </el-form>
+        </div>
+        <div class="flex justify-center gap-4 mt-8">
+          <el-button
+            v-if="routeParams.type != 'view'"
+            @click="goBack"
+            size="large"
+            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"
+            size="large"
+            v-if="routeParams.type != 'view'"
+            @click="submitForm"
+            class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+            >确认</el-button
+          >
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+import { addDesignChange, getDesignChange, catalogList, blueprintList } from '@/api/design/designChange';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+const route = useRoute();
+const router = useRouter();
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const volumeCatalogList = ref([]);
+const blueprintListAll = ref([]);
+let volumeMap = new Map();
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const fileVoList = ref([]);
+const designId = ref('');
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  formNo: undefined,
+  projectName: undefined,
+  submitUnit: undefined,
+  specialty: undefined,
+  specialtyName: undefined,
+  submitDate: undefined,
+  volumeName: undefined,
+  volumeNo: undefined,
+  attachmentPic: undefined,
+  changeReason: [],
+  changeContent: undefined,
+  costEstimation: undefined,
+  costEstimationFile: undefined,
+  fileId: undefined,
+  status: undefined,
+  remark: undefined,
+  saveFile: [],
+  extendDetail: {
+    changeCategory: undefined,
+    ImpProcedure: undefined,
+    involvingProfessions: undefined,
+    subName: undefined,
+    designDisposal: undefined,
+    designPhase: undefined
+  }
+};
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    fileName: undefined,
+    fileType: undefined,
+    fileSuffix: undefined,
+    fileStatus: undefined,
+    originalName: undefined,
+    newest: undefined,
+    params: {}
+  },
+  rules: {
+    // 卷册号
+    volumeNo: [{ required: true, message: '请请选择卷册号', trigger: 'change' }],
+    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }]
+  }
+});
+
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+//返回
+const goBack = () => {
+  proxy.$tab.closePage(route);
+  router.go(-1);
+};
+/** 提交按钮 */
+const submitForm = () => {
+  var changeReason = '';
+  if (form.value.changeReason && form.value.changeReason.length > 0) {
+    changeReason = form.value.changeReason.join(',');
+  }
+  var saveFile = '';
+  if (form.value.saveFile && form.value.saveFile.length > 0) {
+    saveFile = form.value.saveFile.join(',');
+  }
+  leaveFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      var res;
+      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
+      if (res.code == 200) {
+        ElMessage.success('通知成功');
+        goBack();
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }
+  });
+};
+/** 查询卷册目录列表 */
+const getList = async () => {
+  const res = await catalogList(currentProject.value?.id);
+  volumeCatalogList.value = res.data;
+  volumeCatalogList.value.forEach((e) => {
+    volumeMap.set(e.volumeNumber, e);
+  });
+};
+// 获取图纸列表
+const getBlueprintList = async () => {
+  const res = await blueprintList(designId.value);
+  blueprintListAll.value = res.data;
+};
+const handleRadio = (val) => {
+  form.value.saveFile = [];
+  if (val == 2) {
+    getBlueprintList();
+  }
+};
+const handleSelect = (val) => {
+  let obj = volumeMap.get(val);
+  fileVoList.value = obj.fileVoList;
+  designId.value = obj.design;
+  form.value.volumeName = obj.volumeName;
+  form.value.specialty = obj.specialty;
+  form.value.specialtyName = obj.specialtyName;
+  form.value.extendDetail.subName = obj.designSubitem;
+};
+/** 获取详情 */
+const getInfo = () => {
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getDesignChange(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    if (form.value.changeReason.length > 0) {
+      form.value.changeReason = form.value.changeReason.split(',');
+    }
+    buttonLoading.value = false;
+  });
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    getList();
+    if (routeParams.value.type != 'add') {
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+.designChangeForm {
+  .el-select {
+    width: 300px !important;
+  }
+}
+/* 全局样式 */
+: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/design/drawing/indexEdit.vue

@@ -88,12 +88,16 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 //路由参数
 const routeParams = ref<Record<string, any>>({});
-const flowCodeOptions = [
+const flowCodeOptions = ref([
   {
     value: currentProject.value?.id + '_designchanged',
     label: '变更图纸审批'
+  },
+  {
+    value: currentProject.value?.id + '_moneydesignchanged',
+    label: '资金设计变更审批'
   }
-];
+]);
 
 const flowCode = ref<string>('');
 const status = ref<string>('');
@@ -129,6 +133,7 @@ const initFormData = {
   fileUrl: undefined,
   fileType: undefined,
   fileSuffix: undefined,
+  costEstimation: undefined,
   originalName: undefined,
   remark: undefined,
   fileId: undefined
@@ -144,6 +149,7 @@ const data = reactive({
     fileSuffix: undefined,
     fileStatus: undefined,
     originalName: undefined,
+    costEstimation: undefined,
     newest: undefined,
     params: {}
   },
@@ -182,8 +188,13 @@ const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    const res = await getDesignChange(routeParams.value.id);
+    var id = routeParams.value.id;
+    if (routeParams.value.type === 'approval') {
+      id = routeParams.value.id.split('_')[0];
+    }
+    const res = await getDesignChange(id);
     Object.assign(form.value, res.data);
+    if (res.data.costEstimation) form.value.status = res.data.auditStatus;
     loading.value = false;
     buttonLoading.value = false;
   });
@@ -248,6 +259,8 @@ const approvalVerifyOpen = async () => {
 // 图纸上传成功之后 开始提交
 const submit = async (status, data) => {
   form.value = data;
+  form.value.id = routeParams.value.type == 'add' ? form.value.id + '_' : form.value.id.split('_')[0];
+  form.value.status = data.auditStatus ? data.auditStatus : data.status;
   if (status === 'draft') {
     buttonLoading.value = false;
     proxy?.$modal.msgSuccess('暂存成功');
@@ -255,7 +268,13 @@ const submit = async (status, data) => {
     proxy.$router.go(-1);
   } else {
     if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
-      flowCode.value = flowCodeOptions[0].value;
+      if (form.value.costEstimation == '0') {
+        flowCodeOptions.value = [flowCodeOptions.value[0]];
+      } else {
+        console.log('🚀 ~ submit ~ flowCodeOptions.value:', flowCodeOptions.value[1]);
+        flowCodeOptions.value = [flowCodeOptions.value[1]];
+      }
+      flowCode.value = flowCodeOptions.value[0].value;
       dialogVisible.visible = true;
       return;
     }
@@ -275,6 +294,8 @@ onMounted(() => {
     loading.value = false;
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
+    } else {
+      form.value.costEstimation = routeParams.value.costEstimation;
     }
   });
 });

src/views/design/drawingreview/detailForm.vue

@@ -81,13 +81,8 @@
         </el-col> -->
         <el-col :span="12">
           <el-form-item label="校审时间" prop="proofreadingDate">
-            <el-date-picker
+            <el-date-picker v-model="formData.proofreadingDate" type="date" placeholder="选择校审时间" format="YYYY-MM-DD"
-              v-model="formData.proofreadingDate"
+              value-format="YYYY-MM-DD" />
-              type="date"
-              placeholder="选择校审时间"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -102,7 +97,8 @@
         </el-col> -->
         <el-col :span="12">
           <el-form-item label="审核时间" prop="auditDate">
-            <el-date-picker v-model="formData.auditDate" type="date" placeholder="选择审核时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-date-picker v-model="formData.auditDate" type="date" placeholder="选择审核时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -117,7 +113,8 @@
         </el-col> -->
         <el-col :span="12">
           <el-form-item label="执行时间" prop="executorDate">
-            <el-date-picker v-model="formData.executorDate" type="date" placeholder="选择执行时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-date-picker v-model="formData.executorDate" type="date" placeholder="选择执行时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -275,13 +272,25 @@ const submit = async (businessId, cb) => {
   // 先验证表单
   await formRef.value?.validate();
   cb();
+  // 加载中
+  ElLoading.service({
+    lock: true,
+    text: '提交中...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
+
   formData.subprojectName = subProjectMap.get(formData.subprojectId);
-  formData.drawingreviewId = businessId;
+  // formData.drawingreviewId = businessId;
+  console.log(businessId);
+  // businessId 设置 如果有下滑线去掉后面及下划线
+  formData.drawingreviewId = businessId.replace(/_/g, '');
   const res = await drawingreviewReceipts(formData);
   if (res.code === 200) {
-    // // 提交成功处理逻辑
+    // 提交成功处理逻辑
-    // console.log('提交成功');
+    console.log('提交成功');
   }
+  // 关闭
+  ElLoading.service().close();
 };
 onMounted(() => {
   getSubProject();

src/views/design/received/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="p-6 bg-gray-50">
-    <div class="received mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+    <div
+      class="received mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <!-- 表单标题区域 -->
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>收集资料清单</h2>
@@ -15,23 +16,15 @@
 
           <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <el-form-item label="收资人" prop="userId" class="mb-4">
-              <el-select
+              <el-select :disabled="disabledAll" v-model="form.userId" placeholder="请选择收资人"
-                :disabled="disabledAll"
+                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400">
-                v-model="form.userId"
-                placeholder="请选择收资人"
-                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
-              >
                 <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
             <el-form-item label="专业" prop="user_major" class="mb-4">
-              <el-select
+              <el-select :disabled="disabledAll" v-model="form.user_major" placeholder="请选择专业"
-                :disabled="disabledAll"
-                v-model="form.user_major"
-                placeholder="请选择专业"
                 class="transition-all duration-300 border-gray-300"
-                :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
+                :rules="{ required: true, message: '请选择专业', trigger: 'change' }">
-              >
                 <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -49,32 +42,25 @@
         <div class="mb-6">
           <div class="flex items-center justify-between mb-4">
             <h3 class="text-lg font-semibold text-blue-700">资料文件清单</h3>
-            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus"> 添加资料 </el-button>
+            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus"> 添加资料
+            </el-button>
           </div>
           <el-form ref="documentsFormRef" :model="form" class="space-y-4">
-            <div v-for="(item, index) in form.documents" :key="item.id" class="bg-gray-50 p-4 rounded-lg transition-all duration-200 hover:shadow-sm">
+            <div v-for="(item, index) in form.documents" :key="item.id"
+              class="bg-gray-50 p-4 rounded-lg transition-all duration-200 hover:shadow-sm">
               <div class="flex justify-between items-start mb-2">
                 <span class="text-sm font-medium text-gray-600">资料 {{ index + 1 }}</span>
-                <el-button
+                <el-button type="text" size="small" text-color="#ff4d4f" @click="removeDocumentItem(index)"
-                  type="text"
+                  icon="el-icon-delete" v-if="form.documents.length > 1 && !disabledAll">
-                  size="small"
-                  text-color="#ff4d4f"
-                  @click="removeDocumentItem(index)"
-                  icon="el-icon-delete"
-                  v-if="form.documents.length > 1 && !disabledAll"
-                >
                   删除
                 </el-button>
               </div>
 
               <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <el-form-item
+                <el-form-item label="文件目录名称" :prop="`documents.${index}.catalogueName`"
-                  label="文件目录名称"
+                  :rules="[{ required: true, message: '请输入文件目录名称', trigger: 'blur' }]" class="mb-4">
-                  :prop="`documents.${index}.catalogueName`"
+                  <el-input :disabled="disabledAll" placeholder="请输入文件目录名称" v-model="item.catalogueName"
-                  :rules="[{ required: true, message: '请输入文件目录名称', trigger: 'blur' }]"
+                    autocomplete="off" />
-                  class="mb-4"
-                >
-                  <el-input :disabled="disabledAll" placeholder="请输入文件目录名称" v-model="item.catalogueName" autocomplete="off" />
                 </el-form-item>
                 <el-form-item label="备注" :prop="`documents.${index}.remark`" class="mb-4">
                   <el-input :disabled="disabledAll" placeholder="请输入备注" v-model="item.remark" autocomplete="off" />
@@ -85,39 +71,16 @@
         </div>
         <!-- 操作按钮区域 -->
         <div class="flex justify-center gap-4 mt-8">
-          <el-button type="primary" @click="submitForm" v-hasPermi="['design:collect:add']" v-if="!form.id || form.status == 'draft'" size="large"
+          <el-button type="primary" @click="submitForm" v-hasPermi="['design:collect:add']"
-            >确认提交</el-button
+            v-if="!form.id || form.status == 'draft'" size="large">确认提交</el-button>
-          >
+          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']"
-          <el-button
+            v-show="form.id && form.status == 'draft'" icon="Edit" size="large">审核</el-button>
-            type="primary"
+          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']" v-show="form.status == 'back'"
-            @click="update"
+            size="large" icon="Edit">重新发起审核</el-button>
-            v-hasPermi="['design:collect:query']"
+          <el-button type="primary" @click="onView" v-hasPermi="['design:collect:query']"
-            v-show="form.id && form.status == 'draft'"
+            v-show="form.id && form.status != 'draft'" icon="view" size="large">查看流程</el-button>
-            icon="Edit"
+          <el-button type="success" v-hasPermi="['design:collect:export']" @click="onLoad"
-            size="large"
+            v-show="form.id && form.status != 'draft'" icon="Download" size="large">导出</el-button>
-            >审核</el-button
-          >
-          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']" v-show="form.status == 'back'" size="large" icon="Edit"
-            >重新发起审核</el-button
-          >
-          <el-button
-            type="primary"
-            @click="onView"
-            v-hasPermi="['design:collect:query']"
-            v-show="form.id && form.status != 'draft'"
-            icon="view"
-            size="large"
-            >查看流程</el-button
-          >
-          <el-button
-            type="success"
-            v-hasPermi="['design:collect:export']"
-            @click="onLoad"
-            v-show="form.id && form.status != 'draft'"
-            icon="Download"
-            size="large"
-            >导出</el-button
-          >
         </div>
       </el-form>
     </div>
@@ -130,13 +93,15 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { ElMessage, ElLoading } from 'element-plus';
 import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
+import { getUser } from '@/api/system/user';
+// 用户状态管理
 // 获取用户 store
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userStore = useUserStoreHook();
 // 从 store 中获取当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
-
+const userId = computed(() => userStore.userId);
 // 表单引用
 const mainFormRef = ref();
 // 用户列表
@@ -196,6 +161,15 @@ const removeDocumentItem = (index: number) => {
 const byProjectIdAll = async () => {
   // 调用接口获取数据
   const res = await byProjectId(currentProject.value?.id);
+  console.log(res);
+  form.documents = [
+    {
+      id: Date.now(),
+      catalogueName: '',
+      remark: ''
+    }
+  ];
+  disabledAll.value = false;
   if (res.code === 200 && res.data) {
     const data = res.data;
     // 回显基本信息
@@ -222,6 +196,8 @@ const byProjectIdAll = async () => {
         });
       });
     } else {
+      console.log(11111111);
+
       // 如果没有资料，保持一个空项
       form.documents = [
         {
@@ -230,6 +206,9 @@ const byProjectIdAll = async () => {
           remark: ''
         }
       ];
+      console.log(form.documents);
+
+
     }
   }
 };
@@ -314,12 +293,27 @@ const onView = () => {
     }
   });
 };
+/** 获取当前用户详情 */
+const getUserDetail = async () => {
+  try {
+    const res = await getUser(userId.value);
+    // userInfo.value = res.data.user;
+    form.userId = res.data.user.userId;
+    form.phone = res.data.user.phonenumber;
+    form.email = res.data.user.email;
+  } catch (err) {
+    ElMessage.error('获取用户信息失败');
+  }
+};
+
 // 页面挂载时初始化数据
 onMounted(() => {
   // 可以在这里添加初始化逻辑
+  getUserDetail();
   getDeptAllUser(userStore.deptId).then(() => {
     byProjectIdAll();
   });
+
 });
 const onLoad = async () => {
   // 导出接口
@@ -335,6 +329,7 @@ const onLoad = async () => {
 const listeningProject = watch(
   () => currentProject.value?.id,
   (nid, oid) => {
+    getUserDetail();
     getDeptAllUser(userStore.deptId).then(() => {
       byProjectIdAll();
     });

src/views/largeScreen/components/leftPage.vue

@@ -195,8 +195,9 @@ const generatePieOption = (data) => {
         {
           name: '合同数量',
           type: 'pie',
+
           radius: ['30%', '60%'],
-          center: ['50%', '80%'],
+          center: ['30%', '60%'],
           data: [], // 空数据，避免显示圆环
           itemStyle: { borderColor: '#000', borderWidth: 1 },
           // 中心显示“加载中”提示

src/views/materials/batchPlan/index.vue

@@ -6,43 +6,20 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" :offset="0"
+              <el-col :span="1.5" :offset="0"><el-button type="primary"
-                ><el-button
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']" size="default" @click="handleAdd"
-                  type="primary"
+                  icon="FolderAdd" plain>新增</el-button></el-col>
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
+              <el-col :span="1.5" :offset="0"><el-button type="danger" size="default"
-                  size="default"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']" @click="handleDeleteBatch"
-                  @click="handleAdd"
+                  icon="FolderDelete" plain>删除</el-button></el-col>
-                  icon="FolderAdd"
-                  plain
-                  >新增</el-button
-                ></el-col
-              >
-              <el-col :span="1.5" :offset="0"
-                ><el-button
-                  type="danger"
-                  size="default"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
-                  @click="handleDeleteBatch"
-                  icon="FolderDelete"
-                  plain
-                  >删除</el-button
-                ></el-col
-              >
             </el-row>
           </template>
 
-          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
+          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search"
-          <el-tree
+            clearable />
-            ref="batchTreeRef"
+          <el-tree ref="batchTreeRef" class="mt-2" node-key="id" :data="batchOptions"
-            class="mt-2"
+            :props="{ label: 'planCode', children: 'children' }" :expand-on-click-node="false" highlight-current
-            node-key="id"
+            default-expand-all @node-click="handleNodeClick">
-            :data="batchOptions"
-            :props="{ label: 'planCode', children: 'children' }"
-            :expand-on-click-node="false"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          >
             <template #default="{ node, data }">
               <div class="custom-tree-node">
                 {{ node.label }}
@@ -50,14 +27,8 @@
               </div>
             </template>
           </el-tree>
-          <pagination
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.batchData.pageNum"
-            v-show="total > 0"
+            v-model:limit="queryParams.batchData.pageSize" @pagination="getList" layout="prev, pager, next,jumper" />
-            :total="total"
-            v-model:page="queryParams.batchData.pageNum"
-            v-model:limit="queryParams.batchData.pageSize"
-            @pagination="getList"
-            layout="prev, pager, next,jumper"
-          />
         </el-card>
       </el-col>
       <el-col :span="19">
@@ -65,14 +36,12 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
+                <el-button type="primary" plain icon="Edit" @click="handleUpdata"
-                  >修改</el-button
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']">修改</el-button>
-                >
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']"
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()"
-                  >审核</el-button
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']">审核</el-button>
-                >
               </el-col>
 
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,19 +59,14 @@
             <el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
             <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
-          <pagination
+          <pagination v-show="mainTotal > 0" :total="mainTotal" v-model:page="queryParams.mainData.pageNum"
-            v-show="mainTotal > 0"
+            v-model:limit="queryParams.mainData.pageSize" @pagination="getMainList" />
-            :total="mainTotal"
-            v-model:page="queryParams.mainData.pageNum"
-            v-model:limit="queryParams.mainData.pageSize"
-            @pagination="getMainList"
-          />
         </el-card>
       </el-col>
     </el-row>
 
     <!-- 添加或修改物资-材料设备对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1250px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="1300px" append-to-body>
       <el-form :model="form" ref="cailiaoshebeiFormRef" :rules="rules" label-width="80px" :inline="false">
         <el-divider>基础信息</el-divider>
         <el-row :gutter="20">
@@ -113,7 +77,8 @@
           </el-col>
           <el-col :span="8" :offset="0">
             <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择编制日期" />
+              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择编制日期" />
             </el-form-item>
           </el-col>
           <el-col :span="8" :offset="0">
@@ -125,10 +90,21 @@
 
         <el-divider>主要信息</el-divider>
         <el-table :data="form.planList">
+          <el-table-column prop="name" align="center" label="版本号 " width="150">
+
+            <template #default="scope">
+              <el-select v-model="scope.row.versions" placeholder="请选择"
+                @change="(val) => selectNameVersion(val, scope.row)">
+
+                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions"
+                  :value="item.versions" />
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column prop="name" align="center" label="物资名称">
             <template #default="scope">
-              <!-- <el-input v-model="scope.row.name" placeholder="请输入物资" /> -->
+              <el-select :disabled="!scope.row.versions" v-model="scope.row.suppliespriceId" placeholder="请选择"
-              <el-select v-model="scope.row.suppliespriceId" placeholder="请选择" @change="(val) => selectName(val, scope.row)">
+                @change="(val) => selectName(val, scope.row)">
                 <el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </template>
@@ -155,7 +131,8 @@
           </el-table-column>
           <el-table-column prop="arrivalTime" align="center" label="需求到货时间">
             <template #default="scope">
-              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
+              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择"
+                style="width: 140px" />
             </template>
           </el-table-column>
           <el-table-column prop="remark" align="center" label="备注" width="150">
@@ -188,8 +165,8 @@ import {
   listBatch,
   getBatch,
   delBatch,
-  listSelectCailiaoshebei,
+  listSelectCailiaoshebei, obtainTheVersion,
-  getDictList
+  getDictList, coryEngineeringList
 } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -271,6 +248,7 @@ const data = reactive({
 const batchNumber = ref('');
 const { queryParams, form, rules } = toRefs(data);
 const nameList = ref([]);
+const versionList = ref([]);
 /** 查询物资-材料设备列表 */
 const getList = async (type?: string) => {
   loading.value = true;
@@ -480,15 +458,26 @@ const handleAudit = async () => {
   });
 };
 
-const getNameList = () => {
+const getNameList = (versions) => {
-  getDictList({ projectId: currentProject.value?.id }).then((res) => {
+  coryEngineeringList({ projectId: currentProject.value?.id, versions }).then((res) => {
     nameList.value = res.data;
   });
 };
+// 获取版本号
+const getVersion = () => {
+  obtainTheVersion({ projectId: currentProject.value?.id }).then((res) => {
+    versionList.value = res.data;
+  });
+};
+const selectNameVersion = (val, row) => {
+  row.suppliespriceId = undefined;
+  getNameList(val);
+};
 
 onMounted(() => {
   getList();
-  getNameList();
+  // getNameList();
+  getVersion();
 });
 
 //监听项目id刷新数据

src/views/materials/batchPlan/indexEdit.vue

@@ -3,18 +3,13 @@
     <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
+        <approvalButton @submitForm="submitForm" @approvalVerifyOpen="approvalVerifyOpen"
-          @submitForm="submitForm"
+          @handleApprovalRecord="handleApprovalRecord" :buttonLoading="buttonLoading" :id="form.mrpBaseBo.id"
-          @approvalVerifyOpen="approvalVerifyOpen"
+          :status="form.mrpBaseBo.status" :pageType="routeParams.type" />
-          @handleApprovalRecord="handleApprovalRecord"
-          :buttonLoading="buttonLoading"
-          :id="form.mrpBaseBo.id"
-          :status="form.mrpBaseBo.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">
+      <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>
           <el-row :gutter="20">
@@ -25,7 +20,8 @@
             </el-col>
             <el-col :span="8" :offset="0">
               <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-                <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" disabled placeholder="请选择编制日期" />
+                <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" disabled
+                  placeholder="请选择编制日期" />
               </el-form-item>
             </el-col>
             <el-col :span="8" :offset="0">
@@ -54,14 +50,8 @@
       <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
       <approvalRecord ref="approvalRecordRef"></approvalRecord>
       <!-- 流程选择对话框 -->
-      <el-dialog
+      <el-dialog draggable v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose"
-        draggable
+        width="500" class="rounded-lg shadow-lg">
-        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%">
@@ -70,12 +60,10 @@
         </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 @click="handleClose"
-              >取消</el-button
+              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()"
-            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
-              >确认</el-button
-            >
           </div>
         </template>
       </el-dialog>
@@ -123,7 +111,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const flowCodeOptions = [
   {
     value: currentProject.value?.id + '_mrp',
-    label: '物资供应总计划审批'
+    label: '物资需求计划审核'
   }
 ];
 

src/views/materials/materialsEquipment/materialIssue/index.vue

@@ -144,7 +144,9 @@
                       :prop="`itemList.${index}.name`"
                       :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]"
                     >
-                      <el-input v-model="item.name" placeholder="请输入名称" />
+                      <el-select v-model="item.name" placeholder="请输入名称" @change="(value) => getNameChange(value, index, item)">
+                        <el-option v-for="item in optionsName" :key="item.id" :label="item.materialsName" :value="item.id" />
+                      </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -249,7 +251,15 @@
 </template>
 
 <script setup name="MaterialIssue" lang="ts">
-import { listMaterialIssue, getMaterialIssue, delMaterialIssue, addMaterialIssue, updateMaterialIssue } from '@/api/materials/materialIssue';
+import {
+  listMaterialIssue,
+  getMaterialIssue,
+  delMaterialIssue,
+  addMaterialIssue,
+  updateMaterialIssue,
+  getMaterialName
+} from '@/api/materials/materialIssue';
+
 import { MaterialIssueVO, MaterialIssueQuery, MaterialIssueForm } from '@/api/materials/materialIssue/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import wordllssue from './word/index.vue';
@@ -345,6 +355,30 @@ const getList = async () => {
   total.value = res.total;
   loading.value = false;
 };
+const optionsName: any = ref([]);
+
+//获取一起名称
+const getName = async () => {
+  const res = await getMaterialName(currentProject.value.id);
+  console.log(res);
+  if (res.code == 200) {
+    optionsName.value = res.data;
+  }
+};
+
+const getNameChange = (value, index, item) => {
+  // 这里可以添加处理逻辑
+  console.log(value);
+
+  const data = optionsName.value.find((item) => item.id == value);
+  console.log(data);
+
+  form.value.itemList[index].name = data.materialsName;
+  form.value.itemList[index].materialsId = data.id;
+  form.value.itemList[index].specification = data.typeSpecificationName;
+  form.value.itemList[index].unit = data.weightId;
+  form.value.itemList[index].stockQuantity = data.inventoryNumber;
+};
 
 /** 取消按钮 */
 const cancel = () => {
@@ -447,6 +481,7 @@ const handleView = (row) => {
 };
 onMounted(() => {
   getList();
+  getName();
 });
 //监听项目id刷新数据
 const listeningProject = watch(

src/views/materials/materialsEquipment/materialReceive/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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">
@@ -11,7 +12,8 @@
               <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
-              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="合同名称" prop="contractName">
               <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
@@ -23,9 +25,11 @@
               <el-input v-model="queryParams.supplierUnit" placeholder="请输入供货单位" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search"
+                @click="handleQuery">搜索</el-button>
 
-              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']" @click="resetQuery">重置</el-button>
+              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']"
+                @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -36,18 +40,12 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialReceive:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['materials:materialReceive:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              type="danger"
+              v-hasPermi="['materials:materialReceive:remove']">删除</el-button>
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['materials:materialReceive:remove']"
-              >删除</el-button
-            >
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -70,24 +68,21 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"></el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+                v-hasPermi="['materials:materialReceive:query']"></el-button>
             </el-tooltip>
             <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button>
             </el-tooltip> -->
             <el-tooltip content="删除" placement="top">
-              <el-button
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                link
+                v-hasPermi="['materials:materialReceive:remove']"></el-button>
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['materials:materialReceive:remove']"
-              ></el-button>
             </el-tooltip>
           </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" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改物料接收单对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
@@ -106,11 +101,10 @@
               <el-input v-model="form.formCode" placeholder="请输入表单编号" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"
+          <el-col :span="12"><el-form-item label="采购单编号" prop="docId"><el-select @change="handleSelect"
-            ><el-form-item label="采购单编号" prop="docId"
+                v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
-              ><el-select @change="handleSelect" v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
+                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode"
-                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode" :value="item.id"></el-option> </el-select
+                  :value="item.id"></el-option> </el-select></el-form-item>
-            ></el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="供货单位" prop="supplierUnit">
@@ -122,8 +116,7 @@
               <el-input v-model="form.orderingUnit" placeholder="请输入订货单位" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"
+          <el-col :span="12"><el-form-item label="工程名称" prop="projectName">
-            ><el-form-item label="工程名称" prop="projectName">
               <el-input v-model="form.projectName" placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
@@ -146,53 +139,38 @@
               <div v-for="(item, index) in form.itemList" :key="index" class="detail-item">
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item
+                    <el-form-item disabled label="名称" :prop="`itemList.${index}.name`"
-                      disabled
+                      :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
-                      label="名称"
-                      :prop="`itemList.${index}.name`"
-                      :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }"
-                    >
                       <el-input disabled v-model="item.name" placeholder="请输入名称" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
+                    <el-form-item label="规格" :prop="`itemList.${index}.specification`"
-                      label="规格"
+                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }">
-                      :prop="`itemList.${index}.specification`"
-                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }"
-                    >
                       <el-input disabled v-model="item.specification" placeholder="请输入规格" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单位" :prop="`itemList.${index}.unit`" :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
+                    <el-form-item label="单位" :prop="`itemList.${index}.unit`"
+                      :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
                       <el-input disabled v-model="item.unit" placeholder="请输入单位" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
+                    <el-form-item label="数量" :prop="`itemList.${index}.quantity`"
-                      label="数量"
+                      :rules="{ required: true, message: '数量不能为空', trigger: 'blur' }">
-                      :prop="`itemList.${index}.quantity`"
-                      :rules="{ required: true, message: '数量不能为空', trigger: 'blur' }"
-                    >
                       <el-input disabled type="number" v-model="item.quantity" placeholder="请输入数量" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
+                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`"
-                      label="验收"
+                      :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }">
-                      :prop="`itemList.${index}.acceptedQuantity`"
-                      :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
-                    >
                       <el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
+                    <el-form-item label="缺件" :prop="`itemList.${index}.shortageQuantity`"
-                      label="缺件"
+                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }">
-                      :prop="`itemList.${index}.shortageQuantity`"
-                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }"
-                    >
                       <el-input type="number" v-model="item.shortageQuantity" placeholder="自动计算（数量-验收数量）" readonly />
                       <span class="tips">*自动计算（数量-验收数量）</span>
                     </el-form-item>
@@ -232,12 +210,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <span style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
+            <span
+              style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
           </el-col>
           <el-col :span="24">
             <el-form-item label="设备材料入库/移交" prop="storageType">
               <el-radio-group v-model="form.storageType">
-                <el-radio v-for="dict in storage_type" :key="dict.value" :label="dict.value">
+                <el-radio v-for="dict in storage_type.slice(0, 1)" :key="dict.value" :label="dict.value">
                   {{ dict.label }}
                 </el-radio>
               </el-radio-group>
@@ -246,9 +225,7 @@
                   {{ dict.label }}
                 </el-checkbox>
               </el-checkbox-group> -->
-            </el-form-item> </el-col
+            </el-form-item> </el-col><el-col :span="24"><el-form-item label="备注" prop="remark">
-          ><el-col :span="24"
-            ><el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>

src/views/materials/materialsInventory/index.vue

@@ -1,16 +1,20 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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="materialsName">
-              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-hasPermi="['materials:materialsInventory:list']" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialsInventory:list']" icon="Search"
+                @click="handleQuery">搜索</el-button>
 
-              <el-button icon="Refresh" v-hasPermi="['materials:materialsInventory:list']" @click="resetQuery">重置</el-button>
+              <el-button icon="Refresh" v-hasPermi="['materials:materialsInventory:list']"
+                @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -21,7 +25,8 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materialsInventory:export']">
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+              v-hasPermi="['materials:materialsInventory:export']">
               导出
             </el-button>
           </el-col>
@@ -29,8 +34,23 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="materialsInventoryList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="materialsInventoryList" @expand-change="handleExpandChange">
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="expand">
+          <template #default="props">
+            <div style="margin-left: 60px">
+              <el-table :data="materialsUseRecordList" border v-loading="loadingChild">
+                <el-table-column label="序号" align="center" type="index" width="60" />
+                <el-table-column label="使用数量" align="center" prop="useNumber" />
+                <el-table-column label="剩余量" align="center" prop="residueNumber" />
+                <el-table-column label="使用部位" align="center" prop="usePart" />
+                <el-table-column label="备注" align="center" prop="remark" />
+              </el-table>
+              <pagination v-show="totalChild > 0" :total="totalChild" v-model:page="queryParamsChild.pageNum"
+                v-model:limit="queryParamsChild.pageSize" @pagination="getListChild" />
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="物资名称" align="center" prop="materialsName" />
         <el-table-column label="计划数量" align="center" prop="quantityCount" />
@@ -95,7 +115,8 @@
           </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" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改材料出/入库对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -109,7 +130,8 @@
           <el-input v-model="form.number" placeholder="请输入出/入库的数量" />
         </el-form-item>
         <el-form-item label="出/入库操作时间" prop="outPutTime">
-          <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出/入库操作时间">
+          <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择出/入库操作时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="剩余库存数量" prop="residue">
@@ -154,7 +176,9 @@ import {
 } from '@/api/materials/materialsInventory';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
 import { useUserStoreHook } from '@/store/modules/user';
-
+import {
+  listMaterialsUseRecord,
+} from '@/api/materials/materialsUseRecord';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { out_put_type } = toRefs<any>(proxy?.useDict('out_put_type'));
 
@@ -170,7 +194,9 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const loadingChild = ref(true);
+const totalChild = ref(0);
+const materialsUseRecordList = ref<any[]>([]);
 const queryFormRef = ref<ElFormInstance>();
 const materialsInventoryFormRef = ref<ElFormInstance>();
 
@@ -194,7 +220,7 @@ const initFormData: MaterialsInventoryForm = {
   shipper: undefined,
   remark: undefined
 };
-const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>({
+const data = reactive({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -212,14 +238,38 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
     shipper: undefined,
     params: {}
   },
+  queryParamsChild: {
+    pageNum: 1,
+    pageSize: 10,
+    inventoryId: undefined,
+    usePart: undefined,
+    useNumber: undefined,
+    residueNumber: undefined
+  },
   rules: {
     id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
     materialsId: [{ required: true, message: '材料id不能为空', trigger: 'blur' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules, queryParamsChild } = toRefs(data);
 const materialsOptions = ref([]);
+/** 处理外层表格展开/折叠：记录当前展开行的inventoryId */
+const handleExpandChange = (row: any) => {
+  queryParamsChild.value.inventoryId = row.id;
+  getListChild();
+};
+/** 查询材料子级登记列表（内层列表） */
+const getListChild = async () => {
+  loadingChild.value = true;
+  try {
+    const res = await listMaterialsUseRecord(queryParamsChild.value);
+    materialsUseRecordList.value = res.rows;
+    totalChild.value = res.total;
+  } finally {
+    loadingChild.value = false;
+  }
+};
 
 /** 查询材料出/入库列表 */
 const getList = async () => {

src/views/materials/materialsUseRecord/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> </transition>
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave"> </transition>
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
@@ -18,7 +19,8 @@
       </template>
 
       <!-- 外层表格：添加ref用于控制展开状态 -->
-      <el-table ref="outerTableRef" v-loading="loading" :data="materialsUseInventoryList" @expand-change="handleExpandChange" border>
+      <el-table ref="outerTableRef" v-loading="loading" :data="materialsUseInventoryList"
+        @expand-change="handleExpandChange" border>
         <el-table-column type="expand">
           <template #default="props">
             <div style="margin-left: 60px">
@@ -30,25 +32,13 @@
                 <el-table-column label="备注" align="center" prop="remark" />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                   <template #default="scope">
-                    <el-button
+                    <el-button link type="primary" icon="delete" v-if="scope.row.ishow" @click="handleDelete(scope.row)"
-                      link
+                      v-hasPermi="['materials:materialsUseRecord:remove']">删除</el-button>
-                      type="primary"
-                      icon="delete"
-                      v-if="scope.row.ishow"
-                      @click="handleDelete(scope.row)"
-                      v-hasPermi="['materials:materialsUseRecord:remove']"
-                      >删除</el-button
-                    >
                   </template>
                 </el-table-column>
               </el-table>
-              <pagination
+              <pagination v-show="totalChild > 0" :total="totalChild" v-model:page="queryParamsChild.pageNum"
-                v-show="totalChild > 0"
+                v-model:limit="queryParamsChild.pageSize" @pagination="getListChild" />
-                :total="totalChild"
-                v-model:page="queryParamsChild.pageNum"
-                v-model:limit="queryParamsChild.pageSize"
-                @pagination="getListChild"
-              />
             </div>
           </template>
         </el-table-column>
@@ -63,13 +53,13 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['materials:materialsUseRecord:add']"
+            <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
-              >添加登记</el-button
+              v-hasPermi="['materials:materialsUseRecord:add']">添加登记</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" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改材料使用登记对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>

src/views/materials/usageMaterials/purchase/index.vue

@@ -1,37 +1,25 @@
 <template>
   <div style="padding: 20px">
     <el-card class="mb-5">
-      <el-button
+      <el-button type="primary" v-hasPermi="['cailiaoshebei:physicalsupply:add']" icon="Plus" @click="handleAdd"
-        type="primary"
+        class="transition-all duration-200 hover:shadow-md">
-        v-hasPermi="['cailiaoshebei:physicalsupply:add']"
-        icon="Plus"
-        @click="handleAdd"
-        class="transition-all duration-200 hover:shadow-md"
-      >
         新增
       </el-button>
-      <el-button
+      <el-button v-hasPermi="['cailiaoshebei:physicalsupply:list']" icon="Refresh" @click="refreshData"
-        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
+        class="transition-all duration-200 hover:shadow-md">
-        icon="Refresh"
-        @click="refreshData"
-        class="transition-all duration-200 hover:shadow-md"
-      >
         刷新
       </el-button>
     </el-card>
 
     <!-- 数据表格 -->
     <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
-      <el-table
+      <el-table v-loading="loading" :data="tableData" border stripe
-        v-loading="loading"
-        :data="tableData"
-        border
-        stripe
         style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
         :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
-        :row-class-name="tableRowClassName"
+        :row-class-name="tableRowClassName">
-      >
+        <!-- <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column> -->
-        <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
+        <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
+
         <el-table-column prop="name" label="材料名称" align="center"></el-table-column>
         <el-table-column prop="specification" label="规格" align="center"></el-table-column>
         <el-table-column prop="supplier" label="供应商" align="center"></el-table-column>
@@ -55,49 +43,25 @@
         </el-table-column>
         <el-table-column label="操作" width="240" align="center" fixed="right">
           <template #default="scope">
-            <el-button
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupplySon:add']" size="small" icon="Plus"
-              v-hasPermi="['cailiaoshebei:physicalsupplySon:add']"
+              @click="handleAddSon(scope.row)" class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
-              size="small"
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupply:edit']" size="small" icon="Edit"
-              icon="Plus"
+              @click="handleEdit(scope.row)" class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
-              @click="handleAddSon(scope.row)"
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupplySon:list']" size="small" icon="View"
-              class="text-blue-600 hover:text-blue-800 transition-colors"
+              @click="jumpRouter(scope.row)" class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
-            ></el-button>
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupply:remove']" size="small" icon="Delete"
-            <el-button
+              @click="handleDelete(scope.row)" class="text-red-600 hover:text-red-800 transition-colors"></el-button>
-              v-hasPermi="['cailiaoshebei:physicalsupply:edit']"
-              size="small"
-              icon="Edit"
-              @click="handleEdit(scope.row)"
-              class="text-blue-600 hover:text-blue-800 transition-colors"
-            ></el-button>
-            <el-button
-              v-hasPermi="['cailiaoshebei:physicalsupplySon:list']"
-              size="small"
-              icon="View"
-              @click="jumpRouter(scope.row)"
-              class="text-blue-600 hover:text-blue-800 transition-colors"
-            ></el-button>
-            <el-button
-              v-hasPermi="['cailiaoshebei:physicalsupply:remove']"
-              size="small"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              class="text-red-600 hover:text-red-800 transition-colors"
-            ></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="fetchData" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="fetchData" />
     </div>
     <!-- 新增/编辑对话框 -->
-    <el-dialog
+    <el-dialog v-model="dialogVisible" :title="dialogType === 'add' ? '新增记录' : '编辑记录'" :width="dialogWidth"
-      v-model="dialogVisible"
+      :fullscreen="isFullscreen" :before-close="handleDialogClose">
-      :title="dialogType === 'add' ? '新增记录' : '编辑记录'"
-      :width="dialogWidth"
-      :fullscreen="isFullscreen"
-      :before-close="handleDialogClose"
-    >
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -141,12 +105,8 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="合同签订时间" prop="contractSigning">
-              <el-date-picker
+              <el-date-picker v-model="formData.contractSigning" type="datetime" placeholder="选择合同签订时间"
-                v-model="formData.contractSigning"
+                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
-                type="datetime"
-                placeholder="选择合同签订时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-              ></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -159,7 +119,8 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="供货要求" prop="supplyRequirements">
-              <el-input v-model="formData.supplyRequirements" placeholder="请输入供货要求" type="textarea" :rows="3"></el-input>
+              <el-input v-model="formData.supplyRequirements" placeholder="请输入供货要求" type="textarea"
+                :rows="3"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/views/out/constructionValue/index.vue

@@ -1,135 +1,120 @@
-<template>
+  <template>
-  <div class="p-2">
+    <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      <div v-show="showSearch" class="mb-[10px]">
+        :leave-active-class="proxy?.animate.searchAnimate.leave">
-        <el-card shadow="hover">
+        <div v-show="showSearch" class="mb-[10px]">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-card shadow="hover">
-            <el-form-item label="上报日期" prop="reportDate">
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-              <el-date-picker clearable v-model="queryParams.reportDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择上报日期" />
+              <el-form-item label="上报日期" prop="reportDate">
-            </el-form-item>
+                <el-date-picker clearable v-model="queryParams.reportDate" type="date" value-format="YYYY-MM-DD"
-            <el-form-item>
+                  placeholder="请选择上报日期" />
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              </el-form-item>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-form-item>
-            </el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          </el-form>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-card>
+              </el-form-item>
-      </div>
+            </el-form>
-    </transition>
+          </el-card>
+        </div>
+      </transition>
 
-    <el-card shadow="never">
+      <el-card shadow="never">
-      <template #header>
+        <template #header>
-        <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+            <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:constructionValue:add']">新增</el-button>
+              <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          </el-col>
+                v-hasPermi="['out:constructionValue:add']">新增</el-button>
-          <el-col :span="1.5">
+            </el-col>
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:constructionValue:remove']"
+            <el-col :span="1.5">
-              >删除</el-button
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-            >
+                v-hasPermi="['out:constructionValue:remove']">删除</el-button>
-          </el-col>
+            </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+          </el-row>
-      </template>
+        </template>
 
-      <el-table v-loading="loading" :data="constructionValueList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="constructionValueList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="selection" width="55" align="center" />
-        <!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
+          <!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
-        <el-table-column label="上报日期" align="center" prop="reportDate" width="180">
+          <el-table-column label="上报日期" align="center" prop="reportDate" width="180">
-          <template #default="scope">
+            <template #default="scope">
-            <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
+              <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
-          </template>
+            </template>
-        </el-table-column>
+          </el-table-column>
-        <el-table-column label="项目子项" align="center" prop="subProjectName" />
+          <el-table-column label="项目子项" align="center" prop="subProjectName" />
-        <el-table-column label="分部工程" align="center" prop="categoryName" />
+          <el-table-column label="分部工程" align="center" prop="categoryName" />
-        <el-table-column label="分项工程" align="center" prop="progressCategoryName" />
+          <el-table-column label="分项工程" align="center" prop="progressCategoryName" />
-        <el-table-column label="人工填报数量" align="center" prop="artificialNum" />
+          <el-table-column label="人工填报数量" align="center" prop="artificialNum" />
-        <el-table-column label="无人机识别数量" align="center" prop="uavNum" />
+          <el-table-column label="无人机识别数量" align="center" prop="uavNum" />
-        <el-table-column label="确认数量" align="center" prop="confirmNum" />
+          <el-table-column label="确认数量" align="center" prop="confirmNum" />
-        <el-table-column label="产值" align="center" prop="outValue" />
+          <el-table-column label="对乙产值" align="center" prop="outValue" />
-        <el-table-column label="流程状态" align="center" prop="status">
+          <el-table-column label="对甲产值" align="center" prop="ownerValue" />
-          <template #default="scope">
+          <el-table-column label="流程状态" align="center" prop="status">
-            <dict-tag :options="wf_business_status" :value="scope.row.auditStatus" />
+            <template #default="scope">
-          </template>
+              <dict-tag :options="wf_business_status" :value="scope.row.auditStatus" />
-        </el-table-column>
+            </template>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
+          </el-table-column>
-          <template #default="scope">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['out:constructionValue:edit']">修改</el-button>
+            <template #default="scope">
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['out:constructionValue:remove']"
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-              >删除</el-button
+                v-hasPermi="['out:constructionValue:edit']">修改</el-button>
-            >
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:constructionValue:remove']"
+                v-hasPermi="['out:constructionValue:remove']">删除</el-button>
-              >审核</el-button
+              <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)"
-            >
+                v-hasPermi="['out:constructionValue:remove']">审核</el-button>
-          </template>
+            </template>
-        </el-table-column>
+          </el-table-column>
-      </el-table>
+        </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-    </el-card>
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
-    <!-- 添加或修改施工产值对话框 -->
+      </el-card>
-    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <!-- 添加或修改施工产值对话框 -->
-      <el-form ref="constructionValueFormRef" :model="form" :rules="rules" label-width="120px">
+      <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-        <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
+        <el-form ref="constructionValueFormRef" :model="form" :rules="rules" label-width="120px">
-          <el-cascader
+          <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
-            :options="matrixOptions"
+            <el-cascader :options="matrixOptions" placeholder="请选择"
-            placeholder="请选择"
+              :props="{ value: 'matrixId', label: 'name', emitPath: false }" v-model="form.matrixId"
-            :props="{ value: 'matrixId', label: 'name', emitPath: false }"
+              @clear="resetCascader(1)" @change="handleChange" clearable />
-            v-model="form.matrixId"
+          </el-form-item>
-            @clear="resetCascader(1)"
+          <el-form-item label="分项工程" prop="progressCategoryId" v-if="!form.id">
-            @change="handleChange"
+            <el-cascader :options="progressCategoryList" v-model="form.progressCategoryId" @clear="resetCascader()"
-            clearable
+              :disabled="!form.matrixId" @change="selectTime"
-          />
+              :props="{ expandTrigger: 'hover', value: 'id', label: 'name', emitPath: false }" placeholder="请选择分项工程"
-        </el-form-item>
+              clearable>
-        <el-form-item label="分项工程" prop="progressCategoryId" v-if="!form.id">
+            </el-cascader>
-          <el-cascader
+          </el-form-item>
-            :options="progressCategoryList"
+          <el-form-item label="计划日期" prop="reportDateId" v-if="!form.id">
-            v-model="form.progressCategoryId"
+            <el-cascader :options="progressTimeList" v-model="form.reportDateId" :disabled="!form.progressCategoryId"
-            @clear="resetCascader()"
+              :props="{ expandTrigger: 'hover', value: 'id', label: 'date', emitPath: false }" placeholder="请选择计划日期"
-            :disabled="!form.matrixId"
+              @change="submitTime" clearable>
-            @change="selectTime"
+            </el-cascader>
-            :props="{ expandTrigger: 'hover', value: 'id', label: 'name', emitPath: false }"
+          </el-form-item>
-            placeholder="请选择分项工程"
+          <el-form-item label="人工填报数量" prop="artificialNum">
-            clearable
+            <el-input v-model="form.artificialNum" placeholder="请输入人工填报数量" disabled />
-          >
+          </el-form-item>
-          </el-cascader>
+          <el-form-item label="无人机识别数量" prop="uavNum">
-        </el-form-item>
+            <el-input v-model="form.uavNum" placeholder="请输入无人机识别数量" disabled />
-        <el-form-item label="计划日期" prop="reportDateId" v-if="!form.id">
+          </el-form-item>
-          <el-cascader
+          <el-form-item label="上报日期" prop="planDate">
-            :options="progressTimeList"
+            <el-date-picker v-model="form.planDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择上报日期" />
-            v-model="form.reportDateId"
+          </el-form-item>
-            :disabled="!form.progressCategoryId"
+          <el-form-item label="确认数量" prop="confirmNum">
-            :props="{ expandTrigger: 'hover', value: 'id', label: 'date', emitPath: false }"
+            <el-input v-model="form.confirmNum" placeholder="请输入确认数量" />
-            placeholder="请选择计划日期"
+          </el-form-item>
-            @change="submitTime"
+          <!-- <el-form-item label="产值" prop="outValue">
-            clearable
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="人工填报数量" prop="artificialNum">
-          <el-input v-model="form.artificialNum" placeholder="请输入人工填报数量" disabled />
-        </el-form-item>
-        <el-form-item label="无人机识别数量" prop="uavNum">
-          <el-input v-model="form.uavNum" placeholder="请输入无人机识别数量" disabled />
-        </el-form-item>
-        <el-form-item label="上报日期" prop="planDate">
-          <el-date-picker v-model="form.planDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择上报日期" />
-        </el-form-item>
-        <el-form-item label="确认数量" prop="confirmNum">
-          <el-input v-model="form.confirmNum" placeholder="请输入确认数量" />
-        </el-form-item>
-        <!-- <el-form-item label="产值" prop="outValue">
           <el-input v-model="form.outValue" disabled />
         </el-form-item> -->
-      </el-form>
+        </el-form>
-      <template #footer>
+        <template #footer>
-        <div class="dialog-footer">
+          <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+            <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+            <el-button @click="cancel">取 消</el-button>
-        </div>
+          </div>
-      </template>
+        </template>
-    </el-dialog>
+      </el-dialog>
-  </div>
+    </div>
-</template>
+  </template>
 
 <script setup name="ConstructionValue" lang="ts">
 import {
@@ -292,7 +277,7 @@ const handleAdd = async () => {
 const handleChange = async (value: number) => {
   queryParams.value.matrixId = value;
   const res = await listProgressCategory(queryParams.value);
-  const data = proxy?.handleTree<ProgressCategoryVO>(res.data, 'id', 'pid');
+  const data = proxy?.handleTree<ProgressCategoryVO>(res.data, 'id', 'parentId');
   if (data) {
     progressCategoryList.value = data;
     console.log('🚀 ~ handleChange ~ progressCategoryList.value :', progressCategoryList.value);

src/views/out/designCompletion/index.vue

@@ -1,11 +1,19 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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="planMonth">
-              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM"
+                placeholder="请选择计划月份" />
+            </el-form-item>
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="queryParams.type" 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>
@@ -22,13 +30,18 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <el-table v-loading="loading" :data="monthPlanList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="计划月份" align="center" prop="planMonth" />
         <el-table-column label="计划产值" align="center" prop="planValue" />
         <el-table-column label="完成产值" align="center" prop="completeValue" />
         <el-table-column label="差额" align="center" prop="differenceValue" />
+        <el-table-column label="类型" align="center">
+          <template #default="scope">
+            <span v-if="scope.row.type == '1'">对甲</span>
+            <span v-else>对乙</span>
+          </template>
+        </el-table-column>
         <el-table-column label="产值类型" align="center" prop="valueType">
           <template #default="scope">
             <dict-tag :options="out_value_type" :value="scope.row.valueType" />
@@ -41,15 +54,16 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
           <template #default="scope">
-            <el-button type="primary" link icon="Edit" @click="handleAdd(scope.row)" v-hasPermi="['out:monthPlan:add']">编辑</el-button>
+            <el-button type="primary" link icon="Edit" @click="handleAdd(scope.row)"
+              v-hasPermi="['out:monthPlan:add']">编辑</el-button>
 
-            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:constructionValue:remove']"
+            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)"
-              >审核</el-button
+              v-hasPermi="['out:constructionValue:remove']">审核</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" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -60,14 +74,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="计划月份" prop="planMonth">
-          <el-date-picker
+          <el-date-picker v-model="form.planMonth" type="month" value-format="YYYY-MM" disabled placeholder="请选择计划月份"
-            v-model="form.planMonth"
+            @change="handlePlanMonthChange" />
-            type="month"
-            value-format="YYYY-MM"
-            disabled
-            placeholder="请选择计划月份"
-            @change="handlePlanMonthChange"
-          />
         </el-form-item>
         <el-form-item label="计划产值" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" disabled />

src/views/out/monthPlan/index.vue

@@ -1,17 +1,25 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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="planMonth">
-              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+              <el-date-picker v-model="queryParams.planMonth" 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 v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="queryParams.type" 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>
@@ -25,12 +33,12 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:monthPlan:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['out:monthPlan:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:monthPlan:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              >删除</el-button
+              v-hasPermi="['out:monthPlan:remove']">删除</el-button>
-            >
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -47,25 +55,40 @@
             <dict-tag :options="out_value_type" :value="scope.row.valueType" />
           </template>
         </el-table-column>
+        <el-table-column label="类型" align="center">
+          <template #default="scope">
+            <span v-if="scope.row.type == '1'">对甲</span>
+            <span v-else>对乙</span>
+          </template>
+        </el-table-column>
         <el-table-column label="流程状态" align="center" prop="planAuditStatus">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.planAuditStatus" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope"
+          <template #default="scope"><el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            ><el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['out:monthPlan:edit']">修改</el-button>
+              v-hasPermi="['out:monthPlan:edit']">修改</el-button>
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['out:monthPlan:remove']">删除</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:monthPlan:remove']">审核</el-button>
+              v-hasPermi="['out:monthPlan:remove']">删除</el-button>
+            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)"
+              v-hasPermi="['out:monthPlan:remove']">审核</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" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型" prop="planValue">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option label="对甲" value="1" />
+            <el-option label="对乙" value="2" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="计划产值" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" type="number" />
         </el-form-item>
@@ -117,7 +140,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: MonthPlanForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   planValue: undefined,
@@ -125,12 +148,12 @@ const initFormData: MonthPlanForm = {
   differenceValue: undefined,
   planMonth: undefined,
   isDesign: true,
-
+  type: '1',
   valueType: undefined,
   planAuditStatus: undefined,
   completeAuditStatus: undefined
 };
-const data = reactive<PageData<MonthPlanForm, MonthPlanQuery>>({
+const data = reactive({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -143,6 +166,7 @@ const data = reactive<PageData<MonthPlanForm, MonthPlanQuery>>({
     valueType: undefined,
     planAuditStatus: undefined,
     completeAuditStatus: undefined,
+    type: '1',
     params: {}
   },
   rules: {

src/views/out/monthPlan/indexEdit.vue

@@ -25,29 +25,37 @@
             :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
-            label-width="120px"
+            label-width="80px"
             class="space-y-4"
           >
             <div class="grid grid-cols-1 gap-4">
               <el-row :gutter="20" justify="space-between" v-for="item in form">
-                <el-col :span="8" :offset="0">
+                <el-col :span="6" :offset="0">
                   <el-form-item label="计划产值" prop="planValue">
                     <el-input v-model="item.planValue" placeholder="请输入计划产值" disabled />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" :offset="0">
+                <el-col :span="6" :offset="0">
                   <el-form-item label="计划月份" prop="planMonth">
                     <el-date-picker v-model="item.planMonth" type="month" value-format="YYYY-MM" disabled placeholder="请选择计划月份" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :offset="0">
+                <el-col :span="6" :offset="0">
                   <el-form-item label="产值类型" prop="valueType">
                     <el-select v-model="item.valueType" placeholder="请选择产值类型" disabled>
                       <el-option v-for="it in out_value_type" :key="it.value" :label="it.label" :value="it.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="6" :offset="0">
+                  <el-form-item label="类型" prop="valueType">
+                    <el-select v-model="item.type" placeholder="请选择类型" disabled>
+                      <el-option label="对甲" value="1" />
+                      <el-option label="对乙" value="2" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </div>
           </el-form>

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">
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
-      <div v-show="showSearch" class="mb-[10px]">
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label" :name="item.value">
-        <el-card shadow="hover">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <div v-show="showSearch" class="mb-[10px]">
-            <el-form-item label="计划月份" prop="month">
+            <el-card shadow="hover">
-              <el-date-picker v-model="queryParams.month" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            </el-form-item>
+                <el-form-item label="计划月份" prop="month">
-            <el-form-item label="产值类型" prop="valueType">
+                  <el-date-picker v-model="queryParams.month" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
-              <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
+                </el-form-item>
-                <el-option label="设计" value="1" />
+                <el-form-item label="产值类型" prop="valueType">
-                <el-option label="采购" value="2" />
+                  <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
-              </el-select>
+                    <el-option label="设计" value="1" />
-            </el-form-item>
+                    <el-option label="采购" value="2" />
-            <el-form-item>
+                  </el-select>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                </el-form-item>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-form-item>
-            </el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          </el-form>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-card>
+                </el-form-item>
-      </div>
+              </el-form>
-    </transition>
+            </el-card>
-    <el-card shadow="never">
+          </div>
-      <template #header>
+        </transition>
-        <el-row :gutter="10" class="mb8">
+        <el-card shadow="never">
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <template #header>
-        </el-row>
+            <el-row :gutter="10" class="mb8">
-      </template>
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+            </el-row>
+          </template>
 
-      <el-table v-loading="loading" :data="valueAllocationList">
+          <el-table v-loading="loading" :data="valueAllocationList">
-        <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="月预计产值" align="center" prop="monthEstimatedValue" />
+            <el-table-column label="月预计产值" align="center" prop="monthEstimatedValue" />
-        <el-table-column label="完成产值月合计" align="center" prop="monthCompletionValue" />
+            <el-table-column label="完成产值月合计" align="center" prop="monthCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifference" />
+            <el-table-column label="产值差额" align="center" prop="valueDifference" />
-        <el-table-column label="项目总产值" align="center" prop="totalValue" />
+            <el-table-column label="项目总产值" align="center" prop="totalValue" />
-        <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
+            <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
-        <el-table-column label="项目完成率" align="center" prop="projectCompletionRate" />
+            <el-table-column label="项目完成率" align="center" prop="projectCompletionRate" />
-      </el-table>
+          </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+          <pagination
-    </el-card>
+            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 () => {

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">
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
-      <div v-show="showSearch" class="mb-[10px]">
+      <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,9 @@
             </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-option label="施工" value="3" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -18,68 +20,100 @@
             </el-form-item>
           </el-form>
         </el-card>
-      </div>
+        <el-card shadow="never">
-    </transition>
+          <el-table v-loading="loading" :data="tableData" v-if="activeTab == '1' || activeTab == '2'">
-    <el-card shadow="never">
+            <el-table-column label="项目" align="center" prop="projectName" />
-      <template #header>
+            <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
-        <el-row :gutter="10" class="mb8">
+            <el-table-column label="累计结算产值" align="center" prop="totalSettlementOutputValue" />
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+            <el-table-column label="完工未结算额" align="center" prop="completionUnsettledAmount" />
-        </el-row>
+            <el-table-column label="完工未结算比例" align="center" prop="completionUnsettledRatio" />
-      </template>
+            <!-- <el-table-column label="操作" align="center">
-
+              <template #default="scope">
-      <el-table v-loading="loading" :data="valueAllocationList">
+                <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
-        <el-table-column label="项目" align="center" prop="projectName" />
+              </template>
-        <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
+            </el-table-column> -->
-        <el-table-column label="累计结算产值" align="center" prop="totalSettlementOutputValue" />
+          </el-table>
-        <el-table-column label="完工未结算额" align="center" prop="completionUnsettledAmount" />
+          <el-table v-loading="loading" :data="tableData" v-if="activeTab == '3'">
-        <el-table-column label="完工未结算比例" align="center" prop="completionUnsettledRatio" />
+            <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="操作" align="center">
+            <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
-          <template #default="scope">
+            <el-table-column label="分包累计结算产值" align="center" prop="subTotalSettlementOutputValue" />
-            <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
+            <el-table-column label="业主累计结算产值" align="center" prop="ownerTotalSettlementOutputValue" />
-          </template>
+            <el-table-column label="差额" align="center" prop="differenceValue" />
-        </el-table-column>
+            <!-- <el-table-column label="操作" align="center">
-      </el-table>
+              <template #default="scope">
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+                <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
-    </el-card>
+              </template>
+            </el-table-column> -->
+          </el-table>
+          <el-table v-loading="loading" :data="tableData" v-if="activeTab == '4'">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="对甲计划总产值" align="center" prop="ownerTotal" />
+            <el-table-column label="对乙计划总产值" align="center" prop="subTotal" />
+            <el-table-column label="对甲月计划产值" align="center" prop="ownerPlanTotal" />
+            <el-table-column label="对乙月计划产值" align="center" prop="subPlanTotal" />
+            <el-table-column label="对甲月实际产值" align="center" prop="ownerActualTotal" />
+            <el-table-column label="对乙月实际产值" align="center" prop="subActualTotal" />
+            <!-- <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">
+<script setup lang="ts">
-import { listOutTable } from '@/api/out/outDesignTableVS';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { useUserStoreHook } from '@/store/modules/user';
+import { listOutTable, comparisonOfOutputValue, comparisonOfSettlementValue } from '@/api/out/outDesignTableVS/index';
+
 import { dayjs } from 'element-plus';
-// 获取用户 store
 const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const valueAllocationList = ref([]);
+const activeTab = ref('1');
-const loading = ref(true);
+const queryParams = ref({
-const showSearch = ref(true);
+  month: '',
-const total = ref(0);
+  valueType: '2',
-const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
+  pageNum: 1,
-
+  pageSize: 10
-const queryFormRef = ref<ElFormInstance>();
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    valueType: '1',
-    projectId: currentProject.value?.id,
-    month: undefined
-  }
 });
+const total = ref(0);
+const tableData = ref([]);
+const loading = ref(false);
 
-const { queryParams } = toRefs(data);
+const tabList = [
+  {
+    value: '2',
+    label: '对乙产值和对乙结算'
+  },
+  {
+    value: '3',
+    label: '对甲结算和对乙结算'
+  },
+  {
+    value: '1',
+    label: '对甲产值和对甲结算'
+  },
+  {
+    value: '4',
+    label: '对甲产值和对乙产值'
+  }
+];
 
-/** 查询项目总产值分配列表 */
+//切换表单
-const getList = async () => {
+const handleTabChange = (tab) => {
-  loading.value = true;
+  activeTab.value = tab;
 
-  const res = await listOutTable(queryParams.value);
+  handleQuery();
-  valueAllocationList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
 };
 
 /** 搜索按钮操作 */
@@ -88,45 +122,47 @@ 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 getList = async () => {
-const handleExport = () => {
+  const params = {
-  proxy?.download(
+    ...queryParams.value,
-    'out/valueAllocation/export',
+    projectId: currentProject.value?.id,
-    {
+    type: activeTab.value
-      ...queryParams.value
+  };
-    },
+  if (activeTab.value == '4') {
-    `valueAllocation_${new Date().getTime()}.xlsx`
+    comparisonOfOutputValue(params).then((res) => {
-  );
+      if (res.code == 200) {
+        tableData.value = res.rows;
+        total.value = res.total;
+      }
+    });
+  } else if (activeTab.value == '3') {
+    comparisonOfSettlementValue(params).then((res) => {
+      if (res.code == 200) {
+        tableData.value = res.rows;
+        total.value = res.total;
+      }
+    });
+  } else {
+    const res = await listOutTable(params);
+    if (res.code == 200) {
+      tableData.value = res.rows;
+      total.value = res.total;
+    }
+  }
 };
-
+const handleEdit = (row: any) => {};
 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>

src/views/out/outTable/index.vue

@@ -45,6 +45,8 @@
 
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
+import { listOutTable } from '@/api/out/outTable';
+
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const activeTab = ref('1');
@@ -71,7 +73,7 @@ const tabList = [
 //切换表单
 const handleTabChange = (tab) => {
   activeTab.value = tab;
-  queryParams.value.month = '';
+  // queryParams.value.month = '';
   handleQuery();
 };
 
@@ -91,10 +93,26 @@ const getList = async () => {
   const params = {
     ...queryParams.value,
     projectId: currentProject.value?.id,
-    activeTab: activeTab.value
+    type: activeTab.value
   };
   console.log(params);
+  const res = await listOutTable(params);
+  if (res.code == 200) {
+    tableData.value = res.rows;
+    total.value = res.total;
+  }
 };
+onMounted(() => {
+  const currentDate = new Date();
+  const year = currentDate.getFullYear();
+  const month = currentDate.getMonth() + 1; // 月份从0开始，所以需要加1
+
+  // 形成"YYYY-M"格式
+  const formattedDate = `${year}-${String(month).padStart(2, '0')}`;
+  queryParams.value.month = formattedDate;
+
+  getList();
+});
 </script>
 
 <style scoped lang="scss"></style>

src/views/out/purchase/comm/purchPage.vue

@@ -0,0 +1,181 @@
+<template>
+    <div class="p-2">
+        <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 height="70vh" v-loading="loading" :data="monthPlanList" @selection-change="handleSelectionChange">
+                <el-table-column type="index" width="80" label="序号" align="center" />
+                <el-table-column label="名称" align="center" prop="name" />
+                <el-table-column label="规格" align="center" prop="specification" />
+                <el-table-column label="单位" align="center" prop="unit" />
+                <el-table-column label="接收数量" align="center" prop="acceptedQuantity" />
+                <el-table-column label="价格" align="center" prop="unitPrice">
+                </el-table-column>
+                <el-table-column label="备注" align="center" prop="remark">
+                </el-table-column>
+                <el-table-column label="操作" align="center" prop="remark" v-if="queryParams.type == '1'">
+                    <template #default="scope">
+                        <el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <!-- 添加或修改月度产值计划对话框 -->
+        <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="金额" prop="unitPrice">
+                    <el-input v-model="form.unitPrice" placeholder="请输入金额" type="number" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="MonthPlan" lang="ts">
+import { purchaseValueA, purchaseValueAup } from '@/api/out/purchase';
+import { MonthPlanVO } from '@/api/out/monthPlan/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+import { useUserStoreHook } from '@/store/modules/user';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const monthPlanList = ref([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const monthPlanFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const initFormData = {
+    id: undefined,
+    projectId: currentProject.value?.id,
+    planValue: undefined,
+    completeValue: undefined,
+    differenceValue: undefined,
+    planMonth: undefined,
+    isDesign: true,
+    type: '1',
+    valueType: undefined,
+    planAuditStatus: undefined,
+    completeAuditStatus: undefined,
+    unitPrice: undefined,
+};
+const data = reactive({
+    form: { ...initFormData },
+    queryParams: {
+        projectId: currentProject.value?.id,
+        planValue: undefined,
+        completeValue: undefined,
+        differenceValue: undefined,
+        planMonth: undefined,
+        valueType: undefined,
+        planAuditStatus: undefined,
+        completeAuditStatus: undefined,
+        type: '1',
+        params: {}
+    },
+    rules: {
+        unitPrice: [{ required: true, message: '金额不能为空', trigger: 'change' }]
+    }
+});
+const { queryParams, form, rules } = toRefs(data);
+/** 查询月度产值计划列表 */
+const getList = async (type?) => {
+    if (type) {
+        queryParams.value.type = type;
+    }
+    loading.value = true;
+    const res = await purchaseValueA({ projectId: currentProject.value?.id, type: queryParams.value.type });
+    monthPlanList.value = res.data;
+    console.log(monthPlanList.value);
+
+    total.value = res.total;
+    loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    monthPlanFormRef.value?.resetFields();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MonthPlanVO[]) => {
+    ids.value = selection.map((item) => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MonthPlanVO) => {
+    reset();
+    Object.assign(form.value, row);
+    dialog.visible = true;
+    dialog.title = '修改采购完工产值';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+    form.value.projectId = currentProject.value?.id;
+    monthPlanFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            form.value.isDesign = true;
+            if (form.value.id) {
+                await purchaseValueAup(form.value).finally(() => (buttonLoading.value = false));
+            }
+            proxy?.$modal.msgSuccess('操作成功');
+            dialog.visible = false;
+            await getList();
+        }
+    });
+};
+
+onMounted(() => {
+    getList();
+});
+
+//监听项目id刷新数据
+const listeningProject = watch(
+    () => currentProject.value?.id,
+    (nid, oid) => {
+        queryParams.value.projectId = nid;
+        form.value.projectId = nid;
+        getList();
+    }
+);
+
+onUnmounted(() => {
+    listeningProject();
+});
+defineExpose({
+    getList
+});
+</script>

src/views/out/purchase/index.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="p-2">
+    <el-tabs v-model="activeName" class="demo-tabs" type="border-card" @tab-click="handleClick">
+      <el-tab-pane label="对甲" name="1">
+        <purchPage ref="purchPageRef1"></purchPage>
+      </el-tab-pane>
+      <el-tab-pane label="对乙" name="2">
+        <purchPage ref="purchPageRef2"></purchPage>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="MonthPlan" lang="ts">
+import { ref, watch, computed } from 'vue';
+import purchPage from './comm/purchPage.vue';
+// 引用子组件
+const activeName = ref('1');
+const purchPageRef1 = ref<InstanceType<typeof purchPage> | null>(null);
+const purchPageRef2 = ref<InstanceType<typeof purchPage> | null>(null);
+const handleClick = (val) => {
+  if (val.props.name == '1') {
+    purchPageRef1.value.getList(val.props.name); //子组件方法
+  } else {
+    purchPageRef2.value.getList(val.props.name); //子组件方法
+
+  }
+};
+onMounted(() => {
+  purchPageRef1.value?.getList('1'); //初始加载
+});
+</script>

src/views/progress/constructionSchedulePlan/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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">
@@ -9,7 +10,8 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-                <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -25,7 +27,8 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:constructionSchedulePlan:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()"
+              v-hasPermi="['progress:constructionSchedulePlan:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -33,17 +36,12 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-      <el-table
+      <el-table ref="constructionSchedulePlanTableRef" v-loading="loading" :data="constructionSchedulePlanList"
-        ref="constructionSchedulePlanTableRef"
+        row-key="id" :default-expand-all="isExpandAll"
-        v-loading="loading"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-        :data="constructionSchedulePlanList"
-        row-key="id"
-        :default-expand-all="isExpandAll"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
         <!-- <el-table-column label="序号" type="id" /> -->
         <el-table-column label="节点名称" prop="nodeName" />
-        <el-table-column label="对应项目结构" align="center" prop="projectStructure" />
+        <el-table-column label="对应项目结构" align="center" prop="projectStructureName" />
         <el-table-column label="预计开始时间" align="center" prop="planStartDate" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.planStartDate, '{y}-{m}-{d}') }}</span>
@@ -73,19 +71,16 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:constructionSchedulePlan:edit']" />
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['progress:constructionSchedulePlan:edit']" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:constructionSchedulePlan:add']" />
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+                v-hasPermi="['progress:constructionSchedulePlan:add']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                link
+                v-hasPermi="['progress:constructionSchedulePlan:remove']" />
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['progress:constructionSchedulePlan:remove']"
-              />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -95,48 +90,39 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionSchedulePlanFormRef" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="父节点" prop="parentId">
-          <el-tree-select
+          <el-tree-select v-model="form.parentId" :data="constructionSchedulePlanOptions"
-            v-model="form.parentId"
+            :props="{ value: 'id', label: 'nodeName', children: 'children' }" value-key="id" placeholder="请选择父节点"
-            :data="constructionSchedulePlanOptions"
+            check-strictly />
-            :props="{ value: 'id', label: 'nodeName', children: 'children' }"
-            value-key="id"
-            placeholder="请选择父节点"
-            check-strictly
-          />
         </el-form-item>
         <el-form-item label="节点名称" prop="nodeName">
           <el-input v-model="form.nodeName" placeholder="请输入节点名称" />
         </el-form-item>
         <el-form-item label="对应项目结构" prop="projectStructure">
-          <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" />
+          <el-tree-select v-model="form.projectStructure" :data="ProjectStructureList" @node-click="handleCheckChange"
+            :props="{ value: 'id', label: 'name', children: 'children' }" value-key="id" placeholder="请选择项目结构"
+            check-strictly />
+          <!-- <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" /> -->
         </el-form-item>
         <el-form-item label="预计开始时间" prop="planStartDate">
-          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计开始时间" />
+          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择预计开始时间" />
         </el-form-item>
         <el-form-item label="预计结束时间" prop="planEndDate">
-          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计结束时间" />
+          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择预计结束时间" />
         </el-form-item>
         <el-form-item label="实际开始时间" prop="practicalStartDate">
-          <el-date-picker
+          <el-date-picker clearable v-model="form.practicalStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            clearable
+            placeholder="选择实际开始时间" />
-            v-model="form.practicalStartDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择实际开始时间"
-          />
         </el-form-item>
         <el-form-item label="实际结束时间" prop="practicalEndDate">
-          <el-date-picker
+          <el-date-picker clearable v-model="form.practicalEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            clearable
+            placeholder="选择实际结束时间" />
-            v-model="form.practicalEndDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择实际结束时间"
-          />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -159,7 +145,7 @@ import {
   getConstructionSchedulePlan,
   delConstructionSchedulePlan,
   addConstructionSchedulePlan,
-  updateConstructionSchedulePlan
+  updateConstructionSchedulePlan, getProjectStructure
 } from '@/api/progress/constructionSchedulePlan';
 import {
   ConstructionSchedulePlanVO,
@@ -181,6 +167,7 @@ const currentProject = computed(() => userStore.selectedProject);
 const { project_construction_status } = toRefs<any>(proxy?.useDict('project_construction_status'));
 
 const constructionSchedulePlanList = ref<ConstructionSchedulePlanVO[]>([]);
+const ProjectStructureList = ref([]);
 const constructionSchedulePlanOptions = ref<ConstructionSchedulePlanOption[]>([]);
 const buttonLoading = ref(false);
 const showSearch = ref(true);
@@ -196,7 +183,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: ConstructionSchedulePlanForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   parentId: undefined,
@@ -207,7 +194,9 @@ const initFormData: ConstructionSchedulePlanForm = {
   practicalStartDate: undefined,
   practicalEndDate: undefined,
   status: undefined,
-  remark: undefined
+  remark: undefined,
+  projectStructureName: undefined
+
 };
 
 const data = reactive<PageData<ConstructionSchedulePlanForm, ConstructionSchedulePlanQuery>>({
@@ -236,13 +225,21 @@ const getList = async () => {
   loading.value = true;
   const res = await listConstructionSchedulePlan(queryParams.value);
   const data = proxy?.handleTree<ConstructionSchedulePlanVO>(res.data, 'id', 'parentId');
-  console.log('🚀 ~ getList ~ data:', data);
-
   if (data) {
     constructionSchedulePlanList.value = data;
     loading.value = false;
   }
 };
+/** 查询施工进度计划列表 */
+const getProjectStructureList = async () => {
+  const res = await getProjectStructure(currentProject.value?.id);
+  ProjectStructureList.value = [res.data];
+  console.log(ProjectStructureList.value);
+};
+/** 查询施工进度计划列表 */
+const handleCheckChange = (val) => {
+  form.value.projectStructureName = val.name;
+};
 
 /** 查询施工进度计划下拉树结构 */
 const getTreeselect = async () => {
@@ -343,6 +340,7 @@ const handleDelete = async (row: ConstructionSchedulePlanVO) => {
 };
 
 onMounted(() => {
+  getProjectStructureList();
   getList();
 });
 

src/views/progress/progressCategory/index.vue

@@ -31,7 +31,18 @@
             <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>
+            <file-upload
+              upload-url="/progress/progressCategory/import"
+              v-model="file"
+              :limit="1"
+              :file-type="['xls', 'xlsx']"
+              :on-upload-success="handleSuccess"
+            >
+              <el-button type="primary" plain icon="Compass">导入</el-button>
+            </file-upload>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Filter" @click="handleExport">导出</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -48,7 +59,7 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <!-- <el-table-column label="父类别id" prop="parentId" /> -->
-        <el-table-column label="类别名称" prop="name" />
+        <el-table-column label="类别名称" prop="name" width="230" />
         <el-table-column label="计量方式" align="center" prop="unitType">
           <template #default="{ row }">
             <dict-tag :options="progress_unit_type" :value="row.unitType" v-if="row.parentId != 0" />
@@ -60,17 +71,27 @@
             {{ row.parentId == 0 ? '' : row.unit }}
           </template>
         </el-table-column>
-        <el-table-column label="综合单价" align="center" prop="unitPrice">
+        <el-table-column label="综合单价(业主)" align="center" prop="ownerPrice">
           <template #default="{ row }">
-            {{ row.parentId == 0 ? '' : row.unitPrice }}
+            {{ row.parentId == 0 ? '' : row.ownerPrice }}
           </template>
         </el-table-column>
-        <el-table-column label="产值金额" align="center" prop="outputValue">
+        <el-table-column label="综合单价(分包)" align="center" prop="constructionPrice">
           <template #default="{ row }">
-            {{ row.parentId == 0 ? '' : row.outputValue }}
+            {{ row.parentId == 0 ? '' : row.constructionPrice }}
           </template>
         </el-table-column>
-        <el-table-column label="总数量/百分比" align="center" prop="total">
+        <el-table-column label="产值金额(业主)" align="center" prop="ownerOutputValue">
+          <template #default="{ row }">
+            {{ row.parentId == 0 ? '' : row.ownerOutputValue }}
+          </template>
+        </el-table-column>
+        <el-table-column label="产值金额(分包)" align="center" prop="constructionOutputValue">
+          <template #default="{ row }">
+            {{ row.parentId == 0 ? '' : row.constructionOutputValue }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总数量" align="center" prop="total">
           <template #default="{ row }">
             {{ row.parentId == 0 ? '' : row.total }}
           </template>
@@ -91,7 +112,7 @@
     </el-card>
     <!-- 添加或修改分项工程单价对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="progressCategoryFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="progressCategoryFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="父类别" prop="parentId" v-if="!form.id">
           <el-tree-select
             v-model="form.parentId"
@@ -113,12 +134,15 @@
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
+        <el-form-item label="综合单价(业主)" prop="ownerPrice">
+          <el-input v-model="form.ownerPrice" placeholder="请输入综合单价(业主)" />
+        </el-form-item>
+        <el-form-item label="综合单价(分包)" prop="constructionPrice">
+          <el-input v-model="form.constructionPrice" placeholder="请输入综合单价(分包)" />
+        </el-form-item>
         <el-form-item label="数量" prop="total" v-if="isDisabled">
           <el-input v-model="form.total" placeholder="请输入数量" />
         </el-form-item>
-        <el-form-item label="综合单价" prop="unitPrice">
-          <el-input v-model="form.unitPrice" placeholder="请输入综合单价" />
-        </el-form-item>
         <el-form-item label="关联数据" prop="workType" v-if="!form.id">
           <el-select v-model="form.workType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_work_type" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -175,7 +199,7 @@ const buttonLoading = ref(false);
 const showSearch = ref(true);
 const isExpandAll = ref(true);
 const loading = ref(false);
-
+const file = ref();
 const queryFormRef = ref<ElFormInstance>();
 const progressCategoryFormRef = ref<ElFormInstance>();
 const progressCategoryTableRef = ref<ElTableInstance>();
@@ -194,6 +218,8 @@ const initFormData: ProgressCategoryForm = {
   name: undefined,
   unitType: undefined,
   unit: undefined,
+  constructionPrice: undefined,
+  ownerPrice: undefined,
   unitPrice: undefined,
   outputValue: undefined,
   total: undefined,
@@ -236,7 +262,9 @@ const data = reactive<PageData<ProgressCategoryForm, ProgressCategoryQuery>>({
     unitPrice: [{ required: true, message: '综合单价不能为空', trigger: 'blur' }],
     outputValue: [{ required: true, message: '产值金额不能为空', trigger: 'blur' }],
     isDelay: [{ required: true, message: '是否超期不能为空', trigger: 'blur' }],
-    status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }]
+    status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }],
+    constructionPrice: [{ required: true, message: '综合单价(分包)不能为空', trigger: 'change' }],
+    ownerPrice: [{ required: true, message: '综合单价(业主)不能为空', trigger: 'change' }]
   }
 });
 
@@ -276,6 +304,11 @@ const getList = async () => {
   }
 };
 
+const handleSuccess = () => {
+  console.log(111);
+  proxy.$modal.msgSuccess('操作成功');
+};
+
 /** 查询分项工程单价下拉树结构 */
 const getTreeselect = async () => {
   const res = await listProgressCategory(queryParams.value);
@@ -366,12 +399,13 @@ const handleUpdate = async (row: ProgressCategoryVO) => {
 
 const handleExport = async () => {
   const ids = treeRef.value.getCheckedNodes()[0].pathNodes[0].childrenData.map((item) => item.matrixId);
+  const fileName = treeRef.value.getCheckedNodes()[0].pathNodes[0].label;
   proxy?.download(
     '/progress/progressCategory/export',
     {
       ids: ids
     },
-    `qualityInspection_${new Date().getTime()}.xlsx`,
+    `${fileName}分项工程单价导入.xlsx`,
     true
   );
 };

src/views/system/dept/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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">
@@ -8,11 +9,13 @@
               <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="类别编码" prop="deptCategory">
-              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px"
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -28,7 +31,8 @@
       <template #header>
         <el-row :gutter="10">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增 </el-button>
+            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -37,14 +41,8 @@
         </el-row>
       </template>
 
-      <el-table
+      <el-table ref="deptTableRef" v-loading="loading" :data="deptList" row-key="deptId"
-        ref="deptTableRef"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :default-expand-all="isExpandAll">
-        v-loading="loading"
-        :data="deptList"
-        row-key="deptId"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-        :default-expand-all="isExpandAll"
-      >
         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
         <el-table-column prop="deptCategory" align="center" label="类别编码" width="200"></el-table-column>
         <el-table-column prop="deptType" align="center" label="部门类型" width="200">
@@ -66,13 +64,16 @@
         <el-table-column fixed="right" align="center" label="操作">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
+              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit"
+                @click="handleUpdate(scope.row)" />
             </el-tooltip>
-            <el-tooltip content="新增" placement="top" v-if="scope.row.deptType != '2' && scope.row.deptType != '4'">
+            <el-tooltip content="新增" placement="top" v-if="scope.row.deptType != '2' && scope.row.deptType != '5'">
-              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
+              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus"
+                @click="handleAdd(scope.row)" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
+              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete"
+                @click="handleDelete(scope.row)" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -84,14 +85,9 @@
         <el-row>
           <el-col v-if="form.parentId !== 0" :span="24">
             <el-form-item label="上级部门" prop="parentId">
-              <el-tree-select
+              <el-tree-select v-model="form.parentId" :data="deptOptions"
-                v-model="form.parentId"
+                :props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
-                :data="deptOptions"
+                placeholder="选择上级部门" check-strictly />
-                :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
-                value-key="deptId"
-                placeholder="选择上级部门"
-                check-strictly
-              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -112,7 +108,8 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName"
+                  :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -129,7 +126,8 @@
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -140,14 +138,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.deptType == '3'">
+          <el-col :span="12" v-if="form.deptType == '4'">
             <el-form-item label="所属项目" prop="projectId">
               <el-select v-model="form.projectId" placeholder="请选择所属项目">
                 <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.deptType == '4'">
+          <el-col :span="12" v-if="form.deptType == '5'">
             <el-form-item label="分包单位" prop="contractorId">
               <el-select v-model="form.contractorId" placeholder="请选择分包单位">
                 <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
@@ -339,10 +337,10 @@ const handleUpdate = async (row: DeptVO) => {
 };
 
 const changeProject = async (val: any) => {
-  if (val == '3' && (!projectList.value || !projectList.value.length)) {
+  if (val == '4' && (!projectList.value || !projectList.value.length)) {
     const res = await getDeptList();
     projectList.value = res.data;
-  } else if (val == '4' && (!contractorList.value || !contractorList.value.length)) {
+  } else if (val == '5' && (!contractorList.value || !contractorList.value.length)) {
     const res = await optionProjectSelect(form.value.rowProjectId);
     contractorList.value = res;
   }