diff --git a/.env.development b/.env.development
index 36f63d9..f8f2a3b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源场站智慧运维平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.210:18899'
+VITE_APP_BASE_API = 'http://192.168.110.149:18899'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'
diff --git a/src/api/wuziguanli/beijian/index.ts b/src/api/wuziguanli/beijian/index.ts
index a066032..f913945 100644
--- a/src/api/wuziguanli/beijian/index.ts
+++ b/src/api/wuziguanli/beijian/index.ts
@@ -61,3 +61,16 @@ export const delBeipinBeijian = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
+
+/**
+ * 运维-物资-备件-查询总览
+ * @param query
+ * @returns {*}
+ */
+export const chuRuKuTotal = (data:any): AxiosPromise<any> => {
+  return request({
+    url: '/ops/beipinBeijian/getCount',
+    method: 'get',
+    params: data
+  });
+};
\ No newline at end of file
diff --git a/src/api/wuziguanli/caigouPlan/index.ts b/src/api/wuziguanli/caigouPlan/index.ts
index ba6a719..c5a50ac 100644
--- a/src/api/wuziguanli/caigouPlan/index.ts
+++ b/src/api/wuziguanli/caigouPlan/index.ts
@@ -54,3 +54,45 @@ export const caigouPlanDetail = (id: string | number): AxiosPromise<CaigouPlanVO
     method: 'get'
   });
 };
+
+
+/**
+ * 更新运维-物资-采购计划单
+ * @param data
+ * @returns {*}
+ */
+export const updateCaigouPlan = (data: CaigouPlanForm): AxiosPromise<CaigouPlanVO> => {
+  return request({
+    url: '/ops/caigouPlan',
+    method: 'put',
+    data: data
+  });
+};
+
+// /**
+//  * 查询运维-物资-采购计划单年度金额
+//  * @param query
+//  * @returns {*}
+//  */
+// export const getJinE = (query?: CaigouPlanQuery): AxiosPromise<any> => {
+//   return request({
+//     url: '/ops/caigouPlan/getJinE',
+//     method: 'get',
+//     params: query
+//   });
+// };
+
+/**
+ * 查询运维-物资-采购计划单年度金额
+ * @param id
+ * @returns {*}
+ */
+export const getCount = (id: string | number): AxiosPromise<CaigouPlanVO> => {
+  return request({
+    url: '/ops/caigouPlan/getJinE',
+    method: 'get',
+    params: {
+      projectId: id
+    }
+  });
+};
diff --git a/src/api/wuziguanli/caigouPlan/types.ts b/src/api/wuziguanli/caigouPlan/types.ts
index 83d1196..ea67c67 100644
--- a/src/api/wuziguanli/caigouPlan/types.ts
+++ b/src/api/wuziguanli/caigouPlan/types.ts
@@ -178,6 +178,18 @@ export interface CaigouPlanVO {
      * 采购申请计划文件 查询
      */
     opsCaigouPlanFilesVos?: Array<any>;
+    /**
+     * 申请原因
+     */
+    reason?: string;
+    /**
+     * 供应商名称
+     */
+    gonyingshangName?: string;
+    /**
+     * 设备类型
+     */
+    shebeiType?: string;
 
 }
 
@@ -360,8 +372,18 @@ export interface CaigouPlanForm extends BaseEntity {
      * 出货时间
      */
     chouhuoTime?: string;
-   
-
+    /**
+     * 申请原因
+     */
+    reason?: string;
+    /**
+     * 供应商名称
+     */
+    gonyingshangName?: string;
+    /**
+     * 设备类型
+     */
+    shebeiType?: string;
 }
 
 export interface CaigouPlanQuery extends PageQuery {
@@ -545,6 +567,18 @@ export interface CaigouPlanQuery extends PageQuery {
      * 出货时间
      */
     chouhuoTime?: string;
+     /**
+     * 申请原因
+     */
+    reason?: string;
+    /**
+     * 供应商名称
+     */
+    gonyingshangName?: string;
+    /**
+     * 设备类型
+     */
+    shebeiType?: string;
 }
 
 
diff --git a/src/api/wuziguanli/churuku/index.ts b/src/api/wuziguanli/churuku/index.ts
index 98f16ff..4a8b4d1 100644
--- a/src/api/wuziguanli/churuku/index.ts
+++ b/src/api/wuziguanli/churuku/index.ts
@@ -62,15 +62,43 @@ export const delChurukudan = (id: string | number | Array<string | number>) => {
   });
 };
 
+/**
+ * 运维-物资-出入库单折现图
+ * @param query
+ * @returns {*}
+ */
+export const getChuRuKuCountLine = (data:any): AxiosPromise<any> => {
+  return request({
+    url: '/ops/churukudan/getChuRuKuDayCount',
+    method: 'get',
+    params: data
+  });
+};
+
 /**
  * 运维-物资-出入库单柱状图
  * @param query
  * @returns {*}
  */
-export const getChuRuKuCountBar = (data:any): AxiosPromise<any> => {
+export const getChuRuKuDayCountBar = (data:any): AxiosPromise<any> => {
   return request({
     url: '/ops/churukudan/getChuRuKuCount',
     method: 'get',
     params: data
   });
 };
+
+/**
+ * 运维-物资-出入库单-查询产品名称列表
+ * @param query
+ * @returns {*}
+ */
+export const getChanpinLists = (data:any): AxiosPromise<any> => {
+  return request({
+    url: '/ops/caigouPlan/getChanpinList',
+    method: 'get',
+    params: data
+  });
+};
+
+
diff --git a/src/api/wuziguanli/churuku/types.ts b/src/api/wuziguanli/churuku/types.ts
index d9a539b..4457dc5 100644
--- a/src/api/wuziguanli/churuku/types.ts
+++ b/src/api/wuziguanli/churuku/types.ts
@@ -47,6 +47,18 @@ export interface ChurukudanVO {
    */
   danjvType: string;
 
+  /**
+   * 审核状态
+   */
+  auditStatus?: string;
+  /**
+   * 产品名称
+   */
+  chanpinName?: string;
+  /**
+   * 产品id
+   */
+  chanpinId?: string | number;
 }
 
 export interface ChurukudanForm extends BaseEntity {
@@ -102,6 +114,14 @@ export interface ChurukudanForm extends BaseEntity {
    * 审核状态
    */
   auditStatus?: string;
+  /**
+   * 产品名称
+   */
+  chanpinName?: string;
+  /**
+   * 产品id
+   */
+  chanpinId?: string | number;
 
 }
 
@@ -139,11 +159,18 @@ export interface ChurukudanQuery extends PageQuery {
    * 开始日期
    */
   startDate?: string;
-  
+  /**
+   * 产品名称
+   */
+  chanpinName?: string;
   /**
    * 结束日期
    */
   endDate?: string;
+  /**
+   * 产品id
+   */
+  chanpinId?: string | number;
     /**
      * 日期范围参数
      */
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 13093ec..2347861 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,5 +1,16 @@
 <template>
   <div class="upload-file">
+     <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
+        <el-link :href="`${file.url}`" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action">
+          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
+        </div>
+      </li>
+    </transition-group>
     <el-upload
       ref="fileUploadRef"
       multiple
@@ -37,17 +48,6 @@
       </template>
       的文件
     </div>
-    <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
-      <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
-        <el-link :href="`${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
-        <div class="ele-upload-list__item-content-action">
-          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
-        </div>
-      </li>
-    </transition-group>
   </div>
 </template>
 
@@ -55,7 +55,7 @@
 import { propTypes } from '@/utils/propTypes';
 import { delOss, listByIds } from '@/api/system/oss';
 import { globalHeaders } from '@/utils/request';
-
+import { ref } from 'vue';
 const props = defineProps({
   modelValue: {
     type: [String, Object, Array],
@@ -89,7 +89,6 @@ const showTip = computed(() => props.isShowTip && (props.fileType || props.fileS
 
 const fileUploadRef = ref<ElUploadInstance>();
 
-
 // 监听 fileType 变化，更新 fileAccept
 const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
 
@@ -200,7 +199,6 @@ const uploadedSuccessfully = () => {
     uploadList.value = [];
     number.value = 0;
     emit('update:modelValue', listToString(fileList.value));
-    emit('update:fileList', fileList.value);
     proxy?.$modal.closeLoading();
   }
 };
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b6c7b61..cb0db77 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -2,9 +2,11 @@
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
       <transition :enter-active-class="animate" mode="out-in">
-        <keep-alive :include="tagsViewStore.cachedViews">
+        <div>
+          <keep-alive :include="tagsViewStore.cachedViews">
           <component :is="Component" v-if="!route.meta.link" :key="route.path" />
         </keep-alive>
+        </div>
       </transition>
     </router-view>
     <iframe-toggle />
diff --git a/src/store/modules/procurementDraft.ts b/src/store/modules/procurementDraft.ts
index 3b042d2..a099e4d 100644
--- a/src/store/modules/procurementDraft.ts
+++ b/src/store/modules/procurementDraft.ts
@@ -70,11 +70,18 @@ export const useProcurementDraftStore = defineStore('procurementDraft', () => {
     return false;
   };
 
+  // 清除所有草稿
+  const clearAllDrafts = (): void => {
+    draftList.value = [];
+    saveDraftsToStorage(draftList.value);
+  };
+
   return {
     draftList,
     saveDraft,
     getDraftList,
     getDraft,
-    deleteDraft
+    deleteDraft,
+    clearAllDrafts
   };
 });
\ No newline at end of file
diff --git a/src/views/integratedManage/stateManage/components/manageForm.vue b/src/views/integratedManage/stateManage/components/manageForm.vue
index 5d6d9ae..e584bc6 100644
--- a/src/views/integratedManage/stateManage/components/manageForm.vue
+++ b/src/views/integratedManage/stateManage/components/manageForm.vue
@@ -2,7 +2,7 @@
     <div class="manage-form-container">
         <!-- 搜索和筛选区域 -->
         <div class="search-filter-section">
-            <el-row gutter="12" align="middle">
+            <el-row :gutter="12" align="middle">
                 <el-col :span="2">
                     <el-select v-model="searchForm.deviceType" placeholder="设备类型" clearable>
                         <el-option label="全部类型" value="" />
diff --git a/src/views/materialManagement/components/DataAnalysis.vue b/src/views/materialManagement/components/DataAnalysis.vue
index 2181888..4602de8 100644
--- a/src/views/materialManagement/components/DataAnalysis.vue
+++ b/src/views/materialManagement/components/DataAnalysis.vue
@@ -19,9 +19,29 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted } from 'vue';
+import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
 import * as echarts from 'echarts';
 
+// 定义props
+const props = defineProps({
+    lineData: {
+        type: Object,
+        default: () => ({
+            days: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+            rukuCounnts: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
+            chukuCounnts: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90]
+        })
+    },
+    barData: {
+        type: Object,
+        default: () => ({
+            shebeiTypes: ['光伏组件', '逆变器', '汇流箱', '支架', '电缆'],
+            rukuCount: [5, 40, 20, 75, 60],
+            chukuCount: [30, 40, 30, 30, 30]
+        })
+    }
+});
+
 // 图表容器引用
 const lineChartRef = ref(null);
 const barChartRef = ref(null);
@@ -30,6 +50,53 @@ const barChartRef = ref(null);
 let lineChart = null;
 let barChart = null;
 
+// 计算属性：处理传入的lineData，确保数据有效
+const processedLineData = computed(() => {
+    // 检查传入的数据是否有效
+    if (!props.lineData || 
+        !props.lineData.days || 
+        props.lineData.days.length === 0 ||
+        !Array.isArray(props.lineData.rukuCounnts) ||
+        !Array.isArray(props.lineData.chukuCounnts)) {
+        return {
+            days: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+            rukuCounnts: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
+            chukuCounnts: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90]
+        };
+    }
+    
+    // 检查rukuCounnts和chukuCounnts是否全为0
+    const isRukuAllZero = props.lineData.rukuCounnts.every(item => item === 0);
+    const isChukuAllZero = props.lineData.chukuCounnts.every(item => item === 0);
+    
+    if (isRukuAllZero && isChukuAllZero) {
+        return {
+            days: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+            rukuCounnts: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
+            chukuCounnts: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90]
+        };
+    }
+    
+    return props.lineData;
+});
+
+// 计算属性：处理传入的barData，确保数据有效
+const processedBarData = computed(() => {
+    // 检查传入的数据是否有效
+    if (!props.barData || 
+        !props.barData.shebeiTypes || 
+        props.barData.shebeiTypes.length === 0 ||
+        !Array.isArray(props.barData.rukuCount) ||
+        !Array.isArray(props.barData.chukuCount)) {
+        return {
+            shebeiTypes: ['光伏组件', '逆变器', '汇流箱', '支架', '电缆'],
+            rukuCount: [5, 40, 20, 75, 60],
+            chukuCount: [30, 40, 30, 30, 30]
+        };
+    }
+    return props.barData;
+});
+
 onMounted(() => {
     // 初始化折线图
     initLineChart();
@@ -77,7 +144,7 @@ const initLineChart = () => {
             },
             xAxis: {
                 type: 'category',
-                data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']
+                data: processedLineData.value.days
             },
             yAxis: {
                 type: 'value'
@@ -86,7 +153,7 @@ const initLineChart = () => {
                 {
                     name: '入库数量',
                     type: 'line',
-                    data: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
+                    data: processedLineData.value.rukuCounnts,
                     symbol: 'none',
                     smooth: true,
                     lineStyle: {
@@ -105,7 +172,7 @@ const initLineChart = () => {
                 {
                     name: '出库数量',
                     type: 'line',
-                    data: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90],
+                    data: processedLineData.value.chukuCounnts,
                     symbol: 'none',
                     smooth: true,
                     lineStyle: {
@@ -155,7 +222,7 @@ const initBarChart = () => {
             },
             xAxis: {
                 type: 'category',
-                data: ['电器部件', '机械部件', '电子元件', '控制模块', '结构部件', '其他'],
+                data: processedBarData.value.shebeiTypes,
                 axisLabel: {
                     interval: 0, // 强制显示所有标签
                     rotate: 30, // 标签旋转30度
@@ -171,7 +238,7 @@ const initBarChart = () => {
                 {
                     name: '入库数量',
                     type: 'bar',
-                    data: [650, 480, 510, 280, 650, 220],
+                    data: processedBarData.value.rukuCount,
                     itemStyle: {
                         color: 'rgba(22, 93, 255, 1)' // 入库数量颜色
                     },
@@ -182,7 +249,7 @@ const initBarChart = () => {
                 {
                     name: '出库数量',
                     type: 'bar',
-                    data: [850, 400, 770, 590, 540, 310],
+                    data: processedBarData.value.chukuCount,
                     itemStyle: {
                         color: 'rgba(15, 198, 194, 1)' // 出库数量颜色
                     },
@@ -205,6 +272,12 @@ const handleResize = () => {
         barChart.resize();
     }
 };
+
+// 监听数据变化，更新图表
+watch([() => props.lineData, () => props.barData], () => {
+    initLineChart();
+    initBarChart();
+}, { deep: true });
 </script>
 
 <style scoped>
diff --git a/src/views/materialManagement/components/detailInfo.vue b/src/views/materialManagement/components/detailInfo.vue
index 9b807ab..347ec3b 100644
--- a/src/views/materialManagement/components/detailInfo.vue
+++ b/src/views/materialManagement/components/detailInfo.vue
@@ -1,84 +1,37 @@
 <template>
     <div class="approval-form">
         <!-- 基础信息 -->
-        <el-card class="card" shadow="hover">
-            <template #header>
-                <h3>基础信息</h3>
-            </template>
-            <el-form :model="detailInfo" label-width="120px">
-                <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item label="采购单号">
-                            <el-input v-model="detailInfo.id" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="创建时间">
-                            <el-input v-model="detailInfo.createTime" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="经办人">
-                            <el-input v-model="detailInfo.jingbanrenName" disabled />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="所属部门">
-                            <el-select v-model="detailInfo.caigouDanweiName" placeholder="请选择">
-                                <el-option label="运维部" value="运维部" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="采购类型">
-                            <el-select v-model="detailInfo.caigouType" placeholder="请选择">
-                                <el-option label="项目业务" value="项目业务" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item label="申请原因">
-                    <el-input v-model="basicInfo.applyReason" type="textarea" :rows="2" placeholder="请输入申请原因" />
-                </el-form-item>
-            </el-form>
+        <el-card class="card" shadow="hover" style="margin-top: 20px">
+            <el-descriptions title="基础信息" direction="vertical" :column="3" border size="large" class="infoClass">
+                <el-descriptions-item label="采购单编号">{{ props.detailInfo.id }}</el-descriptions-item>
+                <el-descriptions-item label="创建时间">{{ props.detailInfo.createTime }}</el-descriptions-item>
+                <el-descriptions-item label="经办人">{{ props.detailInfo.jingbanrenName }}</el-descriptions-item>
+                <el-descriptions-item label="所属部门">{{ props.detailInfo.caigouDanweiName }}</el-descriptions-item>
+                <el-descriptions-item label="采购类型">{{ getTagLabel(wz_purchase_type, props.detailInfo.caigouType)
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="申请原因">{{ props.detailInfo.reason }}</el-descriptions-item>
+            </el-descriptions>
         </el-card>
-
         <!-- 供应商信息 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>供应商信息</h3>
-            </template>
-            <el-form :model="detailInfo" label-width="120px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="供应商单位">
-                            <el-select v-model="detailInfo.gonyingshangId" placeholder="请选择">
-                                <el-option label="AAAA精密仪器制造有限公司" value="AAAA精密仪器制造有限公司" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="出货时间">
-                            <el-select v-model="detailInfo.chouhuoTime" placeholder="请选择">
-                                <el-option label="2年零4个月" value="2年零4个月" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
+            <el-descriptions title="供应商信息" direction="vertical" :column="2" border size="large">
+                <el-descriptions-item label="供应商单位">{{ props.detailInfo.gonyingshangName }}</el-descriptions-item>
+                <el-descriptions-item label="出货时间">{{ props.detailInfo.chuhuoTime }}</el-descriptions-item>
+            </el-descriptions>
         </el-card>
-
         <!-- 产品信息 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>产品信息</h3>
-            </template>
-            <el-table :data="detailInfo.opsCaigouPlanChanpinVos" border style="width: 100%">
+            <div slot="header" class="infoTitle">产品信息</div>
+            <el-table :data="props.detailInfo.opsCaigouPlanChanpinVos || []" border style="width: 100%">
                 <el-table-column prop="chanpinName" label="产品名称" />
                 <el-table-column prop="chanpinType" label="产品型号" />
-                <el-table-column prop="chanpinMonovalent" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
+                <el-table-column prop="shebeiType" label="设备类型">
+                    <template #default="scope">
+                        {{ getTagLabel(wz_device_type, scope.row.shebeiType) }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="chanpinMonovalent" label="产品单价" align="center"
+                    :cell-style="{ background: 'pink' }" />
                 <el-table-column prop="goumaiNumber" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
                 <el-table-column prop="yontu" label="用途" />
                 <el-table-column prop="totalPrice" label="合计" />
@@ -87,163 +40,89 @@
 
         <!-- 合同条款 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>合同条款</h3>
-            </template>
-            <el-form :model="contractInfo" label-width="120px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="付款条件">
-                            <el-select v-model="detailInfo.fukuantiaojian" placeholder="请选择">
-                                <el-option label="银行卡" value="银行卡" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="发票开具方式">
-                            <el-select v-model="detailInfo.fapiaoKjfs" placeholder="请选择">
-                                <el-option label="请选择" value="请选择" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
+            <el-descriptions title="合同条款" direction="vertical" :column="3" border size="large">
+                <el-descriptions-item label="付款条件">{{ getTagLabel(wz_payment_terms, props.detailInfo.fukuantiaojian)
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="发票开具方式">{{ getTagLabel(wz_invoicing_way, props.detailInfo.fapiaoKjfs)
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="合同类型">{{
+                    getTagLabel(wz_contract_type, props.detailInfo.hetonType) }}</el-descriptions-item>
+            </el-descriptions>
         </el-card>
 
         <!-- 附件 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>附件</h3>
-            </template>
-            <el-upload class="upload-demo" action="#" :file-list="fileList" :auto-upload="false"
-                :on-preview="handlePreview">
-                <el-table :data="fileList" border style="width: 100%">
-                    <el-table-column prop="name" label="文件名" width="300" />
-                    <el-table-column prop="size" label="大小" width="100" />
-                    <el-table-column label="操作" width="100">
-                        <template #default="scope">
-                            <!-- <el-link type="primary" @click="handlePreview(scope.row)"> -->
-                            <el-link type="primary">
-                                预览
-                            </el-link>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-upload>
+            <div slot="header" class="infoTitle">附件</div>
+
+            <el-table :data="props.detailInfo.opsCaigouPlanFilesVos || []" border>
+                <el-table-column prop="fileName" label="文件名" width="300" />
+                <el-table-column label="文件类型" width="200">
+                    <template #default="scope">
+                        {{ getFileType(scope.row.fileName) }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="200">
+                    <template #default="scope">
+                        <el-link type="primary" @click="handlePreview(scope.row)">
+                            预览
+                        </el-link>
+                    </template>
+                </el-table-column>
+            </el-table>
         </el-card>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, getCurrentInstance, toRefs } from 'vue';
-import { useRoute } from 'vue-router';
+import { ref, computed, onMounted, getCurrentInstance, toRefs } from 'vue';
+import { defineProps } from 'vue';
 import type { ComponentInternalInstance } from 'vue';
-const route = useRoute();
+import type { CaigouPlanVO } from '@/api/wuziguanli/caigouPlan/types';
+
+// 定义props
+const props = defineProps<{
+    detailInfo: CaigouPlanVO
+}>();
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
+const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_device_type } = toRefs<any>(proxy?.useDict('wz_device_type','wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine', 'wz_device_type'));
 
-import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
-import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
 
-// 存储计划详情数据
-const detailInfo = ref<CaigouPlanVO>({} as CaigouPlanVO);
 
-// 存储计划编号
-const id = ref('');
 
-const getDetailInfo = async () => {
-    const res = await caigouPlanDetail(id.value);
-    if (res.code === 200) {
-       detailInfo.value = res.data;
-       console.log(detailInfo.value);
-       
-    }
+// 根据字典数组和值获取标签文本
+const getTagLabel = (dictArray: any[], value: any): string => {
+    if (!dictArray || !value) return '';
+    const item = dictArray.find(item => item.value === value);
+    return item?.label || value;
 }
 onMounted(() => {
-    // 接收路由参数
-    id.value = route.query.id as string;
-    getDetailInfo();
-
-
 
-});
-// 基础信息数据
-const basicInfo = ref({
-    orderNo: '0035455',
-    createTime: '2023-11-02 16:32',
-    handler: '李四',
-    dept: '运维部',
-    purchaseType: '项目业务',
-    applyReason:
-        '随着业务拓展，光伏电站业务负责增加，现有设备已运行5年，部分出现效率下降情况。为保证电站正常运行，计划采购一批新的逆变器替换老旧设备，并补充备件库存。',
 });
 
-// 供应商信息数据
-const supplierInfo = ref({
-    supplierName: 'AAAA精密仪器制造有限公司',
-    deliveryTime: '2年零4个月',
-    remark: '',
-});
 
-// 产品信息数据
-const productInfo = ref({
-    tableData: [
-        {
-            productName: 'AAABBBCCC',
-            productModel: '15-42',
-            productPrice: 500,
-            buyQuantity: 10,
-            usage: '组件',
-            total: 5000,
-        },
-    ],
-    remark: '',
-});
-
-// 合同条款数据
-const contractInfo = ref({
-    paymentCondition: '银行卡',
-    invoiceWay: '请选择',
-    remark: '',
-});
-
-// 附件数据
-const fileList = ref([
-    {
-        name: 'MWwwwww.jpg',
-        size: '30kb',
-        url: '',
-    },
-    {
-        name: '231234124w.zip',
-        size: '50kb',
-        url: '',
-    },
-    {
-        name: '12451asdas.doc',
-        size: '80kb',
-        url: '',
-    },
-    {
-        name: '21seasda.xls',
-        size: '29kb',
-        url: '',
-    },
-    {
-        name: '12kjaklskw.png',
-        size: '16kb',
-        url: '',
-    },
-]);
+// 获取文件类型（后缀名）
+const getFileType = (fileName: string): string => {
+    if (!fileName) return '';
+    const lastDotIndex = fileName.lastIndexOf('.');
+    if (lastDotIndex === -1) return '';
+    return fileName.substring(lastDotIndex + 1).toLowerCase();
+};
 
 // 预览文件
 const handlePreview = (file) => {
-    console.log('预览文件：', file);
     // 实际场景可在这里处理文件预览逻辑，如打开新窗口等
+    window.open(file.fileUrl, '_blank');
 };
 </script>
 
 <style scoped>
+.infoTitle {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 20px;
+}
+
 .approval-form {
     padding: 20px;
 }
@@ -258,7 +137,7 @@ const handlePreview = (file) => {
     margin-top: 5px;
 }
 
-::v-deep(.el-input__inner) {
+:v-deep(.el-input__inner) {
     color: red;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/materialManagement/components/updateInfo.vue b/src/views/materialManagement/components/updateInfo.vue
deleted file mode 100644
index 7a4b752..0000000
--- a/src/views/materialManagement/components/updateInfo.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
-    <div class="approval-form">
-        <!-- 基础信息 -->
-        <el-card class="card" shadow="hover">
-            <template #header>
-                <h3>基础信息</h3>
-            </template>
-            <el-form :model="basicInfo" label-width="120px">
-                <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item label="订单编号">
-                            <el-input v-model="basicInfo.orderNo" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="创建时间">
-                            <el-input v-model="basicInfo.createTime" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="经办人">
-                            <el-input v-model="basicInfo.handler" disabled />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="所属部门">
-                            <el-select v-model="basicInfo.dept" placeholder="请选择">
-                                <el-option label="运维部" value="运维部" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="采购类型">
-                            <el-select v-model="basicInfo.purchaseType" placeholder="请选择">
-                                <el-option label="项目业务" value="项目业务" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item label="申请原因">
-                    <el-input v-model="basicInfo.applyReason" type="textarea" :rows="2" placeholder="请输入申请原因" />
-                </el-form-item>
-            </el-form>
-        </el-card>
-
-        <!-- 供应商信息 -->
-        <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>供应商信息</h3>
-            </template>
-            <el-form :model="supplierInfo" label-width="120px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="供应商单位">
-                            <el-select v-model="supplierInfo.supplierName" placeholder="请选择">
-                                <el-option label="AAAA精密仪器制造有限公司" value="AAAA精密仪器制造有限公司" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="出货时间">
-                            <el-select v-model="supplierInfo.deliveryTime" placeholder="请选择">
-                                <el-option label="2年零4个月" value="2年零4个月" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
-
-        <!-- 产品信息 -->
-        <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>产品信息</h3>
-            </template>
-            <el-table :data="productInfo.tableData" border style="width: 100%">
-                <el-table-column prop="productName" label="产品名称" />
-                <el-table-column prop="productModel" label="产品型号" />
-                <el-table-column prop="productPrice" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
-                <el-table-column prop="buyQuantity" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
-                <el-table-column prop="usage" label="用途" />
-                <el-table-column prop="total" label="合计" />
-            </el-table>
-        </el-card>
-
-        <!-- 合同条款 -->
-        <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>合同条款</h3>
-            </template>
-            <el-form :model="contractInfo" label-width="120px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="付款条件">
-                            <el-select v-model="contractInfo.paymentCondition" placeholder="请选择">
-                                <el-option label="银行卡" value="银行卡" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="发票开具方式">
-                            <el-select v-model="contractInfo.invoiceWay" placeholder="请选择">
-                                <el-option label="请选择" value="请选择" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
-
-        <!-- 附件 -->
-        <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <template #header>
-                <h3>附件</h3>
-            </template>
-            <el-upload class="upload-demo" action="#" :file-list="fileList" :auto-upload="false"
-                :on-preview="handlePreview">
-                <el-table :data="fileList" border style="width: 100%">
-                    <el-table-column prop="name" label="文件名" width="300" />
-                    <el-table-column prop="size" label="大小" width="100" />
-                    <el-table-column label="操作" width="100">
-                        <template #default="scope">
-                            <!-- <el-link type="primary" @click="handlePreview(scope.row)"> -->
-                            <el-link type="primary">
-                                预览
-                            </el-link>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-upload>
-        </el-card>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, getCurrentInstance, toRefs } from 'vue';
-import { useRoute } from 'vue-router';
-import type { ComponentInternalInstance } from 'vue';
-const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
-
-import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
-import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
-
-
-// 存储计划编号
-const id = ref('');
-
-const getDetailInfo = async () => {
-    const res = await caigouPlanDetail(id.value);
-    if (res.code === 200) {
-       console.log(res);
-       
-    }
-}
-onMounted(() => {
-    // 接收路由参数
-    id.value = route.query.id as string;
-    getDetailInfo();
-
-
-
-});
-// 基础信息数据
-const basicInfo = ref({
-    orderNo: '0035455',
-    createTime: '2023-11-02 16:32',
-    handler: '李四',
-    dept: '运维部',
-    purchaseType: '项目业务',
-    applyReason:
-        '随着业务拓展，光伏电站业务负责增加，现有设备已运行5年，部分出现效率下降情况。为保证电站正常运行，计划采购一批新的逆变器替换老旧设备，并补充备件库存。',
-});
-
-// 供应商信息数据
-const supplierInfo = ref({
-    supplierName: 'AAAA精密仪器制造有限公司',
-    deliveryTime: '2年零4个月',
-    remark: '',
-});
-
-// 产品信息数据
-const productInfo = ref({
-    tableData: [
-        {
-            productName: 'AAABBBCCC',
-            productModel: '15-42',
-            productPrice: 500,
-            buyQuantity: 10,
-            usage: '组件',
-            total: 5000,
-        },
-    ],
-    remark: '',
-});
-
-// 合同条款数据
-const contractInfo = ref({
-    paymentCondition: '银行卡',
-    invoiceWay: '请选择',
-    remark: '',
-});
-
-// 附件数据
-const fileList = ref([
-    {
-        name: 'MWwwwww.jpg',
-        size: '30kb',
-        url: '',
-    },
-    {
-        name: '231234124w.zip',
-        size: '50kb',
-        url: '',
-    },
-    {
-        name: '12451asdas.doc',
-        size: '80kb',
-        url: '',
-    },
-    {
-        name: '21seasda.xls',
-        size: '29kb',
-        url: '',
-    },
-    {
-        name: '12kjaklskw.png',
-        size: '16kb',
-        url: '',
-    },
-]);
-
-// 预览文件
-const handlePreview = (file) => {
-    console.log('预览文件：', file);
-    // 实际场景可在这里处理文件预览逻辑，如打开新窗口等
-};
-</script>
-
-<style scoped>
-.approval-form {
-    padding: 20px;
-}
-
-.card {
-    border-radius: 8px;
-}
-
-.error-tip {
-    color: red;
-    font-size: 12px;
-    margin-top: 5px;
-}
-
-::v-deep(.el-input__inner) {
-    color: red;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/materialManagement/components/upload.vue b/src/views/materialManagement/components/upload.vue
new file mode 100644
index 0000000..48b9fc8
--- /dev/null
+++ b/src/views/materialManagement/components/upload.vue
@@ -0,0 +1,278 @@
+<template>
+  <div class="upload-file">
+     <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
+        <el-link :href="`${file.url}`" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action">
+          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
+        </div>
+      </li>
+    </transition-group>
+    <el-upload
+      ref="fileUploadRef"
+      multiple
+      :drag="isDrag"
+      :action="uploadFileUrl"
+      :before-upload="handleBeforeUpload"
+      :file-list="fileList"
+      :limit="limit"
+      :accept="fileAccept"
+      :on-error="handleUploadError"
+      :on-exceed="handleExceed"
+      :on-success="handleUploadSuccess"
+      :show-file-list="false"
+      :headers="headers"
+      class="upload-file-uploader"
+      v-if="!disabled"
+    >
+      <!-- 上传按钮 -->
+      <el-button type="primary" v-if="!isDrag">选取文件</el-button>
+      <div v-else>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">
+          拖拽文件到此处，或 <em>点击上传</em>
+        </div>
+      </div>
+    </el-upload>
+    <!-- 上传提示 -->
+    <div v-if="showTip && !disabled" class="el-upload__tip">
+      请上传
+      <template v-if="fileSize">
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
+      </template>
+      的文件
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { propTypes } from '@/utils/propTypes';
+import { delOss, listByIds } from '@/api/system/oss';
+import { globalHeaders } from '@/utils/request';
+import { ref } from 'vue';
+const props = defineProps({
+  modelValue: {
+    type: [String, Object, Array],
+    default: () => []
+  },
+  // 数量限制
+  limit: propTypes.number.def(5),
+  // 大小限制(MB)
+  fileSize: propTypes.number.def(5),
+  // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']),
+  // 是否显示提示
+  isShowTip: propTypes.bool.def(true),
+  // 禁用组件（仅查看文件）
+  disabled: propTypes.bool.def(false),
+  // 是否开启拖拽上传
+  isDrag: propTypes.bool.def(false)
+});
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const emit = defineEmits(['update:modelValue', 'update:fileList']);
+const number = ref(0);
+const uploadList = ref<any[]>([]);
+
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const uploadFileUrl = ref(baseUrl + '/resource/oss/upload'); // 上传文件服务器地址
+const headers = ref(globalHeaders());
+
+const fileList = ref<any[]>([]);
+const showTip = computed(() => props.isShowTip && (props.fileType || props.fileSize));
+
+const fileUploadRef = ref<ElUploadInstance>();
+
+// 暴露方法给父组件
+defineExpose({
+  // 清空所有文件
+  clearAllFiles: () => {
+    fileList.value = [];
+    emit('update:modelValue', '');
+    emit('update:fileList', []);
+  }
+});
+
+
+// 监听 fileType 变化，更新 fileAccept
+const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
+
+watch(
+  () => props.modelValue,
+  async (val) => {
+    if (val) {
+      let temp = 1;
+      // 首先将值转为数组
+      let list: any[] = [];
+      
+      if (Array.isArray(val)) {
+        // 如果是数组，检查第一个元素的格式
+        if (val.length > 0 && val[0].fileName && val[0].fileId && val[0].fileUrl) {
+          // 处理后端返回的格式 [{fileName,fileId,fileUrl}]
+          list = val.map(item => ({
+            name: item.fileName,
+            url: item.fileUrl,
+            ossId: item.fileId
+          }));
+        } else {
+          // 处理组件内部格式 [{name,url,ossId}]
+          list = val;
+        }
+      } else {
+        // 处理字符串格式（逗号分隔的ossId）
+        const res = await listByIds(val);
+        list = res.data.map((oss) => {
+          return { name: oss.originalName, url: oss.url, ossId: oss.ossId };
+        });
+      }
+      
+      // 然后将数组转为对象数组
+      fileList.value = list.map((item) => {
+        item = { name: item.name, url: item.url, ossId: item.ossId };
+        item.uid = item.uid || new Date().getTime() + temp++;
+        return item;
+      });
+    } else {
+      fileList.value = [];
+      return [];
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+// 上传前校检格式和大小
+const handleBeforeUpload = (file: any) => {
+  // 校检文件类型
+  if (props.fileType.length) {
+    const fileName = file.name.split('.');
+    const fileExt = fileName[fileName.length - 1];
+    const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
+    if (!isTypeOk) {
+      proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
+      return false;
+    }
+  }
+  // 校检文件名是否包含特殊字符
+  if (file.name.includes(',')) {
+    proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
+    return false;
+  }
+  // 校检文件大小
+  if (props.fileSize) {
+    const isLt = file.size / 1024 / 1024 < props.fileSize;
+    if (!isLt) {
+      proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+      return false;
+    }
+  }
+  proxy?.$modal.loading('正在上传文件，请稍候...');
+  number.value++;
+  return true;
+};
+
+// 文件个数超出
+const handleExceed = () => {
+  proxy?.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
+};
+
+// 上传失败
+const handleUploadError = () => {
+  proxy?.$modal.msgError('上传文件失败');
+};
+
+// 上传成功回调
+const handleUploadSuccess = (res: any, file: UploadFile) => {
+  if (res.code === 200) {
+    uploadList.value.push({
+      name: res.data.fileName,
+      url: res.data.url,
+      ossId: res.data.ossId
+    });
+    
+    uploadedSuccessfully();
+  } else {
+    number.value--;
+    proxy?.$modal.closeLoading();
+    proxy?.$modal.msgError(res.msg);
+    fileUploadRef.value?.handleRemove(file);
+    uploadedSuccessfully();
+  }
+};
+
+// 删除文件
+const handleDelete = (index: number) => {
+  const ossId = fileList.value[index].ossId;
+  delOss(ossId);
+  fileList.value.splice(index, 1);
+  
+  // 转换为后端需要的格式 [{fileName,fileId,fileUrl}]
+  const formattedList = fileList.value.map(file => ({
+    fileName: file.name,
+    fileId: file.ossId,
+    fileUrl: file.url
+  }));
+  
+  emit('update:modelValue', formattedList);
+};
+
+// 上传结束处理
+const uploadedSuccessfully = () => {
+  if (number.value > 0 && uploadList.value.length === number.value) {
+    fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
+    uploadList.value = [];
+    number.value = 0;
+    
+    // 转换为后端需要的格式 [{fileName,fileId,fileUrl}]
+    const formattedList = fileList.value.map(file => ({
+      fileName: file.name,
+      fileId: file.ossId,
+      fileUrl: file.url
+    }));
+    
+    emit('update:modelValue', formattedList);
+    emit('update:fileList', fileList.value);
+    proxy?.$modal.closeLoading();
+  }
+};
+
+// 获取文件名称
+const getFileName = (name: string) => {
+  // 如果是url那么取最后的名字 如果不是直接返回
+  if (name.lastIndexOf('/') > -1) {
+    return name.slice(name.lastIndexOf('/') + 1);
+  } else {
+    return name;
+  }
+};
+
+</script>
+
+<style lang="scss" scoped>
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/materialManagement/inventoryManagement.vue b/src/views/materialManagement/inventoryManagement.vue
index e291202..6839ecc 100644
--- a/src/views/materialManagement/inventoryManagement.vue
+++ b/src/views/materialManagement/inventoryManagement.vue
@@ -8,8 +8,8 @@
                         <div class="top">
                             <div class="title">单据列表</div>
                             <div class="button-actions">
-                                <button :class="{ active: type === 'chuku' }" @click="changeType('chuku')">出库单</button>
                                 <button :class="{ active: type === 'ruku' }" @click="changeType('ruku')">入库单</button>
+                                <button :class="{ active: type === 'chuku' }" @click="changeType('chuku')">出库单</button>
                             </div>
                         </div>
                         <div class="content" style="height: 100%;flex: 1;">
@@ -23,20 +23,20 @@
                                                 <el-input v-model="queryParams.danjvNumber" placeholder="请输入单据编号"
                                                     clearable @keyup.enter="handleQuery" />
                                             </el-form-item>
-                                            <el-form-item label="设备类型" prop="shebeiType">
+                                            <!-- <el-form-item label="设备类型" prop="shebeiType">
                                                 <el-select v-model="queryParams.shebeiType" placeholder="请选择设备类型"
                                                     clearable>
                                                     <el-option v-for="dict in wz_device_type" :key="dict.value"
                                                         :label="dict.label" :value="dict.value" />
                                                 </el-select>
-                                            </el-form-item>
-                                            <el-form-item label="审核状态" prop="auditStatus">
+                                            </el-form-item> -->
+                                            <!-- <el-form-item label="审核状态" prop="auditStatus">
                                                 <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态"
                                                     clearable>
                                                     <el-option v-for="dict in shenheStatus" :key="dict.value"
                                                         :label="dict.label" :value="dict.value" />
                                                 </el-select>
-                                            </el-form-item>
+                                            </el-form-item> -->
                                             <el-form-item label="开始日期" prop="startDate">
                                                 <el-date-picker v-model="queryParams.startDate" type="date"
                                                     placeholder="请选择开始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -63,21 +63,17 @@
                             <el-table v-loading="loading" border :data="churukudanList"
                                 style="width: 100%;margin-top: 15px;">
                                 <el-table-column label="单据编号" align="center" prop="danjvNumber" />
-                                <el-table-column label="设备类型" align="center" prop="shebeiType">
-                                    <template #default="scope">
-                                        <span>{{ getTagLabel(wz_device_type, scope.row.shebeiType) }}</span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="经手人" align="center" prop="jingshourenName" />
+                                <el-table-column label="产品名称" align="center" prop="chanpinName"></el-table-column>
+                                <el-table-column label="经手人" align="center" prop="jingshourenName" width="80px" />
                                 <el-table-column label="操作时间" align="center" prop="updateTime" />
                                 <el-table-column label="总数量" align="center" prop="zonNumber" width="80px" />
-                                <el-table-column label="审核状态" align="center" prop="shenheStatus">
+                                <!-- <el-table-column label="审核状态" align="center" prop="shenheStatus">
                                     <template #default="scope">
                                         <el-tag :type="getTagType(shenheStatus, scope.row.shenheStatus)" as="span">
                                             {{ getTagLabel(shenheStatus, scope.row.shenheStatus) }}
                                         </el-tag>
                                     </template>
-                                </el-table-column>
+                                </el-table-column> -->
                                 <el-table-column label="单据类型" align="center" prop="danjvType">
                                     <template #default="scope">
                                         <el-tag :type="getTagType(danjvType, scope.row.danjvType)">
@@ -87,8 +83,8 @@
                                 </el-table-column>
                                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                                     <template #default="scope">
-                                        <el-button link type="primary" @click="handleUpdate(scope.row)"
-                                            v-hasPermi="['personnel:churukudan:edit']">修改</el-button>
+                                        <!-- <el-button link type="primary" @click="handleUpdate(scope.row)"
+                                            v-hasPermi="['personnel:churukudan:edit']">修改</el-button> -->
                                         <el-button link type="primary" @click="handleDetail(scope.row)"
                                             v-hasPermi="['personnel:churukudan:query']">详情</el-button>
                                         <el-button link type="primary" @click="handleDelete(scope.row)"
@@ -118,7 +114,7 @@
                     <div class="item-box">
                         <div class="title">数据分析</div>
                         <div class="content">
-                            <DataAnalysis />
+                            <DataAnalysis :lineData="lineData" :barData="barData" />
                         </div>
                     </div>
                 </el-card>
@@ -133,14 +129,17 @@
                             :value="dict.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="单据编号" prop="danjvNumber">
-                    <el-input v-model="form.danjvNumber" placeholder="请输入单据编号" />
-                </el-form-item>
-                <el-form-item label="设备类型" prop="shebeiType">
+                <!-- <el-form-item label="设备类型" prop="shebeiType">
                     <el-select v-model="form.shebeiType" placeholder="请选择设备类型">
                         <el-option v-for="dict in wz_device_type" :key="dict.value" :label="dict.label"
                             :value="dict.value"></el-option>
                     </el-select>
+                </el-form-item> -->
+                <el-form-item label="产品名称" prop="chanpinName">
+                    <el-select v-model="form.chanpinName" placeholder="请选择产品名称">
+                        <el-option v-for="dict in chanpinSelect" :key="dict.value" :label="dict.label"
+                            :value="dict.value"></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="经手人id" prop="jingshourenId">
                     <el-input v-model="form.jingshourenId" placeholder="请输入经手人id" />
@@ -152,7 +151,7 @@
                     <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
                 </el-form-item>
                 <el-form-item label="总数量" prop="zonNumber">
-                    <el-input v-model="form.zonNumber" placeholder="请输入总数量" />
+                    <el-input v-model="form.zonNumber" placeholder="请输入总数量" type="number" min="0"/>
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -316,7 +315,7 @@
     padding: 12px 0;
 }
 
-::v-deep(.el-card__body) {
+:v-deep(.el-card__body) {
     height: 100%;
 }
 </style>
@@ -325,7 +324,7 @@ import SystemInfo from './components/SystemInfo.vue';
 import DataAnalysis from './components/DataAnalysis.vue';
 import { ref, computed } from 'vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-import { listChurukudan, getChurukudan, delChurukudan, addChurukudan, updateChurukudan, getChuRuKuCountBar } from '@/api/wuziguanli/churuku/index';
+import { listChurukudan, getChurukudan, delChurukudan, addChurukudan, updateChurukudan, getChuRuKuCountLine, getChuRuKuDayCountBar, getChanpinLists } from '@/api/wuziguanli/churuku/index';
 import { ChurukudanVO, ChurukudanQuery, ChurukudanForm } from '@/api/wuziguanli/churuku/types';
 const { wz_device_type } = toRefs<any>(proxy?.useDict('wz_device_type'));
 
@@ -342,8 +341,8 @@ const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
 const total = ref(0);
-// 单据类型切换变量 - 默认出库单
-const type = ref<string>('chuku');
+// 单据类型切换变量 - 默认入库单
+const type = ref<string>('ruku');
 
 /** 切换单据类型 */
 const changeType = (newType: string) => {
@@ -427,6 +426,8 @@ const initFormData: ChurukudanForm = {
     danjvType: undefined,
     updateTime: undefined,
     auditStatus: undefined,
+    chanpinName: undefined,
+    chanpinId: undefined,
 }
 const data = reactive<PageData<ChurukudanForm, ChurukudanQuery>>({
     form: { ...initFormData },
@@ -440,13 +441,18 @@ const data = reactive<PageData<ChurukudanForm, ChurukudanQuery>>({
         startDate: undefined,
         endDate: undefined,
         auditStatus: undefined,
-        danjvType: '1', // 默认显示出库单
+        chanpinName: undefined,
+        chanpinId: undefined,
+        danjvType: '2', // 默认显示入库单
         params: {
         }
     },
     rules: {
-        shebeiType: [
-            { required: true, message: "设备类型不能为空", trigger: "change" }
+        // shebeiType: [
+        //     { required: true, message: "设备类型不能为空", trigger: "change" }
+        // ],
+        chanpinName: [
+            { required: true, message: "产品名称不能为空", trigger: "change" }
         ],
         jingshourenId: [
             { required: true, message: "经手人id不能为空", trigger: "blur" }
@@ -460,10 +466,34 @@ const data = reactive<PageData<ChurukudanForm, ChurukudanQuery>>({
         danjvType: [
             { required: true, message: "单据状态不能为空", trigger: "change" }
         ],
+        // 手机号码格式校验
+        contactNumber: [
+            { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码格式", trigger: "blur" }
+        ]
     }
 });
 
 const { queryParams, form, rules } = toRefs(data);
+// 查询产品名称列表
+const chanpinList = ref<any[]>([]);
+const chanpinSelect = ref<any[]>([]);
+// 查询产品名称列表
+const getChanpinList = async () => {
+    try {
+        const res = await getChanpinLists({ projectId: userStore.selectedProject.id });
+        chanpinList.value = res.data || [];
+        chanpinSelect.value = chanpinList.value.map(item => ({
+            label:item.caigouPlanName +'-'+item.chanpinName,
+            value: item.id
+        }));
+        console.log('chanpinSelect.value', chanpinSelect.value);
+        
+    } catch (error) {
+        console.error('获取产品名称列表失败:', error);
+        proxy?.$modal.msgError("获取产品名称列表失败，请稍后重试");
+        chanpinList.value = [];
+    }
+}
 
 /** 查询运维-物资-出入库单管理列表 */
 const getList = async () => {
@@ -526,23 +556,23 @@ const handleAdd = () => {
 }
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ChurukudanVO) => {
-    reset();
-    const _id = row?.id || ids.value[0];
-    if (!_id) {
-        proxy?.$modal.msgWarning("请选择要修改的数据");
-        return;
-    }
-    try {
-        const res = await getChurukudan(_id);
-        Object.assign(form.value, res.data);
-        dialog.visible = true;
-        dialog.title = "修改运维-物资-出入库单管理";
-    } catch (error) {
-        console.error('获取出入库单详情失败:', error);
-        proxy?.$modal.msgError("获取数据失败，请稍后重试");
-    }
-}
+// const handleUpdate = async (row?: ChurukudanVO) => {
+//     reset();
+//     const _id = row?.id || ids.value[0];
+//     if (!_id) {
+//         proxy?.$modal.msgWarning("请选择要修改的数据");
+//         return;
+//     }
+//     try {
+//         const res = await getChurukudan(_id);
+//         Object.assign(form.value, res.data);
+//         dialog.visible = true;
+//         dialog.title = "修改运维-物资-出入库单管理";
+//     } catch (error) {
+//         console.error('获取出入库单详情失败:', error);
+//         proxy?.$modal.msgError("获取数据失败，请稍后重试");
+//     }
+// }
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -550,6 +580,7 @@ const submitForm = () => {
         if (valid) {
             buttonLoading.value = true;
             try {
+                form.value.chanpinId = form.value.chanpinName
                 if (form.value.id) {
                     await updateChurukudan(form.value);
                     proxy?.$modal.msgSuccess("修改成功");
@@ -607,7 +638,29 @@ const handleDelete = async (row?: ChurukudanVO) => {
     }
 }
 
+// 折线图数据获取
+const lineData = ref<any>();
+const fetchChuRuKuCountLineData = async () => {
+    if (!queryParams.value.projectId) {
+        return;
+    }
+    let data = {
+        projectId: queryParams.value.projectId,
+        startDate: currentMonthDates[0].fullDate,
+        endDate: currentMonthDates[currentMonthDates.length - 1].fullDate,
+    }
+    try {
+        const res = await getChuRuKuCountLine(data);
+        if (res.code === 200) {
+            lineData.value = res.data;
+        }
+        // 这里可以添加数据处理和图表更新的逻辑
+    } catch (error) {
+        proxy?.$modal.msgError("获取统计数据失败");
+    }
+}
 // 柱状图数据获取
+const barData = ref<any>();
 const fetchChuRuKuCountBarData = async () => {
     if (!queryParams.value.projectId) {
         return;
@@ -618,16 +671,15 @@ const fetchChuRuKuCountBarData = async () => {
         endDate: currentMonthDates[currentMonthDates.length - 1].fullDate,
     }
     try {
-        const res = await getChuRuKuCountBar(data);
-        console.log(res);
+        const res = await getChuRuKuDayCountBar(data);
+        if (res.code === 200) {
+            barData.value = res.data;
+        }
         // 这里可以添加数据处理和图表更新的逻辑
     } catch (error) {
-        console.error('获取柱状图数据失败:', error);
-        // 可以选择是否显示错误提示，根据UI需求决定
-        // proxy?.$modal.msgError("获取统计数据失败");
+        proxy?.$modal.msgError("获取统计数据失败");
     }
 }
-
 // 监听用户选择的项目变化
 watch(() => userStore.selectedProject, (newProject) => {
     if (newProject && newProject.id) {
@@ -638,12 +690,16 @@ watch(() => userStore.selectedProject, (newProject) => {
         }
         // 调用getList刷新数据
         getList();
+        fetchChuRuKuCountLineData();
         fetchChuRuKuCountBarData();
     }
 }, { immediate: true, deep: true });
 onMounted(() => {
     getList();
+    fetchChuRuKuCountLineData();
     fetchChuRuKuCountBarData();
+    // 查询产品名称列表
+    getChanpinList();
 });
 
 // 组件卸载时清空projectId
diff --git a/src/views/materialManagement/planDetails.vue b/src/views/materialManagement/planDetails.vue
index 48c5b6a..98c7f55 100644
--- a/src/views/materialManagement/planDetails.vue
+++ b/src/views/materialManagement/planDetails.vue
@@ -9,15 +9,15 @@
                                 <ArrowLeft />
                             </el-icon>
                         </span>
-                        <h2>Q2风电轴承采购计划</h2>
+                        <h2>{{ Info.jihuaName }}</h2>
                     </div>
                 </el-card>
             </el-col>
         </el-row>
-        <el-row gutter="10">
+        <el-row :gutter="10">
             <el-col :span="18">
                 <el-card>
-                    <detailInfo />
+                    <detailInfo :detail-info="Info" />
                 </el-card>
             </el-col>
             <el-col :span="6" style="flex-grow: 1;">
@@ -46,12 +46,66 @@
     cursor: pointer;
 }
 </style>
-<script setup>
+<script setup lang="ts">
+
 import detailInfo from './components/detailInfo.vue';
 import DetailsProcess from './components/DetailsProcess.vue';
+import { ref, onMounted, getCurrentInstance, toRefs, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import type { ComponentInternalInstance } from 'vue';
+const route = useRoute();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
+import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
+
+
+// 存储计划详情数据
+const Info = ref<CaigouPlanVO>({} as CaigouPlanVO);
+
+// 存储计划编号
+const id = ref('');
+
+// 获取详细信息
+const getDetailInfo = async () => {
+    const res = await caigouPlanDetail(id.value);
+    if (res.code === 200) {
+        Info.value = res.data;
+        console.log(Info.value);
+
+    }
+}
+onMounted(() => {
+    // 接收路由参数
+    id.value = route.query.id as string || '';
+    console.log('组件挂载时路由参数id:', id.value);
+    // 确保id不为空时才调用接口
+    if (id.value) {
+        getDetailInfo();
+    } else {
+        proxy.$modal.msgError('未获取到详细信息')
+        setTimeout(() => {
+            router.back();
+        }, 800);
+    }
+});
+
+// 监听路由参数变化
+watch(
+    () => route.query.id,
+    (newId) => {
+        id.value = newId as string || ''; 
+        if (id.value) {
+            getDetailInfo();
+        } 
+    },
+    { immediate: true }
+);
 const router = useRouter();
 const handleBack = () => {
     router.back();
 }
+
+
+
 </script>
\ No newline at end of file
diff --git a/src/views/materialManagement/procurementPlan.vue b/src/views/materialManagement/procurementPlan.vue
index 74d8d6d..5854105 100644
--- a/src/views/materialManagement/procurementPlan.vue
+++ b/src/views/materialManagement/procurementPlan.vue
@@ -12,7 +12,7 @@
                                 待审批计划
                             </div>
                             <div class="count" style="color: rgba(255, 178, 30, 1);">
-                                12
+                                {{ pendingCount }}
                             </div>
                         </div>
                         <div class="item">
@@ -20,7 +20,7 @@
                                 已批准计划
                             </div>
                             <div class="count" style="color: rgba(67, 101, 220, 1);">
-                                28
+                                {{ approvedCount }}
                             </div>
                         </div>
                         <div class="item">
@@ -28,7 +28,7 @@
                                 采购中计划
                             </div>
                             <div class="count" style="color: rgba(113, 214, 213, 1);">
-                                15
+                                {{ purchasingCount }}
                             </div>
                         </div>
                         <div class="item">
@@ -36,7 +36,7 @@
                                 已完成计划
                             </div>
                             <div class="count" style="color: rgba(0, 184, 122, 1);">
-                                86
+                                {{ completedCount }}
                             </div>
                         </div>
                     </div>
@@ -53,7 +53,7 @@
                                 本年度已采购金额
                             </div>
                             <div class="count" style="color: rgba(255, 153, 0, 1);">
-                                520,000.00
+                               {{ yearlyAmount.shijiJine }}
                             </div>
                         </div>
                         <div class="item">
@@ -61,7 +61,7 @@
                                 本年度采购预算金额
                             </div>
                             <div class="count" style="color: rgba(67, 101, 220, 1);">
-                                3,000,000.00
+                               {{ yearlyAmount.yujiJine }}
                             </div>
                         </div>
                     </div>
@@ -73,34 +73,38 @@
                 <el-card style="border-radius: 10px;">
                     <div class="content">
                         <div class="tabs">
-                            <el-button type="success">导出</el-button>
-                            <el-button type="primary" @click="isNewProcurementDialogVisible = true">新建采购申请单</el-button>
+                            <!-- <el-button type="success">导出</el-button> -->
+                            <el-button type="primary" @click="handleAdd">新建采购申请单</el-button>
                         </div>
 
                         <!-- 标签页导航 -->
                         <div class="tabs">
-                            <!-- <el-badge :value="pendingCount" type="warning">
-                                <el-button :type="activeTab === 'pending' ? 'primary' : ''"
-                                    @click="changeTab('pending')">待审批</el-button>
+                            <el-badge :value="total" type="success">
+                                <el-button :type="activeTab === 'all' ? 'primary' : ''"
+                                    @click="changeTab('all')">全部</el-button>
                             </el-badge>
-                            <el-badge :value="purchasingCount" type="info">
-                                <el-button :type="activeTab === 'purchasing' ? 'primary' : ''"
-                                    @click="changeTab('purchasing')">采购中</el-button>
+                            <el-badge :value="pendingCount" type="warning">
+                                <el-button :type="activeTab === '3' ? 'primary' : ''"
+                                    @click="changeTab('3')">待审批</el-button>
+                            </el-badge>
+                            <el-badge :value="purchasingCount" type="primary">
+                                <el-button :type="activeTab === '5' ? 'primary' : ''"
+                                    @click="changeTab('5')">采购中</el-button>
                             </el-badge>
                             <el-badge :value="rejectedCount" type="danger">
-                                <el-button :type="activeTab === 'rejected' ? 'primary' : ''"
-                                    @click="changeTab('rejected')">
+                                <el-button :type="activeTab === '7' ? 'primary' : ''"
+                                    @click="changeTab('7')">
                                     未通过
                                 </el-button>
                             </el-badge>
-                            <el-badge :value="approvedCount" type="primary">
-                                <el-button :type="activeTab === 'approved' ? 'primary' : ''"
-                                    @click="changeTab('approved')">已通过</el-button>
+                            <el-badge :value="approvedCount" type="success">
+                                <el-button :type="activeTab === '9' ? 'primary' : ''"
+                                    @click="changeTab('9')">已通过</el-button>
                             </el-badge>
                             <el-badge :value="completedCount" type="success">
-                                <el-button :type="activeTab === 'completed' ? 'primary' : ''"
-                                    @click="changeTab('completed')">已完成</el-button>
-                            </el-badge> -->
+                                <el-button :type="activeTab === '11' ? 'primary' : ''"
+                                    @click="changeTab('11')">已完成</el-button>
+                            </el-badge>
                         </div>
                         <!-- 表格 -->
                         <el-table :data="caigouPlanList" border style="width: 100%;margin-top: 15px;">
@@ -115,9 +119,10 @@
                                     <dict-tag :options="wz_caigou_examine" :value="scope.row.status" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="操作" fixed="right" width="80" align="center">
+                            <el-table-column label="操作" fixed="right" align="center">
                                 <template #default="scope">
-                                    <el-button type="text" @click="handleView(scope.row)">查看</el-button>
+                                    <el-button link @click="handleView(scope.row)">查看</el-button>
+                                    <el-button link @click="handleUpdate(scope.row)">编辑</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -131,26 +136,24 @@
                 </el-card>
             </el-col>
         </el-row>
-        <el-dialog v-model="isNewProcurementDialogVisible" title="新建采购申请单" width="60%" :close-on-click-modal="false">
+        <!-- 添加、修改弹窗 -->
+        <el-dialog v-model="isDialogVisible" :title="dialogTitle" width="60%" :close-on-click-modal="false">
             <div class="new-procurement-form">
                 <!-- 基础信息 -->
                 <div class="form-section">
                     <h3>基础信息</h3>
                     <!-- 输入框行 -->
                     <el-row :gutter="20">
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <el-form-item label="计划名称">
                                 <el-input v-model="form.jihuaName" placeholder="请填写计划名称" />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <el-form-item label="合同名称">
                                 <el-input v-model="form.hetonName" placeholder="请填写合同名称" />
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <!-- 下拉框行 -->
-                    <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="合同类型">
                                 <el-select v-model="form.hetonType" placeholder="请选择">
@@ -159,6 +162,9 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
+                    </el-row>
+                    <!-- 下拉框行 -->
+                    <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="采购类型">
                                 <el-select v-model="form.caigouType" placeholder="请选择">
@@ -173,6 +179,13 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
+                    <el-row :gutter="20">
+                        <el-col :span="24">
+                            <el-form-item label="申请原因">
+                                <el-input v-model="form.reason" placeholder="请输入申请原因" type="textarea" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                 </div>
 
                 <!-- 供应商信息 -->
@@ -181,12 +194,9 @@
                     <el-row :gutter="20">
                         <el-col :span="6">
                             <el-form-item label="供应商单位">
-                                <el-select v-model="form.danwei" placeholder="请选择">
-                                    <!-- <el-option v-for="option in supplierList" :key="option.value" :label="option.label"
-                                        :value="option.value" /> -->
-                                        <el-option label="供应商1" value="供应商1" />
-                                         <el-option label="供应商1" value="供应商1" />
-                                          <el-option label="供应商1" value="供应商1" />
+                                <el-select v-model="form.gonyingshangId" placeholder="请选择">
+                                    <el-option v-for="option in supplierList" :key="option.id" :label="option.supplierName"
+                                        :value="option.id" />
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -212,17 +222,25 @@
                             <template #default="scope">
                                 <el-input v-model="scope.row.chanpinType" placeholder="请填写" />
                             </template>
+                        </el-table-column>
+                         <el-table-column prop="shebeiType" label="设备类型">
+                            <template #default="scope">
+                                <el-select v-model="scope.row.shebeiType" placeholder="请选择">
+                                    <el-option v-for="option in wz_device_type" :key="option.value"
+                                        :label="option.label" :value="option.value" />
+                                </el-select>
+                            </template>
                         </el-table-column>
                         <el-table-column prop="chanpinMonovalent" label="产品单价">
                             <template #default="scope">
                                 <el-input v-model="scope.row.chanpinMonovalent" placeholder="请填写" type="number"
-                                    @change="calculateTotalPrice(scope.row)" />
+                                    @change="calculateTotalPrice(scope.row)" min="0" />
                             </template>
                         </el-table-column>
                         <el-table-column prop="goumaiNumber" label="购买数量">
                             <template #default="scope">
                                 <el-input v-model="scope.row.goumaiNumber" placeholder="请填写" type="number"
-                                    @change="calculateTotalPrice(scope.row)" />
+                                    @change="calculateTotalPrice(scope.row)" min="0" />
                             </template>
                         </el-table-column>
                         <el-table-column prop="danwei" label="单位">
@@ -230,6 +248,11 @@
                                 <el-input v-model="scope.row.danwei" placeholder="请填写" />
                             </template>
                         </el-table-column>
+                        <el-table-column prop="yontu" label="用途(简要描述)">
+                            <template #default="scope">
+                                <el-input v-model="scope.row.yontu" placeholder="请填写" />
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="totalPrice" label="合计" :formatter="calculateTotalPrice">
                             <template #default="scope">
                                 <span>{{ calculateTotalPrice(scope.row) }}</span>
@@ -271,23 +294,24 @@
                 <!-- 附件上传 -->
                 <div class="form-section">
                     <h3>附件上传</h3>
-                    <file-upload ref="fileUploadRef" :isDrag="true" :file-list="form.opsCaigouPlanFilesBos"
+                    <FileUpload ref="fileUploadRef" :isDrag="true" v-model="form.opsCaigouPlanFilesBos"
                         :is-show-tip="false"
-                        @update:file-list="handleUpdateFileList"
                         :file-type="['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf', 'png', 'jpg', 'jpeg']" />
                 </div>
             </div>
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button @click="cancelNewProcurement">取消</el-button>
-                    <el-button @click="saveDraft" :loading="buttonLoading">保存草稿</el-button>
-                    <el-button type="primary" @click="submitProcurement" :loading="buttonLoading">提交申请</el-button>
+                    <el-button @click="cancelOperation">取消</el-button>
+                    <el-button v-if="currentOperation !== 'update'" @click="saveDraft" :loading="buttonLoading">保存草稿</el-button>
+                    <el-button type="primary" @click="getSubmitFunction()" :loading="buttonLoading">
+                        {{ currentOperation === 'add' ? '提交申请' : '更新' }}
+                    </el-button>
                 </div>
             </template>
         </el-dialog>
     </div>
 </template>
-<style sc oped lang="scss">
+<style scoped lang="scss">
 .procurementPlan {
     background-color: #F2F8FC;
     padding: 20px;
@@ -361,18 +385,21 @@
 }
 </style>
 <script setup lang="ts">
-import { ref, reactive, computed } from 'vue';
+import { ref, reactive, computed, getCurrentInstance, onUnmounted } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useProcurementDraftStore } from '@/store/modules/procurementDraft';
+import {  } from '@/views/materialManagement/components/upload.vue'
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
+const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine,wz_device_type } = toRefs<any>(proxy?.useDict('wz_device_type','wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
 
-import { listCaigouPlan, getSupplierList, addCaigouPlan } from '@/api/wuziguanli/caigouPlan';
+import { listCaigouPlan, getSupplierList, addCaigouPlan, caigouPlanDetail, updateCaigouPlan,getCount } from '@/api/wuziguanli/caigouPlan';
 import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
 
 import { useRouter } from 'vue-router';
 const router = useRouter();
 
+import FileUpload from '@/views/materialManagement/components/upload.vue';
+
 
 // 导入用户store
 import { useUserStore } from '@/store/modules/user';
@@ -383,6 +410,27 @@ const caigouPlanList = ref<CaigouPlanVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const total = ref(0);
+// 文件上传组件引用
+const fileUploadRef = ref<InstanceType<typeof FileUpload>>();
+
+// 标签页状态变量
+const activeTab = ref('all');
+
+// 各状态数量变量
+const pendingCount = ref(0);
+const purchasingCount = ref(0);
+const rejectedCount = ref(0);
+const approvedCount = ref(0);
+const completedCount = ref(0);
+
+// 标签页切换函数
+const changeTab = (tab: string) => {
+  activeTab.value = tab;
+  // 重置页码
+  queryParams.value.pageNum = 1;
+  // 重新获取列表数据
+  getList();
+};
 
 const initFormData: CaigouPlanForm = {
     id: undefined,
@@ -397,7 +445,7 @@ const initFormData: CaigouPlanForm = {
     caigouType: undefined,
     cangkuUrl: undefined,
     hetonName: undefined,
-    gonyingshangId: 1,
+    gonyingshangId: undefined,
     chuhuoTime: undefined,
     fukuantiaojian: undefined,
     fapiaoKjfs: undefined,
@@ -405,7 +453,7 @@ const initFormData: CaigouPlanForm = {
     shenheStatus: undefined,
     yujiJine: undefined,
     shijiJine: undefined,
-    opsCaigouPlanFilesBos: [],
+    opsCaigouPlanFilesBos: undefined,
     opsCaigouPlanChanpinBos: [
         {
             chanpinName: '',
@@ -413,9 +461,11 @@ const initFormData: CaigouPlanForm = {
             chanpinMonovalent: 0,
             goumaiNumber: 0,
             danwei: '',
+            yontu: '',
             totalPrice: 0
         }
     ],
+    reason: undefined,
 }
 const data = reactive<PageData<CaigouPlanForm, CaigouPlanQuery>>({
     form: { ...initFormData },
@@ -433,7 +483,7 @@ const data = reactive<PageData<CaigouPlanForm, CaigouPlanQuery>>({
         caigouType: undefined,
         cangkuUrl: undefined,
         hetonName: undefined,
-        gonyingshangId: 1,
+        gonyingshangId: undefined,
         chuhuoTime: undefined,
         fukuantiaojian: undefined,
         fapiaoKjfs: undefined,
@@ -441,6 +491,7 @@ const data = reactive<PageData<CaigouPlanForm, CaigouPlanQuery>>({
         shenheStatus: undefined,
         yujiJine: undefined,
         shijiJine: undefined,
+        reason: undefined,
         opsCaigouPlanChanpinBos: [
             {
                 chanpinName: '',
@@ -448,6 +499,7 @@ const data = reactive<PageData<CaigouPlanForm, CaigouPlanQuery>>({
                 chanpinMonovalent: 0,
                 goumaiNumber: 0,
                 danwei: '',
+                yontu: '',
                 totalPrice: 0
             }
         ],
@@ -457,42 +509,252 @@ const data = reactive<PageData<CaigouPlanForm, CaigouPlanQuery>>({
     },
     rules: {}
 });
-   
+
 const { queryParams, form, rules } = toRefs(data);
 
+
+// 查询运维-物资-采购计划单年度金额
+const yearlyAmount=ref({
+    yujiJine: 0,
+    shijiJine: 0,
+})
+const getYearlyAmount = async () => {
+    try {
+        // 检查项目ID是否存在
+        if (!queryParams.value.projectId) {
+            ElMessage({ message: '项目ID不能为空', type: 'warning' });
+            // 重置年度金额数据
+            yearlyAmount.value = {
+                yujiJine: 0,
+                shijiJine: 0
+            };
+            return;
+        }
+        
+        const res = await getCount(queryParams.value.projectId);
+        
+        // 检查响应数据结构
+        if (res && res.code === 200 && res.data) {
+            // 确保金额数据有效
+            yearlyAmount.value.shijiJine = res.data.shijiJine || 0;
+            yearlyAmount.value.yujiJine = res.data.yujiJine || 0;
+        } else {
+            ElMessage({ message: '获取年度金额数据格式异常', type: 'error' });
+            console.error('获取年度金额响应数据异常:', res);
+            // 重置年度金额数据
+            yearlyAmount.value = {
+                yujiJine: 0,
+                shijiJine: 0
+            };
+        }
+    } catch (error) {
+        console.error('获取年度金额失败:', error);
+        ElMessage({ message: '获取年度金额失败，请重试', type: 'error' });
+        // 重置年度金额数据，避免显示错误数据
+        yearlyAmount.value = {
+            yujiJine: 0,
+            shijiJine: 0
+        };
+    }
+}
 /** 查询运维-物资-采购计划单列表 */
 const getList = async () => {
     loading.value = true;
-    const res = await listCaigouPlan(queryParams.value);
-    caigouPlanList.value = res.rows;
-    total.value = res.total;
-    loading.value = false;
+    
+    // 创建查询参数的副本，避免直接修改原参数
+    const queryParamsCopy = { ...queryParams.value };
+    
+    // 根据当前选中的标签页设置状态过滤条件
+    if (activeTab.value !== 'all') {
+        queryParamsCopy.status = activeTab.value;
+    } else {
+        // 如果是'全部'标签页，不设置状态过滤条件
+        queryParamsCopy.status = undefined;
+    }
+    
+    try {
+        // 检查项目ID是否存在
+        if (!queryParamsCopy.projectId) {
+            ElMessage({ message: '项目ID不能为空', type: 'warning' });
+            // 重置统计数据
+            pendingCount.value = 0;
+            purchasingCount.value = 0;
+            rejectedCount.value = 0;
+            approvedCount.value = 0;
+            completedCount.value = 0;
+            total.value = 0;
+            caigouPlanList.value = [];
+            return;
+        }
+        
+        // 先查询所有数据来统计各状态数量
+        const allDataRes = await listCaigouPlan({ ...queryParamsCopy, status: undefined });
+        
+        // 检查响应数据结构
+        if (allDataRes && allDataRes.code === 200 && Array.isArray(allDataRes.rows)) {
+            // 统计各状态数量
+            pendingCount.value = allDataRes.rows.filter(item => item.status === '3').length;
+            purchasingCount.value = allDataRes.rows.filter(item => item.status === '5').length;
+            rejectedCount.value = allDataRes.rows.filter(item => item.status === '7').length;
+            approvedCount.value = allDataRes.rows.filter(item => item.status === '9').length;
+            completedCount.value = allDataRes.rows.filter(item => item.status === '11').length;
+            total.value = allDataRes.total || 0;
+            
+            // 然后查询当前标签页的数据
+            const filteredRes = await listCaigouPlan(queryParamsCopy);
+            
+            // 检查过滤后的数据结构
+            if (filteredRes && filteredRes.code === 200 && Array.isArray(filteredRes.rows)) {
+                caigouPlanList.value = filteredRes.rows;
+            } else {
+                ElMessage({ message: '获取过滤后的数据格式异常', type: 'error' });
+                console.error('获取过滤后的数据响应异常:', filteredRes);
+                caigouPlanList.value = [];
+            }
+        } else {
+            ElMessage({ message: '获取统计数据格式异常', type: 'error' });
+            console.error('获取统计数据响应异常:', allDataRes);
+            // 重置统计数据
+            pendingCount.value = 0;
+            purchasingCount.value = 0;
+            rejectedCount.value = 0;
+            approvedCount.value = 0;
+            completedCount.value = 0;
+            total.value = 0;
+            caigouPlanList.value = [];
+        }
+    } catch (error) {
+        console.error('获取采购计划列表失败:', error);
+        ElMessage({ message: '获取数据失败，请重试', type: 'error' });
+        // 重置统计数据，避免显示错误数据
+        pendingCount.value = 0;
+        purchasingCount.value = 0;
+        rejectedCount.value = 0;
+        approvedCount.value = 0;
+        completedCount.value = 0;
+        total.value = 0;
+        caigouPlanList.value = [];
+    } finally {
+        loading.value = false;
+    }
 }
-// 新增采购计划单
-const addCaigouPlans = async () => {
+// 新增采购计划单提交函数
+const addCaigouPlanSubmit = async () => {
     buttonLoading.value = true; // 显示按钮加载状态
     try {
-        // 提交表单数据到后端
-        const res = await addCaigouPlan(form.value);
+        // 创建表单数据的深拷贝，避免直接修改原表单数据
+        const submitData = JSON.parse(JSON.stringify(form.value));
         
-        if (res.code === 200) {
+        // 数据完整性检查
+        if (!submitData || !submitData.projectId) {
+            ElMessage({ message: '项目信息不完整，无法提交', type: 'error' });
+            return;
+        }
+        
+        // 提交数据前确保文件列表格式正确
+        if (submitData.opsCaigouPlanFilesBos === undefined) {
+            submitData.opsCaigouPlanFilesBos = [];
+        }
+        
+        const res = await addCaigouPlan(submitData);
+
+        // 检查响应数据结构
+        if (res && res.code === 200) {
             ElMessage({ message: '采购申请单已成功提交，等待审批！', type: 'success' });
             
+            try {
+                // 提交成功后，删除相关的草稿
+                const procurementDraftStore = useProcurementDraftStore();
+                const draftList = procurementDraftStore.getDraftList();
+                
+                // 查找并删除与当前计划名称匹配的草稿
+                if (form.value.jihuaName && draftList && draftList.length > 0) {
+                    const matchingDraft = draftList.find(draft => 
+                        draft.name === form.value.jihuaName
+                    );
+                    
+                    if (matchingDraft) {
+                        procurementDraftStore.deleteDraft(matchingDraft.id);
+                    }
+                }
+            } catch (draftError) {
+                console.error('删除草稿时发生错误:', draftError);
+                // 草稿删除失败不应影响主流程
+            }
+            
             // 刷新列表数据
-            getList();
+            await getList();
             
             // 关闭对话框并重置表单
             resetNewProcurementForm();
-            isNewProcurementDialogVisible.value = false;
+            isDialogVisible.value = false;
         } else {
             // 显示详细的错误信息
-            ElMessage({ 
-                message: res.msg || '新增采购计划单失败，请重试', 
+            console.error('新增采购计划单失败:', res);
+            ElMessage({
+                message: res?.msg || '新增采购计划单失败，请重试',
                 type: 'error'
             });
         }
     } catch (error) {
-        ElMessage({ message: '失败', type: 'error' });
+        console.error('新增采购计划单操作异常:', error);
+        // 根据错误类型提供更具体的错误信息
+        let errorMessage = '操作失败';
+        if (error.message) {
+            errorMessage = `操作失败: ${error.message}`;
+        }
+        ElMessage({ message: errorMessage, type: 'error' });
+    } finally {
+        buttonLoading.value = false; // 无论成功失败，都关闭加载状态
+    }
+}
+
+// 更新采购计划单提交函数
+const updateCaigouPlanSubmit = async () => {
+    buttonLoading.value = true; // 显示按钮加载状态
+    try {
+        // 创建表单数据的深拷贝，避免直接修改原表单数据
+        const submitData = JSON.parse(JSON.stringify(form.value));
+        
+        // 数据完整性检查
+        if (!submitData || !submitData.id || !submitData.projectId) {
+            ElMessage({ message: '计划ID或项目信息不完整，无法更新', type: 'error' });
+            return;
+        }
+        
+        // 提交数据前确保文件列表格式正确
+        if (submitData.opsCaigouPlanFilesBos === undefined) {
+            submitData.opsCaigouPlanFilesBos = [];
+        }
+        
+        const res = await updateCaigouPlan(submitData);
+        
+        // 检查响应数据结构
+        if (res && res.code === 200) {
+            ElMessage({ message: '采购申请单已成功更新！', type: 'success' });
+            
+            // 刷新列表数据
+            await getList();
+            
+            // 关闭对话框并重置表单
+            resetNewProcurementForm();
+            isDialogVisible.value = false;
+        } else {
+            // 显示详细的错误信息
+            console.error('更新采购计划单失败:', res);
+            ElMessage({
+                message: res?.msg || '更新采购计划单失败，请重试',
+                type: 'error'
+            });
+        }
+    } catch (error) {
+        console.error('更新采购计划单操作异常:', error);
+        // 根据错误类型提供更具体的错误信息
+        let errorMessage = '操作失败';
+        if (error.message) {
+            errorMessage = `操作失败: ${error.message}`;
+        }
+        ElMessage({ message: errorMessage, type: 'error' });
     } finally {
         buttonLoading.value = false; // 无论成功失败，都关闭加载状态
     }
@@ -503,18 +765,36 @@ const addCaigouPlans = async () => {
 // 采购商列表
 const supplierList = ref([]);
 const getSupplierLists = async () => {
-    const res = await getSupplierList({
-        projectId: userStore.selectedProject.id
-    });
-    supplierList.value = res.rows;
-
+    try {
+        // 检查项目ID是否存在
+        if (!userStore.selectedProject || !userStore.selectedProject.id) {
+            ElMessage({ message: '请先选择项目', type: 'warning' });
+            return;
+        }
+        
+        const res = await getSupplierList({
+            projectId: userStore.selectedProject.id
+        });
+        
+        // 检查响应数据结构
+        if (res && res.code === 200 && Array.isArray(res.data)) {
+            supplierList.value = res.data;
+        } else {
+            ElMessage({ message: '获取供应商列表数据格式异常', type: 'error' });
+            console.error('获取供应商列表响应数据异常:', res);
+        }
+    } catch (error) {
+        console.error('获取供应商列表失败:', error);
+        ElMessage({ message: '获取供应商列表失败，请重试', type: 'error' });
+        // 在严重错误情况下清空列表，避免显示错误数据
+        supplierList.value = [];
+    }
 }
 
-
-
 onMounted(() => {
     getList();
     getSupplierLists();
+    getYearlyAmount();
 });
 // 监听用户选择的项目变化
 watch(() => userStore.selectedProject, (newProject) => {
@@ -526,12 +806,19 @@ watch(() => userStore.selectedProject, (newProject) => {
         }
         // 调用getList刷新数据
         getList();
+        getYearlyAmount();
     }
 }, { immediate: true, deep: true });
-// 新建采购申请单对话框是否可见
-const isNewProcurementDialogVisible = ref(false);
+// 对话框是否可见
+const isDialogVisible = ref(false);
+// 当前操作类型：'add' 或 'update'
+const currentOperation = ref('add');
+// 对话框标题
+const dialogTitle = computed(() => {
+    return currentOperation.value === 'add' ? '新建采购申请单' : '编辑采购申请单';
+});
 
-// 跳转查看详情
+// 跳转查看
 const handleView = (row) => {
     router.push({
         path: '/materialManagement/planDetails',
@@ -540,6 +827,109 @@ const handleView = (row) => {
         }
     });
 };
+
+// 处理新增
+const handleAdd = async () => {
+    currentOperation.value = 'add';
+    resetNewProcurementForm();
+    
+    // 检查是否有保存的草稿
+    const procurementDraftStore = useProcurementDraftStore();
+    const draftList = procurementDraftStore.getDraftList();
+    
+    if (draftList && draftList.length > 0) {
+        try {
+            // 提示用户是否恢复上次保存的草稿
+            await ElMessageBox.confirm(
+                '检测到您有未提交的草稿，是否恢复？',
+                '恢复草稿',
+                {
+                    confirmButtonText: '恢复',
+                    cancelButtonText: '不恢复',
+                    type: 'info'
+                }
+            );
+            
+            // 获取最新的草稿并恢复
+            const latestDraft = draftList[0]; // 假设列表是按创建时间降序排列的
+            const draftData = procurementDraftStore.getDraft(latestDraft.id);
+            
+            if (draftData) {
+                form.value = JSON.parse(JSON.stringify(draftData.content));
+                // 确保产品列表和附件列表有默认值
+                if (!form.value.opsCaigouPlanChanpinBos || form.value.opsCaigouPlanChanpinBos.length === 0) {
+                    form.value.opsCaigouPlanChanpinBos = [{chanpinName: '',chanpinType: '',chanpinMonovalent: '',goumaiNumber: '',danwei: '',yontu: '',totalPrice: ''}];
+                }
+                if (!form.value.opsCaigouPlanFilesBos) {
+                    form.value.opsCaigouPlanFilesBos = [];
+                }
+            }
+        } catch (error) {
+            // 用户选择不恢复草稿，继续使用空表单
+            if (error !== 'cancel') {
+                console.error('恢复草稿时发生错误:', error);
+            }
+        }
+    }
+    
+    isDialogVisible.value = true;
+};
+
+// 根据操作类型获取对应的提交函数
+const getSubmitFunction = computed(() => {
+    return currentOperation.value === 'add' ? submitAddProcurement : submitUpdateProcurement;
+});
+
+// 处理编辑
+const handleUpdate = async (row) => {
+    currentOperation.value = 'update';
+    buttonLoading.value = true;
+    try {
+        // 获取采购计划详情
+        const res = await caigouPlanDetail(row.id);
+        if (res.code === 200) {
+            // 深拷贝数据，避免直接修改原始数据
+            form.value = JSON.parse(JSON.stringify(res.data));
+            // 将数据字段从Vos后缀改为Bos后缀
+            if (form.value.opsCaigouPlanChanpinVos) {
+                form.value.opsCaigouPlanChanpinBos = form.value.opsCaigouPlanChanpinVos;
+                delete form.value.opsCaigouPlanChanpinVos;
+            }
+            if (form.value.opsCaigouPlanFilesVos) {
+                // 转换文件数据格式为FileUpload组件期望的格式
+                form.value.opsCaigouPlanFilesBos = form.value.opsCaigouPlanFilesVos.map(file => ({
+                    ossId: file.fileId,
+                    name: file.fileName,
+                    url: file.fileUrl
+                }));
+                delete form.value.opsCaigouPlanFilesVos;
+            }
+            // 确保产品列表和附件列表有默认值
+            if (!form.value.opsCaigouPlanChanpinBos || form.value.opsCaigouPlanChanpinBos.length === 0) {
+                form.value.opsCaigouPlanChanpinBos = [{
+                    chanpinName: '',
+                    chanpinType: '',
+                    chanpinMonovalent: 0,
+                    goumaiNumber: 0,
+                    danwei: '',
+                    yontu: '',
+                    totalPrice: 0
+                }];
+            }
+            if (!form.value.opsCaigouPlanFilesBos || form.value.opsCaigouPlanFilesBos.length === 0) {
+                form.value.opsCaigouPlanFilesBos = [];
+            }
+            // 显示对话框
+            isDialogVisible.value = true;
+        } else {
+            ElMessage({ message: res.msg || '获取采购计划详情失败', type: 'error' });
+        }
+    } catch (error) {
+        ElMessage({ message: '获取采购计划详情失败', type: 'error' });
+    } finally {
+        buttonLoading.value = false;
+    }
+};
 // 计算产品总价
 const calculateTotalPrice = (row) => {
     if (!row.chanpinMonovalent || !row.goumaiNumber) {
@@ -589,99 +979,22 @@ const resetNewProcurementForm = () => {
     form.value.chuhuoTime = '';
     form.value.fukuantiaojian = '';
     form.value.fapiaoKjfs = '';
+    form.value.gonyingshangId = '';
+    form.value.gonyingshangName = '';
+    form.value.reason = '';
     form.value.opsCaigouPlanChanpinBos = [{
         chanpinName: '',
         chanpinType: '',
         chanpinMonovalent: '',
         goumaiNumber: '',
         danwei: '',
+        yontu: '',
         totalPrice: ''
     }];
     form.value.opsCaigouPlanFilesBos = [];
-};
-
-// 取消新建采购申请
-const cancelNewProcurement = () => {
-    // 检查是否有未保存的内容
-    const hasContent = Object.values(form.value).some(value => {
-        if (Array.isArray(value)) {
-            return value.length > 0 &&
-                value.some(item =>
-                    typeof item === 'object' &&
-                    Object.values(item).some(v => v)
-                );
-        }
-        return !!value;
-    });
-
-    if (hasContent) {
-        ElMessageBox.confirm('表单内容尚未保存，确定要关闭吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            resetNewProcurementForm();
-            isNewProcurementDialogVisible.value = false;
-        });
-    } else {
-        resetNewProcurementForm();
-        isNewProcurementDialogVisible.value = false;
-    }
-};
-
-// 草稿校验函数
-const validateDraft = () => {
-    // 草稿只需要计划名称作为必填项
-    if (!form.value.jihuaName.trim()) {
-        ElMessage({ message: '请填写计划名称', type: 'error' });
-        return false;
-    }
-
-    // 检查已填写的产品信息的有效性
-    for (let i = 0; i < form.value.opsCaigouPlanChanpinBos.length; i++) {
-        const product = form.value.opsCaigouPlanChanpinBos[i];
-        if (product.chanpinName && !product.chanpinType) {
-            ElMessage({ message: `第${i + 1}行产品：填写了产品名称，请也填写产品型号`, type: 'warning' });
-        }
-        if (product.productPrice && parseFloat(product.productPrice) <= 0) {
-            ElMessage({ message: `第${i + 1}行产品：产品单价应大于0`, type: 'warning' });
-        }
-        if (product.purchaseQuantity && parseInt(product.purchaseQuantity) <= 0) {
-            ElMessage({ message: `第${i + 1}行产品：购买数量应大于0`, type: 'warning' });
-        }
-    }
-
-    return true;
-};
-
-// 保存草稿
-const saveDraft = async () => {
-    // 验证草稿
-    if (!validateDraft()) {
-        return;
-    }
-
-    buttonLoading.value = true; // 显示按钮加载状态
-    try {
-        // 使用pinia store保存草稿
-        const draftStore = useProcurementDraftStore();
-        const savedDraft = draftStore.saveDraft(form.value.jihuaName, form.value);
-
-        console.log('保存草稿:', {
-            draftNumber: savedDraft.draftNumber,
-            saveTime: savedDraft.saveTime,
-            content: savedDraft.content
-        });
-
-        ElMessage({ message: `草稿已成功保存（编号：${savedDraft.draftNumber}），您可以在草稿箱中查看`, type: 'success' });
-    } catch (error) {
-        console.error('保存草稿失败:', error);
-        ElMessage({ 
-            message: '保存草稿失败，请重试', 
-            type: 'error'
-        });
-    } finally {
-        buttonLoading.value = false; // 无论成功失败，都关闭加载状态
+    // 清空文件上传组件中的文件列表
+    if (fileUploadRef.value) {
+        fileUploadRef.value.clearAllFiles();
     }
 };
 
@@ -713,18 +1026,28 @@ const validateForm = () => {
         return false;
     }
 
-    if (!form.value.danwei) {
+    if (!form.value.gonyingshangId) {
         ElMessage({ message: '请选择供应商单位', type: 'error' });
         return false;
     }
-
+    if (!form.value.reason) {
+        ElMessage({ message: '请填写申请原因', type: 'error' });
+        return false;
+    }
+    // 附件校验
+    if (!form.value.opsCaigouPlanFilesBos || form.value.opsCaigouPlanFilesBos.length === 0) {
+        ElMessage({ message: '请至少上传一个附件', type: 'error' });
+        return false;
+    }
+    
     // 产品信息校验
     const hasValidProduct = form.value.opsCaigouPlanChanpinBos.some(product => {
         return product.chanpinName &&
             product.chanpinType &&
             product.chanpinMonovalent && parseFloat(product.chanpinMonovalent) > 0 &&
             product.goumaiNumber && parseInt(product.goumaiNumber) > 0 &&
-            product.danwei;
+            product.danwei &&
+            product.yontu;
     });
 
     if (!hasValidProduct) {
@@ -756,6 +1079,10 @@ const validateForm = () => {
                 ElMessage({ message: `第${i + 1}行产品：请填写购买数量`, type: 'error' });
                 return false;
             }
+            if (!product.shebeiType) {
+                ElMessage({ message: `第${i + 1}行产品：请填写设备类型`, type: 'error' });
+                return false;
+            }
             if (parseInt(product.goumaiNumber) <= 0) {
                 ElMessage({ message: `第${i + 1}行产品：购买数量必须大于0`, type: 'error' });
                 return false;
@@ -764,14 +1091,50 @@ const validateForm = () => {
                 ElMessage({ message: `第${i + 1}行产品：请填写单位`, type: 'error' });
                 return false;
             }
+            if (!product.yontu) {
+                ElMessage({ message: `第${i + 1}行产品：请填写用途`, type: 'error' });
+                return false;
+            }
+
         }
     }
 
     return true;
 };
 
-// 提交申请
-const submitProcurement = async () => {
+// 新增申请提交
+const submitAddProcurement = async () => {
+    // 在提交前，为所有产品行重新计算并保存总价
+    form.value.opsCaigouPlanChanpinBos.forEach(product => {
+        calculateTotalPrice(product);
+    });
+    // 表单验证
+    if (!validateForm()) {
+        return;
+    }
+    try {
+        // 确认提交
+        await ElMessageBox.confirm(
+            '确定要提交采购申请单吗？提交后将进入审批流程，不可撤销。',
+            '确认操作',
+            {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }
+        );
+        // 调用新增提交函数
+        await addCaigouPlanSubmit();
+    } catch (error) {
+        // 处理用户取消或其他错误
+        if (error !== 'cancel') {
+            ElMessage({ message: '提交过程中发生错误，请重试', type: 'error' });
+        }
+    }
+}
+
+// 更新申请提交
+const submitUpdateProcurement = async () => {
     // 在提交前，为所有产品行重新计算并保存总价
     form.value.opsCaigouPlanChanpinBos.forEach(product => {
         calculateTotalPrice(product);
@@ -785,34 +1148,138 @@ const submitProcurement = async () => {
     try {
         // 确认提交
         await ElMessageBox.confirm(
-            '确定要提交采购申请单吗？提交后将进入审批流程，不可撤销。', 
-            '确认提交', 
+            '确定要更新采购申请单吗？',
+            '确认操作',
             {
-                confirmButtonText: '确认提交',
+                confirmButtonText: '确认',
                 cancelButtonText: '取消',
                 type: 'warning'
             }
         );
 
-        // 调用提交函数
-        await addCaigouPlans();
+        // 调用更新提交函数
+        await updateCaigouPlanSubmit();
 
     } catch (error) {
         // 处理用户取消或其他错误
         if (error !== 'cancel') {
-            console.error('提交采购申请单时发生错误:', error);
-            ElMessage({ message: '提交过程中发生错误，请重试', type: 'error' });
+            ElMessage({ message: '更新过程中发生错误，请重试', type: 'error' });
         }
     }
 }
-    // });
 
-// 处理文件上传完成后获取完整文件列表
-const handleUpdateFileList = (fileList) => {
-    form.value.opsCaigouPlanFilesBos = fileList.map(file => ({
-        fileId: file.ossId,
-        fileName: file.name,
-        fileUrl: file.url,
-    }));
+
+
+// 检查表单是否有内容
+const hasFormContent = () => {
+    // 检查基础信息字段
+    if (form.value.jihuaName || 
+        form.value.hetonName || 
+        form.value.hetonType || 
+        form.value.caigouType || 
+        form.value.cangkuUrl || 
+        form.value.danwei || 
+        form.value.chuhuoTime || 
+        form.value.fukuantiaojian || 
+        form.value.fapiaoKjfs ||
+        form.value.reason) {
+        return true;
+    }
+    
+    // 检查产品信息
+    if (form.value.opsCaigouPlanChanpinBos) {
+        for (const product of form.value.opsCaigouPlanChanpinBos) {
+            if (product.chanpinName || 
+                product.chanpinType || 
+                product.chanpinMonovalent || 
+                product.goumaiNumber || 
+                product.danwei || 
+                product.yontu) {
+                return true;
+            }
+        }
+    }
+    
+    // 检查附件
+    if (form.value.opsCaigouPlanFilesBos && form.value.opsCaigouPlanFilesBos.length > 0) {
+        return true;
+    }
+    
+    return false;
 };
+
+// 取消操作
+const cancelOperation = async () => {
+    // 检查是否有表单内容
+    if (hasFormContent()) {
+        try {
+            // 提示用户确认是否放弃编辑
+            await ElMessageBox.confirm(
+                '您有未保存的内容，确定要取消吗？',
+                '确认取消',
+                {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }
+            );
+            // 重置表单
+            resetNewProcurementForm();
+            // 关闭对话框
+            isDialogVisible.value = false;
+        } catch (error) {
+            // 用户取消了确认操作
+            if (error !== 'cancel') {
+                console.error('取消操作时发生错误:', error);
+            }
+            // 不执行任何操作，保持对话框打开
+        }
+    } else {
+        // 没有表单内容，直接关闭对话框并重置
+        resetNewProcurementForm();
+        isDialogVisible.value = false;
+    }
+};
+
+// 保存草稿
+const saveDraft = async () => {
+    buttonLoading.value = true;
+    try {
+        // 检查是否有计划名称
+        if (!form.value.jihuaName || !form.value.jihuaName.trim()) {
+            ElMessage({ message: '请填写计划名称后再保存草稿', type: 'warning' });
+            return;
+        }
+        
+        // 获取草稿存储
+        const procurementDraftStore = useProcurementDraftStore();
+        
+        // 保存草稿到pinia存储
+        const savedDraft = procurementDraftStore.saveDraft(form.value.jihuaName, form.value);
+        
+        // 显示成功消息
+        ElMessage({ message: '草稿保存成功', type: 'success' });
+        
+        // 关闭对话框
+        isDialogVisible.value = false;
+    } catch (error) {
+        ElMessage({ message: '草稿保存失败，请重试', type: 'error' });
+    } finally {
+        buttonLoading.value = false;
+    }
+};
+
+// 组件卸载时清除草稿
+onUnmounted(() => {
+    try {
+        // 获取草稿存储
+        const procurementDraftStore = useProcurementDraftStore();
+        // 清除所有草稿
+        procurementDraftStore.clearAllDrafts();
+    } catch (error) {
+        console.error('组件卸载时清除草稿失败:', error);
+        // 这里不显示错误消息，因为组件已经卸载
+    }
+});
+
 </script>
\ No newline at end of file
diff --git a/src/views/materialManagement/spareParts.vue b/src/views/materialManagement/spareParts.vue
index 9f2aad0..a9f4edc 100644
--- a/src/views/materialManagement/spareParts.vue
+++ b/src/views/materialManagement/spareParts.vue
@@ -214,7 +214,7 @@
                             <dict-tag :options="wz_inventory_type" :value="scope.row.kucunStatus"></dict-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template #default="scope">
                             <el-button type="text" @click="handleUpdate(scope.row)"
                                 v-hasPermi="['personnel:beipinBeijian:edit']">编辑</el-button>
@@ -223,7 +223,7 @@
                             <el-button type="text" @click="handleDelete(scope.row)"
                                 v-hasPermi="['personnel:beipinBeijian:remove']">删除</el-button>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
                 <div class="pagination-section">
                     <div class="pagination-info">
@@ -252,7 +252,7 @@
                     <el-input v-model="form.guigexinghao" placeholder="请输入规格型号" />
                 </el-form-item>
                 <el-form-item label="库存数量" prop="kucunCount">
-                    <el-input v-model="form.kucunCount" placeholder="请输入库存数量" />
+                    <el-input v-model="form.kucunCount" placeholder="请输入库存数量" type="number" min="0" />
                 </el-form-item>
                 <el-form-item label="库存状态" prop="kucunStatus">
                     <el-select v-model="form.kucunStatus" placeholder="请选择库存状态">
@@ -260,12 +260,12 @@
                             :value="dict.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备类型" prop="shebeiType">
+                <!-- <el-form-item label="设备类型" prop="shebeiType">
                     <el-select v-model="form.shebeiType" placeholder="请选择设备类型">
                         <el-option v-for="dict in wz_device_type" :key="dict.value" :label="dict.label"
                             :value="dict.value"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
             <template #footer>
                 <div class="dialog-footer">
@@ -408,7 +408,7 @@ const userStore = useUserStore();
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-import { listBeipinBeijian, getBeipinBeijian, delBeipinBeijian, updateBeipinBeijian } from '@/api/wuziguanli/beijian';
+import { listBeipinBeijian, getBeipinBeijian, delBeipinBeijian, updateBeipinBeijian,chuRuKuTotal } from '@/api/wuziguanli/beijian';
 import { BeipinBeijianVO, BeipinBeijianQuery, BeipinBeijianForm } from '@/api/wuziguanli/beijian/types';
 
 
@@ -502,6 +502,18 @@ const getDictLabel = (dictType, value) => {
     return option?.label || value;
 };
 
+//查询总览
+const getTotalView= async () => {
+    try {
+        const res = await chuRuKuTotal({projectId: queryParams.value.projectId});
+        console.log(res);
+        
+        total.value = res.total;
+    } catch (error) {
+        proxy?.$modal.msgError('获取数据失败，请重试');
+    }
+}
+
 /** 查询运维-物资-备品配件列表 */
 const getList = async () => {
     loading.value = true;
@@ -511,7 +523,6 @@ const getList = async () => {
         total.value = res.total;
     } catch (error) {
         proxy?.$modal.msgError('获取数据失败，请重试');
-        console.error('获取备品配件列表失败:', error);
     } finally {
         loading.value = false;
     }
@@ -555,7 +566,6 @@ const handleUpdate = async (row?: BeipinBeijianVO) => {
         dialog.visible = true;
     } catch (error) {
         proxy?.$modal.msgError('获取数据失败，请重试');
-        console.error('获取备品配件详情失败:', error);
     }
 }
 
@@ -572,7 +582,6 @@ const handleDetail = async (row?: BeipinBeijianVO) => {
         detailDialogVisible.value = true;
     } catch (error) {
         proxy?.$modal.msgError('获取数据失败，请重试');
-        console.error('获取备品配件详情失败:', error);
     }
 }
 
@@ -595,7 +604,6 @@ const submitForm = () => {
                 await getList();
             } catch (error) {
                 proxy?.$modal.msgError('操作失败，请重试');
-                console.error('提交表单失败:', error);
             } finally {
                 buttonLoading.value = false;
             }
@@ -620,7 +628,6 @@ const handleDelete = async (row?: BeipinBeijianVO) => {
         // 如果是用户取消确认，则不显示错误信息
         if (error !== 'cancel') {
             proxy?.$modal.msgError('删除失败，请重试');
-            console.error('删除数据失败:', error);
         }
     } finally {
         loading.value = false;
@@ -644,6 +651,8 @@ watch(() => userStore.selectedProject, (newProject) => {
 
 onMounted(() => {
     getList();
+    // 初始化查询总览
+    getTotalView();
 });
 
 // 组件卸载时清空projectId
diff --git a/src/views/securitySurveillance/components/sbzt.vue b/src/views/securitySurveillance/components/sbzt.vue
index 8adc284..ae85a82 100644
--- a/src/views/securitySurveillance/components/sbzt.vue
+++ b/src/views/securitySurveillance/components/sbzt.vue
@@ -1,10 +1,10 @@
 <template>
     <el-card style="border-radius: 15px;">
-        <el-row gutter="35">
+        <el-row :gutter="35">
             <el-col :span="8" class="status-card">
                 <div class="title">设备状态</div>
                 <!-- gutter设置为20，创建左右间隙 -->
-                <el-row gutter="20" style="width: 100%;">
+                <el-row :gutter="20" style="width: 100%;">
                     <!-- 一行2个，每个占12格（24/2=12） -->
                     <el-col :span="12">
                         <div class="item">
@@ -120,7 +120,7 @@
     }
 
     .red {
-        ::v-deep::before {
+        :v-deep::before {
             position: absolute;
             content: '';
             background-color: rgba(227, 39, 39, 1);
@@ -133,7 +133,7 @@
     }
 
     .yellow {
-        ::v-deep::before {
+        :v-deep::before {
             position: absolute;
             content: '';
             background-color: rgba(255, 208, 35, 1);
diff --git a/src/views/securitySurveillance/components/spgl.vue b/src/views/securitySurveillance/components/spgl.vue
index a6bb236..68ffb56 100644
--- a/src/views/securitySurveillance/components/spgl.vue
+++ b/src/views/securitySurveillance/components/spgl.vue
@@ -132,7 +132,7 @@
     position: relative;
     margin: 10px 0;
 
-    ::v-deep::before {
+    :v-deep::before {
         position: absolute;
         width: 5px;
         height: 5px;