diff --git a/package.json b/package.json
index d7b5ff1..b745b32 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "@microsoft/signalr": "^6.0.23",
     "@riophae/vue-treeselect": "0.4.0",
     "@vue/composition-api": "^1.7.2",
+    "@vxe-ui/plugin-export-xlsx": "^3.2.3",
     "af-table-column": "^1.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.4",
@@ -67,8 +68,8 @@
     "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "^2.20.0",
     "vuex": "3.6.0",
-    "vxe-table": "^3.7.8",
-    "vxe-table-plugin-export-xlsx": "legacy",
+    "vxe-pc-ui": "^3.8.2",
+    "vxe-table": "^3.16.8",
     "xe-utils": "^3.5.11",
     "xlsx": "^0.18.5"
   },
diff --git a/src/main.js b/src/main.js
index 98cf4ec..4499bb6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -45,13 +45,25 @@ import printJS from 'print-js'
 import * as echarts from 'echarts'
 import ECharts from 'vue-echarts'
 // VXE-Table相关组件
-import VXETable from 'vxe-table'
-import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
-import ExcelJS from 'exceljs'
-VXETable.use(VXETablePluginExportXLSX, {
-  ExcelJS,
-})
+// import VXETable from 'vxe-table'
+// import 'vxe-table/lib/style.css'
+// import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
+// vxe-table 3.x版本不需要传入ExcelJS参数
+// VXETable.use(VXETablePluginExportXLSX)
+
+// vxe-table更新用法 =============================
+import VxeUIAll, { VxeUI } from 'vxe-pc-ui'
+import 'vxe-pc-ui/lib/style.css'
+import VxeUITable from 'vxe-table'
 import 'vxe-table/lib/style.css'
+import VxeUIPluginExportXLSX from '@vxe-ui/plugin-export-xlsx'
+import ExcelJS from 'exceljs'
+VxeUI.use(VxeUIPluginExportXLSX, {
+  ExcelJS
+})
+Vue.use(VxeUIAll)
+Vue.use(VxeUITable)
+// ===========================================
 
 import dataV from '@jiaminghi/data-view'
 
@@ -62,11 +74,13 @@ import AFTableColumn from 'af-table-column'
 import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 引入中文语言包
 import relativeTime from 'dayjs/plugin/relativeTime'
+import weekOfYear from 'dayjs/plugin/weekOfYear'
 import utc from 'dayjs/plugin/utc'
 import timezone from 'dayjs/plugin/timezone'
 dayjs.extend(utc)
 dayjs.extend(timezone)
 dayjs.extend(relativeTime)
+dayjs.extend(weekOfYear)
 dayjs.tz.setDefault('Asia/Shanghai')
 // mdicon
 import '@mdi/font/css/materialdesignicons.css'
@@ -115,7 +129,7 @@ Vue.use(Element, {
   size: Cookies.get('size') || 'small', // set element-ui default size
 })
 
-Vue.use(VXETable)
+//Vue.use(VXETable)
 
 Vue.use(dataV)
 Vue.use(AFTableColumn)
diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue
index f7c0d0c..2738fb4 100644
--- a/src/views/productManagement/workorder2.vue
+++ b/src/views/productManagement/workorder2.vue
@@ -6,7 +6,8 @@
 					<el-input size="mini" v-model="search.year" placeholder="输入年份"></el-input>
 				</el-form-item>
 				<el-form-item label="周次">
-					<el-input-number size="mini" v-model="search.week" :min="1" :max="100" label="输入周次"></el-input-number>
+					<el-input-number size="mini" v-model="search.week" :min="1" :max="100"
+						label="输入周次"></el-input-number>
 				</el-form-item>
 				<el-form-item label="星期">
 					<el-select size="mini" v-model="search.date" placeholder="请选择星期">
@@ -28,28 +29,33 @@
 				<el-button type="info" size="mini" @click="download_workorder">导出工单</el-button>
 				<el-button type="danger" size="mini" @click="handleAllworkorder">删除工单</el-button>
 				<el-button type="success" size="mini" @click="generate_workorder">生成工单</el-button>
-
 			</div>
 			<!-- 背景描述 -->
 			<div class="tag-box">
-				<el-tag style="margin-right: 10px;" v-for="(item,index) in stateCheckOptions" :key="index" :color="item.color">
-					<span style="color: black;font-weight: 600;font-size: 16px;">{{item.text}}:{{checkNumOption[index]}}</span>
+				<el-tag style="margin-right: 10px;" v-for="(item, index) in stateCheckOptions" :key="index"
+					:color="item.color">
+					<span
+						style="color: black;font-weight: 600;font-size: 16px;">{{ item.text }}:{{ checkNumOption[index] }}</span>
 				</el-tag>
 			</div>
 			<div class="nowOrderRetainBox">
 				<span>当前首检工单：</span>
-				<span v-if="nowOrderRetainStr!==''">{{nowOrderRetainStr}}</span>
+				<span v-if="nowOrderRetainStr !== ''">{{ nowOrderRetainStr }}</span>
 			</div>
 		</div>
 		<!-- 用户导入对话框 -->
 		<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-			<el-upload name="file" ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+			<el-upload name="file" ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+				:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+				:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
 				<i class="el-icon-upload"></i>
 				<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 				<div class="el-upload__tip text-center" slot="tip">
-					<div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产工单</div>
+					<div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产工单
+					</div>
 					<span>仅允许导入xls、xlsx格式文件。</span>
-					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+						@click="importTemplate">下载模板</el-link>
 				</div>
 			</el-upload>
 			<div slot="footer" class="dialog-footer">
@@ -77,12 +83,14 @@
 			</div>
 		</el-dialog>
 
-		<vxe-table :cell-style="rowClassName" border resizable show-overflow ref="xTable" v-loading="loading_1" height="800" :row-config="{ isHover: true, useKey: true, keyField: 'sort' }" :data="workorder_table_data">
-			<vxe-column type="seq" width="60" align="center"></vxe-column>
+		<vxe-table :cell-style="rowClassName" border :column-config="{ resizable: true }" show-overflow ref="xTable"
+			v-loading="loading_1" height="800" :row-config="{ isHover: true, useKey: true, keyField: 'id', drag: true }"
+			:data="workorder_table_data" @row-dragend="handleRowDragEnd">
+			<vxe-column type="seq" width="60" align="center" drag-sort></vxe-column>
 			<!-- <vxe-column field="sort" title="序号"></vxe-column>  -->
 			<!-- <vxe-column field="id" title="1工单号"></vxe-column>  -->
 			<vxe-column title="工单号">
-				<template #default="{row}">
+				<template #default="{ row }">
 					<span style="color: blue;font-weight: bold;">{{ row.clientWorkorder }}</span>
 				</template>
 			</vxe-column>
@@ -100,59 +108,77 @@
 			<vxe-column field="remark2" title="备注2"></vxe-column>
 			<vxe-column title="操作" width="100" show-overflow>
 				<template #default="{ row }">
-					<!-- <vxe-button size="mini" type="text" status="primary" content="修改" @click="updateitem(row)"></vxe-button>
-          <vxe-button size="mini" type="text" status="danger" content="删除" @click="deleteitem(row)"></vxe-button> -->
+					<!-- <vxe-button size="mini" mode="text" status="primary" content="修改" @click="updateitem(row)"></vxe-button>
+          <vxe-button size="mini" mode="text" status="danger" content="删除" @click="deleteitem(row)"></vxe-button> -->
 
 					<el-dropdown>
 						<span class="el-dropdown-link"> 更多操作<i class="el-icon-arrow-down el-icon--right"></i> </span>
 						<el-dropdown-menu slot="dropdown">
 							<el-dropdown-item>
-								<vxe-button size="mini" type="text" status="primary" content="修改" @click="updateitem(row)"></vxe-button></el-dropdown-item>
+								<vxe-button size="mini" mode="text" status="primary" content="修改"
+									@click="updateitem(row)"></vxe-button></el-dropdown-item>
 							<el-dropdown-item>
-								<vxe-button size="mini" type="text" status="danger" content="删除" @click="deleteitem(row)"></vxe-button></el-dropdown-item>
+								<vxe-button size="mini" mode="text" status="danger" content="删除"
+									@click="deleteitem(row)"></vxe-button></el-dropdown-item>
 							<el-dropdown-item>
-								<vxe-button v-show="row.status == 0" size="mini" type="text" status="warning" content="插入工单" @click="addworkorder(row)"></vxe-button></el-dropdown-item>
+								<vxe-button v-show="row.status == 0" size="mini" mode="text" status="warning"
+									content="插入工单" @click="addworkorder(row)"></vxe-button></el-dropdown-item>
 						</el-dropdown-menu>
 					</el-dropdown>
 				</template>
 			</vxe-column>
 		</vxe-table>
-		<pagination v-show="pagination.total > 0" :total="pagination.total" :page.sync="pagination.pageNum" :limit.sync="pagination.pageSize" @pagination="getList" />
+		<pagination v-show="pagination.total > 0" :total="pagination.total" :page.sync="pagination.pageNum"
+			:limit.sync="pagination.pageSize" @pagination="getList" />
 		<!-- 添加或修改生产工单对话框 -->
 		<el-dialog :title="dialog.title" :visible.sync="dialog.open" width="63%">
 			<el-form :model="workorderItem" ref="workorder">
 				<el-row>
 					<el-col :span="8"><el-form-item label="毛坯号" prop="blankNumber">
-							<el-input v-model="workorderItem.blankNumber" placeholder="毛坯号"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.blankNumber" placeholder="毛坯号"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="成品零件号" prop="finishedPartNumber">
-							<el-input v-model="workorderItem.finishedPartNumber" placeholder="毛坯号"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.finishedPartNumber" placeholder="毛坯号"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="产品描述" prop="productDescription">
-							<el-input v-model="workorderItem.productDescription" placeholder="产品描述"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.productDescription" placeholder="产品描述"></el-input>
+						</el-form-item></el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="8"><el-form-item label="颜色" prop="colour"> <el-input v-model="workorderItem.colour" placeholder="颜色"></el-input> </el-form-item></el-col>
+					<el-col :span="8"><el-form-item label="颜色" prop="colour"> <el-input v-model="workorderItem.colour"
+								placeholder="颜色"></el-input> </el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="规格" prop="specifications">
-							<el-input v-model="workorderItem.specifications" placeholder="规格"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.specifications" placeholder="规格"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="编码号" prop="codeNumber">
-							<el-input v-model="workorderItem.codeNumber" placeholder="编码号"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.codeNumber" placeholder="编码号"></el-input>
+						</el-form-item></el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="8"><el-form-item label="车数" prop="vehicleNumber">
-							<el-input v-model="workorderItem.vehicleNumber" placeholder="毛坯号" @input="vehicleNumberInput"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.vehicleNumber" placeholder="毛坯号"
+								@input="vehicleNumberInput"></el-input> </el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="挂具摆放数" prop="hangNumber">
-							<el-input v-model="workorderItem.hangNumber" placeholder="挂具摆放数" @input="hangNumberInput"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.hangNumber" placeholder="挂具摆放数"
+								@input="hangNumberInput"></el-input> </el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="上件数" prop="previousNumber">
-							<el-input v-model="workorderItem.previousNumber" placeholder="上件数"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.previousNumber" placeholder="上件数"></el-input>
+						</el-form-item></el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="8"><el-form-item label="双组号缸号" prop="cylinderNumber">
-							<el-input v-model="workorderItem.cylinderNumber" placeholder="双组号缸号"></el-input> </el-form-item></el-col>
-					<el-col :span="8"><el-form-item label="备注1" prop="remark1"> <el-input v-model="workorderItem.remark1" placeholder="备注1"></el-input> </el-form-item></el-col>
-					<el-col :span="8"><el-form-item label="备注2" prop="remark2"> <el-input v-model="workorderItem.remark2" placeholder="备注2"></el-input> </el-form-item></el-col>
+							<el-input v-model="workorderItem.cylinderNumber" placeholder="双组号缸号"></el-input>
+						</el-form-item></el-col>
+					<el-col :span="8"><el-form-item label="备注1" prop="remark1"> <el-input
+								v-model="workorderItem.remark1" placeholder="备注1"></el-input> </el-form-item></el-col>
+					<el-col :span="8"><el-form-item label="备注2" prop="remark2"> <el-input
+								v-model="workorderItem.remark2" placeholder="备注2"></el-input> </el-form-item></el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="8"><el-form-item label="年" prop="cylinderNumber"> <el-input v-model="workorderItem.year" placeholder="年"></el-input> </el-form-item></el-col>
-					<el-col :span="8"><el-form-item label="周" prop="remark1"> <el-input v-model="workorderItem.week" placeholder="周"></el-input> </el-form-item></el-col>
+					<el-col :span="8"><el-form-item label="年" prop="cylinderNumber"> <el-input
+								v-model="workorderItem.year" placeholder="年"></el-input> </el-form-item></el-col>
+					<el-col :span="8"><el-form-item label="周" prop="remark1"> <el-input v-model="workorderItem.week"
+								placeholder="周"></el-input> </el-form-item></el-col>
 					<el-col :span="8"><el-form-item label="日" prop="remark2">
 							<el-select v-model="workorderItem.date" placeholder="请选择日">
 								<el-option label="周一" value="1"> </el-option>
@@ -175,531 +201,499 @@
 </template>
 
 <script>
-	import * as emqxUtil from '@/utils/mqtt/emqxUtil';
-	import {
-		getWorkoderList,
-		dowmloadWorkorder,
-		deleteAllWorkorder,
-		addNewworkorder,
-		deleteworkorder,
-		updateworkorder,
-		updateSort,
-		updateSort2,
-		GenerateWorkorder,
-	} from '@/api/productManagement/workoder_v2.js'
-	import Sortable from 'sortablejs'
-	import { getToken } from '@/utils/auth'
+import * as emqxUtil from '@/utils/mqtt/emqxUtil';
+import {
+	getWorkoderList,
+	dowmloadWorkorder,
+	deleteAllWorkorder,
+	addNewworkorder,
+	deleteworkorder,
+	updateworkorder,
+	updateSort,
+	updateSort2,
+	GenerateWorkorder,
+} from '@/api/productManagement/workoder_v2.js'
+// 已移除Sortable.js依赖，使用vxe-table内置拖拽功能
+import { getToken } from '@/utils/auth'
 
-	export default {
-		name: 'workorder2',
-		data() {
-			return {
-				mqttClient: null,
-				mqttClientId: emqxUtil.title + Math.random().toString(16).substring(2, 8),
-				sortable: null,
-				search: {
-					year: new Date().getFullYear(),
-					week: 1,
-					date: 1,
+export default {
+	name: 'workorder2',
+	data() {
+		return {
+			mqttClient: null,
+			mqttClientId: emqxUtil.title + Math.random().toString(16).substring(2, 8),
+			sortable: null,
+			search: {
+				year: new Date().getFullYear(),
+				week: 1,
+				date: 1,
+			},
+			pagination: {
+				total: 0,
+				pageNum: 1,
+				pageSize: 10,
+			},
+			// 新增修改工单模态框
+			dialog: {
+				title: '',
+				open: false,
+				form: {},
+			},
+			loading_1: true,
+			workorder_table_data: [],
+			upload: {
+				// 用户导入参数
+				// 是否显示弹出层（用户导入）
+				open: false,
+				// 弹出层标题（用户导入）
+				title: '',
+				// 是否禁用上传
+				isUploading: false,
+				// 是否更新已经存在的用户数据
+				updateSupport: false,
+				// 设置上传的请求头部
+				headers: { Authorization: 'Bearer ' + getToken() },
+				// 上传的地址
+				url: process.env.VUE_APP_BASE_API + '/mes/pro/workorder_v2/importData',
+			},
+			download_: {
+				title: '下载生产工单',
+				open: false,
+				query: {
+					year: 0,
+					week: 0,
 				},
-				pagination: {
-					total: 0,
-					pageNum: 1,
-					pageSize: 10,
-				},
-				// 新增修改工单模态框
-				dialog: {
-					title: '',
-					open: false,
-					form: {},
-				},
-				loading_1: true,
-				workorder_table_data: [],
-				upload: {
-					// 用户导入参数
-					// 是否显示弹出层（用户导入）
-					open: false,
-					// 弹出层标题（用户导入）
-					title: '',
-					// 是否禁用上传
-					isUploading: false,
-					// 是否更新已经存在的用户数据
-					updateSupport: false,
-					// 设置上传的请求头部
-					headers: { Authorization: 'Bearer ' + getToken() },
-					// 上传的地址
-					url: process.env.VUE_APP_BASE_API + '/mes/pro/workorder_v2/importData',
-				},
-				download_: {
-					title: '下载生产工单',
-					open: false,
-					query: {
-						year: 0,
-						week: 0,
-					},
-				},
-				// 新增或者修改表格
-				workorderItem: {
-					blankNumber: '',
-					finishedPartNumber: '',
-					productDescription: '',
-					colour: '',
-					specifications: '',
-					codeNumber: null,
-					vehicleNumber: null,
-					hangNumber: null,
-					previousNumber: null,
-					cylinderNumber: null,
-					remark1: '',
-					remark2: '',
-					sort: 0,
-					year: new Date().getFullYear(),
-					week: null,
-					date: null,
-				},
-				nowOrderRetainStr: '',
-				rules: {
-					finishedPartNumber: [{ required: true, message: '成品零件号不能为空', trigger: 'blur' }],
-				},
-				// 数据检查
-				stateCheckOptions: [
-					{ state: 0, color: '#ffffff', text: '正常' },
-					{ state: 1, color: '#FA8072', text: '物料不存在' },
-					{ state: 2, color: '#EE82EE', text: '毛坯号异常' },
-					{ state: 3, color: '#FFC0CB', text: '颜色异常' },
-					{ state: 4, color: '#E6E6FA', text: '规格异常' },
-					{ state: 5, color: '#ffffd5', text: '物料不包含此描述' },
-				],
-				tableAllData: [],
-				// checkNumOption: [0, 0, 0, 0, 0, 0],
+			},
+			// 新增或者修改表格
+			workorderItem: {
+				blankNumber: '',
+				finishedPartNumber: '',
+				productDescription: '',
+				colour: '',
+				specifications: '',
+				codeNumber: null,
+				vehicleNumber: null,
+				hangNumber: null,
+				previousNumber: null,
+				cylinderNumber: null,
+				remark1: '',
+				remark2: '',
+				sort: 0,
+				year: new Date().getFullYear(),
+				week: null,
+				date: null,
+			},
+			nowOrderRetainStr: '',
+			rules: {
+				finishedPartNumber: [{ required: true, message: '成品零件号不能为空', trigger: 'blur' }],
+			},
+			// 数据检查
+			stateCheckOptions: [
+				{ state: 0, color: '#ffffff', text: '正常' },
+				{ state: 1, color: '#FA8072', text: '物料不存在' },
+				{ state: 2, color: '#EE82EE', text: '毛坯号异常' },
+				{ state: 3, color: '#FFC0CB', text: '颜色异常' },
+				{ state: 4, color: '#E6E6FA', text: '规格异常' },
+				{ state: 5, color: '#ffffd5', text: '物料不包含此描述' },
+			],
+			tableAllData: [],
+			// checkNumOption: [0, 0, 0, 0, 0, 0],
+		}
+	},
+	created() {
+		this.initMqtt();
+	},
+	computed: {
+		checkNumOption() {
+			let list = [0, 0, 0, 0, 0, 0];
+			for (let item of this.tableAllData) {
+				list[item.state]++;
 			}
-		},
-		created() {
-			this.initMqtt();
-		},
-		computed: {
-			checkNumOption() {
-				let list = [0, 0, 0, 0, 0, 0];
-				for (let item of this.tableAllData) {
-					list[item.state]++;
-				}
-				return list;
+			return list;
+		}
+	},
+	mounted() {
+		// 使用dayjs获取当前周数和星期
+		const today = this.$dayjs();
+		this.search.week = today.week();
+		// 获取星期几，1-7对应周一到周日
+		this.search.date = today.day() === 0 ? 7 : today.day();
+
+		this.getList();
+	},
+	methods: {
+		// 处理行拖拽结束事件
+		handleRowDragEnd(dragEvent) {
+			const { newRow, oldRow, dragRow, offsetIndex } = dragEvent;
+			if (!newRow || !oldRow) {
+				console.error('未获取到有效行数据');
+				return;
 			}
-		},
-		mounted() {
-			this.getList()
-			// this.drag()
-			this.rowDrop();
-		},
-		methods: {
-			//todo 拖拽
-			drag() {
-				// 首先获取需要拖拽的dom节点
-				const el1 = document.querySelectorAll('.vxe-table--body-wrapper')[0].querySelectorAll('table > tbody')[0]
-				Sortable.create(el1, {
-					disabled: false, // 是否开启拖拽
-					delay: 5,
-					dragClass: 'sortable-ghost', //拖拽样式
-					chosenClass: 'sortable-ghost',
-					animation: 3000, // 拖拽延时，效果更好看
-					dataIdAttr: 'rowid',
-					group: {
-						// 是否开启跨表拖拽
-						pull: false,
-						put: false,
-					},
-					onEnd: ({ newIndex, oldIndex }) => {
-						//  获取新的排序值，然后剩余的累加即可
-						this.$nextTick(function () {
-							const query = {}
-							query.sort = this.workorder_table_data[newIndex].sort
-							query.id = this.workorder_table_data[oldIndex].id
-							//发起请求 排序持久化
-							updateSort(query).then((res) => {
-								if (res.code == 200 && res.data > 0) {
-									this.$notify.success('修改成功')
-								}
-							}).catch
-						})
-					},
-				})
-			},
-			//XXX新方案
-			rowDrop() {
-				this.$nextTick(() => {
-					let xTable = this.$refs.xTable;
-					this.sortable = Sortable.create(
-						xTable.$el.querySelector(".body--wrapper>.vxe-table--body tbody"),
-						{
-							handle: ".vxe-body--row",
-							animation: 150,
-							onEnd: ({ newIndex, oldIndex }) => { // 拖拽后回调
-								// 解决方案
-								this.workorder_table_data.splice(newIndex, 0, this.workorder_table_data.splice(oldIndex, 1)[0]);
-								let newArray = this.workorder_table_data.slice(0);
-								this.workorder_table_data = [];
-								this.$nextTick(function () {
-									this.workorder_table_data = newArray;
-									const query = {
-										oldId: this.workorder_table_data[oldIndex].id,
-										oldSort: this.workorder_table_data[oldIndex].sort,
-										newId: this.workorder_table_data[newIndex].id,
-										newSort: this.workorder_table_data[newIndex].sort,
-									}
-									updateSort2(query).then((res) => {
-										if (res.code == 200 && res.data > 0) {
-											this.$notify.success('修改成功')
-										} else {
-											this.$notify.error('修改失败')
-										}
-									})
-								});
-							},
-						}
-					);
-				});
-			},
-
-			handleClick() {
-				this.getList()
-			},
-			//todo   获取生产工单列表
-			getList() {
-				const query = { ...this.search, ...this.pagination }
-				if (query.week == null || query.week == undefined || query.week == '') query.week = -1
-				if (query.year == null || query.year == undefined || query.year == '') query.year = -1
-				getWorkoderList(query).then((res) => {
-					if (res.code == 200) {
-						this.loading_1 = false
-						this.workorder_table_data = res.data.item1
-						this.pagination.total = res.data.item2
-					}
-				})
-				let allQuery = query;
-				allQuery.pageNum = 1;
-				allQuery.pageSize = 1000;
-				getWorkoderList(allQuery).then((res) => {
-					if (res.code == 200) {
-						this.tableAllData = res.data.item1
-					}
-				})
-			},
-
-
-			//todo  导入生产工单
-			importworkorder() {
-				this.upload.open = true
-				this.upload.title = '生产工单导入'
-			},
-			//todo 下载模板
-			importTemplate() {
-				//  @/utils/ruoyi"
-				this.download('/mes/pro/workorder_v2/importTemplate', '生产工单导入模板')
-			},
-
-			// todo 文件上传中处理
-			handleFileUploadProgress(event, file, fileList) {
-				this.upload.isUploading = true
-			},
-			//todo  提交上传文件
-			submitFileForm() {
-				this.$refs.upload.submit()
-			},
-			//todo 文件上传成功处理
-			handleFileSuccess(response, file, fileList) {
-				this.upload.open = false
-				this.upload.isUploading = false
-				this.$refs.upload.clearFiles()
-				if (response.code == 200) {
-					this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
-				} else {
-					this.$alert(response.msg, '导入结果', {
-						dangerouslyUseHTMLString: true,
-						type: 'error',
-					})
-				}
-
-				this.getList()
-			},
-
-			//todo  下载
-			async submitdowm() {
-				this.download_.open = false
-				await dowmloadWorkorder(this.download_.query)
-			},
-			//todo
-			download_workorder() {
-				this.download_.open = true
-				this.download_.query.year = this.search.year
-				this.download_.query.week = this.search.week
-				this.download_.query.date = this.search.date
-			},
-
-			//todo 删除本周工单
-			handleAllworkorder() {
-				if (this.search.week == undefined || this.search.date == undefined) {
-					return
-				}
+			// 查找新旧行在数据中的索引
+			const oldIndex = this.workorder_table_data.findIndex(item => item.id === oldRow.id);
+			const newIndex = this.workorder_table_data.findIndex(item => item.id === newRow.id);
+			if (oldIndex === -1 || newIndex === -1) {
+				console.error('未在数据中找到对应的行');
+				return;
+			}
+			// 获取拖拽前的数据
+			const oldData = [...this.workorder_table_data];
+			// 从旧位置移除数据并插入到新位置
+			const movedItem = oldData.splice(oldIndex, 1)[0];
+			oldData.splice(newIndex, 0, movedItem);
+			// 更新数据
+			this.workorder_table_data = [];
+			this.$nextTick(() => {
+				this.workorder_table_data = oldData;
+				// 准备排序请求参数
 				const query = {
-					year: this.search.year,
-					week: this.search.week,
-					date: this.search.date,
-				}
-
-				this.$modal
-					.confirm('是否确认删除本天所有生产工单？')
-					.then(function () {
-						return deleteAllWorkorder(query)
-						// return deleteworkplan(query)
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							if (res.data > 1) {
-								this.$notify.success('删除成功')
-								this.getList()
-							} else {
-								this.$notify.error('删除失败')
-								this.getList()
-							}
-						}
-					})
-					.catch(() => {})
-			},
-
-			//todo 新增生产工单
-			addworkorder(row) {
-				this.dialog.title = '新增生产工单'
-				this.dialog.open = true
-				this.flag = 'insert'
-				this.workorderItem.year = this.search.year
-				this.workorderItem.week = this.search.week
-				this.workorderItem.date = this.search.date
-				this.workorderItem.sort = row.sort
-			},
-			//todo 新增或者修改 提交按钮
-			submitForm() {
-				const query = { ...this.workorderItem };
-				// (query.codeNumber = Number(query.codeNumber)),
-				(query.qualificationRate = Number(query.qualificationRate)),
-				(query.vehicleNumber = Number(query.vehicleNumber)),
-				(query.hangNumber = Number(query.hangNumber)),
-				(query.previousNumber = Number(query.previousNumber)),
-				(query.year = Number(query.year)),
-				(query.week = Number(query.week)),
-				(query.date = Number(query.date)),
-				(query.sort = Number(query.sort))
-				console.log('query',query);
-				if (this.flag == 'insert') {
-					this.$refs['workorder'].validate((valid) => {
-						if (valid) {
-							addNewworkorder(query).then((res) => {
-								if (res.code == 200) {
-									this.$notify.success('新增成功')
-									this.getList()
-									this.dialog.open = false
-									// 清空表单
-									this.clearworkorderItem()
-								}
-							})
-						}
-					})
-				} else if (this.flag == 'update') {
-					this.$refs['workorder'].validate((valid) => {
-						if (valid) {
-							updateworkorder(query).then((res) => {
-								if (res.code == 200) {
-									this.$notify.success('修改成功')
-									this.getList()
-									this.dialog.open = false
-									// 清空表单
-									//this.resetForm('workplan')
-									this.clearworkorderItem()
-								}
-							})
-						}
-					})
-				}
-			},
-
-			//todo  清空表单
-			clearworkorderItem() {
-				Object.keys(this.workorderItem).forEach((key) => {
-					this.workorderItem[key] = null
-				})
-			},
-			//todo 返回
-			cancel() {
-				this.dialog.open = false
-				this.clearworkorderItem()
-			},
-
-			//todo 删除事件
-			deleteitem(row) {
-				this.$modal
-					.confirm('是否确认删除生产工单名称为' + row.productDescription + '"的数据项？')
-					.then(function () {
-						return deleteworkorder(row.id)
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							if (res.data == 1) {
-								this.$notify.success('删除成功')
-								this.getList()
-							} else {
-								this.$notify.error('删除失败')
-							}
-						}
-					})
-					.catch(() => {})
-			},
-
-			//todo 修改生产工单
-			updateitem(row) {
-				this.dialog.open = true
-				this.flag = 'update'
-				this.dialog.title = '修改生产工单'
-				this.workorderItem.id = row.id
-				this.workorderItem.blankNumber = row.blankNumber
-				this.workorderItem.finishedPartNumber = row.finishedPartNumber
-				this.workorderItem.productDescription = row.productDescription
-				this.workorderItem.colour = row.colour
-				this.workorderItem.specifications = row.specifications
-				this.workorderItem.codeNumber = row.codeNumber
-				this.workorderItem.vehicleNumber = row.vehicleNumber
-				this.workorderItem.hangNumber = row.hangNumber
-				this.workorderItem.previousNumber = row.previousNumber
-				this.workorderItem.cylinderNumber = row.cylinderNumber
-				this.workorderItem.remark1 = row.remark1
-				this.workorderItem.remark2 = row.remark2
-				this.workorderItem.year = row.year
-				this.workorderItem.week = row.week
-				this.workorderItem.date = row.date
-			},
-			//todo 生成工单
-			generate_workorder() {
-				this.$modal
-					.confirm('是否确认重新生成工单')
-					.then(() => {
-						if (this.search.year == undefined) {
-							this.$message.error('请选择年份')
-							return
-						}
-						if (this.search.week == undefined) {
-							this.$message.error('请选择周')
-							return
-						}
-						if (this.search.date == undefined) {
-							this.$message.error('请选择日期')
-							return
-						}
-
-						return GenerateWorkorder(this.search)
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							if (res.data > 0) {
-								this.$notify.success('生成工单成功')
-								this.getList()
-							} else {
-								this.$notify.error('生成工单失败')
-							}
-						}
-					})
-					.catch(() => {})
-			},
-			vehicleNumberInput(value) {
-				if (this.workorderItem.vehicleNumber >= 0 && this.workorderItem.hangNumber >= 0) {
-					this.workorderItem.previousNumber = this.workorderItem.vehicleNumber * this.workorderItem.hangNumber
-				} else {
-					this.workorderItem.previousNumber = 0;
-				}
-
-			},
-			hangNumberInput(value) {
-				if (this.workorderItem.vehicleNumber >= 0 && this.workorderItem.hangNumber >= 0) {
-					this.workorderItem.previousNumber = this.workorderItem.vehicleNumber * this.workorderItem.hangNumber
-				} else {
-					this.workorderItem.previousNumber = 0;
-				}
-			},
-			// 更改单元格格式
-			rowClassName(item) {
-				const row = item.row;
-				const options = this.stateCheckOptions;
-				for (let index in options) {
-					if (row.state === options[index].state) {
-						return {
-							backgroundColor: options[index].color,
-						}
+					oldId: oldRow.id,
+					oldSort: oldRow.sort,
+					newId: newRow.id,
+					newSort: newRow.sort,
+				};
+				// 发送排序请求
+				updateSort2(query).then((res) => {
+					if (res.code == 200 && res.data > 0) {
+						this.$notify.success('修改成功');
+					} else {
+						this.$notify.error('修改失败');
 					}
+				});
+			});
+		},
+		handleClick() {
+			this.getList()
+		},
+		// 获取生产工单列表
+		getList() {
+			const query = { ...this.search, ...this.pagination }
+			// 处理空值
+			query.week = query.week ?? -1;
+			query.year = query.year ?? -1;
+
+			// 并行请求分页数据和全量数据
+			Promise.all([
+				getWorkoderList(query),
+				getWorkoderList({ ...query, pageNum: 1, pageSize: 1000 })
+			]).then(([pageRes, allRes]) => {
+				// 处理分页数据响应
+				if (pageRes.code === 200) {
+					this.loading_1 = false;
+					this.workorder_table_data = pageRes.data.item1;
+					this.pagination.total = pageRes.data.item2;
 				}
-				return null;
-			},
-			initMqtt() {
-				const that = this;
-				if (that.mqttClient !== null && that.mqttClient.connected) {
-					// 已建立连接
-					return;
+
+				// 处理全量数据响应
+				if (allRes.code === 200) {
+					this.tableAllData = allRes.data.item1;
 				}
-				// 需要传输或订阅的内容
-				const _topic = emqxUtil.firstFQCTopic;
-				that.mqttClient = emqxUtil.createClient(that.mqttClientId);
-				that.mqttClient.subscribe(_topic.NowOrderRetain);
-				// 去重处理
-				let nowOrderRetainTimestemp = 0;
-				let nowOrderRetainWorkOrder = '';
-				// 监听数据
-				that.mqttClient.on('message', function (topic, message) {
-					// 首检当前工单
-					if (topic === _topic.NowOrderRetain) {
-						// 其他同页面触发当前工单的点击值变动
-						const nowOrderRetainData = emqxUtil.parseJSON(message);
-						// 检查消息时间，要最新
-						if (nowOrderRetainTimestemp < nowOrderRetainData.timestemp) {
-							nowOrderRetainTimestemp = nowOrderRetainData.timestemp;
-							if (nowOrderRetainWorkOrder !== nowOrderRetainData.workId) {
-								nowOrderRetainWorkOrder = nowOrderRetainData.workId;
-								that.nowOrderRetainStr = nowOrderRetainData.workId;
-								that.$notify.info({
-									title: '首检通知消息',
-									message: '首检当前工单:' + nowOrderRetainData.workId,
-									duration: 30000
-								});
-							}
+			}).catch(error => {
+				console.error('获取工单数据失败:', error);
+				this.loading_1 = false;
+				this.$notify.error('获取数据失败，请重试');
+			})
+		},
+		//todo  导入生产工单
+		importworkorder() {
+			this.upload.open = true
+			this.upload.title = '生产工单导入'
+		},
+		//todo 下载模板
+		importTemplate() {
+			//  @/utils/ruoyi"
+			this.download('/mes/pro/workorder_v2/importTemplate', '生产工单导入模板')
+		},
+
+		// todo 文件上传中处理
+		handleFileUploadProgress(event, file, fileList) {
+			this.upload.isUploading = true
+		},
+		//todo  提交上传文件
+		submitFileForm() {
+			this.$refs.upload.submit()
+		},
+		//todo 文件上传成功处理
+		handleFileSuccess(response, file, fileList) {
+			this.upload.open = false
+			this.upload.isUploading = false
+			this.$refs.upload.clearFiles()
+			if (response.code == 200) {
+				this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
+			} else {
+				this.$alert(response.msg, '导入结果', {
+					dangerouslyUseHTMLString: true,
+					type: 'error',
+				})
+			}
+
+			this.getList()
+		},
+
+		//todo  下载
+		async submitdowm() {
+			this.download_.open = false
+			await dowmloadWorkorder(this.download_.query)
+		},
+		//todo
+		download_workorder() {
+			this.download_.open = true
+			this.download_.query.year = this.search.year
+			this.download_.query.week = this.search.week
+			this.download_.query.date = this.search.date
+		},
+		//todo 删除本周工单
+		handleAllworkorder() {
+			if (this.search.week == undefined || this.search.date == undefined) {
+				return
+			}
+			const query = {
+				year: this.search.year,
+				week: this.search.week,
+				date: this.search.date,
+			}
+
+			this.$modal
+				.confirm('是否确认删除本天所有生产工单？')
+				.then(function () {
+					return deleteAllWorkorder(query)
+					// return deleteworkplan(query)
+				})
+				.then((res) => {
+					if (res.code == 200) {
+						if (res.data > 1) {
+							this.$notify.success('删除成功')
+							this.getList()
+						} else {
+							this.$notify.error('删除失败')
+							this.getList()
 						}
 					}
 				})
-			},
+				.catch(() => { })
+		},
+
+		// 新增生产工单
+		addworkorder(row) {
+			this.dialog = {
+				title: '新增生产工单',
+				open: true,
+				mode: 'insert'
+			};
+			this.workorderItem = {
+				...this.workorderItem,
+				year: this.search.year,
+				week: this.search.week,
+				date: this.search.date,
+				sort: row.sort,
+				id: null
+			};
+		},
+		// 新增或者修改 提交按钮
+		submitForm() {
+			// 深拷贝表单数据
+			const query = { ...this.workorderItem };
+
+			// 转换数值类型
+			query.qualificationRate = Number(query.qualificationRate) || 0;
+			query.vehicleNumber = Number(query.vehicleNumber) || 0;
+			query.hangNumber = Number(query.hangNumber) || 0;
+			query.previousNumber = Number(query.previousNumber) || 0;
+			query.year = Number(query.year) || 0;
+			query.week = Number(query.week) || 0;
+			query.date = Number(query.date) || 0;
+			query.sort = Number(query.sort) || 0;
+
+			this.$refs['workorder'].validate((valid) => {
+				if (valid) {
+					// 根据操作类型选择API
+					const apiMethod = this.dialog.mode === 'insert' ? addNewworkorder : updateworkorder;
+
+					apiMethod(query).then((res) => {
+						if (res.code === 200) {
+							this.$notify.success(
+								this.dialog.mode === 'insert' ? '新增成功' : '修改成功'
+							);
+							this.getList();
+							this.dialog.open = false;
+							this.clearworkorderItem();
+						} else {
+							this.$notify.error(res.msg || '操作失败，请重试');
+						}
+					}).catch(error => {
+						console.error('提交表单失败:', error);
+						this.$notify.error('网络异常，请重试');
+					})
+				}
+			})
+		},
+		//todo  清空表单
+		clearworkorderItem() {
+			Object.keys(this.workorderItem).forEach((key) => {
+				this.workorderItem[key] = null
+			})
+		},
+		//todo 返回
+		cancel() {
+			this.dialog.open = false
+			this.clearworkorderItem()
+		},
+		//todo 删除事件
+		deleteitem(row) {
+			this.$modal
+				.confirm('是否确认删除生产工单名称为' + row.productDescription + '"的数据项？')
+				.then(function () {
+					return deleteworkorder(row.id)
+				})
+				.then((res) => {
+					if (res.code == 200) {
+						if (res.data == 1) {
+							this.$notify.success('删除成功')
+							this.getList()
+						} else {
+							this.$notify.error('删除失败')
+						}
+					}
+				})
+				.catch(() => { })
+		},
+		// 修改生产工单
+		updateitem(row) {
+			this.dialog = {
+				title: '修改生产工单',
+				open: true,
+				mode: 'update'
+			};
+			// 直接赋值整行数据
+			this.workorderItem = { ...row };
+		},
+		//todo 生成工单
+		generate_workorder() {
+			this.$modal
+				.confirm('是否确认重新生成工单')
+				.then(() => {
+					if (this.search.year == undefined) {
+						this.$message.error('请选择年份')
+						return
+					}
+					if (this.search.week == undefined) {
+						this.$message.error('请选择周')
+						return
+					}
+					if (this.search.date == undefined) {
+						this.$message.error('请选择日期')
+						return
+					}
+
+					return GenerateWorkorder(this.search)
+				})
+				.then((res) => {
+					if (res.code == 200) {
+						if (res.data > 0) {
+							this.$notify.success('生成工单成功')
+							this.getList()
+						} else {
+							this.$notify.error('生成工单失败')
+						}
+					}
+				})
+				.catch(() => { })
+		},
+		vehicleNumberInput(value) {
+			if (this.workorderItem.vehicleNumber >= 0 && this.workorderItem.hangNumber >= 0) {
+				this.workorderItem.previousNumber = this.workorderItem.vehicleNumber * this.workorderItem.hangNumber
+			} else {
+				this.workorderItem.previousNumber = 0;
+			}
+
+		},
+		hangNumberInput(value) {
+			if (this.workorderItem.vehicleNumber >= 0 && this.workorderItem.hangNumber >= 0) {
+				this.workorderItem.previousNumber = this.workorderItem.vehicleNumber * this.workorderItem.hangNumber
+			} else {
+				this.workorderItem.previousNumber = 0;
+			}
+		},
+		// 更改单元格格式
+		rowClassName(item) {
+			const row = item.row;
+			const options = this.stateCheckOptions;
+			for (let index in options) {
+				if (row.state === options[index].state) {
+					return {
+						backgroundColor: options[index].color,
+					}
+				}
+			}
+			return null;
+		},
+		initMqtt() {
+			const that = this;
+			if (that.mqttClient !== null && that.mqttClient.connected) {
+				// 已建立连接
+				return;
+			}
+			// 需要传输或订阅的内容
+			const _topic = emqxUtil.firstFQCTopic;
+			that.mqttClient = emqxUtil.createClient(that.mqttClientId);
+			that.mqttClient.subscribe(_topic.NowOrderRetain);
+			// 去重处理
+			let nowOrderRetainTimestemp = 0;
+			let nowOrderRetainWorkOrder = '';
+			// 监听数据
+			that.mqttClient.on('message', function (topic, message) {
+				// 首检当前工单
+				if (topic === _topic.NowOrderRetain) {
+					// 其他同页面触发当前工单的点击值变动
+					const nowOrderRetainData = emqxUtil.parseJSON(message);
+					// 检查消息时间，要最新
+					if (nowOrderRetainTimestemp < nowOrderRetainData.timestemp) {
+						nowOrderRetainTimestemp = nowOrderRetainData.timestemp;
+						if (nowOrderRetainWorkOrder !== nowOrderRetainData.workId) {
+							nowOrderRetainWorkOrder = nowOrderRetainData.workId;
+							that.nowOrderRetainStr = nowOrderRetainData.workId;
+							that.$notify.info({
+								title: '首检通知消息',
+								message: '首检当前工单:' + nowOrderRetainData.workId,
+								duration: 30000
+							});
+						}
+					}
+				}
+			})
 		},
 	}
+}
+
 </script>
 
 <style lang="scss" scoped>
-	.el-dropdown-link {
-		cursor: pointer;
-		color: #409eff;
-	}
+.el-dropdown-link {
+	cursor: pointer;
+	color: #409eff;
+}
 
-	.el-icon-arrow-down {
-		font-size: 0.5rem;
-	}
+.el-icon-arrow-down {
+	font-size: 0.5rem;
+}
 
-	.sortable-ghost {
-		opacity: 0.4;
-		background-color: #409eff;
-	}
+.sortable-ghost {
+	opacity: 0.4;
+	background-color: #409eff;
+}
 
-	.nowOrderRetainBox {
-		margin-bottom: 10px;
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-	.tag-box{
-		margin-top: 10px;
-		margin-bottom: 10px;
-		
-	}
+.nowOrderRetainBox {
+	margin-bottom: 10px;
+	width: 100%;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+}
+
+.tag-box {
+	margin-top: 10px;
+	margin-bottom: 10px;
+
+}
 </style>
\ No newline at end of file
diff --git a/src/views/productManagement/workorder_online.vue b/src/views/productManagement/workorder_online.vue
index d204d32..d3fa6b6 100644
--- a/src/views/productManagement/workorder_online.vue
+++ b/src/views/productManagement/workorder_online.vue
@@ -96,6 +96,11 @@ export default {
     }
   },
   mounted() {
+    const today = this.$dayjs();
+    this.search.year = today.year();
+    this.search.week = today.week();
+    // 将0(周日)转为7
+    this.search.date = today.day() === 0 ? 7 : today.day();
     this.getList()
   },
   methods: {
diff --git a/src/views/productManagement/workplan2.vue b/src/views/productManagement/workplan2.vue
index a499727..4054522 100644
--- a/src/views/productManagement/workplan2.vue
+++ b/src/views/productManagement/workplan2.vue
@@ -6,7 +6,8 @@
 					<el-input size="mini" v-model.trim="search.year" placeholder="输入年份"></el-input>
 				</el-form-item>
 				<el-form-item label="周">
-					<el-input-number size="mini" v-model.trim="search.week" :min="1" :max="100" label="输入周"></el-input-number>
+					<el-input-number size="mini" v-model.trim="search.week" :min="1" :max="100"
+						label="输入周"></el-input-number>
 				</el-form-item>
 				<el-form-item label="零件号">
 					<el-input size="mini" v-model.trim="search.partnumber" placeholder="输入零件号"></el-input>
@@ -22,11 +23,11 @@
 		<div>
 			<el-form :model="weekAll" inline>
 				<!-- 周汇总 -->
-				<el-form-item label="物料号异常">
-					<el-tag type="danger" class="statistic-text"></el-tag>
+				<el-form-item label="当前页物料号异常">
+					<el-tag type="danger" class="statistic-text">{{ materialNotFoundCount }}</el-tag>
 				</el-form-item>
-				<el-form-item label="规格颜色异常">
-					<el-tag type="warning" class="statistic-text"></el-tag>
+				<el-form-item label="当前页规格颜色异常">
+					<el-tag type="warning" class="statistic-text">{{ materialSpecColorErrorCount }}</el-tag>
 				</el-form-item>
 				<el-form-item label="本周要货数量">
 					<el-tag type="success" class="statistic-text">{{ weekAll.requireNum }}</el-tag>
@@ -49,7 +50,8 @@
 			<el-button type="danger" size="mini" @click="handleAllworkplan">删除本周计划</el-button>
 		</div>
 
-		<vxe-table border resizable show-overflow ref="xTable" v-loading="loading_1" height="500" :row-config="{ isHover: true }" :data="workplan_table_data" :cell-style="rowClassName">
+		<vxe-table border :column-config="{ resizable: true }" show-overflow ref="xTable" v-loading="loading_1" height="500"
+			:row-config="{ isHover: true }" :data="workplan_table_data" :cell-style="rowClassName">
 			<vxe-column type="seq" width="60"></vxe-column>
 			<vxe-column field="blankNum" title="毛坯号"></vxe-column>
 			<vxe-column field="partnumber" title="零件号"></vxe-column>
@@ -76,21 +78,28 @@
 			</vxe-column>
 			<vxe-column title="操作" width="100" show-overflow>
 				<template #default="{ row }">
-					<vxe-button size="mini" type="text" status="primary" content="修改" @click="updateitem(row)"></vxe-button>
-					<vxe-button size="mini" type="text" status="danger" content="删除" @click="deleteitem(row)"></vxe-button>
+					<vxe-button size="mini" mode="text" status="primary" content="修改"
+						@click="updateitem(row)"></vxe-button>
+					<vxe-button size="mini" mode="text" status="danger" content="删除"
+						@click="deleteitem(row)"></vxe-button>
 				</template>
 			</vxe-column>
 		</vxe-table>
-		<pagination v-show="pagination.total > 0" :total="pagination.total" :page.sync="pagination.pageNum" :limit.sync="pagination.pageSize" @pagination="getList" />
+		<pagination v-show="pagination.total > 0" :total="pagination.total" :page.sync="pagination.pageNum"
+			:limit.sync="pagination.pageSize" @pagination="getList" />
 		<!-- 用户导入对话框 -->
 		<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-			<el-upload name="file" ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+			<el-upload name="file" ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+				:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+				:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
 				<i class="el-icon-upload"></i>
 				<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 				<div class="el-upload__tip text-center" slot="tip">
-					<div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产计划</div>
+					<div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产计划
+					</div>
 					<span>仅允许导入xls、xlsx格式文件。</span>
-					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+					<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+						@click="importTemplate">下载模板</el-link>
 				</div>
 			</el-upload>
 			<el-tag type="warning">上传导入时间:{{ upload.time }}</el-tag>
@@ -119,10 +128,12 @@
 		<el-dialog :title="dialog.title" :visible.sync="dialog.open" width="63%">
 			<el-form :model="workplanItem" :rules="rules" ref="workplan">
 				<el-row>
-					<el-col :span="8"><el-form-item label="毛坯号" prop="blankNum"> <el-input v-model="workplanItem.blankNum" placeholder="毛坯号"></el-input> </el-form-item></el-col>
+					<el-col :span="8"><el-form-item label="毛坯号" prop="blankNum"> <el-input
+								v-model="workplanItem.blankNum" placeholder="毛坯号"></el-input> </el-form-item></el-col>
 					<el-col :span="8">
 						<el-form-item label="零件号" prop="partnumber">
-							<el-input v-model="workplanItem.partnumber" placeholder="零件号"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.partnumber" placeholder="零件号"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
 						<el-form-item label="产品描述" prop="productName">
 							<el-input v-model="workplanItem.productName" placeholder="产品描述"></el-input>
@@ -132,24 +143,31 @@
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="规格" prop="specification">
-							<el-input v-model="workplanItem.specification" placeholder="规格"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.specification" placeholder="规格"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
 						<el-form-item label="颜色代码" prop="colorCode">
-							<el-input v-model="workplanItem.colorCode" placeholder="颜色代码"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.colorCode" placeholder="颜色代码"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
 						<el-form-item label="计划数量" prop="requireNum">
-							<el-input v-model="workplanItem.requireNum" placeholder="计划数量" type="number"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.requireNum" placeholder="计划数量" type="number"></el-input>
+						</el-form-item></el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="产品合格率(0.9)" prop="qualificationRate">
-							<el-input v-model="workplanItem.qualificationRate" placeholder="产品合格率" type="number"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.qualificationRate" placeholder="产品合格率"
+								type="number"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
 						<el-form-item label="每挂数量" prop="everyHangerNum">
-							<el-input v-model="workplanItem.everyHangerNum" placeholder="每挂数量" type="number"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.everyHangerNum" placeholder="每挂数量" type="number"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
 						<el-form-item label="生产节拍（分钟）" prop="productionBeat">
-							<el-input v-model="workplanItem.productionBeat" placeholder="生产节拍（分钟）"></el-input> </el-form-item></el-col>
+							<el-input v-model="workplanItem.productionBeat" placeholder="生产节拍（分钟）"></el-input>
+						</el-form-item></el-col>
 				</el-row>
 
 				<el-row>
@@ -160,20 +178,26 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="订单需生产挂具数量">
-							<el-input v-model="calculate_everyHangerNum" placeholder="订单需生产挂具数量" disabled type="number"></el-input>
+							<el-input v-model="calculate_everyHangerNum" placeholder="订单需生产挂具数量" disabled
+								type="number"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="圈数"> <el-input v-model="calculate_turnNumber" placeholder="圈数" disabled></el-input> </el-form-item></el-col>
+						<el-form-item label="圈数"> <el-input v-model="calculate_turnNumber" placeholder="圈数"
+								disabled></el-input>
+						</el-form-item></el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="订单生产时间(分钟)">
-							<el-input v-model="calculate_productTime" placeholder="订单生产时间(分钟)" disabled></el-input> </el-form-item></el-col>
+							<el-input v-model="calculate_productTime" placeholder="订单生产时间(分钟)" disabled></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
-						<el-form-item label="年"> <el-input v-model="workplanItem.year" placeholder="年"></el-input> </el-form-item></el-col>
+						<el-form-item label="年"> <el-input v-model="workplanItem.year" placeholder="年"></el-input>
+						</el-form-item></el-col>
 					<el-col :span="8">
-						<el-form-item label="周次"> <el-input v-model="workplanItem.week" placeholder="周次"></el-input> </el-form-item></el-col>
+						<el-form-item label="周次"> <el-input v-model="workplanItem.week" placeholder="周次"></el-input>
+						</el-form-item></el-col>
 				</el-row>
 			</el-form>
 
@@ -186,216 +210,230 @@
 </template>
 
 <script>
-	import {
-		getWorkplanList,
-		addNewworkplan,
-		deleteworkplan,
-		updateworkplan,
-		handleWeekSummary,
-		dowmloadWorkplan,
-		deleteAllWorkplan,
-		checkWorkPlan,
-	} from '@/api/productManagement/workplan_v2.js'
-	import { getToken } from '@/utils/auth'
-	export default {
-		name: 'workplan2',
-		data() {
-			return {
-				workplan_table_data: [],
-				search: {
-					year: new Date().getFullYear(),
-					week: null,
-					partnumber: '',
-					color: '',
-				},
-				pagination: {
-					total: 0,
-					pageNum: 1,
-					pageSize: 10,
-				},
-				loading_1: true,
-				// 新增或者修改表格
-				workplanItem: {
-					id: '',
-					blankNum: '',
-					partnumber: '',
-					productName: '',
-					specification: '',
-					colorCode: '',
-					requireNum: null,
-					qualificationRate: null,
-					everyHangerNum: null,
-					productionBeat: null,
-					allHangerNum: null,
-					turnNumber: null,
-					productTime: null,
-					requireHanger: null,
+import {
+	getWorkplanList,
+	addNewworkplan,
+	deleteworkplan,
+	updateworkplan,
+	handleWeekSummary,
+	dowmloadWorkplan,
+	deleteAllWorkplan,
+	checkWorkPlan,
+} from '@/api/productManagement/workplan_v2.js'
+import { getToken } from '@/utils/auth'
+export default {
+	name: 'workplan2',
+	data() {
+		return {
+			workplan_table_data: [],
+			search: {
+				year: new Date().getFullYear(),
+				week: null,
+				partnumber: '',
+				color: '',
+			},
+			pagination: {
+				total: 0,
+				pageNum: 1,
+				pageSize: 10,
+			},
+			loading_1: true,
+			// 新增或者修改表格
+			workplanItem: {
+				id: '',
+				blankNum: '',
+				partnumber: '',
+				productName: '',
+				specification: '',
+				colorCode: '',
+				requireNum: null,
+				qualificationRate: null,
+				everyHangerNum: null,
+				productionBeat: null,
+				allHangerNum: null,
+				turnNumber: null,
+				productTime: null,
+				requireHanger: null,
+				year: 0,
+				week: 0,
+			},
+			rules: {
+				blankNum: [{ required: true, message: '毛坯号不能为空', trigger: 'blur' }],
+				partnumber: [{ required: true, message: '零件号不能为空', trigger: 'blur' }],
+				productName: [{ required: true, message: '产品描述不能为空', trigger: 'blur' }],
+				//specification: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
+				colorCode: [{ required: true, message: '颜色代码不能为空', trigger: 'blur' }],
+				requireNum: [{ required: true, message: '本周要货数量不能为空', trigger: 'blur' }],
+				qualificationRate: [{ required: true, message: '合格率不能为空', trigger: 'blur' }],
+				everyHangerNum: [{ required: true, message: '每挂数量不能为空', trigger: 'blur' }],
+				productionBeat: [{ required: true, message: '生产节拍不能为空', trigger: 'blur' }],
+				allHangerNum: [{ required: true, message: '总挂具数不能为空', trigger: 'blur' }],
+			},
+			//本周合计
+			weekAll: {
+				requireNum: 0,
+				requireHanger: 0,
+				turnnum: 0,
+				productiontime: 0,
+			},
+			partnumberError: 0,
+			// 新增修改计划模态框
+			dialog: {
+				title: '',
+				open: false,
+				form: {},
+			},
+
+			flag: '', //判断新增还是修改
+
+			upload: {
+				time: null,
+				// 用户导入参数
+				// 是否显示弹出层（用户导入）
+				open: false,
+				// 弹出层标题（用户导入）
+				title: '',
+				// 是否禁用上传
+				isUploading: false,
+				// 是否更新已经存在的用户数据
+				updateSupport: false,
+				// 设置上传的请求头部
+				headers: { Authorization: 'Bearer ' + getToken() },
+				// 上传的地址
+				url: process.env.VUE_APP_BASE_API + '/mes/pro/workplan_v2/importData',
+			},
+			download_: {
+				title: '下载生产计划',
+				open: false,
+				query: {
 					year: 0,
 					week: 0,
 				},
-				rules: {
-					blankNum: [{ required: true, message: '毛坯号不能为空', trigger: 'blur' }],
-					partnumber: [{ required: true, message: '零件号不能为空', trigger: 'blur' }],
-					productName: [{ required: true, message: '产品描述不能为空', trigger: 'blur' }],
-					specification: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
-					colorCode: [{ required: true, message: '颜色代码不能为空', trigger: 'blur' }],
-					requireNum: [{ required: true, message: '本周要货数量不能为空', trigger: 'blur' }],
-					qualificationRate: [{ required: true, message: '合格率不能为空', trigger: 'blur' }],
-					everyHangerNum: [{ required: true, message: '每挂数量不能为空', trigger: 'blur' }],
-					productionBeat: [{ required: true, message: '生产节拍不能为空', trigger: 'blur' }],
-					allHangerNum: [{ required: true, message: '总挂具数不能为空', trigger: 'blur' }],
-				},
-				//本周合计
-				weekAll: {
-					requireNum: 0,
-					requireHanger: 0,
-					turnnum: 0,
-					productiontime: 0,
-				},
-				partnumberError: 0,
-				// 新增修改计划模态框
-				dialog: {
-					title: '',
-					open: false,
-					form: {},
-				},
-
-				flag: '', //判断新增还是修改
-
-				upload: {
-					time: null,
-					// 用户导入参数
-					// 是否显示弹出层（用户导入）
-					open: false,
-					// 弹出层标题（用户导入）
-					title: '',
-					// 是否禁用上传
-					isUploading: false,
-					// 是否更新已经存在的用户数据
-					updateSupport: false,
-					// 设置上传的请求头部
-					headers: { Authorization: 'Bearer ' + getToken() },
-					// 上传的地址
-					url: process.env.VUE_APP_BASE_API + '/mes/pro/workplan_v2/importData',
-				},
-				download_: {
-					title: '下载生产计划',
-					open: false,
-					query: {
-						year: 0,
-						week: 0,
-					},
-				},
-			}
+			},
+		}
+	},
+	mounted() {
+		this.search.week = this.getWeekNumber(this.$dayjs());
+		this.getList()
+	},
+	computed: {
+		//计算 订单需生产挂具数量
+		calculate_everyHangerNum() {
+			this.workplanItem.requireHanger = (
+				this.workplanItem.requireNum /
+				this.workplanItem.everyHangerNum /
+				this.workplanItem.qualificationRate
+			).toFixed(2)
+			return this.workplanItem.requireHanger
 		},
-		mounted() {
+		// 统计物料不存在(状态1)的数量
+		materialNotFoundCount() {
+			return this.workplan_table_data.filter(row => row.state === 1).length
+		},
+		// 统计物料规格颜色异常(状态2)的数量
+		materialSpecColorErrorCount() {
+			return this.workplan_table_data.filter(row => row.state === 2).length
+		},
+		//计算 圈数
+		calculate_turnNumber() {
+			this.workplanItem.turnNumber = (this.workplanItem.requireHanger / 170).toFixed(2)
+			return this.workplanItem.turnNumber
+		},
+		//计算 订单生产时间(分钟)
+		calculate_productTime() {
+			this.workplanItem.productTime = (this.workplanItem.productionBeat * this.workplanItem.requireHanger).toFixed(2)
+			return this.workplanItem.productTime
+		},
+
+		// 本周合计
+		// 本周要货数量
+		// calculate_requireNum() {
+		//   this.workplan_table_data.forEach((item) => {
+		//     this.weekAll.requireNum += Number(item.requireNum)
+		//   })
+		//   return this.weekAll.requireNum
+		// },
+		// // 订单需生产挂具数量
+		// calculate_requireHanger() {
+		//   this.workplan_table_data.forEach((item) => {
+		//     this.weekAll.requireHanger += Number(item.requireHanger)
+		//   })
+		//   return this.weekAll.requireHanger
+		// },
+		// // 圈数
+		// calculate_turnnum() {
+		//   this.workplan_table_data.forEach((item) => {
+		//     this.weekAll.turnnum += Number(item.turnNumber)
+		//   })
+		//   return this.weekAll.turnnum
+		// },
+		// //订单生产时间(分钟)
+		// calculate_productiontime() {
+		//   this.workplan_table_data.forEach((item) => {
+		//     this.weekAll.productiontime += Number(item.productTime)
+		//   })
+		//   return this.weekAll.productiontime
+		// },
+	},
+	methods: {
+		handleClick() {
 			this.getList()
+			this.getWeekSummary()
+
+
 		},
-		computed: {
-			//计算 订单需生产挂具数量
-			calculate_everyHangerNum() {
-				this.workplanItem.requireHanger = (
-					this.workplanItem.requireNum /
-					this.workplanItem.everyHangerNum /
-					this.workplanItem.qualificationRate
-				).toFixed(2)
-				return this.workplanItem.requireHanger
-			},
-			//计算 圈数
-			calculate_turnNumber() {
-				this.workplanItem.turnNumber = (this.workplanItem.requireHanger / 170).toFixed(2)
-				return this.workplanItem.turnNumber
-			},
-			//计算 订单生产时间(分钟)
-			calculate_productTime() {
-				this.workplanItem.productTime = (this.workplanItem.productionBeat * this.workplanItem.requireHanger).toFixed(2)
-				return this.workplanItem.productTime
-			},
-
-			// 本周合计
-			// 本周要货数量
-			// calculate_requireNum() {
-			//   this.workplan_table_data.forEach((item) => {
-			//     this.weekAll.requireNum += Number(item.requireNum)
-			//   })
-			//   return this.weekAll.requireNum
-			// },
-			// // 订单需生产挂具数量
-			// calculate_requireHanger() {
-			//   this.workplan_table_data.forEach((item) => {
-			//     this.weekAll.requireHanger += Number(item.requireHanger)
-			//   })
-			//   return this.weekAll.requireHanger
-			// },
-			// // 圈数
-			// calculate_turnnum() {
-			//   this.workplan_table_data.forEach((item) => {
-			//     this.weekAll.turnnum += Number(item.turnNumber)
-			//   })
-			//   return this.weekAll.turnnum
-			// },
-			// //订单生产时间(分钟)
-			// calculate_productiontime() {
-			//   this.workplan_table_data.forEach((item) => {
-			//     this.weekAll.productiontime += Number(item.productTime)
-			//   })
-			//   return this.weekAll.productiontime
-			// },
+				// 获取日期所在的周数
+		getWeekNumber(date) {
+			// 使用dayjs的week()方法获取周数（从1开始）
+			return date.week();
+		},
+		//todo   获取生产计划列表
+		getList() {
+			const query = { ...this.search, ...this.pagination }
+			if (query.week == null || query.week == undefined || query.week == '') query.week = -1
+			if (query.year == null || query.year == undefined || query.year == '') query.year = -1
+			getWorkplanList(query).then((res) => {
+				if (res.code == 200) {
+					this.loading_1 = false
+					this.workplan_table_data = res.data.item1
+					this.pagination.total = res.data.item2
+				}
+			})
 		},
-		methods: {
-			handleClick() {
-				this.getList()
-				this.getWeekSummary()
 
+		//todo   新增生产计划
+		addworkplan() {
+			this.dialog.title = '新增生产计划'
+			this.dialog.open = true
+			this.flag = 'insert'
+		},
+		//todo 修改生产计划
+		updateitem(row) {
+			this.dialog.open = true
+			this.flag = 'update'
+			this.dialog.title = '修改生产计划'
+			this.workplanItem.id = row.id
+			this.workplanItem.blankNum = row.blankNum
+			this.workplanItem.partnumber = row.partnumber
+			this.workplanItem.productName = row.productName
+			this.workplanItem.specification = row.specification
+			this.workplanItem.colorCode = row.colorCode
+			this.workplanItem.requireNum = row.requireNum
+			this.workplanItem.qualificationRate = row.qualificationRate
+			this.workplanItem.everyHangerNum = row.everyHangerNum
+			this.workplanItem.productionBeat = row.productionBeat
+			this.workplanItem.allHangerNum = row.allHangerNum
+			this.workplanItem.turnNumber = row.turnNumber
+			this.workplanItem.productTime = row.productTime
+			this.workplanItem.requireHanger = row.requireHanger
+			this.workplanItem.year = row.year
+			this.workplanItem.week = row.week
+		},
 
-			},
-			//todo   获取生产计划列表
-			getList() {
-				const query = { ...this.search, ...this.pagination }
-				if (query.week == null || query.week == undefined || query.week == '') query.week = -1
-				if (query.year == null || query.year == undefined || query.year == '') query.year = -1
-				getWorkplanList(query).then((res) => {
-					if (res.code == 200) {
-						this.loading_1 = false
-						this.workplan_table_data = res.data.item1
-						this.pagination.total = res.data.item2
-					}
-				})
-			},
-
-			//todo   新增生产计划
-			addworkplan() {
-				this.dialog.title = '新增生产计划'
-				this.dialog.open = true
-				this.flag = 'insert'
-			},
-			//todo 修改生产计划
-			updateitem(row) {
-				this.dialog.open = true
-				this.flag = 'update'
-				this.dialog.title = '修改生产计划'
-				this.workplanItem.id = row.id
-				this.workplanItem.blankNum = row.blankNum
-				this.workplanItem.partnumber = row.partnumber
-				this.workplanItem.productName = row.productName
-				this.workplanItem.specification = row.specification
-				this.workplanItem.colorCode = row.colorCode
-				this.workplanItem.requireNum = row.requireNum
-				this.workplanItem.qualificationRate = row.qualificationRate
-				this.workplanItem.everyHangerNum = row.everyHangerNum
-				this.workplanItem.productionBeat = row.productionBeat
-				this.workplanItem.allHangerNum = row.allHangerNum
-				this.workplanItem.turnNumber = row.turnNumber
-				this.workplanItem.productTime = row.productTime
-				this.workplanItem.requireHanger = row.requireHanger
-				this.workplanItem.year = row.year
-				this.workplanItem.week = row.week
-			},
-
-			//todo 新增或者修改 提交按钮
-			submitForm() {
-				const query = { ...this.workplanItem };
-				(query.requireNum = Number(query.requireNum)),
+		//todo 新增或者修改 提交按钮
+		submitForm() {
+			const query = { ...this.workplanItem };
+			(query.requireNum = Number(query.requireNum)),
 				(query.qualificationRate = Number(query.qualificationRate)),
 				(query.everyHangerNum = Number(query.everyHangerNum)),
 				(query.productionBeat = Number(query.productionBeat)),
@@ -406,212 +444,212 @@
 				(query.week = Number(query.week)),
 				(query.turnNumber = Number(query.turnNumber))
 
-				if (this.flag == 'insert') {
-					this.$refs['workplan'].validate((valid) => {
-						if (valid) {
-							addNewworkplan(query).then((res) => {
-								if (res.code == 200) {
-									this.$notify.success('新增成功')
-									this.getList()
-									this.dialog.open = false
-									// 清空表单
-									this.clearworkplanItem()
-								}
-							})
-						}
-					})
-				} else if (this.flag == 'update') {
-					this.$refs['workplan'].validate((valid) => {
-						if (valid) {
-							updateworkplan(query).then((res) => {
-								if (res.code == 200) {
-									this.$notify.success('修改成功')
-									this.getList()
-									this.dialog.open = false
-									// 清空表单
-									//this.resetForm('workplan')
-									this.clearworkplanItem()
-								}
-							})
-						}
-					})
-				}
-			},
-			//todo  清空表单
-			clearworkplanItem() {
-				Object.keys(this.workplanItem).forEach((key) => {
-					this.workplanItem[key] = null
-				})
-			},
-			//todo 返回
-			cancel() {
-				this.dialog.open = false
-				this.clearworkplanItem()
-			},
-			//todo 删除事件
-			deleteitem(row) {
-				this.$modal
-					.confirm('是否确认删除生产计划名称为' + row.partnumber + '"的数据项？')
-					.then(function () {
-						return deleteworkplan(row.id)
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							if (res.data == 1) {
-								this.$notify.success('删除成功')
+			if (this.flag == 'insert') {
+				this.$refs['workplan'].validate((valid) => {
+					if (valid) {
+						addNewworkplan(query).then((res) => {
+							if (res.code == 200) {
+								this.$notify.success('新增成功')
 								this.getList()
-							} else {
-								this.$notify.error('删除失败')
+								this.dialog.open = false
+								// 清空表单
+								this.clearworkplanItem()
 							}
-						}
-					})
-					.catch(() => {})
-			},
-			//todo 导入文件
-			importworkplan() {
-				this.upload.open = true
-				this.upload.title = '生产计划导入'
-			},
-
-			//todo 下载模板
-			importTemplate() {
-				//  @/utils/ruoyi"
-				this.download('/mes/pro/workplan_v2/importTemplate', '生产计划导入模板')
-				dowmloadTemplate('生产计划导入模板')
-			},
-
-			// todo 文件上传中处理
-			handleFileUploadProgress(event, file, fileList) {
-				this.upload.isUploading = true
-			},
-			//todo  提交上传文件
-			submitFileForm() {
-				this.$refs.upload.submit()
-			},
-			//todo 文件上传成功处理
-			handleFileSuccess(response, file, fileList) {
-				this.upload.open = false
-				this.upload.isUploading = false
-				this.$refs.upload.clearFiles()
-				if (response.code == 200) {
-					this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
-				} else {
-					this.$alert(response.msg, '导入结果', {
-						dangerouslyUseHTMLString: true,
-						type: 'error',
-					})
-				}
-				this.upload.time = new Date();
-
-				this.getList()
-			},
-			//todo 获取周汇总
-			getWeekSummary() {
-				const query = {}
-				query.year = this.search.year
-				query.week = this.search.week
-				handleWeekSummary(query).then((res) => {
-					if (res.code == 200) {
-						this.weekAll = res.data
-					} else if ((res.code = 210)) {
-						Object.keys(this.weekAll).forEach((key) => {
-							this.weekAll[key] = 0
 						})
 					}
 				})
-			},
-			//todo  下载
-			async submitdowm() {
-				this.download_.open = false
-				await dowmloadWorkplan(this.download_.query)
-			},
-			//todo
-			download_workplan() {
-				this.download_.open = true
-				this.download_.query.year = this.search.year
-				this.download_.query.week = this.search.week
-			},
-
-			//todo 删除本周计划
-			handleAllworkplan() {
-				if (this.search.week == undefined) {
-					return
-				}
-				const query = {
-					year: this.search.year,
-					week: this.search.week,
-				}
-
-				this.$modal
-					.confirm('是否确认删除本周所有生产计划？')
-					.then(function () {
-						return deleteAllWorkplan(query)
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							if (res.data > 1) {
-								this.$notify.success('删除成功')
+			} else if (this.flag == 'update') {
+				this.$refs['workplan'].validate((valid) => {
+					if (valid) {
+						updateworkplan(query).then((res) => {
+							if (res.code == 200) {
+								this.$notify.success('修改成功')
 								this.getList()
-							} else {
-								this.$notify.error('删除失败')
+								this.dialog.open = false
+								// 清空表单
+								//this.resetForm('workplan')
+								this.clearworkplanItem()
 							}
-						}
-					})
-					.catch(() => {})
-			},
-
-			//todo   新增生产计划
-			addworkplan() {
-				this.dialog.title = '新增生产计划'
-				this.dialog.open = true
-				this.flag = 'insert'
-			},
-			// 更改单元格格式
-			rowClassName(item) {
-				const row = item.row;
-				if (row.state === 1) {
-					// 物料不存在
-					return {
-						backgroundColor: '#F56C6C',
+						})
 					}
-				}
-				if (row.state === 2) {
-					// 物料规格颜色异常
-					return {
-						backgroundColor: '#E6A23C',
-					}
-				}
-				return null;
-			},
+				})
+			}
 		},
-	}
+		//todo  清空表单
+		clearworkplanItem() {
+			Object.keys(this.workplanItem).forEach((key) => {
+				this.workplanItem[key] = null
+			})
+		},
+		//todo 返回
+		cancel() {
+			this.dialog.open = false
+			this.clearworkplanItem()
+		},
+		//todo 删除事件
+		deleteitem(row) {
+			this.$modal
+				.confirm('是否确认删除生产计划名称为' + row.partnumber + '"的数据项？')
+				.then(function () {
+					return deleteworkplan(row.id)
+				})
+				.then((res) => {
+					if (res.code == 200) {
+						if (res.data == 1) {
+							this.$notify.success('删除成功')
+							this.getList()
+						} else {
+							this.$notify.error('删除失败')
+						}
+					}
+				})
+				.catch(() => { })
+		},
+		//todo 导入文件
+		importworkplan() {
+			this.upload.open = true
+			this.upload.title = '生产计划导入'
+		},
+
+		//todo 下载模板
+		importTemplate() {
+			//  @/utils/ruoyi"
+			this.download('/mes/pro/workplan_v2/importTemplate', '生产计划导入模板')
+			dowmloadTemplate('生产计划导入模板')
+		},
+
+		// todo 文件上传中处理
+		handleFileUploadProgress(event, file, fileList) {
+			this.upload.isUploading = true
+		},
+		//todo  提交上传文件
+		submitFileForm() {
+			this.$refs.upload.submit()
+		},
+		//todo 文件上传成功处理
+		handleFileSuccess(response, file, fileList) {
+			this.upload.open = false
+			this.upload.isUploading = false
+			this.$refs.upload.clearFiles()
+			if (response.code == 200) {
+				this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
+			} else {
+				this.$alert(response.msg, '导入结果', {
+					dangerouslyUseHTMLString: true,
+					type: 'error',
+				})
+			}
+			this.upload.time = new Date();
+
+			this.getList()
+		},
+		//todo 获取周汇总
+		getWeekSummary() {
+			const query = {}
+			query.year = this.search.year
+			query.week = this.search.week
+			handleWeekSummary(query).then((res) => {
+				if (res.code == 200) {
+					this.weekAll = res.data
+				} else if ((res.code = 210)) {
+					Object.keys(this.weekAll).forEach((key) => {
+						this.weekAll[key] = 0
+					})
+				}
+			})
+		},
+		//todo  下载
+		async submitdowm() {
+			this.download_.open = false
+			await dowmloadWorkplan(this.download_.query)
+		},
+		//todo
+		download_workplan() {
+			this.download_.open = true
+			this.download_.query.year = this.search.year
+			this.download_.query.week = this.search.week
+		},
+
+		//todo 删除本周计划
+		handleAllworkplan() {
+			if (this.search.week == undefined) {
+				return
+			}
+			const query = {
+				year: this.search.year,
+				week: this.search.week,
+			}
+
+			this.$modal
+				.confirm('是否确认删除本周所有生产计划？')
+				.then(function () {
+					return deleteAllWorkplan(query)
+				})
+				.then((res) => {
+					if (res.code == 200) {
+						if (res.data > 1) {
+							this.$notify.success('删除成功')
+							this.getList()
+						} else {
+							this.$notify.error('删除失败')
+						}
+					}
+				})
+				.catch(() => { })
+		},
+
+		//todo   新增生产计划
+		addworkplan() {
+			this.dialog.title = '新增生产计划'
+			this.dialog.open = true
+			this.flag = 'insert'
+		},
+		// 更改单元格格式
+		rowClassName(item) {
+			const row = item.row;
+			if (row.state === 1) {
+				// 物料不存在
+				return {
+					backgroundColor: '#F56C6C',
+				}
+			}
+			if (row.state === 2) {
+				// 物料规格颜色异常
+				return {
+					backgroundColor: '#E6A23C',
+				}
+			}
+			return null;
+		},
+	},
+}
 </script>
 
 <style lang="scss" scoped>
-	.el-dropdown-link {
-		cursor: pointer;
-		color: #409eff;
-	}
+.el-dropdown-link {
+	cursor: pointer;
+	color: #409eff;
+}
 
-	.el-icon-arrow-down {
-		font-size: 12px;
-	}
+.el-icon-arrow-down {
+	font-size: 12px;
+}
 
-	.form_define ::v-deep .el-form-item__content {
-		height: 27.6px;
-	}
+.form_define ::v-deep .el-form-item__content {
+	height: 27.6px;
+}
 
-	.form_define {
-		height: 37px;
-	}
+.form_define {
+	height: 37px;
+}
 
-	.statistic-title {
-		font-weight: 700;
-		font-size: 24px;
-	}
+.statistic-title {
+	font-weight: 700;
+	font-size: 24px;
+}
 
-	.statistic-text {
-		font-weight: 600;
-		font-size: 18px;
-	}
+.statistic-text {
+	font-weight: 600;
+	font-size: 18px;
+}
 </style>
\ No newline at end of file