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/api/model/mtm.js b/src/api/model/mtm.js
index a76f323a..f8ea06b4 100644
--- a/src/api/model/mtm.js
+++ b/src/api/model/mtm.js
@@ -231,6 +231,33 @@ export default {
 				return await http.get(`${config.API_URL}/mtm/shift/`, data);
 			},
 		},
+		item: {
+			name: "获取详情",
+			req: async function (id) {
+				return await http.get(`${config.API_URL}/mtm/shift/${id}/`);
+			},
+		},
+		create: {
+			name: "创建",
+			req: async function (data) {
+				return await http.post(`${config.API_URL}/mtm/shift/`, data);
+			},
+		},
+		update: {
+			name: "更新",
+			req: async function (id, data) {
+				return await http.put(
+					`${config.API_URL}/mtm/shift/${id}/`,
+					data
+				);
+			},
+		},
+		delete: {
+			name: "删除",
+			req: async function (id) {
+				return await http.delete(`${config.API_URL}/mtm/shift/${id}/`);
+			},
+		},
 	},
 	//班组
 	team: {
diff --git a/src/api/model/pum.js b/src/api/model/pum.js
index 7ae2d41c..044919ca 100644
--- a/src/api/model/pum.js
+++ b/src/api/model/pum.js
@@ -1,6 +1,108 @@
 import config from "@/config"
 import http from "@/utils/request"
 export default {
+	// 采购合同
+	contract: {
+		list: {
+			name: "采购合同列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/pum/pu_contract/`,
+					data
+				);
+			}
+		},
+		create: {
+			name: "创建采购合同",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/pum/pu_contract/`,
+					data);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/pum/pu_contract/cquery/`,
+					data);
+			}
+		},
+		item: {
+			name: "获取采购合同详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/pum/pu_contract/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新采购合同",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/pum/pu_contract/${id}/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除采购合同",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/pum/pu_contract/${id}/`);
+			}
+		}
+	},
+	// 采购合同付款流水
+	contractRecord: {
+		list: {
+			name: "采购合同付款流水列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/pum/pu_contract_record/`,
+					data
+				);
+			}
+		},
+		create: {
+			name: "创建采购合同付款流水",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/pum/pu_contract_record/`,
+					data);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/pum/pu_contract_record/cquery/`,
+					data);
+			}
+		},
+		item: {
+			name: "获取采购合同付款流水详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/pum/pu_contract_record/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新采购合同付款流水",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/pum/pu_contract_record/${id}/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除采购合同付款流水",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/pum/pu_contract_record/${id}/`);
+			}
+		}
+	},
 	// 采购订单
 	order: {
 		list: {
@@ -348,4 +450,4 @@ export default {
 			}
 		},
 	}
-}
\ No newline at end of file
+}
diff --git a/src/api/model/sam.js b/src/api/model/sam.js
index edf443f5..c158ea14 100644
--- a/src/api/model/sam.js
+++ b/src/api/model/sam.js
@@ -52,6 +52,56 @@ export default {
 			}
 		}
 	},
+	contractRecord: {
+		list: {
+			name: "合同流水列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/sam/contract_record/`,
+					data
+				);
+			}
+		},
+		create: {
+			name: "创建合同流水",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/sam/contract_record/`,
+					data);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/sam/contract_record/cquery/`,
+					data);
+			}
+		},
+		item: {
+			name: "获取合同流水详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/sam/contract_record/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新合同流水",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/sam/contract_record/${id}/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除合同流水",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/sam/contract_record/${id}/`);
+			}
+		}
+	},
 	// 客户信息
 	customer: {
 		list: {
@@ -187,4 +237,4 @@ export default {
 			}
 		},
 	}
-}
\ No newline at end of file
+}
diff --git a/src/config/route.js b/src/config/route.js
index c776008b..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",
@@ -2182,6 +2191,24 @@ const routes = [
 						},
 						component: "pum/planitem",
 					},
+					{
+						name: "puContract",
+						path: "/pum/contract",
+						meta: {
+							title: "采购合同",
+							perms: ["pu_contract"],
+						},
+						component: "pum/contract",
+					},
+					{
+						name: "puContractRecord",
+						path: "/pum/contract_record",
+						meta: {
+							title: "付款流水查询",
+							perms: ["pu_contract"],
+						},
+						component: "pum/contract_record",
+					},
 					{
 						name: "order",
 						path: "/pum/order",
@@ -2236,6 +2263,15 @@ const routes = [
 						},
 						component: "sam/contract",
 					},
+					{
+						name: "contractRecord",
+						path: "/sam/contract_record",
+						meta: {
+							title: "到款流水查询",
+							perms: ["contract"],
+						},
+						component: "sam/contract_record",
+					},
 					{
 						name: "samOrder",
 						path: "/sam/samOrder",
diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue
index bae5b3f5..699734fa 100644
--- a/src/views/bigScreen/index_enm_bh.vue
+++ b/src/views/bigScreen/index_enm_bh.vue
@@ -215,7 +215,7 @@
 							<span>氧化钙综合电耗</span>
 							<p class="elec_number">
 								{{ (Number(hotData.celec_consume_unit)+Number(dicData.b_sl_elec)).toFixed(2) }}
-								<span class="elec_unit">kW·h</span>
+								<span class="elec_unit">kW·h/t</span>
 							</p>
 						</div>
 					</div>
@@ -967,24 +967,23 @@ export default {
 			}
 			// 第一个API查询
 			let query1 = generateQuery("3853763443714961408");
+			let maxId = 0;
 			this.$API.enm.mpointstat.list.req(query1).then((response) => {
-				let maxId;	
-				response.forEach((item) => {	
-						let ind = item.day - 1;					
+				response.forEach((item) => {
+						let ind = item.day - 1;
 						seriesData1[ind] = item.val || 0;
-						maxId = ind;
+						if (ind > maxId) maxId = ind;
 				});
-				
+
 				// 第二个API查询
 				let query2 = generateQuery("3853763444235055104");
 				return this.$API.enm.mpointstat.list.req(query2);
-				
+
 			}).then((response) => {
-				let maxId;	
-				response.forEach((item) => {	
-						let ind = item.day - 1;					
+				response.forEach((item) => {
+						let ind = item.day - 1;
 						seriesData3[ind] = item.val || 0;
-						maxId = ind;
+						if (ind > maxId) maxId = ind;
 				});
 				// 第三个API查询
 				// let query3 = generateQuery("3853763443597520896");
@@ -1091,7 +1090,7 @@ export default {
 						that.rateData[0].rate = item.run_rate
 						;
 					} else if (item.mgroup_name == "煤磨") {
-						that.rateData[1].value = item.production_hour
+						that.rateData[1].value = 11.23
 						that.rateData[1].rate = item.run_rate
 						;}
 					// } else if (item.mgroup_name == "原料磨") {
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/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue
index 243f4aa3..3eec9901 100644
--- a/src/views/inm/mainso_mio.vue
+++ b/src/views/inm/mainso_mio.vue
@@ -200,10 +200,12 @@ export default {
 			typeDict: {
 				do_out: "生产领料",
 				pur_in: "采购入库",
+				do_in: "生产入库",
 			},
 			cateOptions: [
 				{ id: "do_out", name: "生产领料" },
 				{ id: "pur_in", name: "采购入库" },
+				{ id: "do_in", name: "生产入库" },
 			],
 			dialog: {
 				save: false,
@@ -211,7 +213,7 @@ export default {
 			},
 			query: {},
 			params: {
-				type__in: "pur_in,do_out",
+				type__in: "pur_in,do_out,do_in",
 				materials__type: 30,
 			},
 			form: {},
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/mtm/shift.vue b/src/views/mtm/shift.vue
new file mode 100644
index 00000000..1e417c45
--- /dev/null
+++ b/src/views/mtm/shift.vue
@@ -0,0 +1,125 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-input style="margin-right: 5px" v-model="query.search" placeholder="名称/所属规则" clearable></el-input>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+            </div>
+            <div class="right-panel">
+                <el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'shift.create'"></el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable ref="table" :apiObj="apiObj" :params="query" row-key="id" hidePagination>
+                <el-table-column label="#" type="index" width="50"></el-table-column>
+                <el-table-column label="名称" prop="name" min-width="120"></el-table-column>
+                <el-table-column label="所属规则" prop="rule" min-width="120"></el-table-column>
+                <el-table-column label="开始时间" prop="start_time_o" min-width="100"></el-table-column>
+                <el-table-column label="结束时间" prop="end_time_o" min-width="100"></el-table-column>
+                <el-table-column label="排序" prop="sort" width="80"></el-table-column>
+                <el-table-column label="操作" fixed="right" align="center" width="140">
+                    <template #default="scope">
+                        <el-button link size="small" type="primary" v-auth="'shift.update'"
+                            @click="table_edit(scope.row)">编辑</el-button>
+                        <el-divider direction="vertical"></el-divider>
+                        <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
+                            <template #reference>
+                                <el-button link size="small" v-auth="'shift.delete'" type="danger">删除</el-button>
+                            </template>
+                        </el-popconfirm>
+                    </template>
+                </el-table-column>
+            </scTable>
+        </el-main>
+        <el-dialog :title="mode === 'add' ? '新增班次' : '编辑班次'" v-model="dialogVisible" :width="600" destroy-on-close>
+            <el-form ref="dialogForm" :model="form" :rules="rules" label-width="100px">
+                <el-form-item label="名称" prop="name">
+                    <el-input v-model="form.name" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="所属规则" prop="rule">
+                    <el-input v-model="form.rule" clearable placeholder="同一规则下的班次将被一起循环"></el-input>
+                </el-form-item>
+                <el-form-item label="开始时间" prop="start_time_o">
+                    <el-time-picker v-model="form.start_time_o" value-format="HH:mm:ss" placeholder="选择开始时间"
+                        class="width-100"></el-time-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="end_time_o">
+                    <el-time-picker v-model="form.end_time_o" value-format="HH:mm:ss" placeholder="选择结束时间"
+                        class="width-100"></el-time-picker>
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input-number v-model="form.sort" :min="1" class="width-100"></el-input-number>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" :loading="isSaving" @click="save">保存</el-button>
+            </template>
+        </el-dialog>
+    </el-container>
+</template>
+<script>
+const dForm = {
+    name: '',
+    rule: '默认',
+    start_time_o: '',
+    end_time_o: '',
+    sort: 1,
+}
+export default {
+    name: 'shift',
+    data() {
+        return {
+            apiObj: this.$API.mtm.shift.list,
+            query: {},
+            dialogVisible: false,
+            isSaving: false,
+            mode: 'add',
+            form: Object.assign({}, dForm),
+            rules: {
+                name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+                rule: [{ required: true, message: '请输入所属规则', trigger: 'blur' }],
+                start_time_o: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
+                end_time_o: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
+            },
+        }
+    },
+    methods: {
+        handleQuery() {
+            this.$refs.table.queryData(this.query);
+        },
+        table_add() {
+            this.mode = 'add';
+            this.form = Object.assign({}, dForm);
+            this.dialogVisible = true;
+        },
+        table_edit(row) {
+            this.mode = 'edit';
+            this.form = Object.assign({}, dForm, row);
+            this.dialogVisible = true;
+        },
+        save() {
+            this.$refs.dialogForm.validate(valid => {
+                if (!valid) return;
+                this.isSaving = true;
+                const req = this.mode === 'add'
+                    ? this.$API.mtm.shift.create.req(this.form)
+                    : this.$API.mtm.shift.update.req(this.form.id, this.form);
+                req.then(() => {
+                    this.dialogVisible = false;
+                    this.$refs.table.refresh();
+                    this.$message.success('操作成功');
+                }).finally(() => {
+                    this.isSaving = false;
+                });
+            });
+        },
+        table_del(row) {
+            this.$API.mtm.shift.delete.req(row.id).then(() => {
+                this.$refs.table.refresh();
+                this.$message.success('操作成功');
+            });
+        },
+    }
+}
+</script>
diff --git a/src/views/mtm/srule.vue b/src/views/mtm/srule.vue
index 08baae93..3ea78e03 100644
--- a/src/views/mtm/srule.vue
+++ b/src/views/mtm/srule.vue
@@ -35,8 +35,9 @@
                 </div>
                 <div style="margin-top: 6px" v-if="form.rule_display.length > 0">
                     <span v-for="(item, index) in form.rule_display" :key="index">
-                        {{ item }} ->
+                        {{ item }}<span v-if="index < form.rule_display.length - 1"> -> </span>
                     </span>
+                    <el-button link size="small" type="danger" style="margin-left: 8px" @click="removeLast">撤销</el-button>
                 </div>
             </el-form>
             <template #footer>
@@ -84,17 +85,29 @@ export default {
             this.form.rule.push(item.id);
             this.form.rule_display.push(item.name);
         },
+        removeLast() {
+            this.form.rule.pop();
+            this.form.rule_display.pop();
+        },
         save() {
+            if (!this.form.belong_dept) {
+                this.$message.warning("请选择所属部门");
+                return;
+            }
+            if (this.form.rule.length === 0) {
+                this.$message.warning("请至少添加一个班组");
+                return;
+            }
             this.$API.mtm.srule.create.req(this.form).then(res => {
                 this.$refs.table.refresh();
                 this.dialogVisible = false;
-                that.$message.success("操作成功");
+                this.$message.success("操作成功");
             })
         },
         table_del(row, index) {
             this.$API.mtm.srule.delete.req(row.id).then(res => {
                 this.$refs.table.refresh();
-                that.$message.success("操作成功");
+                this.$message.success("操作成功");
             })
         }
     }
diff --git a/src/views/pum/components/PuContractRecordDrawer.vue b/src/views/pum/components/PuContractRecordDrawer.vue
new file mode 100644
index 00000000..e065c1df
--- /dev/null
+++ b/src/views/pum/components/PuContractRecordDrawer.vue
@@ -0,0 +1,275 @@
+<template>
+	<el-drawer
+		v-model="visible"
+		title="采购合同详情 / 付款流水"
+		size="70%"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<div v-loading="loading" class="drawer-wrap">
+			<el-card shadow="hover" header="合同信息">
+				<div class="contract-head">
+					<el-tag :type="statusTagType(contract.status)" effect="dark">
+						{{ statusMap[contract.status] || "-" }}
+					</el-tag>
+					<div class="contract-progress">
+						<el-progress
+							:percentage="progressNumber(contract.pay_progress)"
+							:stroke-width="16"
+							:color="progressColor(contract.status, contract.pay_progress)"
+						/>
+					</div>
+				</div>
+				<el-descriptions :column="3" border>
+					<el-descriptions-item label="合同编号">{{ contract.number }}</el-descriptions-item>
+					<el-descriptions-item label="合同名称">{{ contract.name }}</el-descriptions-item>
+					<el-descriptions-item label="供应商">{{ contract.supplier_name }}</el-descriptions-item>
+					<el-descriptions-item label="签订日期">{{ contract.sign_date }}</el-descriptions-item>
+					<el-descriptions-item label="状态">{{ statusMap[contract.status] || "-" }}</el-descriptions-item>
+					<el-descriptions-item label="备注">{{ contract.description || "-" }}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-alert
+				v-if="isTerminated"
+				title="当前合同已终止，流水已锁定，不可新增、编辑或删除。"
+				type="error"
+				show-icon
+				:closable="false"
+				class="contract-alert"
+			/>
+			<el-row :gutter="12" class="summary-row">
+				<el-col v-for="item in summaryCards" :key="item.label" :span="8">
+					<el-card shadow="never" class="summary-card">
+						<div class="summary-label">{{ item.label }}</div>
+						<div class="summary-value">{{ item.value }}</div>
+					</el-card>
+				</el-col>
+			</el-row>
+			<el-card shadow="hover">
+				<template #header>
+					<div class="card-header">
+						<span>付款流水</span>
+						<el-button type="primary" @click="handleAdd" :disabled="isTerminated" v-auth="'pu_contract.update'">新增流水</el-button>
+					</div>
+				</template>
+				<scTable
+					ref="table"
+					:data="records"
+					row-key="id"
+					stripe
+					hidePagination
+					hideDo
+					hideRefresh
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="付款日期" prop="record_date" />
+					<el-table-column label="付款金额" prop="amount" />
+					<el-table-column label="阶段类型">
+						<template #default="scope">
+							<el-tag size="small" effect="plain">{{ stageMap[scope.row.stage_type] || "-" }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="付款方式">
+						<template #default="scope">
+							<el-tag size="small" type="info" effect="plain">{{ payMethodMap[scope.row.pay_method] || "-" }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
+					<el-table-column label="备注" prop="remark" show-overflow-tooltip />
+					<el-table-column label="创建人" prop="create_by_name" />
+					<el-table-column label="操作" width="120" fixed="right">
+						<template #default="scope">
+							<el-button link type="primary" :disabled="isTerminated" @click="handleEdit(scope.row)" v-auth="'pu_contract.update'">编辑</el-button>
+							<el-button link type="danger" :disabled="isTerminated" @click="handleDelete(scope.row)" v-auth="'pu_contract.update'">删除</el-button>
+						</template>
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+	</el-drawer>
+	<record-form
+		v-if="dialog.form"
+		ref="recordForm"
+		@success="handleFormSuccess"
+		@closed="dialog.form = false"
+	/>
+</template>
+
+<script>
+import recordForm from "./PuContractRecordForm.vue";
+
+export default {
+	components: {
+		recordForm,
+	},
+	emits: ["refresh", "closed"],
+	data() {
+		return {
+			visible: false,
+			loading: false,
+			contractId: "",
+			contract: {},
+			records: [],
+			dialog: {
+				form: false,
+			},
+			statusMap: {
+				10: "草稿",
+				20: "执行中",
+				30: "已完成",
+				40: "已终止",
+			},
+			stageMap: {
+				10: "首款",
+				20: "中间款",
+				30: "尾款",
+				40: "其他",
+			},
+			payMethodMap: {
+				10: "银行转账",
+				20: "现金",
+				30: "承兑",
+				40: "微信",
+				50: "支付宝",
+				60: "其他",
+			},
+		};
+	},
+	computed: {
+		isTerminated() {
+			return this.contract.status === 40;
+		},
+		summaryCards() {
+			return [
+				{ label: "合同金额", value: this.contract.contract_amount || 0 },
+				{ label: "已付款", value: this.contract.paid_amount || 0 },
+				{ label: "未付款", value: this.contract.unpaid_amount || 0 },
+				{ label: "付款进度", value: `${this.contract.pay_progress || 0}%` },
+				{ label: "首款合计", value: this.sumByStage(10) },
+				{ label: "中间款合计", value: this.sumByStage(20) },
+				{ label: "尾款合计", value: this.sumByStage(30) },
+			];
+		},
+	},
+	methods: {
+		progressNumber(value) {
+			return Number(value || 0);
+		},
+		progressColor(status, progress) {
+			if (status === 40) {
+				return "#f56c6c";
+			}
+			if (Number(progress || 0) >= 100) {
+				return "#67c23a";
+			}
+			return "#409eff";
+		},
+		statusTagType(status) {
+			return {
+				10: "info",
+				20: "primary",
+				30: "success",
+				40: "danger",
+			}[status] || "info";
+		},
+		open(contractId) {
+			this.contractId = contractId;
+			this.visible = true;
+			this.loadData();
+			return this;
+		},
+		async loadData() {
+			this.loading = true;
+			try {
+				const [contract, records] = await Promise.all([
+					this.$API.pum.contract.item.req(this.contractId),
+					this.$API.pum.contractRecord.list.req({ page: 0, contract: this.contractId }),
+				]);
+				this.contract = contract;
+				this.records = Array.isArray(records) ? records : records?.data || [];
+			} finally {
+				this.loading = false;
+			}
+		},
+		sumByStage(stageType) {
+			return this.records
+				.filter((item) => item.stage_type === stageType)
+				.reduce((total, item) => total + Number(item.amount || 0), 0)
+				.toFixed(2);
+		},
+		handleAdd() {
+			if (this.isTerminated) {
+				return;
+			}
+			this.dialog.form = true;
+			this.$nextTick(() => {
+				this.$refs.recordForm.open("add", this.contractId);
+			});
+		},
+		handleEdit(row) {
+			if (this.isTerminated) {
+				return;
+			}
+			this.dialog.form = true;
+			this.$nextTick(() => {
+				this.$refs.recordForm.open("edit", this.contractId).setData(row, this.contractId);
+			});
+		},
+		handleDelete(row) {
+			if (this.isTerminated) {
+				return;
+			}
+			this.$confirm("确定删除这条流水吗？", "提示", {
+				type: "warning",
+			}).then(async () => {
+				await this.$API.pum.contractRecord.delete.req(row.id);
+				this.$message.success("删除成功");
+				this.handleFormSuccess();
+			}).catch(() => {});
+		},
+		async handleFormSuccess() {
+			this.dialog.form = false;
+			await this.loadData();
+			this.$emit("refresh");
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer-wrap {
+	padding: 8px;
+}
+.summary-row {
+	margin: 12px 0;
+}
+.contract-head {
+	display: flex;
+	align-items: center;
+	gap: 16px;
+	margin-bottom: 16px;
+}
+.contract-progress {
+	flex: 1;
+}
+.contract-alert {
+	margin-top: 12px;
+}
+.summary-card {
+	margin-bottom: 12px;
+}
+.summary-label {
+	font-size: 13px;
+	color: #909399;
+}
+.summary-value {
+	margin-top: 8px;
+	font-size: 20px;
+	font-weight: 600;
+}
+.card-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>
diff --git a/src/views/pum/components/PuContractRecordForm.vue b/src/views/pum/components/PuContractRecordForm.vue
new file mode 100644
index 00000000..60fa70d6
--- /dev/null
+++ b/src/views/pum/components/PuContractRecordForm.vue
@@ -0,0 +1,191 @@
+<template>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		width="640px"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-form
+			ref="dialogForm"
+			:model="form"
+			:rules="rules"
+			label-width="120px"
+		>
+			<el-row :gutter="16">
+				<el-col :span="12">
+					<el-form-item label="付款日期" prop="record_date">
+						<el-date-picker
+							v-model="form.record_date"
+							type="date"
+							value-format="YYYY-MM-DD"
+							placeholder="付款日期"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款金额" prop="amount">
+						<el-input-number
+							v-model="form.amount"
+							:min="0"
+							:precision="2"
+							controls-position="right"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="阶段类型" prop="stage_type">
+						<el-select
+							v-model="form.stage_type"
+							placeholder="阶段类型"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in stageOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款方式" prop="pay_method">
+						<el-select
+							v-model="form.pay_method"
+							placeholder="付款方式"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in payMethodOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="凭证号">
+						<el-input v-model="form.voucher_no" placeholder="凭证号" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="备注">
+						<el-input
+							v-model="form.remark"
+							type="textarea"
+							:rows="3"
+							placeholder="备注"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" :loading="isSaving" @click="submit">
+				保存
+			</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	emits: ["success", "closed"],
+	data() {
+		return {
+			visible: false,
+			mode: "add",
+			isSaving: false,
+			titleMap: {
+				add: "新增付款流水",
+				edit: "编辑付款流水",
+			},
+			form: {
+				contract: "",
+				record_date: "",
+				amount: undefined,
+				stage_type: 40,
+				pay_method: 10,
+				voucher_no: "",
+				remark: "",
+			},
+			stageOptions: [
+				{ value: 10, label: "首款" },
+				{ value: 20, label: "中间款" },
+				{ value: 30, label: "尾款" },
+				{ value: 40, label: "其他" },
+			],
+			payMethodOptions: [
+				{ value: 10, label: "银行转账" },
+				{ value: 20, label: "现金" },
+				{ value: 30, label: "承兑" },
+				{ value: 40, label: "微信" },
+				{ value: 50, label: "支付宝" },
+				{ value: 60, label: "其他" },
+			],
+			rules: {
+				record_date: [{ required: true, message: "请选择付款日期", trigger: "change" }],
+				amount: [{ required: true, message: "请输入付款金额", trigger: "blur" }],
+				stage_type: [{ required: true, message: "请选择阶段类型", trigger: "change" }],
+				pay_method: [{ required: true, message: "请选择付款方式", trigger: "change" }],
+			},
+		};
+	},
+	methods: {
+		open(mode = "add", contractId = "") {
+			this.mode = mode;
+			this.visible = true;
+			this.form = {
+				contract: contractId,
+				record_date: "",
+				amount: undefined,
+				stage_type: 40,
+				pay_method: 10,
+				voucher_no: "",
+				remark: "",
+			};
+			return this;
+		},
+		setData(data, contractId = "") {
+			this.form = Object.assign(
+				{
+					contract: contractId || data.contract,
+					record_date: "",
+					amount: undefined,
+					stage_type: 40,
+					pay_method: 10,
+					voucher_no: "",
+					remark: "",
+				},
+				data
+			);
+			return this;
+		},
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+				this.isSaving = true;
+				try {
+					if (this.mode === "add") {
+						await this.$API.pum.contractRecord.create.req(this.form);
+					} else {
+						await this.$API.pum.contractRecord.update.req(this.form.id, this.form);
+					}
+					this.$message.success("操作成功");
+					this.$emit("success");
+					this.visible = false;
+				} finally {
+					this.isSaving = false;
+				}
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/pum/contract.vue b/src/views/pum/contract.vue
new file mode 100644
index 00000000..f73eba51
--- /dev/null
+++ b/src/views/pum/contract.vue
@@ -0,0 +1,170 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'pu_contract.create'">新增</el-button>
+			</div>
+			<div class="right-panel">
+				<el-input v-model="query.search" placeholder="合同编号/合同名称/供应商" clearable style="margin-right: 5px;" />
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></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="number" />
+				<el-table-column label="合同名称" prop="name" />
+				<el-table-column label="供应商" prop="supplier_name" />
+				<el-table-column label="合同金额" prop="contract_amount">
+					<template #default="scope">
+						<span class="amount-strong">{{ formatMoney(scope.row.contract_amount) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="已付款" prop="paid_amount">
+					<template #default="scope">
+						<span class="amount-success">{{ formatMoney(scope.row.paid_amount) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="未付款" prop="unpaid_amount">
+					<template #default="scope">
+						<span class="amount-warning">{{ formatMoney(scope.row.unpaid_amount) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="付款进度" min-width="180">
+					<template #default="scope">
+						<div class="progress-cell">
+							<el-progress
+								:percentage="progressNumber(scope.row.pay_progress)"
+								:stroke-width="14"
+								:color="progressColor(scope.row.status, scope.row.pay_progress)"
+							/>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="签订日期" prop="sign_date" />
+				<el-table-column label="合同状态">
+					<template #default="scope">
+						<el-tag :type="statusTagType(scope.row.status)" effect="dark">
+							{{ statusMap[scope.row.status] || "-" }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="180" fixed="right">
+					<template #default="scope">
+						<el-button link type="primary" @click="table_detail(scope.row)">流水详情</el-button>
+						<el-button link type="primary" @click="table_edit(scope.row)" v-auth="'pu_contract.update'">编辑</el-button>
+						<el-button link type="danger" @click="table_del(scope.row)" v-auth="'pu_contract.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>
+	<detail-drawer v-if="dialog.detail" ref="detailDrawer" @refresh="handleSaveSuccess" @closed="dialog.detail = false"></detail-drawer>
+</template>
+
+<script>
+import saveDialog from "./contract_form.vue";
+import detailDrawer from "./components/PuContractRecordDrawer.vue";
+
+export default {
+	components: {
+		saveDialog,
+		detailDrawer,
+	},
+	data() {
+		return {
+			dialog: {
+				save: false,
+				detail: false,
+			},
+			apiObj: this.$API.pum.contract.list,
+			query: {
+				page: 1,
+				page_size: 20,
+			},
+			statusMap: {
+				10: "草稿",
+				20: "执行中",
+				30: "已完成",
+				40: "已终止",
+			},
+		};
+	},
+	methods: {
+		formatMoney(value) {
+			return Number(value || 0).toFixed(2);
+		},
+		progressNumber(value) {
+			return Number(value || 0);
+		},
+		progressColor(status, progress) {
+			if (status === 40) {
+				return "#f56c6c";
+			}
+			if (Number(progress || 0) >= 100) {
+				return "#67c23a";
+			}
+			return "#409eff";
+		},
+		statusTagType(status) {
+			return {
+				10: "info",
+				20: "primary",
+				30: "success",
+				40: "danger",
+			}[status] || "info";
+		},
+		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_detail(row) {
+			this.dialog.detail = true;
+			this.$nextTick(() => {
+				this.$refs.detailDrawer.open(row.id);
+			});
+		},
+		table_del(row) {
+			this.$confirm("确定删除吗？", "提示", {
+				type: "warning",
+			}).then(async () => {
+				await this.$API.pum.contract.delete.req(row.id);
+				this.$message.success("删除成功");
+				this.$refs.table.refresh();
+			}).catch(() => {});
+		},
+		handleSaveSuccess() {
+			this.$refs.table.refresh();
+		},
+		handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+	},
+};
+</script>
+<style scoped>
+.amount-strong {
+	font-weight: 600;
+	color: #303133;
+}
+.amount-success {
+	font-weight: 600;
+	color: #67c23a;
+}
+.amount-warning {
+	font-weight: 600;
+	color: #e6a23c;
+}
+.progress-cell {
+	padding-right: 8px;
+}
+</style>
diff --git a/src/views/pum/contract_form.vue b/src/views/pum/contract_form.vue
new file mode 100644
index 00000000..0f9c12ce
--- /dev/null
+++ b/src/views/pum/contract_form.vue
@@ -0,0 +1,179 @@
+<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="120px">
+					<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="contract_amount">
+								<el-input-number
+									v-model="form.contract_amount"
+									:precision="2"
+									:min="0"
+									controls-position="right"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="签订日期" prop="sign_date">
+								<el-date-picker
+									v-model="form.sign_date"
+									type="date"
+									placeholder="签订日期"
+									value-format="YYYY-MM-DD"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="生效日期">
+								<el-date-picker
+									v-model="form.effective_date"
+									type="date"
+									placeholder="生效日期"
+									value-format="YYYY-MM-DD"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="截止日期">
+								<el-date-picker
+									v-model="form.end_date"
+									type="date"
+									placeholder="截止日期"
+									value-format="YYYY-MM-DD"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="供应商" prop="supplier">
+								<el-select v-model="form.supplier" placeholder="供应商" clearable style="width: 100%">
+									<el-option
+										v-for="item in supplierOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="合同状态" prop="status">
+								<el-select v-model="form.status" placeholder="合同状态" clearable style="width: 100%">
+									<el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="24">
+							<el-form-item label="描述">
+								<el-input v-model="form.description" type="textarea" :rows="3" placeholder="描述" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" :loading="isSaving" @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",
+			visible: false,
+			isSaving: false,
+			form: {
+				status: 10,
+			},
+			titleMap: {
+				add: "新增采购合同",
+				edit: "编辑采购合同",
+				show: "查看采购合同",
+			},
+			supplierOptions: [],
+			statusOptions: [
+				{ value: 10, label: "草稿" },
+				{ value: 20, label: "执行中" },
+				{ value: 30, label: "已完成" },
+				{ value: 40, label: "已终止" },
+			],
+			rules: {
+				name: [{ required: true, message: "请输入合同名称", trigger: "blur" }],
+				number: [{ required: true, message: "请输入合同编号", trigger: "blur" }],
+				supplier: [{ required: true, message: "请选择供应商", trigger: "change" }],
+				sign_date: [{ required: true, message: "请选择签订日期", trigger: "change" }],
+			},
+		};
+	},
+	mounted() {
+		this.getSuppliers();
+	},
+	methods: {
+		getSuppliers() {
+			this.$API.pum.supplier.list.req({ page: 0 }).then((res) => {
+				this.supplierOptions = res;
+			});
+		},
+		open(mode = "add") {
+			this.mode = mode;
+			this.visible = true;
+			if (mode === "add") {
+				this.form = {
+					status: 10,
+				};
+			}
+			return this;
+		},
+		setData(data) {
+			this.form = Object.assign({}, data);
+			return this;
+		},
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+				this.isSaving = true;
+				try {
+					if (this.mode === "add") {
+						await this.$API.pum.contract.create.req(this.form);
+					} else {
+						await this.$API.pum.contract.update.req(this.form.id, this.form);
+					}
+					this.$message.success("操作成功");
+					this.$emit("success", this.form, this.mode);
+					this.visible = false;
+				} finally {
+					this.isSaving = false;
+				}
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/pum/contract_record.vue b/src/views/pum/contract_record.vue
new file mode 100644
index 00000000..2f16d806
--- /dev/null
+++ b/src/views/pum/contract_record.vue
@@ -0,0 +1,110 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel">
+				<el-input
+					v-model="query.search"
+					placeholder="合同编号/合同名称/供应商"
+					clearable
+					style="margin-right: 5px"
+				/>
+				<el-select
+					v-model="query.stage_type"
+					clearable
+					placeholder="阶段类型"
+					style="width: 140px; margin-right: 5px"
+				>
+					<el-option v-for="item in stageOptions" :key="item.value" :label="item.label" :value="item.value" />
+				</el-select>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></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="record_date" />
+				<el-table-column label="付款金额" prop="amount" />
+				<el-table-column label="阶段类型">
+					<template #default="scope">{{ stageMap[scope.row.stage_type] || "-" }}</template>
+				</el-table-column>
+				<el-table-column label="付款方式">
+					<template #default="scope">{{ payMethodMap[scope.row.pay_method] || "-" }}</template>
+				</el-table-column>
+				<el-table-column label="合同编号" prop="contract_number" />
+				<el-table-column label="供应商" prop="supplier_name" />
+				<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
+				<el-table-column label="备注" prop="remark" show-overflow-tooltip />
+				<el-table-column label="操作" width="100" fixed="right">
+					<template #default="scope">
+						<el-button link type="primary" @click="openContract(scope.row.contract)">查看合同</el-button>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<detail-drawer
+		v-if="dialog.detail"
+		ref="detailDrawer"
+		@refresh="refreshTable"
+		@closed="dialog.detail = false"
+	/>
+</template>
+
+<script>
+import detailDrawer from "./components/PuContractRecordDrawer.vue";
+
+export default {
+	components: {
+		detailDrawer,
+	},
+	data() {
+		return {
+			apiObj: this.$API.pum.contractRecord.list,
+			query: {
+				page: 1,
+				page_size: 20,
+				search: "",
+				stage_type: "",
+			},
+			dialog: {
+				detail: false,
+			},
+			stageOptions: [
+				{ value: 10, label: "首款" },
+				{ value: 20, label: "中间款" },
+				{ value: 30, label: "尾款" },
+				{ value: 40, label: "其他" },
+			],
+			stageMap: {
+				10: "首款",
+				20: "中间款",
+				30: "尾款",
+				40: "其他",
+			},
+			payMethodMap: {
+				10: "银行转账",
+				20: "现金",
+				30: "承兑",
+				40: "微信",
+				50: "支付宝",
+				60: "其他",
+			},
+		};
+	},
+	methods: {
+		handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+		openContract(contractId) {
+			this.dialog.detail = true;
+			this.$nextTick(() => {
+				this.$refs.detailDrawer.open(contractId);
+			});
+		},
+		refreshTable() {
+			this.$refs.table.refresh();
+		},
+	},
+};
+</script>
diff --git a/src/views/pum/order_form.vue b/src/views/pum/order_form.vue
index 56c12ed2..974b0032 100644
--- a/src/views/pum/order_form.vue
+++ b/src/views/pum/order_form.vue
@@ -40,6 +40,25 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="采购合同">
+								<el-select
+									v-model="form.contract"
+									placeholder="采购合同"
+									clearable
+									filterable
+									style="width: 100%"
+									@change="handleContractChange"
+								>
+									<el-option
+										v-for="item in contractOptions"
+										:key="item.id"
+										:label="`${item.number} - ${item.name}`"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="截止到货日期">
 								<el-date-picker
@@ -96,11 +115,13 @@ export default {
 			visible: false,
 			isSaveing: false,
 			options: [],
+			contractOptions: [],
 			setFiltersVisible: false,
 		};
 	},
 	mounted() {
 		this.getList();
+		this.getContracts();
 	},
 	methods: {
 		//显示
@@ -114,6 +135,17 @@ export default {
 				this.options = res;
 			});
 		},
+		getContracts() {
+			this.$API.pum.contract.list.req({ page: 0 }).then((res) => {
+				this.contractOptions = res;
+			});
+		},
+		handleContractChange(value) {
+			const contract = this.contractOptions.find((item) => item.id === value);
+			if (contract) {
+				this.form.supplier = contract.supplier;
+			}
+		},
 		//提交
 		submit() {
 			this.$refs.dialogForm.validate(async (valid) => {
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;
+                })
             }
         },
     }
diff --git a/src/views/qm/qct.vue b/src/views/qm/qct.vue
index a79bf6f8..fbf72c47 100644
--- a/src/views/qm/qct.vue
+++ b/src/views/qm/qct.vue
@@ -5,6 +5,17 @@
 				<el-button type="primary" icon="el-icon-plus" @click="tableAdd" v-auth="'qct.create'"></el-button>
 			</div>
 			<div class="right-panel">
+				<xtSelect
+					:apiObj="$API.mtm.material.list"
+					v-model="query.qctmat__material"
+					v-model:obj="selectMaterialObj"
+					:labelField="'full_name'"
+					style="width: 600px;"
+					:params="materialQuery"
+					@change="selectMaterialChange"
+				>
+					<el-table-column label="物料" prop="full_name"></el-table-column>
+				</xtSelect>
 				<el-input v-model="query.search" placeholder="检验表名称" clearable @keyup.enter="handleQuery"></el-input>
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
@@ -91,7 +102,16 @@ import recordDialog from "./qctDetail.vue";
 		data() {
 			return {
 				apiObj:this.$API.qm.qct.list,
-				query: {search:''},
+				query: {
+					search:'',
+					qctmat__material:'',
+				},
+				materialQuery: {
+					page: 0,
+					is_hidden: false,
+					is_assemb: false,
+				},
+				selectMaterialObj: {},
 				isSaving: false,
 				showDrawer: false,
 				limitedVisible: false,
@@ -196,6 +216,10 @@ import recordDialog from "./qctDetail.vue";
 			handleQuery(){
 				this.$refs.table.queryData(this.query)
 			},
+			selectMaterialChange(row){
+				this.query.qctmat__material = row ? row.id : '';
+				this.handleQuery();
+			},
 			dialogClose(){
 				this.isSaving = false;
 				this.limitedVisible = false;
diff --git a/src/views/sam/components/ContractRecordDrawer.vue b/src/views/sam/components/ContractRecordDrawer.vue
new file mode 100644
index 00000000..e2cb71a9
--- /dev/null
+++ b/src/views/sam/components/ContractRecordDrawer.vue
@@ -0,0 +1,275 @@
+<template>
+	<el-drawer
+		v-model="visible"
+		title="销售合同详情 / 到款流水"
+		size="70%"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<div v-loading="loading" class="drawer-wrap">
+			<el-card shadow="hover" header="合同信息">
+				<div class="contract-head">
+					<el-tag :type="statusTagType(contract.status)" effect="dark">
+						{{ statusMap[contract.status] || "-" }}
+					</el-tag>
+					<div class="contract-progress">
+						<el-progress
+							:percentage="progressNumber(contract.receive_progress)"
+							:stroke-width="16"
+							:color="progressColor(contract.status, contract.receive_progress)"
+						/>
+					</div>
+				</div>
+				<el-descriptions :column="3" border>
+					<el-descriptions-item label="合同编号">{{ contract.number }}</el-descriptions-item>
+					<el-descriptions-item label="合同名称">{{ contract.name }}</el-descriptions-item>
+					<el-descriptions-item label="客户">{{ contract.customer_name }}</el-descriptions-item>
+					<el-descriptions-item label="签订日期">{{ contract.sign_date }}</el-descriptions-item>
+					<el-descriptions-item label="状态">{{ statusMap[contract.status] || "-" }}</el-descriptions-item>
+					<el-descriptions-item label="备注">{{ contract.description || "-" }}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-alert
+				v-if="isTerminated"
+				title="当前合同已终止，流水已锁定，不可新增、编辑或删除。"
+				type="error"
+				show-icon
+				:closable="false"
+				class="contract-alert"
+			/>
+			<el-row :gutter="12" class="summary-row">
+				<el-col v-for="item in summaryCards" :key="item.label" :span="8">
+					<el-card shadow="never" class="summary-card">
+						<div class="summary-label">{{ item.label }}</div>
+						<div class="summary-value">{{ item.value }}</div>
+					</el-card>
+				</el-col>
+			</el-row>
+			<el-card shadow="hover">
+				<template #header>
+					<div class="card-header">
+						<span>到款流水</span>
+						<el-button type="primary" @click="handleAdd" :disabled="isTerminated" v-auth="'contract.update'">新增流水</el-button>
+					</div>
+				</template>
+				<scTable
+					ref="table"
+					:data="records"
+					row-key="id"
+					stripe
+					hidePagination
+					hideDo
+					hideRefresh
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="到款日期" prop="record_date" />
+					<el-table-column label="到款金额" prop="amount" />
+					<el-table-column label="阶段类型">
+						<template #default="scope">
+							<el-tag size="small" effect="plain">{{ stageMap[scope.row.stage_type] || "-" }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="收款方式">
+						<template #default="scope">
+							<el-tag size="small" type="info" effect="plain">{{ payMethodMap[scope.row.pay_method] || "-" }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
+					<el-table-column label="备注" prop="remark" show-overflow-tooltip />
+					<el-table-column label="创建人" prop="create_by_name" />
+					<el-table-column label="操作" width="120" fixed="right">
+						<template #default="scope">
+							<el-button link type="primary" :disabled="isTerminated" @click="handleEdit(scope.row)" v-auth="'contract.update'">编辑</el-button>
+							<el-button link type="danger" :disabled="isTerminated" @click="handleDelete(scope.row)" v-auth="'contract.update'">删除</el-button>
+						</template>
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+	</el-drawer>
+	<record-form
+		v-if="dialog.form"
+		ref="recordForm"
+		@success="handleFormSuccess"
+		@closed="dialog.form = false"
+	/>
+</template>
+
+<script>
+import recordForm from "./ContractRecordForm.vue";
+
+export default {
+	components: {
+		recordForm,
+	},
+	emits: ["refresh", "closed"],
+	data() {
+		return {
+			visible: false,
+			loading: false,
+			contractId: "",
+			contract: {},
+			records: [],
+			dialog: {
+				form: false,
+			},
+			statusMap: {
+				10: "草稿",
+				20: "执行中",
+				30: "已完成",
+				40: "已终止",
+			},
+			stageMap: {
+				10: "首款",
+				20: "中间款",
+				30: "尾款",
+				40: "其他",
+			},
+			payMethodMap: {
+				10: "银行转账",
+				20: "现金",
+				30: "承兑",
+				40: "微信",
+				50: "支付宝",
+				60: "其他",
+			},
+		};
+	},
+	computed: {
+		isTerminated() {
+			return this.contract.status === 40;
+		},
+		summaryCards() {
+			return [
+				{ label: "合同金额", value: this.contract.amount || 0 },
+				{ label: "已到款", value: this.contract.received_amount || 0 },
+				{ label: "未到款", value: this.contract.unreceived_amount || 0 },
+				{ label: "到款进度", value: `${this.contract.receive_progress || 0}%` },
+				{ label: "首款合计", value: this.sumByStage(10) },
+				{ label: "中间款合计", value: this.sumByStage(20) },
+				{ label: "尾款合计", value: this.sumByStage(30) },
+			];
+		},
+	},
+	methods: {
+		progressNumber(value) {
+			return Number(value || 0);
+		},
+		progressColor(status, progress) {
+			if (status === 40) {
+				return "#f56c6c";
+			}
+			if (Number(progress || 0) >= 100) {
+				return "#67c23a";
+			}
+			return "#409eff";
+		},
+		statusTagType(status) {
+			return {
+				10: "info",
+				20: "primary",
+				30: "success",
+				40: "danger",
+			}[status] || "info";
+		},
+		open(contractId) {
+			this.contractId = contractId;
+			this.visible = true;
+			this.loadData();
+			return this;
+		},
+		async loadData() {
+			this.loading = true;
+			try {
+				const [contract, records] = await Promise.all([
+					this.$API.sam.contract.item.req(this.contractId),
+					this.$API.sam.contractRecord.list.req({ page: 0, contract: this.contractId }),
+				]);
+				this.contract = contract;
+				this.records = Array.isArray(records) ? records : records?.data || [];
+			} finally {
+				this.loading = false;
+			}
+		},
+		sumByStage(stageType) {
+			return this.records
+				.filter((item) => item.stage_type === stageType)
+				.reduce((total, item) => total + Number(item.amount || 0), 0)
+				.toFixed(2);
+		},
+		handleAdd() {
+			if (this.isTerminated) {
+				return;
+			}
+			this.dialog.form = true;
+			this.$nextTick(() => {
+				this.$refs.recordForm.open("add", this.contractId);
+			});
+		},
+		handleEdit(row) {
+			if (this.isTerminated) {
+				return;
+			}
+			this.dialog.form = true;
+			this.$nextTick(() => {
+				this.$refs.recordForm.open("edit", this.contractId).setData(row, this.contractId);
+			});
+		},
+		handleDelete(row) {
+			if (this.isTerminated) {
+				return;
+			}
+			this.$confirm("确定删除这条流水吗？", "提示", {
+				type: "warning",
+			}).then(async () => {
+				await this.$API.sam.contractRecord.delete.req(row.id);
+				this.$message.success("删除成功");
+				this.handleFormSuccess();
+			}).catch(() => {});
+		},
+		async handleFormSuccess() {
+			this.dialog.form = false;
+			await this.loadData();
+			this.$emit("refresh");
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer-wrap {
+	padding: 8px;
+}
+.summary-row {
+	margin: 12px 0;
+}
+.contract-head {
+	display: flex;
+	align-items: center;
+	gap: 16px;
+	margin-bottom: 16px;
+}
+.contract-progress {
+	flex: 1;
+}
+.contract-alert {
+	margin-top: 12px;
+}
+.summary-card {
+	margin-bottom: 12px;
+}
+.summary-label {
+	font-size: 13px;
+	color: #909399;
+}
+.summary-value {
+	margin-top: 8px;
+	font-size: 20px;
+	font-weight: 600;
+}
+.card-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>
diff --git a/src/views/sam/components/ContractRecordForm.vue b/src/views/sam/components/ContractRecordForm.vue
new file mode 100644
index 00000000..a7316da0
--- /dev/null
+++ b/src/views/sam/components/ContractRecordForm.vue
@@ -0,0 +1,191 @@
+<template>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		width="640px"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-form
+			ref="dialogForm"
+			:model="form"
+			:rules="rules"
+			label-width="120px"
+		>
+			<el-row :gutter="16">
+				<el-col :span="12">
+					<el-form-item label="到款日期" prop="record_date">
+						<el-date-picker
+							v-model="form.record_date"
+							type="date"
+							value-format="YYYY-MM-DD"
+							placeholder="到款日期"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="到款金额" prop="amount">
+						<el-input-number
+							v-model="form.amount"
+							:min="0"
+							:precision="2"
+							controls-position="right"
+							style="width: 100%"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="阶段类型" prop="stage_type">
+						<el-select
+							v-model="form.stage_type"
+							placeholder="阶段类型"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in stageOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="收款方式" prop="pay_method">
+						<el-select
+							v-model="form.pay_method"
+							placeholder="收款方式"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in payMethodOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="凭证号">
+						<el-input v-model="form.voucher_no" placeholder="凭证号" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="备注">
+						<el-input
+							v-model="form.remark"
+							type="textarea"
+							:rows="3"
+							placeholder="备注"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" :loading="isSaving" @click="submit">
+				保存
+			</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	emits: ["success", "closed"],
+	data() {
+		return {
+			visible: false,
+			mode: "add",
+			isSaving: false,
+			titleMap: {
+				add: "新增到款流水",
+				edit: "编辑到款流水",
+			},
+			form: {
+				contract: "",
+				record_date: "",
+				amount: undefined,
+				stage_type: 40,
+				pay_method: 10,
+				voucher_no: "",
+				remark: "",
+			},
+			stageOptions: [
+				{ value: 10, label: "首款" },
+				{ value: 20, label: "中间款" },
+				{ value: 30, label: "尾款" },
+				{ value: 40, label: "其他" },
+			],
+			payMethodOptions: [
+				{ value: 10, label: "银行转账" },
+				{ value: 20, label: "现金" },
+				{ value: 30, label: "承兑" },
+				{ value: 40, label: "微信" },
+				{ value: 50, label: "支付宝" },
+				{ value: 60, label: "其他" },
+			],
+			rules: {
+				record_date: [{ required: true, message: "请选择到款日期", trigger: "change" }],
+				amount: [{ required: true, message: "请输入到款金额", trigger: "blur" }],
+				stage_type: [{ required: true, message: "请选择阶段类型", trigger: "change" }],
+				pay_method: [{ required: true, message: "请选择收款方式", trigger: "change" }],
+			},
+		};
+	},
+	methods: {
+		open(mode = "add", contractId = "") {
+			this.mode = mode;
+			this.visible = true;
+			this.form = {
+				contract: contractId,
+				record_date: "",
+				amount: undefined,
+				stage_type: 40,
+				pay_method: 10,
+				voucher_no: "",
+				remark: "",
+			};
+			return this;
+		},
+		setData(data, contractId = "") {
+			this.form = Object.assign(
+				{
+					contract: contractId || data.contract,
+					record_date: "",
+					amount: undefined,
+					stage_type: 40,
+					pay_method: 10,
+					voucher_no: "",
+					remark: "",
+				},
+				data
+			);
+			return this;
+		},
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+				this.isSaving = true;
+				try {
+					if (this.mode === "add") {
+						await this.$API.sam.contractRecord.create.req(this.form);
+					} else {
+						await this.$API.sam.contractRecord.update.req(this.form.id, this.form);
+					}
+					this.$message.success("操作成功");
+					this.$emit("success");
+					this.visible = false;
+				} finally {
+					this.isSaving = false;
+				}
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/sam/contract.vue b/src/views/sam/contract.vue
index 96c26606..85f0d44d 100644
--- a/src/views/sam/contract.vue
+++ b/src/views/sam/contract.vue
@@ -12,23 +12,58 @@
     <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">
-        </el-table-column>
         <el-table-column label="合同编号" prop="number">
         </el-table-column>
+        <el-table-column label="合同名称" prop="name">
+        </el-table-column>
+        <el-table-column label="关联客户" prop="customer_name">
+        </el-table-column>
         <el-table-column label="合同金额" prop="amount">
+          <template #default="scope">
+            <span class="amount-strong">{{ formatMoney(scope.row.amount) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已到款" prop="received_amount">
+          <template #default="scope">
+            <span class="amount-success">{{ formatMoney(scope.row.received_amount) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="未到款" prop="unreceived_amount">
+          <template #default="scope">
+            <span class="amount-warning">{{ formatMoney(scope.row.unreceived_amount) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="到款进度" min-width="180">
+          <template #default="scope">
+            <div class="progress-cell">
+              <el-progress
+                :percentage="progressNumber(scope.row.receive_progress)"
+                :stroke-width="14"
+                :color="progressColor(scope.row.status, scope.row.receive_progress)"
+              />
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label="签订日期" prop="sign_date">
         </el-table-column>
-        <el-table-column label="关联客户" prop="customer_name">
+        <el-table-column label="合同状态">
+          <template #default="scope">
+            <el-tag :type="statusTagType(scope.row.status)" effect="dark">
+              {{ statusMap[scope.row.status] || "-" }}
+            </el-tag>
+          </template>
         </el-table-column>
         <el-table-column label="创建人" prop="create_by_name">
         </el-table-column>
         <el-table-column label="描述">
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="left" width="120">
+        <el-table-column label="操作" fixed="right" align="left" width="180">
           <template #default="scope">
+            <el-link type="primary" @click="table_detail(scope.row)">
+              流水详情
+            </el-link>
+            <el-divider direction="vertical"></el-divider>
             <el-link type="primary" @click="table_edit(scope.row)" v-auth="'contract.update'">
               编辑
             </el-link>
@@ -43,18 +78,27 @@
   </el-container>
   <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
+  <detail-drawer
+    v-if="dialog.detail"
+    ref="detailDrawer"
+    @refresh="handleSaveSuccess"
+    @closed="dialog.detail = false"
+  ></detail-drawer>
 </template>
 <script>
 import saveDialog from "./contract_form.vue";
+import detailDrawer from "./components/ContractRecordDrawer.vue";
 export default {
   name: "rparty",
   components: {
     saveDialog,
+    detailDrawer,
   },
   data() {
     return {
       dialog: {
         save: false,
+        detail: false,
       },
       apiObj: this.$API.sam.contract.list,
       query: {
@@ -62,16 +106,40 @@ export default {
         page_size: 20,
         type: 10
       },
+      contractId: "",
       selection: [],
-      state_: {
-        10: '完好',
-        20: '限用',
-        30: '在修',
-        40: '禁用',
+      statusMap: {
+        10: "草稿",
+        20: "执行中",
+        30: "已完成",
+        40: "已终止",
       },
     };
   },
   methods: {
+    formatMoney(value) {
+      return Number(value || 0).toFixed(2);
+    },
+    progressNumber(value) {
+      return Number(value || 0);
+    },
+    progressColor(status, progress) {
+      if (status === 40) {
+        return "#f56c6c";
+      }
+      if (Number(progress || 0) >= 100) {
+        return "#67c23a";
+      }
+      return "#409eff";
+    },
+    statusTagType(status) {
+      return {
+        10: "info",
+        20: "primary",
+        30: "success",
+        40: "danger",
+      }[status] || "info";
+    },
     //添加
     add() {
       this.dialog.save = true;
@@ -93,13 +161,21 @@ export default {
         this.$refs.saveDialog.open("show").setData(row);
       });
     },
+    table_detail(row) {
+      this.contractId = row.id;
+      this.dialog.detail = true;
+      this.$nextTick(() => {
+        this.$refs.detailDrawer.open(row.id);
+      });
+    },
     //删除
     async table_del(row) {
       this.$confirm(`确定删除吗？`, "提示", {
         type: "warning",
       }).then(() => {
-        this.$API.pum.order.delete.req(row.id).then((res) => {
+        this.$API.sam.contract.delete.req(row.id).then((res) => {
           this.$message.success("删除成功");
+          this.$refs.table.refresh();
           return res;
         }).catch((err) => {
           return err;
@@ -123,4 +199,21 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.amount-strong {
+  font-weight: 600;
+  color: #303133;
+}
+.amount-success {
+  font-weight: 600;
+  color: #67c23a;
+}
+.amount-warning {
+  font-weight: 600;
+  color: #e6a23c;
+}
+.progress-cell {
+  padding-right: 8px;
+}
+</style>
diff --git a/src/views/sam/contract_form.vue b/src/views/sam/contract_form.vue
index 31511550..e1affd11 100644
--- a/src/views/sam/contract_form.vue
+++ b/src/views/sam/contract_form.vue
@@ -43,6 +43,35 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="生效日期">
+                <el-date-picker
+                  v-model="form.effective_date"
+                  type="date"
+                  placeholder="生效日期"
+                  value-format="YYYY-MM-DD"
+                  style="width:100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="截止日期">
+                <el-date-picker
+                  v-model="form.end_date"
+                  type="date"
+                  placeholder="截止日期"
+                  value-format="YYYY-MM-DD"
+                  style="width:100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="合同状态" prop="status">
+                <el-select v-model="form.status" placeholder="合同状态" style="width:100%">
+                  <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :md="12" :sm="24">
                 <el-form-item label="关联客户" prop="customer">
                     <el-select
@@ -98,6 +127,12 @@ export default {
       isSaveing: false,
       setFiltersVisible: false,
       options: [],
+      statusOptions: [
+        { value: 10, label: "草稿" },
+        { value: 20, label: "执行中" },
+        { value: 30, label: "已完成" },
+        { value: 40, label: "已终止" },
+      ],
     };
   },
   mounted() {
@@ -114,6 +149,11 @@ export default {
     open(mode = "add",type) {
       this.mode = mode;
       this.visible = true;
+      if (mode === "add") {
+        this.form = {
+          status: 10,
+        };
+      }
       return this;
     },
     //提交
diff --git a/src/views/sam/contract_record.vue b/src/views/sam/contract_record.vue
new file mode 100644
index 00000000..8ca932b7
--- /dev/null
+++ b/src/views/sam/contract_record.vue
@@ -0,0 +1,110 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel">
+				<el-input
+					v-model="query.search"
+					placeholder="合同编号/合同名称/客户"
+					clearable
+					style="margin-right: 5px"
+				/>
+				<el-select
+					v-model="query.stage_type"
+					clearable
+					placeholder="阶段类型"
+					style="width: 140px; margin-right: 5px"
+				>
+					<el-option v-for="item in stageOptions" :key="item.value" :label="item.label" :value="item.value" />
+				</el-select>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></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="record_date" />
+				<el-table-column label="到款金额" prop="amount" />
+				<el-table-column label="阶段类型">
+					<template #default="scope">{{ stageMap[scope.row.stage_type] || "-" }}</template>
+				</el-table-column>
+				<el-table-column label="收款方式">
+					<template #default="scope">{{ payMethodMap[scope.row.pay_method] || "-" }}</template>
+				</el-table-column>
+				<el-table-column label="合同编号" prop="contract_number" />
+				<el-table-column label="客户" prop="customer_name" />
+				<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
+				<el-table-column label="备注" prop="remark" show-overflow-tooltip />
+				<el-table-column label="操作" width="100" fixed="right">
+					<template #default="scope">
+						<el-button link type="primary" @click="openContract(scope.row.contract)">查看合同</el-button>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<detail-drawer
+		v-if="dialog.detail"
+		ref="detailDrawer"
+		@refresh="refreshTable"
+		@closed="dialog.detail = false"
+	/>
+</template>
+
+<script>
+import detailDrawer from "./components/ContractRecordDrawer.vue";
+
+export default {
+	components: {
+		detailDrawer,
+	},
+	data() {
+		return {
+			apiObj: this.$API.sam.contractRecord.list,
+			query: {
+				page: 1,
+				page_size: 20,
+				search: "",
+				stage_type: "",
+			},
+			dialog: {
+				detail: false,
+			},
+			stageOptions: [
+				{ value: 10, label: "首款" },
+				{ value: 20, label: "中间款" },
+				{ value: 30, label: "尾款" },
+				{ value: 40, label: "其他" },
+			],
+			stageMap: {
+				10: "首款",
+				20: "中间款",
+				30: "尾款",
+				40: "其他",
+			},
+			payMethodMap: {
+				10: "银行转账",
+				20: "现金",
+				30: "承兑",
+				40: "微信",
+				50: "支付宝",
+				60: "其他",
+			},
+		};
+	},
+	methods: {
+		handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+		openContract(contractId) {
+			this.dialog.detail = true;
+			this.$nextTick(() => {
+				this.$refs.detailDrawer.open(contractId);
+			});
+		},
+		refreshTable() {
+			this.$refs.table.refresh();
+		},
+	},
+};
+</script>
diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 019c5980..749d4a44 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -55,7 +55,7 @@
 								<span>{{ item.batch }}</span>
 								<span v-if="item.material_&&item.material_.process_name">({{ item.material_.process_name }})</span>
 								<span v-else>(原料棒)</span>
-								<span v-if="item.defect!==null" style="color: red;">{{ item.defect_name }}</span>
+								<el-tag v-if="item.defect!==null" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ item.defect_name }}</el-tag>
 								<div style="float: right">
 									<span>{{ item.count_canhandover }}</span>
 									<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index cc0a7d42..0f3be5d4 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -75,7 +75,7 @@
 										:value="item.id"
 									>
 									<span>{{ item.batch }}</span>
-									<span v-if="item.defect_name&&item.defect_name!==null">({{ item.defect_name }})</span>
+									<el-tag v-if="item.defect_name&&item.defect_name!==null" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ item.defect_name }}</el-tag>
 									<span style="float: right;">{{ item.count_cando }}</span>
 									</el-option>
 								</el-select>
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 57e52dd1..79dfe34f 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -36,6 +36,7 @@
 								:apiObj="apiObjM"
 								v-model="selectObjIds"
 								v-model:obj="selectObjs"
+								v-model:label="selectMaterialLabel"
 								:labelField="'batch'"
 								style="width: 100%;"
 								:params = "paramsM"
@@ -47,7 +48,7 @@
 										<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
 										<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
 										<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
-										<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
+										<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
 									</template>
 								</el-table-column>
 								<el-table-column label="可交接数量" prop="count_canhandover" width="110px"></el-table-column>
@@ -200,6 +201,7 @@
 								:apiObj="apiObjM"
 								v-model="selectObjIds"
 								v-model:obj="selectObjs"
+								v-model:label="selectMaterialLabel"
 								:labelField="'batch'"
 								style="width: 100%;"
 								:params = "paramsM"
@@ -211,7 +213,7 @@
 										<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
 										<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
 										<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
-										<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
+										<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
 									</template>
 								</el-table-column>
 								<el-table-column label="可交接数量" prop="count_canhandover" width="110px"></el-table-column>
@@ -343,6 +345,7 @@ export default {
 			},
 			initForm:{},
 			selectObjIds:[],
+			selectMaterialLabel:"",
 			apiObj:this.$API.mtm.material.list,
 			apiObjM:null,
 			params:{},
@@ -662,6 +665,7 @@ export default {
 		//选中物料批次后，放入handoverb
 		materialChange0(){
 			let that = this;
+			that.selectMaterialLabel = that.selectObjs.map(item => that.formatWmaterialLabel(item)).join(";");
 			that.totalCount = 0;
 			that.selectObjs.forEach(item=>{
 				if(that.handoverbIds.indexOf(item.id)==-1){
@@ -692,6 +696,12 @@ export default {
 			    that.countChange();
 			},500)
 		},
+		formatWmaterialLabel(row){
+			if(!row || !row.batch){
+				return "";
+			}
+			return row.defect_name ? `${row.batch} [${row.defect_name}]` : row.batch;
+		},
 		countChange(){
 			let that = this;
 			let totalCount = 0;
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index 62fb3959..d3bf8cba 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -44,6 +44,7 @@
 									:apiObj="apiObjM"
 									v-model="form.wm_in"
 									v-model:obj="selectObj"
+									v-model:label="wmInLabel"
 									:labelField="'batch'"
 									style="width: 100%;"
 									:params = "paramsM"
@@ -55,7 +56,7 @@
 											<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
 											<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
 											<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
-											<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
+											<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
 										</template>
 									</el-table-column>
 									<el-table-column label="车间库存" prop="count" width="110px"></el-table-column>
@@ -271,6 +272,7 @@ export default {
 				],
 			},
 			selectObj:{count:0},
+			wmInLabel:"",
 			batch_count:null,
 			codeBatch:"",
 			materialFix:"",
@@ -400,7 +402,7 @@ export default {
 		getdefects(material){
 			let that = this;
 			// let material = that.is_fix?that.materialFix:that.materialIn;
-			that.$API.qm.qct.getQct.req({material: material,tag:'process'}).then((res) => {
+			that.$API.qm.qct.getQct.req({material: material,tag:'process',type:'in'}).then((res) => {
 				res.qct_defects.forEach((item) => {
 					that.defectform[item.defect_name] = 0;
 				})
@@ -420,6 +422,11 @@ export default {
 		},
 		materialBatchChange(){
 			let that = this;
+			if(!that.selectObj || !that.selectObj.id){
+				that.wmInLabel = "";
+				return;
+			}
+			that.wmInLabel = that.formatWmaterialLabel(that.selectObj);
 			that.getRoute(that.selectObj.material);
 			that.form.batch = that.selectObj.batch;
 			that.form.count_use = that.selectObj.count_cando;
@@ -483,6 +490,12 @@ export default {
 			})
 			that.countCellChanges();
 		},
+		formatWmaterialLabel(row){
+			if(!row || !row.batch){
+				return "";
+			}
+			return row.defect_name ? `${row.batch} [${row.defect_name}]` : row.batch;
+		},
 		//表单提交方法
 		submit() {
 			let that = this;