diff --git a/src/api/model/mpr.js b/src/api/model/mpr.js
index c0a2b30b..f78f0772 100644
--- a/src/api/model/mpr.js
+++ b/src/api/model/mpr.js
@@ -1,6 +1,38 @@
 import config from "@/config"
 import http from "@/utils/request"
 export default {
+	warehouse: {
+		list: {
+			name: "库房列表",
+			req: async function(data){
+				return await http.get(`${config.API_URL}/mpr/warehouse/`, data);
+			}
+		},
+		create: {
+			name: "创建库房",
+			req: async function(data){
+				return await http.post(`${config.API_URL}/mpr/warehouse/`, data);
+			}
+		},
+		item: {
+			name: "获取库房详情",
+			req: async function(id){
+				return await http.get(`${config.API_URL}/mpr/warehouse/${id}/`);
+			}
+		},
+		update: {
+			name: "更新库房",
+			req: async function(id, data){
+				return await http.put(`${config.API_URL}/mpr/warehouse/${id}/`, data);
+			}
+		},
+		delete: {
+			name: "删除库房",
+			req: async function(id){
+				return await http.delete(`${config.API_URL}/mpr/warehouse/${id}/`);
+			}
+		},
+	},
 	requisition: {
 		list: {
 			name: "申购单列表",
diff --git a/src/config/route.js b/src/config/route.js
index d0f28f8b..6ee83b9d 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2102,6 +2102,15 @@ const routes = [
 					perms: ["mpr"],
 				},
 				children: [
+					{
+						name: "mpr_warehouse",
+						path: "/mpr/warehouse",
+						meta: {
+							title: "库房管理",
+							perms: ["mpr_warehouse"],
+						},
+						component: "mpr/warehouse",
+					},
 					{
 						name: "requisition",
 						path: "/mpr/requisition",
diff --git a/src/views/enm_energy/carbon_ly.vue b/src/views/enm_energy/carbon_ly.vue
deleted file mode 100644
index dc7f06a0..00000000
--- a/src/views/enm_energy/carbon_ly.vue
+++ /dev/null
@@ -1,1036 +0,0 @@
-<!-- 全厂水量统计 -->
-<template>
-	<div class="app-container" id="app-container" style="height: 40%">
-		<el-header id="app-header">
-			<div class="left-panel">
-				<el-select
-                    v-model="query.type"
-                    placeholder="查询类型"
-                    clearable
-                    class="headerSearch"
-                    @change="typeCange"
-                >
-				<el-option
-                    v-for="item in options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    ></el-option>
-				</el-select>
-                <!-- <el-date-picker 
-					v-model="daterange" 
-					type="datetimerange" 
-					value-format="YYYY-MM-DD HH:mm:ss" 
-					range-separator="至"
-					start-placeholder="开始时间" 
-					end-placeholder="结束时间"
-					format="YYYY-MM-DD HH"
-                    popper-class="tpc"
-					v-if="query.type==3"
-					@change="changeDate"
-					/> -->
-
-				<el-date-picker
-					v-model="query.day"
-					type="date"
-					value-format="YYYY-MM-DD"
-					format="YYYY-MM-DD"
-					placeholder="天"
-					v-if="query.type==0"
-					style="margin-right: 6px"
-				/>
-				<el-date-picker
-                    v-model="query.month"
-                    type="month"
-                    value-format="YYYY-MM"
-                    format="YYYY-MM"
-                    placeholder="查询月份"
-                    v-if="query.type==1"
-                    class="headerSearch"
-                />
-				<el-date-picker
-				v-model="query.year"
-                    type="year"
-                    value-format="YYYY"
-                    format="YYYY"
-                    placeholder="查询年份"
-                    v-if="query.type==2"
-                    class="headerSearch"
-					/>
-				<el-button
-					type="primary"
-					icon="el-icon-search"
-					@click="dateChange"
-				></el-button>
-				<!-- <el-button
-					type="primary"
-					@click="exportExcel()"
-					:loading="exportLoading"
-					v-auth="'export_excel'"
-					>导出xlsx
-				</el-button> -->
-				<el-button type="primary" @click="handlePrint">打印 </el-button>
-			</div>
-		</el-header>
-		<el-main>
-			<el-card>
-				<div>
-					<div ref="print" id="myReport" class="printContainer">
-						<el-table
-							v-if="query.type==0"
-							id="hourBaseTable"
-							:data="tableDatas2"
-							style="width: 100%"
-							border
-							:height="tableHeight"
-							@cell-click="handleCellClick"
-						>
-							<el-table-column
-								label="分类"
-								prop="nickname"
-								width="110"
-								fixed
-							>
-							</el-table-column>
-							<el-table-column label="单位" prop="unit" fixed>
-							</el-table-column>
-							<el-table-column
-								v-for="(item, index) in 24"
-								:key="item"
-								:label="index + '时'"
-								:prop="index + '时'"
-								width="120"
-							>
-							</el-table-column>
-							<!-- <el-table-column
-								label="合计"
-								prop="sum"
-								width="130"
-								fixed="right"
-							>
-							</el-table-column> -->
-						</el-table>
-						<el-table
-							v-if="query.type==1"
-							id="hourBaseTable"
-							:data="tableDatas_day"
-							style="width: 100%"
-							border
-							:height="tableHeight"
-							
-						>
-							<el-table-column
-								label="分类"
-								prop="nickname"
-								width="110"
-								fixed
-							>
-							</el-table-column>
-							<el-table-column label="单位" prop="unit" fixed>
-							</el-table-column>
-							<el-table-column
-								v-for="item in xAxisData_day"
-								:key="item"
-								:label="item"
-								:prop="item"
-								width="120"
-							>
-							</el-table-column>
-							<!-- <el-table-column
-								label="合计"
-								prop="sum"
-								width="130"
-								fixed="right"
-							>
-							</el-table-column> -->
-						</el-table>
-						<el-table
-							v-if="query.type==2"
-							id="hourBaseTable"
-							:data="tableDatas_month"
-							style="width: 100%"
-							border
-							:height="tableHeight"
-							
-						>
-							<el-table-column
-								label="分类"
-								prop="nickname"
-								width="110"
-								fixed
-							>
-							</el-table-column>
-							<el-table-column label="单位" prop="unit" fixed>
-							</el-table-column>
-							<el-table-column
-								v-for="item in months"
-								:key="item"
-								:label="item + '月'"
-								:prop="item + '月'"
-								width="120"
-							>
-							</el-table-column>
-							<!-- <el-table-column
-								label="合计"
-								prop="sum"
-								width="130"
-								fixed="right"
-							>
-							</el-table-column> -->
-						</el-table>
-						<el-table
-							v-if="query.type==3"
-							id="hourBaseTable"
-							:data="tableDatas_range"
-							style="width: 100%"
-							border
-							:height="tableHeight"
-							
-						>
-							<el-table-column
-								label="分类"
-								prop="mpoint__nickname"
-								fixed
-								align="center"
-							>
-							</el-table-column>
-							<el-table-column label="单位" prop="mpoint__unit" fixed align="center">
-							</el-table-column>
-							<el-table-column
-								label = "总碳排放量" prop="total_val" fixed align="center">
-							</el-table-column>
-						</el-table>
-					</div>
-				</div>
-				<div class="chartWrap" v-show="query.type==0">
-						<div class="chartTitle">本日生产参数统计图</div>
-						<scEcharts
-							height="400px"
-							width="1500px"
-							:option="optionHour"
-						></scEcharts>
-					</div>
-					<div class="chartWrap" v-show="query.type==1">
-						<div class="chartTitle">本月生产参数统计图</div>
-						<scEcharts
-							height="400px"
-							width="1500px"
-							:option="optionDay"
-						></scEcharts>
-					</div>
-					<div class="chartWrap" v-show="query.type==2">
-						<div class="chartTitle">本年生产参数统计图</div>
-						<scEcharts
-							height="400px"
-							width="1500px"
-							:option="optionMonth"
-						></scEcharts>
-					</div>
-			</el-card>
-		</el-main>
-		<el-dialog v-model="itemVisible" :title="itemChartTitle" width="1100px">
-			<scEcharts
-				height="400px"
-				width="1033px"
-				:option="option"
-			></scEcharts>
-			<template #footer>
-				<slot name="footer"></slot>
-			</template>
-		</el-dialog>
-	</div>
-</template>
-<script>
-let legend = {
-	top: "2%",
-	data: ["碳排放量(t)", "碳排放强度(t/t)"],
-};
-let grid = {
-	right: "11%",
-	left: "11%",
-	top: "27%",
-};
-let colors = ["#518A3A", "#2DAEEF", "#C6F47D"];
-let yAxis = [
-	{
-		type: "value",
-		name: "碳排放量(t)",
-		position: "left",
-		alignTicks: true,
-		nameRotate: 50,
-		axisLine: {
-			show: true,
-			lineStyle: {
-				color: colors[0],
-			},
-		},
-		axisLabel: {
-			formatter: "{value}",
-		},
-	},
-	{
-		type: "value",
-		name: "碳排放强度(t/t)",
-		position: "right",
-		alignTicks: true,
-		nameRotate: 50,
-		axisLine: {
-			show: true,
-			lineStyle: {
-				color: colors[1],
-			},
-		},
-		axisLabel: {
-			formatter: "{value}",
-		},
-	}
-
-];
-import scEcharts from "@/components/scEcharts";
-export default {
-	components: {
-		scEcharts,
-	},
-	data() {
-		return {
-			days: 30,
-			day: "",
-			year: "",
-			month: "",
-			daterange:[],
-			search_date: "",
-			query:{
-                    type:1,
-					day:'',
-                    year:'',
-                    month:'',
-                    yearStart:'',
-					start_time:'',
-					end_time:'',
-                },
-			mgroupObj: {},
-			indexList: [],
-			mpointList: [],
-			tableDatas: [],
-			optionHour: {},
-			optionDay: {},
-			optionMonth: {},
-			options: [
-				{id:0,name:'日统计'},
-				{id:1,name:'月统计'},
-				{id:2,name:'年统计'},
-			],
-			tableDatas2: [],
-			tableDatas_day:[],
-			tableDatas_range:[],
-			tableDatas_month:[],
-			months: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-			hours: [
-				1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-				19, 20, 21, 22, 23, 24,
-			],
-			tableHeight: 600,
-			itemChartTitle: "",
-			itemChartData: [],
-			itemChartXData: [],
-			itemChartYData: [],
-			itemChartLegend: [],
-			itemChartSeries: [],
-			timeStamp: null,
-			itemVisible: false,
-			exportLoading: false,
-			tableName: "全厂电量小时统计",
-			sourceData: {},
-			option: {
-				title: {
-					x: "center",
-				},
-				grid: {
-					top: "20%",
-					left: "3%",
-					right: "10%",
-					bottom: "5%",
-					containLabel: true,
-				},
-				legend: {
-					orient: "horizontal",
-					x: "right",
-					y: "10",
-					data: [],
-				},
-				xAxis: {
-					type: "category",
-					data: [],
-					name: "时间",
-
-					nameTextStyle: {
-						fontWeight: 600,
-						fontSize: 14,
-					},
-					axisLine: {
-						lineStyle: {
-							color: "#3366CC",
-						},
-					},
-					axisLabel: {
-						rotate: 45,
-						interval: 0,
-					},
-					boundaryGap: false,
-				},
-				yAxis: {
-					type: "value",
-					name: "对象值",
-					nameTextStyle: {
-						fontWeight: 500,
-						fontSize: 14,
-					},
-					axisLine: {
-						lineStyle: {
-							color: "#3366CC",
-						},
-					},
-				},
-				tooltip: {
-					show: true,
-					trigger: "axis",
-					axisPointer: {
-						type: "cross",
-						axis: "auto",
-						snap: true,
-					},
-					showContent: true,
-				},
-				series: [
-					{
-						name: "",
-						data: [],
-						type: "line",
-						symbolSize: 8,
-						symbol: "circle",
-						smooth: 0.5,
-						itemStyle: {
-							normal: {
-								label: {
-									show: true,
-								},
-								lineStyle: {
-									width: 1,
-									type: "dotted",
-									color: "#3366CC",
-								},
-							},
-						},
-					},
-				],
-			},
-			xAxisData: [],
-			xAxisData_day: [],
-			xAxisData_month: [],
-			xTtimeRange: [],
-			gyhourlyData : [], 
-			mpointList_code:"3956743506395295744,3956744806948302848,3853763498006032384",
-			StrengthData : [],
-			shhourlyData : [], // 用于存储每小时的数据
-			gyhourlyData_month : [], 
-			StrengthData_month : [],
-			ProductionData_month : [], // 用于存储每小时的数据
-			gyhourlyData_year : [], 
-			StrengthData_year : [],
-			shhourlyData_year : [], // 用于存储每小时的数据
-		};
-	},
-	mounted() {
-		let that = this;
-		var nowDate = new Date();
-		let year = nowDate.getFullYear();
-		let month = nowDate.getMonth() + 1;
-		let day = nowDate.getDate();
-		that.timeStamp = nowDate.getTime();
-		that.days = new Date(year, month, 0).getDate();
-		that.day = day;
-		that.year = year;
-		that.month = month;
-		that.query.day = year + "-" + month + "-" + day;
-		that.query.month = year + "-" + month;
-		for (let n = 0; n < 24; n++) {
-			that.xAxisData.push(n + "时");
-		}
-		that.timeStamp = nowDate.getTime();
-		that.headerLength = that.days + 4;
-		that.tableWidth = that.headerLength * 100 + "";
-		for (let n = 1; n < 13; n++) {
-			that.xAxisData_month.push(n + "月");
-		}
-		for (let n = 1; n <= that.days; n++) {
-			that.xAxisData_day.push(n + "日");
-		}
-		let colors = ["##36492E", "#4BA328", "#C6F47D"];
-		this.getMPoints();
-		let heightContainer =
-			document.getElementById("app-container").clientHeight;
-		let heightHeader = document.getElementById("app-header").clientHeight;
-		let heightTable = heightContainer - heightHeader - 35;
-		that.tableHeight = heightTable;
-	},
-	methods: {
-		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-			let that = this;
-			if (columnIndex == 0) {
-				if (that.indexList.indexOf(rowIndex) > -1) {
-					let rowspans = that.mgroupObj[row.mgroupName];
-					return {
-						rowspan: rowspans,
-						colspan: 1,
-					};
-				} else {
-					return {
-						rowspan: 1,
-						colspan: 0,
-					};
-				}
-			}
-		},
-		changeDate(){
-			let obj = {};
-			obj.type = "hour";
-			obj.start_time = this.daterange[0];
-			obj.end_time = this.daterange[1];
-			obj.mpoint__in = '3956743506395295744,3850767865456439296';
-			obj.page = 0;
-			this.$API.enm.mpointstat.groupValues.req(obj).then((res) => {
-				//处理res数组中的 total_val 字段 保留两位
-				res.forEach(item => {
-					item.total_val = Number(item.total_val).toFixed(2);
-				});
-				this.tableDatas_range = res;
-			});
-		},
-		dateChange() {
-			let that = this;
-			that.tableDatas = [];
-			let arr = [];
-			if(that.query.type==0){//日
-				arr = that.query.day.split('-');
-				that.year = Number(arr[0]);
-				that.month = Number(arr[1]);
-				that.day = Number(arr[2]);
-				that.dataLoop();
-			}else if(that.query.type==1){//月
-				let arr = that.query.month.split('-');
-				that.year = Number(arr[0]);
-				that.month = Number(arr[1]);
-                that.days = new Date(that.year, that.month, 0).getDate();
-                that.xAxisData_day = [];
-                for (let n = 1; n <= that.days; n++) {
-                    that.xAxisData_day.push(n + "日");
-                }
-				that.dataLoop1();
-			}else if (that.query.type==2){
-				that.year = that.query.year;
-				that.dataLoop_month();
-			}else if(that.query.type==3){//时间段
-				that.xTtimeRange.push("总计")
-			}
-			let nowDate = new Date();
-			that.timeStamp = nowDate.getTime();
-			// that.getLengthData();
-		},
-		getMPoints() {
-			let that = this;
-			that.$API.enm.mpoint.list
-				.req({
-					page: 0,
-					// enabled: 1,
-					// need_display: 1,
-					ordering: "report_sortstr",
-					code__in: "tanpfqd, tpfl",
-					query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }",
-				})
-				.then((res) => {
-					// that.mpointList = that.mockDatas.filter((item) => {
-					that.mpointList = res
-					that.dataLoop();
-				});
-		},
-		dataLoop() {
-			let that = this;
-			that.tableDatas = [];
-			that.tableDatas2 = [];
-			let _mgroup = [],
-				_nameLength = [],
-				indexList = [];
-			let mgroupObj = {};
-			console.log(that.mpointList);
-			that.mpointList.forEach((item, index) => {
-				let indexs = _mgroup.indexOf(item.mgroup_name);
-				if (indexs > -1) {
-					_nameLength[indexs] += 1;
-				} else {
-					_mgroup.push(item.mgroup_name);
-					_nameLength.push(1);
-					indexList.push(index);
-				}
-
-				for (let i = 0; i < _mgroup.length; i++) {
-					mgroupObj[_mgroup[i]] = _nameLength[i];
-				}
-				let arr = [];
-				arr[0] =
-					item.mgroup_name != null ? item.mgroup_name : item.name;
-				arr[1] = item.nickname != null ? item.nickname : item.name;
-				arr[2] = item.unit;
-				for (let i = 0; i < 24; i++) {
-					arr[i + 3] = 0;
-				}
-				that.tableDatas.push(arr);
-				let obj = {};
-				obj.mgroupName =
-					item.mgroup_name != null ? item.mgroup_name : item.name;
-				obj.nickname =
-					item.nickname != null && item.nickname != ""
-						? item.nickname
-						: item.name;
-				obj.unit = item.unit;
-				that.tableDatas2.push(obj);
-				that.getData(item.id, index);
-			});
-			that.updateChart(that.gyhourlyData, that.StrengthData);
-			that.mgroupObj = mgroupObj;
-			that.indexList = indexList;
-		},
-		getData(id, index) {
-			let that = this;
-			that.StrengthData = [];
-			that.gyhourlyData = [];
-			let obj = {};
-			obj.type = "hour";
-			obj.year = that.year;
-			obj.month = that.month;
-			obj.day = that.day;
-			obj.mpoint = id;
-			obj.page = 0;
-			this.$API.enm.mpoint.stat.req(obj).then((res) => {
-				let sum = 0;
-				res.forEach((item) => {
-					let ind = item.hour + 3;
-					that.tableDatas[index][ind] = item.val;
-					sum += Number(item.val);
-					let keyName = item.hour + "时";
-					that.tableDatas2[index][keyName] = item.val;
-					if (item.mpoint_nickname == "碳排放量"){
-						that.gyhourlyData[item.hour] = item.val;
-					}else if(
-						item.mpoint_nickname == "碳排放强度"
-					){
-						that.StrengthData[item.hour] = item.val;
-					}
-				});
-				sum = sum * 100;
-				sum = Math.round(sum);
-				sum = sum / 100;
-				that.tableDatas[index][27] = sum.toFixed(2);
-				that.tableDatas2[index].sum = sum.toFixed(2);
-				
-				that.$forceUpdate();
-			});
-		},
-		updateChart(gyhourlyData, StrengthData) {
-		let that = this;
-			// 创建 ECharts 配置
-		let option = {
-			legend: legend,
-			grid: grid,
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'shadow'
-				}
-			},
-			xAxis: {
-				type: 'category',
-				data: ['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时', '15时', '16时', '17时', '18时', '19时', '20时', '21时', '22时', '23时'],
-			},
-			yAxis: yAxis,
-			series: [{
-				name: '碳排放量(t)', // 此处修改为对应分类的名称
-				type: 'bar',
-				data: gyhourlyData, 
-				yAxisIndex: 0,
-				itemStyle: {
-					color: '#518A3A',
-				},
-				
-			},
-			{
-				name: '碳排放强度(t/t)', 
-				type: 'bar',
-				data: StrengthData,
-				yAxisIndex: 1,
-				itemStyle: {
-					color: colors[1],
-				},
-				
-			},
-			
-		]
-		};
-		that.optionHour = option;
-		},
-		dataLoop1() {
-			let that = this;
-			that.tableDatas = [];
-			that.tableDatas_day = [];
-			let _mgroup = [], _nameLength = [], indexList = [];
-			let mgroupObj = {};
-			that.mpointList.forEach((item, index) => {
-				let indexs = _mgroup.indexOf(item.mgroup_name);
-				if (indexs > -1) {
-					_nameLength[indexs] += 1;
-				} else {
-					_mgroup.push(item.mgroup_name);
-					_nameLength.push(1);
-					indexList.push(index);
-				}
-
-				for (let i = 0; i < _mgroup.length; i++) {
-					mgroupObj[_mgroup[i]] = _nameLength[i];
-				}
-
-				let arr = [];
-				arr[0] = item.mgroup_name != null ? item.mgroup_name : item.nickname != null ? item.nickname : item.name;
-				arr[1] = item.nickname != null ? item.nickname : item.name;
-				arr[2] = item.unit;
-				for (let i = 0; i < that.days; i++) {
-					arr[i + 2] = 0;
-				}
-
-				that.tableDatas.push(arr);
-				let obj = {};
-				obj.mgroupName = item.mgroup_name != null ? item.mgroup_name : item.name;
-				obj.nickname = item.nickname != null && item.nickname != "" ? item.nickname : item.name;
-				obj.unit = item.unit;
-
-				that.tableDatas_day.push(obj);
-
-				// 在每次循环调用 getData1(index)，确保异步操作独立
-				that.getData1(index);
-    	});
-
-		that.updateMonthChart(that.gyhourlyData_month, that.StrengthData_month, that.ProductionData_month);
-		that.mgroupObj = mgroupObj;
-		that.indexList = indexList;
-		},
-		updateMonthChart(gyhourlyData, StrengthData, ) {
-			let that = this;
-			// 创建 ECharts 配置
-		let option1 = {
-			legend: legend,
-			grid: grid,
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'shadow'
-				}
-			},
-			xAxis: {
-				type: 'category',
-				data: [],
-			},
-			yAxis: yAxis,
-			series: [{
-				name: '碳排放量(t)',
-				type: 'bar',
-				data: gyhourlyData, 
-				yAxisIndex: 0,
-				itemStyle: {
-					color: '#518A3A',
-				},
-				
-			},
-			{
-				name: '碳排放强度(t/t)', 
-				type: 'bar',
-				data: StrengthData, 
-				yAxisIndex: 1,
-				itemStyle: {
-					color: colors[1],
-				},
-				
-			},
-			
-		]
-		};
-		option1.xAxis.data = that.xAxisData_day;
-		that.optionDay = option1;
-		},
-		getData1(index) {
-    let that = this;
-    that.StrengthData_month = [];
-    that.gyhourlyData_month = [];
-    let carbonEmission = [];  // 存储每一天的碳排放量
-    let outputKiln = [];      // 存储每一天的出窑熟料产量
-    let emissionIntensity = []; // 存储每一天的碳排放强度
-    let obj = {};
-    obj.type = "day";
-    obj.year = that.year;
-    obj.month = that.month;
-    obj.mpoint__in = this.mpointList_code;
-    obj.page = 0;
-
-    this.$API.enm.mpoint.stat.req(obj).then((res) => {
-        let sum = 0;
-        res.forEach((item) => {
-            let ind = item.day + 2;
-            that.tableDatas[index][ind] = item.val;
-            sum += Number(item.val);
-            if (item.mpoint_nickname === "碳排放量") {
-                carbonEmission[item.day - 1] = item.val; // 存储每日的碳排放量
-            } else if (item.mpoint_nickname === "出窑熟料产量") {
-                outputKiln[item.day - 1] = item.val; // 存储每日的出窑熟料产量
-            }
-            if(item.mpoint_nickname == "碳排放强度"){
-                return;
-            }
-            // that.tableDatas_day[index][keyName] = item.val;
-            if (item.mpoint_nickname == "碳排放量"){
-                that.gyhourlyData_month[item.day - 1] = item.val;
-            } else if(item.mpoint_nickname == "出窑熟料产量"){
-                that.ProductionData_month[item.day - 1] = item.val;
-            }
-        });
-        // 计算碳排放强度：碳排放量 / 出窑熟料产量
-		for (let i = 0; i < carbonEmission.length; i++) {
-			let keyName = i + 1 + "日";
-			if(index==1 && carbonEmission[i] && outputKiln[i]){
-				emissionIntensity[i] = carbonEmission[i] / outputKiln[i]; // 计算碳排放强度
-				that.StrengthData_month[i] = emissionIntensity[i].toFixed(2); // 存入 StrengthData_month
-				that.tableDatas_day[index][keyName] = emissionIntensity[i].toFixed(2); // 存入 tableDatas_day
-			} else if(index==0 && carbonEmission[i]){
-				that.tableDatas_day[index][keyName] = carbonEmission[i];
-			}
-		}
-        sum = sum * 100;
-        sum = Math.round(sum);
-        sum = sum / 100;
-        let dayss = 0;
-        dayss = this.days + 3;
-        that.tableDatas[index][dayss] = sum.toFixed(2);
-        that.tableDatas_day[index].sum = sum.toFixed(2);
-        that.$forceUpdate();
-    });
-},
-
-		dataLoop_month() {
-			let that = this;
-			that.tableDatas = [];
-			that.tableDatas_month = [];
-			let _mgroup = [],
-				_nameLength = [],
-				indexList = [];
-			let mgroupObj = {};
-			that.mpointList.forEach((item, index) => {
-				let indexs = _mgroup.indexOf(item.mgroup_name);
-				if (indexs > -1) {
-					_nameLength[indexs] += 1;
-				} else {
-					_mgroup.push(item.mgroup_name);
-					_nameLength.push(1);
-					indexList.push(index);
-				}
-
-				for (let i = 0; i < _mgroup.length; i++) {
-					mgroupObj[_mgroup[i]] = _nameLength[i];
-				}
-				let arr = [];
-				arr[0] =
-					item.mgroup_name != null ? item.mgroup_name : item.name;
-				arr[1] = item.nickname != null ? item.nickname : item.name;
-				arr[2] = item.unit;
-				for (let i = 0; i < 12; i++) {
-					arr[i + 3] = 0;
-				}
-				that.tableDatas.push(arr);
-				let obj = {};
-				obj.mgroupName =
-					item.mgroup_name != null ? item.mgroup_name : item.name;
-				obj.nickname =
-					item.nickname != null && item.nickname != ""
-						? item.nickname
-						: item.name;
-				obj.unit = item.unit;
-				that.tableDatas_month.push(obj);
-				that.getData_month(index);
-			});
-			that.updateMonthChart_month(that.gyhourlyData_year, that.StrengthData_year);
-			that.mgroupObj = mgroupObj;
-			that.indexList = indexList;
-		},
-		updateMonthChart_month(gyhourlyData_year, StrengthData_year) {
-			let that = this;
-			let option2 = {
-			legend: legend,
-			grid: grid,
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'shadow'
-				}
-			},
-			xAxis: {
-				type: 'category',
-				data: [],
-			},
-			yAxis: yAxis,
-			series: [{
-				name: '碳排放量(t)',
-				type: 'bar',
-				data: gyhourlyData_year, 
-				yAxisIndex: 0,
-				itemStyle: {
-					color: '#518A3A',
-				},
-			},
-			{
-				name: '碳排放强度(t/t)',
-				type: 'bar',
-				data: StrengthData_year, 
-				yAxisIndex: 1,
-				itemStyle: {
-					color: colors[1],
-				},
-			}
-			
-		]
-		};
-		option2.xAxis.data = that.xAxisData_month;
-		that.optionMonth = option2;
-		},
-		getData_month(index) {
-			let that = this;
-			that.StrengthData_year = [];
-			that.gyhourlyData_year = [];
-			let carbonEmission = [];  // 存储每一天的碳排放量
-			let outputKiln = [];      // 存储每一天的出窑熟料产量
-			let emissionIntensity = []; // 存储每一天的碳排放强度
-			let obj = {};
-			obj.type = "month";
-			obj.year = that.year;
-			obj.mpoint__in = that.mpointList_code;
-			obj.page = 0;
-			this.$API.enm.mpoint.stat.req(obj).then((res) => {
-				let sum = 0;
-				res.forEach((item) => {
-					let ind = item.month + 2;
-					that.tableDatas[index][ind] = item.val;
-					sum += Number(item.val);
-					let keyName = item.month + "月";
-					// that.tableDatas_month[index][keyName] = item.val;
-					if (item.mpoint_nickname === "碳排放量") {
-						carbonEmission[item.month - 1] = item.val; // 存储每日的碳排放量
-					} else if (item.mpoint_nickname === "出窑熟料产量") {
-						outputKiln[item.month - 1] = item.val; // 存储每日的出窑熟料产量
-					}
-					if(item.mpoint_nickname == "碳排放强度"){
-						return;
-            		}
-					if (item.mpoint_nickname == "碳排放量"){
-						that.gyhourlyData_year[item.month-1] = item.val;
-					}else if(item.mpoint_nickname == "碳排放强度"){
-						that.StrengthData_year[item.month-1] = item.val;
-					}
-
-
-				});
-				 // 计算碳排放强度：碳排放量 / 出窑熟料产量
-			for (let i = 0; i < carbonEmission.length; i++) {
-				let keyName = i + 1 + "月";
-				if(index==1 && carbonEmission[i] && outputKiln[i]){
-					emissionIntensity[i] = carbonEmission[i] / outputKiln[i]; // 计算碳排放强度
-					that.StrengthData_year[i] = emissionIntensity[i].toFixed(2); // 存入 StrengthData_month
-					that.tableDatas_month[index][keyName] = emissionIntensity[i].toFixed(2); // 存入 tableDatas_day
-				} else if(index==0 && carbonEmission[i]){
-					that.tableDatas_month[index][keyName] = carbonEmission[i];
-				}
-			}
-				sum = sum * 100;
-				sum = Math.round(sum);
-				sum = sum / 100;
-				that.tableDatas[index][15] = sum.toFixed(2);
-				that.tableDatas_month[index].sum = sum.toFixed(2);
-				that.$forceUpdate();
-			});
-		},
-
-		handleCellClick(row, column, cell, event) {
-			let that = this;
-			console.log("row", row);
-			console.log("column", column);
-			console.log("cell", cell);
-			let index = that.tableDatas2.indexOf(row);
-			console.log(index, "index");
-			let lineData = that.tableDatas[index].slice(2, 26);
-			that.option.xAxis.data = that.xAxisData;
-			that.option.series[0].data = lineData;
-			this.itemVisible = true;
-		},
-		handleCellClick1(row, column, cell, event) {
-			let that = this;
-			let index = that.tableDatas_day.indexOf(row);
-			console.log("row", row, that.tableDatas_day, index);
-			that.tableName = `${row.nickname}`
-			console.log("tableDatas", that.tableDatas);
-			let lineData = that.tableDatas_day[index].slice(2, 13);
-			that.option.xAxis.data = that.xAxisData_day;
-			that.option.series[0].data = lineData;
-			this.itemVisible = true;
-		},
-		handleCellClick_month(row, column, cell, event) {
-			let that = this;
-			let index = that.tableDatas_month.indexOf(row);
-			that.tableName = `${row.nickname}`
-			//获取图数据
-			let lineData = that.tableDatas[index].slice(2, 13);
-			that.option.xAxis.data = that.xAxisData_month;
-			that.option.series[0].data = lineData;
-			this.itemVisible = true;
-		},
-		handleCellClick_range(row, column, cell, event) {
-			let that = this;
-			let index = that.tableDatas_range.indexOf(row);
-			// that.tableName = `${row.nickname}-电量范围统计`
-			//获取图数据
-			// let lineData = that.tableDatas[index].slice(2, 3);
-			// that.option.xAxis.data = that.xAxisData_month;
-			// that.option.series[0].data = lineData;
-			this.itemVisible = true;
-		},
-		exportExcel() {
-			this.exportLoading = true;
-			this.$XLSX("#hourBaseTable", this.tableName);
-			this.exportLoading = false;
-		},
-		handlePrint() {
-			this.$PRINT("#myReport");
-		},
-	},
-};
-</script>
-<style scoped>
-.printWrap {
-	width: 100%;
-	overflow-x: scroll;
-}
-.printContainer {
-	width: 100%;
-}
-.chartTitle{
-	text-align: center; 
-    width: 100%; 
-}
-.chartWrap {
-	width: 1500px;
-	margin-top: 20px;
-	border: 1px solid #eeeeee;
-}
-</style>
diff --git a/src/views/hrm/empjoin.vue b/src/views/hrm/empjoin.vue
index 490d69d4..7973c9de 100644
--- a/src/views/hrm/empjoin.vue
+++ b/src/views/hrm/empjoin.vue
@@ -9,7 +9,9 @@
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="API.hrm.empjoin.list" row-key="id" stripe
         @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}">
-        <el-table-column label="部门" prop="dept_need_name" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column label="部门" min-width="100" show-overflow-tooltip>
+          <template #default="scope">{{ deptMap[scope.row.dept_need] || '' }}</template>
+        </el-table-column>
         <el-table-column label="入职日期" prop="join_date" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column label="审批状态" min-width="180">
           <template #default="scope">
@@ -25,7 +27,7 @@
   </el-drawer>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import API from '@/api'
 import empjoin_form from './empjoin_form.vue'
 import ExportBtn from '@/components/scExportBtn/index.vue'
@@ -33,9 +35,15 @@ import { actStateEnum } from "@/utils/enum.js"
 const drawerVisible = ref(false)
 const mode = ref('add')
 const t_id = ref(null)
+const deptMap = ref({})
 const handleAdd = () => { mode.value = 'add'; t_id.value = null; drawerVisible.value = true; }
+onMounted(async () => {
+  const res = await API.system.dept.list.req({ page: 0 })
+  const list = Array.isArray(res) ? res : (res.results || res.data || [])
+  list.forEach(d => { deptMap.value[d.id] = d.name })
+})
 const exportCols = [
-  { header: "部门", key: "dept_need_name", wch: 15 },
+  { header: "部门", key: "_dept_name", wch: 15 },
   { header: "入职日期", key: "join_date", wch: 12 },
   { header: "审批状态", key: "_act_state_text", wch: 10 },
 ]
diff --git a/src/views/hrm/empjoin_form.vue b/src/views/hrm/empjoin_form.vue
index 8388b65b..9df17526 100644
--- a/src/views/hrm/empjoin_form.vue
+++ b/src/views/hrm/empjoin_form.vue
@@ -202,6 +202,18 @@ export default {
         async getTid() {
             try {
                 let res = await this.$API.hrm.empjoin.item.req(this.t_id);
+                // 获取岗位列表，填充 post_name
+                if (res.person && res.person.length > 0) {
+                    const postRes = await this.$API.system.post.list.req({ page: 0 });
+                    const postList = Array.isArray(postRes) ? postRes : (postRes.results || postRes.data || []);
+                    const postMap = {};
+                    postList.forEach(p => { postMap[p.id] = p.name; });
+                    res.person.forEach(p => {
+                        if (p.post && !p.post_name) {
+                            p.post_name = postMap[p.post] || '';
+                        }
+                    });
+                }
                 this.formData = res;
                 if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
                     this.localMode = "edit";
diff --git a/src/views/mpr/material_requisition_form.vue b/src/views/mpr/material_requisition_form.vue
index fdedf79f..3d605af6 100644
--- a/src/views/mpr/material_requisition_form.vue
+++ b/src/views/mpr/material_requisition_form.vue
@@ -130,7 +130,7 @@
 				</div>
 
 				<div style="text-align: right; margin-top: 15px; font-size: 14px;">
-					<span style="margin-right: 30px;">部门负责人：___________</span>
+					<span style="margin-right: 30px;">部门负责人：{{ deptHeadName || '___________' }}</span>
 					<span>领取人：{{ formData.collector || '___________' }}</span>
 				</div>
 			</div>
@@ -212,6 +212,7 @@ export default {
 			stockSearch: '',
 			stockList: [],
 			selectedStocks: [],
+			deptHeadName: '',
 		}
 	},
 	computed: {
@@ -241,6 +242,21 @@ export default {
 				if (res.ticket_ && res.ticket_.state_.type === 1 && res.create_by === this.currentUser.id) {
 					this.localMode = 'edit'
 				}
+				// 从审批流程日志中获取部门负责人（非"开始"和"结束"状态的审批人）
+				if (res.ticket_ && res.ticket_.id) {
+					try {
+						const logs = await this.$API.wf.ticket.ticketFlowlogs.req(res.ticket_.id)
+						const approveLog = logs.find(log =>
+							log.state_?.name !== '开始' &&
+							log.state_?.name !== '结束' &&
+							log.transition_?.attribute_type === 1 &&
+							log.participant_
+						)
+						if (approveLog) {
+							this.deptHeadName = approveLog.participant_.name
+						}
+					} catch (e) {}
+				}
 			} catch (error) {
 				this.$message.error('加载失败')
 			}
diff --git a/src/views/mpr/warehouse.vue b/src/views/mpr/warehouse.vue
new file mode 100644
index 00000000..e4c60dc3
--- /dev/null
+++ b/src/views/mpr/warehouse.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'warehouse.create'">新增</el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
+        <el-table-column type="index" width="50" />
+        <el-table-column label="库房名称" prop="name" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="库房编号" prop="number">
+        </el-table-column>
+        <el-table-column label="库房地点" prop="place">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="150px">
+          <template #default="scope">
+            <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'warehouse.update'">
+              编辑
+            </el-button>
+            <el-button link type="danger" @click="table_del(scope.row)" v-auth="'warehouse.delete'">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+    @closed="dialog.save = false"></save-dialog>
+</template>
+<script>
+import saveDialog from "./warehouse_form2.vue";
+export default {
+  name: "mprWarehouse",
+  components: {
+    saveDialog,
+  },
+  data() {
+    return {
+      dialog: {
+        save: false,
+      },
+      apiObj: this.$API.mpr.warehouse.list,
+      query: {
+        page: 1,
+        page_size: 20,
+      },
+    };
+  },
+  methods: {
+    add() {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("add");
+      });
+    },
+    table_edit(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("edit").setData(row);
+      });
+    },
+    table_del(row) {
+      this.$confirm(`确定删除吗？`, "提示", {
+        type: "warning",
+      }).then(() => {
+        this.$API.mpr.warehouse.delete.req(row.id).then(() => {
+          this.$message.success("删除成功");
+          this.$refs.table.refresh();
+        });
+      }).catch(() => { });
+    },
+    handleSaveSuccess(data, mode) {
+      this.$refs.table.refresh();
+    },
+  },
+};
+</script>
diff --git a/src/views/mpr/warehouse_entry.vue b/src/views/mpr/warehouse_entry.vue
index 232023a0..2c9ee4f9 100644
--- a/src/views/mpr/warehouse_entry.vue
+++ b/src/views/mpr/warehouse_entry.vue
@@ -85,7 +85,7 @@ const t_id = ref(null)
 const warehouseOptions = ref([])
 
 onMounted(async () => {
-	let res = await API.inm.warehouse.list.req({ page: 0 })
+	let res = await API.mpr.warehouse.list.req({ page: 0 })
 	warehouseOptions.value = res
 })
 
diff --git a/src/views/mpr/warehouse_entry_form.vue b/src/views/mpr/warehouse_entry_form.vue
index fb8592fc..598095b4 100644
--- a/src/views/mpr/warehouse_entry_form.vue
+++ b/src/views/mpr/warehouse_entry_form.vue
@@ -192,7 +192,7 @@ export default {
 		}
 	},
 	async mounted() {
-		let res = await this.$API.inm.warehouse.list.req({ page: 0 })
+		let res = await this.$API.mpr.warehouse.list.req({ page: 0 })
 		this.warehouseOptions = res
 		if (this.t_id) {
 			this.loadData()
diff --git a/src/views/mpr/warehouse_form2.vue b/src/views/mpr/warehouse_form2.vue
new file mode 100644
index 00000000..3cc91d4d
--- /dev/null
+++ b/src/views/mpr/warehouse_form2.vue
@@ -0,0 +1,96 @@
+<template>
+  <el-dialog
+    :title="titleMap[mode]"
+    v-model="visible"
+    :size="1000"
+    destroy-on-close
+    @closed="$emit('closed')"
+  >
+    <el-container v-loading="loading">
+      <el-main style="padding: 0 20px 20px 20px">
+        <el-form
+          ref="dialogForm"
+          :model="form"
+          :rules="rules"
+          label-width="100px"
+        >
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="库房名称" prop="name">
+                <el-input v-model="form.name" placeholder="库房名称"/>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="库房编号" prop="number">
+                <el-input v-model="form.number" placeholder="库房编号"/>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="库房地点" prop="place">
+                <el-input v-model="form.place" placeholder="库房地点"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-main>
+      <el-footer>
+        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+        <el-button @click="visible = false">取消</el-button>
+      </el-footer>
+    </el-container>
+  </el-dialog>
+</template>
+<script>
+export default {
+  emits: ["success", "closed"],
+  data() {
+    return {
+      loading: false,
+      mode: "add",
+      titleMap: {
+        add: "新增库房",
+        edit: "编辑库房",
+      },
+      form: {},
+      rules: {
+        name: [{required: true, message: "请输入库房名称", trigger: "blur"}],
+        number: [{required: true, message: "请输入库房编号", trigger: "blur"}],
+        place: [{required: true, message: "请输入库房地点", trigger: "blur"}],
+      },
+      visible: false,
+      isSaveing: false,
+    };
+  },
+  methods: {
+    open(mode = "add") {
+      this.mode = mode;
+      this.visible = true;
+      return this;
+    },
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          try {
+            if (this.mode == "add") {
+              await this.$API.mpr.warehouse.create.req(this.form);
+            } else if (this.mode == "edit") {
+              await this.$API.mpr.warehouse.update.req(this.form.id, this.form);
+            }
+            this.isSaveing = false;
+            this.$emit("success", this.form, this.mode);
+            this.visible = false;
+            this.$message.success("操作成功");
+          } catch (err) {
+            this.isSaveing = false;
+            return err;
+          }
+        }
+      });
+    },
+    setData(data) {
+      Object.assign(this.form, data);
+    },
+  },
+};
+</script>
diff --git a/src/views/mpr/warehouse_stock.vue b/src/views/mpr/warehouse_stock.vue
index f7d8983b..20d45898 100644
--- a/src/views/mpr/warehouse_stock.vue
+++ b/src/views/mpr/warehouse_stock.vue
@@ -91,7 +91,7 @@ const dateRange = ref(null)
 const warehouseOptions = ref([])
 
 onMounted(async () => {
-	let res = await API.inm.warehouse.list.req({ page: 0 })
+	let res = await API.mpr.warehouse.list.req({ page: 0 })
 	warehouseOptions.value = res
 })
 
diff --git a/src/views/pum/supplieraudit_form.vue b/src/views/pum/supplieraudit_form.vue
index dd3877b8..6159c73f 100644
--- a/src/views/pum/supplieraudit_form.vue
+++ b/src/views/pum/supplieraudit_form.vue
@@ -134,17 +134,31 @@ export default {
                 })
         },
         handleSave() {
+            // 过滤掉 _ 后缀的对象字段，只发送后端需要的数据
+            let data = {};
+            for (let key in this.formData) {
+                if (!key.endsWith('_')) {
+                    data[key] = this.formData[key];
+                }
+            }
             if (this.localMode == "add") {
                 this.saveLoading = true;
-                this.$API.pum.supplieraudit.create.req(this.formData).then(res=>{
-                    this.saveLoading = true;
+                this.$API.pum.supplieraudit.create.req(data).then(res=>{
+                    this.saveLoading = false;
                     this.$message.success("提交成功");
                     this.$emit('success', this.localMode);
                 }).catch(e=>{
                     this.saveLoading = false;
                 })
             } else if (this.localMode == "edit") {
-                this.$message.error("不支持编辑!")
+                this.saveLoading = true;
+                this.$API.pum.supplieraudit.update.req(this.formData.id, data).then(res=>{
+                    this.saveLoading = false;
+                    this.$message.success("更新成功");
+                    this.$emit('success', this.localMode);
+                }).catch(e=>{
+                    this.saveLoading = false;
+                })
             }
         },
     }