From dfd7030de93cefc4fc49c9b0a9e4cad8e52560c5 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Thu, 14 Aug 2025 19:43:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E8=B5=84=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E6=80=BB=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overallPlanMaterialSupply/index.ts        |  34 ++
 .../materials/materialsEquipment/partyA.rar   | Bin 0 -> 17074 bytes
 .../overallPlanMaterialSupply/index.vue       | 315 ++++++++++++++
 .../overallPlanMaterialSupply/indexEdit.vue   | 390 ++++++++++++++++++
 4 files changed, 739 insertions(+)
 create mode 100644 src/api/materials/overallPlanMaterialSupply/index.ts
 create mode 100644 src/views/materials/materialsEquipment/partyA.rar
 create mode 100644 src/views/materials/overallPlanMaterialSupply/indexEdit.vue

diff --git a/src/api/materials/overallPlanMaterialSupply/index.ts b/src/api/materials/overallPlanMaterialSupply/index.ts
new file mode 100644
index 0000000..bf856e1
--- /dev/null
+++ b/src/api/materials/overallPlanMaterialSupply/index.ts
@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+// 获取主数据列表
+export const obtainMasterDataList = (params: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/queryList',
+    method: 'get',
+    params
+  });
+};
+
+// 总供应计划列表
+export const totalsupplyplan = (params: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/list',
+    method: 'get',
+    params
+  });
+};
+// 总供应计划详细信息
+export const totalSupplyplanDetails = (id: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/' + id,
+    method: 'get',
+  });
+};
+// 修改物资-总供应计划
+export const materialChangeSupplyplan = (data: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan',
+    method: 'put',
+    data
+  });
+};
\ No newline at end of file
diff --git a/src/views/materials/materialsEquipment/partyA.rar b/src/views/materials/materialsEquipment/partyA.rar
new file mode 100644
index 0000000000000000000000000000000000000000..85d82761418d18ec63147456424f91439d6c2978
GIT binary patch
literal 17074
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

literal 0
HcmV?d00001

diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index e69de29..6bc4248 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -0,0 +1,315 @@
+<template>
+    <div class="overall-plan-material-supply">
+        <!-- tabPosition="left" -->
+        <el-card shadow="always">
+            <el-form :inline="true">
+                <el-form-item>
+                    <el-button v-if="state.masterData.status == 'draft'" type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'" icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-table :data="state.tableData" v-loading="state.loading.list" stripe
+            style="width: 100%; margin-bottom: 20px; height: calc(100vh - 230px)" row-key="id" border>
+            <el-table-column prop="num" label="编号" />
+            <el-table-column prop="name" label="工程或费用名称" />
+            <el-table-column prop="unit" label="单位" />
+            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="remark" label="备注" />
+            <el-table-column label="操作">
+                <template #default="{ row }">
+                    <el-button :disabled="state.masterData.status == 'waiting' || state.masterData.status == 'finish'" type="primary" @click="editApprovalSheet(row)">修改</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 编辑 -->
+        <el-dialog v-model="visible" title="修改物料信息" :width="800" :close-on-click-modal="false" @close="handleClose">
+            <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="批次号" prop="batchNumber">
+                            <el-input disabled v-model="formData.batchNumber" placeholder="请输入批次号" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="品牌" prop="brand">
+                            <el-input v-model="formData.brand" placeholder="请输入品牌" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 物料属性区域 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="材质" prop="texture">
+                            <el-input v-model="formData.texture" placeholder="请输入材质" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="质量标准" prop="qualityStandard">
+                            <el-input v-model="formData.qualityStandard" placeholder="请输入质量标准" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 日期与状态区域 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="使用部位" prop="partUsed">
+                            <el-input v-model="formData.partUsed" placeholder="请输入使用部位" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="交货地点" prop="deliveryPoints">
+                            <el-input v-model="formData.deliveryPoints" placeholder="请输入交货地点" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 其他信息区域 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="预计使用日期" prop="dateService">
+                            <el-date-picker v-model="formData.dateService" type="date" placeholder="选择预计使用日期"
+                                format="YYYY-MM-DD" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" placeholder="请输入备注信息" type="textarea" rows="3" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="handleSubmit">确定</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="billofQuantities">
+import { ref, reactive, onMounted, computed, getCurrentInstance } from 'vue';
+import { obtainMasterDataList, totalsupplyplan, totalSupplyplanDetails, materialChangeSupplyplan } from '@/api/materials/overallPlanMaterialSupply/index';
+import { useUserStoreHook } from '@/store/modules/user';
+import { edit } from '@/api/workflow/definition';
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const { proxy } = getCurrentInstance();
+const visible = ref(false);
+const formRef = ref(null);
+const state = reactive({
+    tableData: [],
+    queryForm: {
+        projectId: currentProject.value?.id,
+        versions: '',
+        sheet: '',
+        pageSize: 20,
+        pageNum: 1
+    },
+    loading: {
+        versions: false,
+        sheets: false,
+        list: false
+    },
+    // 主id
+    masterData: {}
+    
+});
+// 表单数据
+const formData = reactive({
+    batchNumber: '',
+    brand: '',
+    compileDate: '',
+    dateService: '',
+    deliveryPoints: '',
+    id: undefined,
+    name: '',
+    num: '',
+    partUsed: '',
+    planNumber: '',
+    projectId: undefined,
+    qualityStandard: '',
+    quantity: 0,
+    remark: '',
+    specification: '',
+    status: '',
+    texture: '',
+    unit: ''
+});
+// 表单验证规则
+const formRules = reactive({
+    name: [
+        { required: true, message: '请输入名称', trigger: 'blur' },
+        { max: 100, message: '名称长度不能超过100个字符', trigger: 'blur' }
+    ],
+    num: [
+        { required: true, message: '请输入编号', trigger: 'blur' },
+        { max: 50, message: '编号长度不能超过50个字符', trigger: 'blur' }
+    ],
+    quantity: [
+        { required: true, message: '请输入数量', trigger: 'blur' },
+        { type: 'number', min: 0, message: '数量不能为负数', trigger: 'blur' }
+    ],
+    compileDate: [
+        { required: true, message: '请选择编制日期', trigger: 'change' }
+    ]
+});
+// 获取主表数据
+async function getMasterDataList() {
+    try {
+        // 获取主数据列表
+        state.loading.list = true;
+        const masterDataRes = await obtainMasterDataList({
+            projectId: currentProject.value?.id
+        });
+
+        const { data: masterData } = masterDataRes;
+        console.log('masterData', masterData);
+
+        if (!masterData[0].id) {
+            console.warn('未获取到有效的主数据ID');
+            state.tableData = [];
+            return;
+        }
+        state.masterData = masterData[0];
+
+        // 获取供应计划
+        const supplyPlanRes = await totalsupplyplan({ id: masterData[0].id });
+
+        // 处理结果
+        if (supplyPlanRes.list == null) {
+            state.tableData = supplyPlanRes.rows || [];
+            console.log('state.tableData', state.tableData);
+        } else {
+            // 根据实际业务逻辑处理有list的情况
+            state.tableData = [];
+        }
+
+    } catch (error) {
+        console.error('获取主数据列表失败:', error);
+        // 错误情况下给默认值，避免页面出错
+        state.tableData = [];
+    } finally {
+        state.loading.list = false;
+    }
+}
+// 获取详情
+// 修改获取详情的方法
+async function totalSupplyplanDetail(id) {
+    try {
+        const result = await totalSupplyplanDetails(id);
+        if (result?.code === 200) {
+            const detailData = result.data || {};
+            // 1. 清空原有表单数据
+            Object.keys(formData).forEach(key => {
+                formData[key] = undefined;
+            });
+            // 2. 处理日期格式（假设接口返回的是Date对象或ISO字符串）
+            const formatDate = (date) => {
+                if (!date) return '';
+                // 若为字符串，先转为Date对象
+                const d = typeof date === 'string' ? new Date(date) : date;
+                return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+            };
+            // 3. 合并数据到formData（响应式赋值）
+            Object.assign(formData, {
+                ...detailData,
+                // 单独处理日期字段，转为表单可识别的字符串格式
+                compileDate: formatDate(detailData.compileDate),
+                dateService: formatDate(detailData.dateService)
+            });
+            console.log('表单数据已更新:', formData);
+        } else {
+            ElMessage.error(`获取详情失败: ${result?.msg || '未知错误'}`);
+        }
+    } catch (err) {
+        ElMessage.error(`接口请求失败: ${err.message}`);
+        console.error('详情接口错误:', err);
+    } finally {
+        state.loading.list = false;
+    }
+}
+// 修改
+function editApprovalSheet(row) {
+    console.log(row);
+    totalSupplyplanDetail(row.id)
+    visible.value = true;
+}
+// 提交表单
+const handleSubmit = async () => {
+    try {
+        // 表单验证
+        await formRef.value.validate();
+        // 触发提交事件
+        console.log('submitData:', formData);
+        editMaterialSupply(formData);
+        handleClose();
+    } catch (error) {
+        // 验证失败不提交
+        console.error('表单验证失败:', error);
+        return;
+    }
+};
+// 修改物资
+function editMaterialSupply(formData) {
+    materialChangeSupplyplan(formData).then(res => {
+        if (res.code === 200) {
+            ElMessage.success('修改成功');
+        } else {
+            ElMessage.error('修改失败');
+        }
+    });
+}
+
+// 关闭弹窗
+const handleClose = () => {
+    visible.value = false;
+    // 清空表单数据
+    Object.keys(formData).forEach(key => {
+        formData[key] = undefined;
+    });
+    // 重置表单验证状态
+    formRef.value?.resetFields();
+};
+
+// 审批
+function clickApprovalSheet1() {
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.push({
+        path: `/materials/overallPlanMaterialSupply/indexEdit`,
+        query: {
+            id: state.masterData.id,
+            type: 'update'
+        }
+    });
+}
+// 审核流程
+function lookApprovalFlow() {
+    proxy.$router.push({
+        path: `/materials/overallPlanMaterialSupply/indexEdit`,
+        query: {
+            id: state.masterData.id,
+            type: 'view'
+        }
+    });
+}
+onMounted(() => {
+    getMasterDataList();
+})
+</script>
+<style>
+.overall-plan-material-supply {
+    padding: 20px;
+}
+
+.space-y-4>.el-row {
+    margin-bottom: 16px;
+}
+
+.space-y-4>.el-row:last-child {
+    margin-bottom: 0;
+}
+</style>
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
new file mode 100644
index 0000000..714a7f4
--- /dev/null
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton @submitForm="submitForm" @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord" :buttonLoading="buttonLoading" :id="form.id"
+          :status="form.status" :pageType="routeParams.type" />
+      </el-card>
+      <!-- 表单区域 -->
+      <el-card
+        class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">设计原则</h3>
+        </div>
+        <div class="p-6">
+          <!-- <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view' || routeParams.type === 'update'" :model="form"
+            :rules="rules" label-width="100px" class="space-y-4">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="批次号" prop="batchNumber">
+                  <el-input disabled v-model="form.batchNumber" placeholder="请输入批次号" clearable />
+                </el-form-item>
+              </el-col>
+             <el-col :span="12">
+                <el-form-item label="品牌" prop="brand">
+                  <el-input v-model="form.brand" placeholder="请输入品牌" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="材质" prop="texture">
+                  <el-input v-model="form.texture" placeholder="请输入材质" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="质量标准" prop="qualityStandard">
+                  <el-input v-model="form.qualityStandard" placeholder="请输入质量标准" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+               <el-col :span="12">
+                <el-form-item label="使用部位" prop="partUsed">
+                  <el-input v-model="form.partUsed" placeholder="请输入使用部位" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="交货地点" prop="deliveryPoints">
+                  <el-input v-model="form.deliveryPoints" placeholder="请输入交货地点" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+               <el-col :span="12">
+                <el-form-item label="预计使用日期" prop="dateService">
+                  <el-date-picker v-model="form.dateService" type="date" placeholder="选择预计使用日期" format="YYYY-MM-DD" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" placeholder="请输入备注信息" type="textarea" rows="3" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form> -->
+          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+            <el-table-column prop="num" label="编号" />
+            <el-table-column prop="name" label="名称" />
+            <el-table-column prop="specification" label="规格" />
+            <el-table-column prop="unit" label="单位" />
+            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="remark" label="备注" />
+          </el-table>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog draggable v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose"
+        width="500" class="rounded-lg shadow-lg">
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose"
+              class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors">取消</el-button>
+            <el-button type="primary" @click="submitFlow()"
+              class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+import { totalsupplyplan,obtainMasterDataList } from '@/api/materials/overallPlanMaterialSupply/index';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_totalsupplyplan',
+    label: '物资总计划审核'
+  }
+];
+
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  batchNumber: '',
+  brand: '',
+  compileDate: '',
+  dateService: '',
+  deliveryPoints: '',
+  id: undefined,
+  name: '',
+  num: '',
+  partUsed: '',
+  planNumber: '',
+  projectId: undefined,
+  qualityStandard: '',
+  quantity: 0,
+  remark: '',
+  specification: '',
+  status: '',
+  texture: '',
+  unit: ''
+};
+const data = reactive({
+  form: { ...initFormData },
+  tableData: [],
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules, tableData } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const masterDataRes = await obtainMasterDataList({ projectId: currentProject.value?.id });
+    const res = await totalsupplyplan(routeParams.value.id);
+    console.log('res.data', masterDataRes);
+    Object.assign(form.value, masterDataRes?.data[0]);
+    // console.log('form', form.value);
+    tableData.value = res.rows;
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+      console.log('routeParams.value', routeParams.value);
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>

From 8ececf8c12b322303946dfa5b85c6da9f9f10c76 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Thu, 14 Aug 2025 22:08:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=80=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/materials/usageMaterials/index.ts     |  41 ++
 .../overallPlanMaterialSupply/index.vue       |  27 +-
 .../overallPlanMaterialSupply/indexEdit.vue   |   2 +-
 .../usageMaterials/material/index.vue         | 626 ++++++++++++++++++
 .../usageMaterials/purchase/index.vue         | 176 +++++
 6 files changed, 849 insertions(+), 25 deletions(-)
 create mode 100644 src/api/materials/usageMaterials/index.ts
 create mode 100644 src/views/materials/usageMaterials/material/index.vue
 create mode 100644 src/views/materials/usageMaterials/purchase/index.vue

diff --git a/.env.development b/.env.development
index 21892b7..fe20df3 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.180:8898'
+VITE_APP_BASE_API = 'http://192.168.110.159:8898'
 
 # 无人机接口地址
 
diff --git a/src/api/materials/usageMaterials/index.ts b/src/api/materials/usageMaterials/index.ts
new file mode 100644
index 0000000..f2a860e
--- /dev/null
+++ b/src/api/materials/usageMaterials/index.ts
@@ -0,0 +1,41 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+// 查询物资-使用情况列表
+export const useMaterialsQueryList = (params: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply/list',
+    method: 'get',
+    params
+  });
+};
+
+// 新增物资
+export const newMaterialsAdd = (data: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply',
+    method: 'post',
+    data
+  });
+};
+// 修改物资
+export const materialsEdit = (data: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply',
+    method: 'put',
+    data
+  });
+};
+// 删除物资
+export const materialsDel = (id: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply/' + id,
+    method: 'delete',
+  });
+};
+// 获取物资详情
+export const queryMaterialsInfo = (id: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/physicalsupply/' + id,
+    method: 'get',
+  });
+};
\ No newline at end of file
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index f8ebf58..af49aa1 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -1,14 +1,13 @@
 <template>
-<<<<<<< HEAD
     <div class="overall-plan-material-supply">
         <!-- tabPosition="left" -->
         <el-card shadow="always">
             <el-form :inline="true">
-                <el-form-item>
-                    <el-button v-if="state.masterData.status == 'draft'" type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
+                <el-form-item v-if="state.masterData.status == 'draft'">
+                    <el-button type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
                 </el-form-item>
-                <el-form-item>
-                    <el-button v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'" icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+                <el-form-item v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'">
+                    <el-button icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
                 </el-form-item>
             </el-form>
         </el-card>
@@ -95,7 +94,6 @@
 import { ref, reactive, onMounted, computed, getCurrentInstance } from 'vue';
 import { obtainMasterDataList, totalsupplyplan, totalSupplyplanDetails, materialChangeSupplyplan } from '@/api/materials/overallPlanMaterialSupply/index';
 import { useUserStoreHook } from '@/store/modules/user';
-import { edit } from '@/api/workflow/definition';
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const { proxy } = getCurrentInstance();
@@ -314,20 +312,3 @@ onMounted(() => {
     margin-bottom: 0;
 }
 </style>
-=======
-  <div>init</div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  setup() {
-    // todo
-    return {};
-  }
-});
-</script>
-
-<style lang="stylus" scoped></style>
->>>>>>> 90e6ddc21241aecd8dcdfb84d82b9283ab193ccf
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index 714a7f4..f1836ce 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -67,7 +67,7 @@
               </el-col>
             </el-row>
           </el-form> -->
-          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+          <el-table :data="tableData" v-loading="loading"  row-key="id" border>
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="specification" label="规格" />
diff --git a/src/views/materials/usageMaterials/material/index.vue b/src/views/materials/usageMaterials/material/index.vue
new file mode 100644
index 0000000..8d3ed0a
--- /dev/null
+++ b/src/views/materials/usageMaterials/material/index.vue
@@ -0,0 +1,626 @@
+<template>
+  <div class="min-h-screen bg-gray-50 flex flex-col">
+    <!-- 主要内容区 -->
+    <main class="flex-1 p-6">
+      <!-- 操作栏 -->
+      <div class="bg-white rounded-lg shadow-sm p-4 mb-6 transition-all duration-300 hover:shadow-md">
+        <div class="flex flex-wrap items-center justify-between gap-4">
+          <!-- <div class="flex flex-wrap items-center gap-4">
+            <el-select 
+              v-model="searchForm.findType" 
+              placeholder="选择查询类型" 
+              class="w-[180px]"
+              @change="handleSearch"
+            >
+              <el-option label="采购" value="1"></el-option>
+              <el-option label="材料" value="2"></el-option>
+              <el-option label="查询所有" value="3"></el-option>
+            </el-select>
+            <el-input
+              v-model="searchForm.keyword"
+              placeholder="输入材料名称或供应商搜索"
+              class="w-[250px]"
+              clearable
+              @keyup.enter="handleSearch"
+            >
+              <template #append>
+                <el-button icon="Search" @click="handleSearch"></el-button>
+              </template>
+            </el-input>
+          </div> -->
+          <!-- 操作按钮 -->
+          <div class="flex gap-2">
+            <el-button 
+              type="primary" 
+              icon="Plus" 
+              @click="handleAdd"
+              class="transition-all duration-200 hover:shadow-md"
+            >
+              新增
+            </el-button>
+            <el-button 
+              icon="Refresh" 
+              @click="refreshData"
+              class="transition-all duration-200 hover:shadow-md"
+            >
+              刷新
+            </el-button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 数据表格 -->
+      <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          border
+          stripe
+          :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
+          :row-class-name="tableRowClassName"
+          @row-dblclick="handleRowDblClick"
+        >
+          <el-table-column prop="id" label="ID" width="80" align="center"></el-table-column>
+          <el-table-column prop="name" label="材料名称" min-width="150"></el-table-column>
+          <el-table-column prop="specification" label="规格" min-width="120"></el-table-column>
+          <el-table-column prop="supplier" label="供应商" min-width="150"></el-table-column>
+          <el-table-column 
+            prop="findType" 
+            label="类型" 
+            width="100" 
+            align="center"
+          >
+            <template #default="scope">
+              <el-tag :type="scope.row.findType === '1' ? 'success' : 'info'">
+                {{ scope.row.findType === '1' ? '采购' : '材料' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="installationQuantity" label="安装量" width="100" align="center"></el-table-column>
+          <el-table-column 
+            prop="contractSigning" 
+            label="合同签订时间" 
+            width="180" 
+            align="center"
+          >
+            <template #default="scope">
+              {{ formatDate(scope.row.contractSigning) }}
+            </template>
+          </el-table-column>
+          <el-table-column 
+            prop="createTime" 
+            label="创建时间" 
+            width="180" 
+            align="center"
+          >
+            <template #default="scope">
+              {{ formatDate(scope.row.createTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column 
+            label="操作" 
+            width="180" 
+            align="center"
+            fixed="right"
+          >
+            <template #default="scope">
+              <el-button 
+                size="small" 
+                icon="Edit" 
+                @click="handleEdit(scope.row)"
+                class="text-blue-600 hover:text-blue-800 transition-colors"
+              ></el-button>
+              <el-button 
+                size="small" 
+                icon="Delete" 
+                @click="handleDelete(scope.row)"
+                class="text-red-600 hover:text-red-800 transition-colors"
+              ></el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <div class="flex items-center justify-between p-4 border-t">
+          <div class="text-gray-500 text-sm">
+            共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
+          </div>
+          <el-pagination
+            v-model:current-page="currentPage"
+            v-model:page-size="pageSize"
+            :page-sizes="[10, 20, 50, 100]"
+            :total="total"
+            layout="prev, pager, next, jumper, sizes"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          ></el-pagination>
+        </div>
+      </div>
+    </main>
+
+    <!-- 底部信息 -->
+    <footer class="bg-white border-t border-gray-200 py-3 px-6 text-center text-gray-500 text-sm">
+      © 2023 材料/采购管理系统 - 版权所有
+    </footer>
+
+    <!-- 新增/编辑对话框 -->
+    <el-dialog
+      v-model="dialogVisible"
+      :title="dialogType === 'add' ? '新增记录' : '编辑记录'"
+      :width="dialogWidth"
+      :fullscreen="isFullscreen"
+      :before-close="handleDialogClose"
+    >
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="120px"
+        class="space-y-4"
+      >
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="材料名称" prop="name">
+              <el-input v-model="formData.name" placeholder="请输入材料名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规格" prop="specification">
+              <el-input v-model="formData.specification" placeholder="请输入规格"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="供应商" prop="supplier">
+              <el-input v-model="formData.supplier" placeholder="请输入供应商"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="findType">
+              <el-radio-group v-model="formData.findType">
+                <el-radio label="1">采购</el-radio>
+                <el-radio label="2">材料</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装量" prop="installationQuantity">
+              <el-input v-model="formData.installationQuantity" placeholder="请输入安装量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装比例" prop="installationRatio">
+              <el-input v-model="formData.installationRatio" placeholder="请输入安装比例" suffix="%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="合同签订时间" prop="contractSigning">
+              <el-date-picker
+                v-model="formData.contractSigning"
+                type="datetime"
+                placeholder="选择合同签订时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产周期(天)" prop="productionPhase">
+              <el-input v-model.number="formData.productionPhase" placeholder="请输入生产周期" type="number"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="运算周期(天)" prop="executionCycle">
+              <el-input v-model.number="formData.executionCycle" placeholder="请输入运算周期" type="number"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目ID" prop="projectId">
+              <el-input v-model.number="formData.projectId" placeholder="请输入项目ID" type="number"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="供货要求" prop="supplyRequirements">
+              <el-input
+                v-model="formData.supplyRequirements"
+                placeholder="请输入供货要求"
+                type="textarea"
+                rows="3"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="采购提交状态" prop="purchaseSubmission">
+              <el-select v-model="formData.purchaseSubmission" placeholder="请选择">
+                <el-option label="已提交" value="已提交"></el-option>
+                <el-option label="未提交" value="未提交"></el-option>
+                <el-option label="处理中" value="处理中"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="材料提交状态" prop="submissionMaterials">
+              <el-select v-model="formData.submissionMaterials" placeholder="请选择">
+                <el-option label="已提交" value="已提交"></el-option>
+                <el-option label="未提交" value="未提交"></el-option>
+                <el-option label="处理中" value="处理中"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="formData.remark"
+                placeholder="请输入备注信息"
+                type="textarea"
+                rows="3"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 隐藏的创建和更新信息 -->
+        <el-form-item prop="id" class="hidden">
+          <el-input v-model="formData.id"></el-input>
+        </el-form-item>
+        <el-form-item prop="createTime" class="hidden">
+          <el-input v-model="formData.createTime"></el-input>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <div class="flex justify-end gap-2">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button 
+            type="primary" 
+            @click="handleSave"
+            :loading="saveLoading"
+          >
+            保存
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 删除确认对话框 -->
+    <el-dialog
+      v-model="deleteDialogVisible"
+      title="确认删除"
+      width="300px"
+      :show-close="false"
+    >
+      <div class="text-center py-4">
+        <el-icon class="text-orange-500 text-4xl mb-3"><WarningFilled /></el-icon>
+        <p>确定要删除这条记录吗？</p>
+        <p class="text-gray-500 text-sm mt-2">此操作不可撤销，请谨慎操作</p>
+      </div>
+      <template #footer>
+        <div class="flex justify-center gap-2">
+          <el-button @click="deleteDialogVisible = false">取消</el-button>
+          <el-button 
+            type="danger" 
+            @click="confirmDelete"
+            :loading="deleteLoading"
+          >
+            确认删除
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, computed, toRaw } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { WarningFilled } from '@element-plus/icons-vue';
+import { useUserStoreHook } from '@/store/modules/user';
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const { proxy } = getCurrentInstance();
+import { useMaterialsQueryList,newMaterialsAdd,materialsEdit,materialsDel,queryMaterialsInfo} from "@/api/materials/usageMaterials/index";
+// 表格数据相关
+const tableData = ref([]);
+const total = ref(0);
+const currentPage = ref(1);
+const pageSize = ref(10);
+const loading = ref(false);
+
+// 搜索表单
+const searchForm = reactive({
+  findType: '3', // 默认查询所有
+  keyword: ''
+});
+
+// 对话框相关
+const dialogVisible = ref(false);
+const dialogType = ref('add'); // add 或 edit
+const dialogWidth = ref('70%');
+const isFullscreen = ref(false);
+const deleteDialogVisible = ref(false);
+const formRef = ref(null);
+const saveLoading = ref(false);
+const deleteLoading = ref(false);
+const currentRow = ref(null);
+
+// 表单数据
+const formData = reactive({
+  id: '',
+  name: '',
+  specification: '',
+  supplier: '',
+  findType: '1', // 默认采购
+  installationQuantity: '',
+  installationRatio: '',
+  contractSigning: '',
+  productionPhase: null,
+  executionCycle: null,
+  projectId: null,
+  supplyRequirements: '',
+  purchaseSubmission: '',
+  submissionMaterials: '',
+  remark: '',
+  createTime: '',
+  createBy: null,
+  updateTime: '',
+  updateBy: null
+});
+
+// 表单验证规则
+const formRules = reactive({
+  name: [
+    { required: true, message: '请输入材料名称', trigger: 'blur' },
+    { max: 50, message: '材料名称不能超过50个字符', trigger: 'blur' }
+  ],
+  supplier: [
+    { required: true, message: '请输入供应商', trigger: 'blur' },
+    { max: 100, message: '供应商名称不能超过100个字符', trigger: 'blur' }
+  ],
+  findType: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ]
+});
+
+// 初始化页面
+onMounted(() => {
+  fetchData();
+});
+
+// 格式化日期
+const formatDate = (dateString) => {
+  if (!dateString) return '-';
+  const date = new Date(dateString);
+  return date.toLocaleString('zh-CN', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit'
+  }).replace(',', ' ');
+};
+
+// 表格行样式
+const tableRowClassName = ({ row, rowIndex }) => {
+  return rowIndex % 2 === 0 ? 'bg-white' : 'bg-gray-50';
+};
+
+// 获取数据
+const fetchData = async () => {
+  loading.value = true;
+  try {
+    const res = await useMaterialsQueryList({
+      projectId: currentProject.value?.id,
+      findType:2
+    });
+
+    tableData.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  } catch (error) {
+    ElMessage.error('获取数据失败：' + error.message);
+    console.error(error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 搜索
+const handleSearch = () => {
+  currentPage.value = 1; // 重置到第一页
+  fetchData();
+};
+
+// 刷新数据
+const refreshData = () => {
+  fetchData();
+  ElMessage.success('数据已刷新');
+};
+
+// 分页大小改变
+const handleSizeChange = (val) => {
+  pageSize.value = val;
+  currentPage.value = 1;
+  fetchData();
+};
+
+// 当前页改变
+const handleCurrentChange = (val) => {
+  currentPage.value = val;
+  fetchData();
+};
+
+// 新增
+const handleAdd = () => {
+  dialogType.value = 'add';
+  resetForm();
+  dialogVisible.value = true;
+};
+
+// 编辑
+const handleEdit = (row) => {
+  dialogType.value = 'edit';
+  currentRow.value = row;
+  resetForm();
+  
+  // 填充表单数据
+  Object.keys(formData).forEach(key => {
+    if (row.hasOwnProperty(key)) {
+      formData[key] = row[key];
+    }
+  });
+  
+  dialogVisible.value = true;
+};
+
+// 双击行编辑
+const handleRowDblClick = (row) => {
+  handleEdit(row);
+};
+
+// 删除
+const handleDelete = (row) => {
+  currentRow.value = row;
+  deleteDialogVisible.value = true;
+};
+
+// 确认删除
+const confirmDelete = async () => {
+  if (!currentRow.value) return;
+  
+  deleteLoading.value = true;
+  try {
+    // 模拟API请求
+    await new Promise(resolve => setTimeout(resolve, 500));
+    
+    // 从表格中移除数据
+    tableData.value = tableData.value.filter(item => item.id !== currentRow.value.id);
+    total.value--;
+    
+    deleteDialogVisible.value = false;
+    ElMessage.success('删除成功');
+  } catch (error) {
+    ElMessage.error('删除失败：' + error.message);
+    console.error(error);
+  } finally {
+    deleteLoading.value = false;
+  }
+};
+
+// 保存
+const handleSave = async () => {
+  // 表单验证
+  if (!formRef.value) return;
+  const valid = await formRef.value.validate();
+  if (!valid) return;
+  
+  saveLoading.value = true;
+  try {
+    // 模拟API请求
+    await new Promise(resolve => setTimeout(resolve, 800));
+    
+    const form = toRaw(formData);
+    
+    if (dialogType.value === 'add') {
+      // 新增
+      const newId = Math.max(...tableData.value.map(item => item.id), 0) + 1;
+      const newItem = {
+        ...form,
+        id: newId,
+        createTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
+        createBy: 1, // 假设当前用户ID为1
+        updateTime: null,
+        updateBy: null
+      };
+      tableData.value.unshift(newItem);
+      total.value++;
+      ElMessage.success('新增成功');
+    } else {
+      // 编辑
+      const index = tableData.value.findIndex(item => item.id === form.id);
+      if (index !== -1) {
+        tableData.value[index] = {
+          ...form,
+          updateTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
+          updateBy: 1 // 假设当前用户ID为1
+        };
+        ElMessage.success('更新成功');
+      }
+    }
+    
+    dialogVisible.value = false;
+  } catch (error) {
+    ElMessage.error('保存失败：' + error.message);
+    console.error(error);
+  } finally {
+    saveLoading.value = false;
+  }
+};
+
+// 重置表单
+const resetForm = () => {
+  if (formRef.value) {
+    formRef.value.resetFields();
+  }
+  
+  // 重置表单数据
+  Object.keys(formData).forEach(key => {
+    formData[key] = '';
+  });
+  
+  // 设置默认值
+  formData.findType = '1';
+  formData.id = '';
+};
+
+// 关闭对话框
+const handleDialogClose = () => {
+  resetForm();
+  dialogVisible.value = false;
+};
+</script>
+
+<style scoped>
+/* 自定义表格行悬停样式 */
+::v-deep .el-table__row:hover > td {
+  background-color: #f0f7ff !important;
+}
+
+/* 表单间距优化 */
+::v-deep .el-form-item {
+  margin-bottom: 16px;
+}
+
+/* 对话框动画 */
+::v-deep .el-dialog__wrapper {
+  backdrop-filter: blur(2px);
+}
+
+/* 按钮样式优化 */
+::v-deep .el-button--primary {
+  transition: all 0.2s ease;
+}
+
+::v-deep .el-button--primary:hover {
+  transform: translateY(-2px);
+}
+</style>
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
new file mode 100644
index 0000000..0d331c4
--- /dev/null
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -0,0 +1,176 @@
+<template>
+    <div class="overall-plan-material-supply">
+        <!-- tabPosition="left" -->
+        <el-card shadow="always">
+            <el-form :inline="true">
+                <el-form-item v-if="state.masterData.status == 'draft'">
+                    <el-button type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
+                </el-form-item>
+                <el-form-item v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'">
+                    <el-button icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-table :data="state.tableData" v-loading="state.loading.list" stripe
+            style="width: 100%; margin-bottom: 20px; height: calc(100vh - 230px)" row-key="id" border>
+            <el-table-column prop="num" label="编号" />
+            <el-table-column prop="name" label="工程或费用名称" />
+            <el-table-column prop="unit" label="单位" />
+            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="remark" label="备注" />
+            <el-table-column label="操作">
+                <template #default="{ row }">
+                    <el-button :disabled="state.masterData.status == 'waiting' || state.masterData.status == 'finish'" type="primary" @click="editApprovalSheet(row)">修改</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 编辑 -->
+        <el-dialog v-model="visible" title="修改物料信息" :width="800" :close-on-click-modal="false" @close="handleClose">
+            <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="批次号" prop="batchNumber">
+                            <el-input disabled v-model="formData.batchNumber" placeholder="请输入批次号" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="品牌" prop="brand">
+                            <el-input v-model="formData.brand" placeholder="请输入品牌" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 物料属性区域 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="材质" prop="texture">
+                            <el-input v-model="formData.texture" placeholder="请输入材质" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="质量标准" prop="qualityStandard">
+                            <el-input v-model="formData.qualityStandard" placeholder="请输入质量标准" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 日期与状态区域 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="使用部位" prop="partUsed">
+                            <el-input v-model="formData.partUsed" placeholder="请输入使用部位" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="交货地点" prop="deliveryPoints">
+                            <el-input v-model="formData.deliveryPoints" placeholder="请输入交货地点" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 其他信息区域 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="预计使用日期" prop="dateService">
+                            <el-date-picker v-model="formData.dateService" type="date" placeholder="选择预计使用日期"
+                                format="YYYY-MM-DD" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" placeholder="请输入备注信息" type="textarea" rows="3" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="handleSubmit">确定</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="billofQuantities">
+import { ref, reactive, onMounted, computed, getCurrentInstance } from 'vue';
+import { obtainMasterDataList, totalsupplyplan, totalSupplyplanDetails, materialChangeSupplyplan } from '@/api/materials/overallPlanMaterialSupply/index';
+import { useUserStoreHook } from '@/store/modules/user';
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const { proxy } = getCurrentInstance();
+const visible = ref(false);
+const formRef = ref(null);
+const state = reactive({
+    tableData: [],
+    queryForm: {
+        projectId: currentProject.value?.id,
+        versions: '',
+        sheet: '',
+        pageSize: 20,
+        pageNum: 1
+    },
+    loading: {
+        versions: false,
+        sheets: false,
+        list: false
+    },
+    // 主id
+    masterData: {}
+    
+});
+// 表单数据
+const formData = reactive({
+    batchNumber: '',
+    brand: '',
+    compileDate: '',
+    dateService: '',
+    deliveryPoints: '',
+    id: undefined,
+    name: '',
+    num: '',
+    partUsed: '',
+    planNumber: '',
+    projectId: undefined,
+    qualityStandard: '',
+    quantity: 0,
+    remark: '',
+    specification: '',
+    status: '',
+    texture: '',
+    unit: ''
+});
+// 表单验证规则
+const formRules = reactive({
+    name: [
+        { required: true, message: '请输入名称', trigger: 'blur' },
+        { max: 100, message: '名称长度不能超过100个字符', trigger: 'blur' }
+    ],
+    num: [
+        { required: true, message: '请输入编号', trigger: 'blur' },
+        { max: 50, message: '编号长度不能超过50个字符', trigger: 'blur' }
+    ],
+    quantity: [
+        { required: true, message: '请输入数量', trigger: 'blur' },
+        { type: 'number', min: 0, message: '数量不能为负数', trigger: 'blur' }
+    ],
+    compileDate: [
+        { required: true, message: '请选择编制日期', trigger: 'change' }
+    ]
+});
+// 获取主表数据
+onMounted(() => {
+    getMasterDataList();
+})
+</script>
+<style>
+.overall-plan-material-supply {
+    padding: 20px;
+}
+
+.space-y-4>.el-row {
+    margin-bottom: 16px;
+}
+
+.space-y-4>.el-row:last-child {
+    margin-bottom: 0;
+}
+</style>