From 11df9b0584ed9827d9a18be22f72af41d49a3ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 3 Dec 2024 19:09:07 +0800
Subject: [PATCH] 1

---
 src/api/productManagement/proreportwork.js    |  16 +-
 .../BaseRoute/TheRouteDialog/index.vue        | 434 ++++++-------
 .../WorkReport/ProReportwork.vue              | 367 -----------
 .../WorkReport/index-old.vue                  | 479 +++++++++++++++
 .../productManagement/WorkReport/index.vue    | 575 +++++++-----------
 5 files changed, 914 insertions(+), 957 deletions(-)
 delete mode 100644 src/views/productManagement/WorkReport/ProReportwork.vue
 create mode 100644 src/views/productManagement/WorkReport/index-old.vue

diff --git a/src/api/productManagement/proreportwork.js b/src/api/productManagement/proreportwork.js
index 56e9ad1..700bada 100644
--- a/src/api/productManagement/proreportwork.js
+++ b/src/api/productManagement/proreportwork.js
@@ -6,9 +6,9 @@ import request from '@/utils/request'
  */
 export function listProReportwork(query) {
   return request({
-    url: 'BZFM/ProReportwork/list',
+    url: 'mes/productManagement/ProReportwork/list',
     method: 'get',
-    params: query,
+    params: query
   })
 }
 
@@ -18,9 +18,9 @@ export function listProReportwork(query) {
  */
 export function addProReportwork(data) {
   return request({
-    url: 'BZFM/ProReportwork',
+    url: 'mes/productManagement/ProReportwork',
     method: 'post',
-    data: data,
+    data: data
   })
 }
 /**
@@ -29,9 +29,9 @@ export function addProReportwork(data) {
  */
 export function updateProReportwork(data) {
   return request({
-    url: 'BZFM/ProReportwork',
+    url: 'mes/productManagement/ProReportwork',
     method: 'PUT',
-    data: data,
+    data: data
   })
 }
 /**
@@ -40,7 +40,7 @@ export function updateProReportwork(data) {
  */
 export function getProReportwork(id) {
   return request({
-    url: 'BZFM/ProReportwork/' + id,
+    url: 'mes/productManagement/ProReportwork/' + id,
     method: 'get'
   })
 }
@@ -51,7 +51,7 @@ export function getProReportwork(id) {
  */
 export function delProReportwork(pid) {
   return request({
-    url: 'BZFM/ProReportwork/delete/' + pid,
+    url: 'mes/productManagement/ProReportwork/delete/' + pid,
     method: 'POST'
   })
 }
diff --git a/src/views/baseManagement/BaseRoute/TheRouteDialog/index.vue b/src/views/baseManagement/BaseRoute/TheRouteDialog/index.vue
index f92a503..32058d5 100644
--- a/src/views/baseManagement/BaseRoute/TheRouteDialog/index.vue
+++ b/src/views/baseManagement/BaseRoute/TheRouteDialog/index.vue
@@ -10,7 +10,8 @@
 					<el-form-item label="工序类别" prop="dictWorkType">
 						<el-select v-model="queryParams.dictWorkType" placeholder="全部" @change="handleQuery">
 							<el-option label="全部" :value="''"></el-option>
-							<el-option v-for="item in options.dictWorkTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+							<el-option v-for="item in options.dictWorkTypeOptions" :key="item.dictValue"
+								:label="item.dictLabel" :value="item.dictValue"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item>
@@ -33,230 +34,229 @@
 </template>
 
 <script setup>
-	import base64Icon from './icon/base64.json'
-	import {
-		listBaseWorkProcesses,
-		queryBaseWorkRoute_No_bind
-	} from '@/api/baseManagement/baseworkprocesses.js'
-	import {
-		updateBaseWorkRoute,
-		getBaseWorkRoute,
-		parseRouteBindProccess
-	}
+import base64Icon from './icon/base64.json'
+import {
+	listBaseWorkProcesses,
+	queryBaseWorkRoute_No_bind
+} from '@/api/baseManagement/baseworkprocesses.js'
+import {
+	updateBaseWorkRoute,
+	getBaseWorkRoute,
+	parseRouteBindProccess
+}
 	from '@/api/baseManagement/baseworkroute.js'
-	import {
-		getOneDict
-	}
+import {
+	getOneDict
+}
 	from '@/utils/dict.js'
-	import { default as TheLogicFlow } from '../TheLogicFlow'
-	const { proxy } = getCurrentInstance()
-	const props = defineProps({
-		modelValue: {
-			type: Boolean,
-			default: false
-		},
-		title: {
-			type: String
-		},
-		fullScreen: {
-			type: Boolean,
-			default: false
-		},
-		routeId: {
-			type: Number,
-			default: -1
+import { default as TheLogicFlow } from '../TheLogicFlow'
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+	modelValue: {
+		type: Boolean,
+		default: false
+	},
+	title: {
+		type: String
+	},
+	fullScreen: {
+		type: Boolean,
+		default: false
+	},
+	routeId: {
+		type: Number,
+		default: -1
+	}
+})
+const state = reactive({
+	options: {
+		dictWorkTypeOptions: [],
+	},
+})
+const { options } = toRefs(state)
+
+function opened() {
+	initData();
+	initDict();
+}
+const theLogicFlowRef = ref()
+// 初始化
+function initData() {
+	proxy.$nextTick(() => {
+		theLogicFlowRef.value.init();
+		theLogicFlowRef.value.setTheme({
+			baseNode: {
+				fill: "#d9ecff",
+				stroke: "#409EFF",
+				strokeWidth: 2,
+			},
+			nodeText: {
+				color: "#409EFF",
+				overflowMode: "autoWrap",
+				lineHeight: 2,
+				fontSize: 18,
+			},
+			baseEdge: {
+				stroke: "#606266",
+				strokeWidth: 2,
+			},
+		});
+		resetQuery();
+		getLogicFlowData();
+	})
+}
+async function initDict() {
+	const dictSelectList = ['base_work_type'];
+	const workStationDescriptionRes = await getOneDict(dictSelectList[0]);
+	if (workStationDescriptionRes.code === 200) {
+		state.options.dictWorkTypeOptions = workStationDescriptionRes.data[0].list;
+	}
+}
+// 数据准备==================
+// 所有可以选择的工序
+const AllProcessesList = ref([]);
+// 已选择的工序
+const SelectedProcessesList = ref([]);
+const queryParams = reactive({
+	pageNum: 1,
+	pageSize: 7,
+	status: 1,
+	name: '',
+	dictWorkType: '',
+	sort: 'createdTime',
+	sortType: 'desc'
+})
+// 重置查询操作
+function handleQuery() {
+	getAllProcessesList();
+}
+// 重置查询操作
+function resetQuery() {
+	proxy.resetForm('queryRef');
+	getAllProcessesList();
+}
+
+function getAllProcessesList() {
+	queryParams.routeID = props.routeId;
+	queryBaseWorkRoute_No_bind(queryParams).then(res => {
+		const { code, data } = res
+		if (code == 200) {
+			AllProcessesList.value = createDndPanelList(data.result);
+			theLogicFlowRef.value.setDndPanel(AllProcessesList.value);
 		}
 	})
-	const state = reactive({
-		options: {
-			dictWorkTypeOptions: [],
-		},
-	})
-	const { options } = toRefs(state)
+}
 
-	function opened() {
-		initData();
-		initDict();
-	}
-	const theLogicFlowRef = ref()
-	// 初始化
-	function initData() {
-		proxy.$nextTick(() => {
-			theLogicFlowRef.value.init();
-			theLogicFlowRef.value.setTheme({
-				baseNode: {
-					fill: "#d9ecff",
-					stroke: "#409EFF",
-					strokeWidth: 2,
-				},
-				nodeText: {
-					color: "#409EFF",
-					overflowMode: "autoWrap",
-					lineHeight: 2,
-					fontSize: 18,
-				},
-				baseEdge: {
-					stroke: "#606266",
-					strokeWidth: 2,
-				},
-			});
-			resetQuery();
-			getLogicFlowData();
-		})
-	}
-	async function initDict() {
-		const dictSelectList = ['base_work_type'];
-		const workStationDescriptionRes = await getOneDict(dictSelectList[0]);
-		if (workStationDescriptionRes.code === 200) {
-			state.options.dictWorkTypeOptions = workStationDescriptionRes.data[0].list;
-		}
-	}
-	// 数据准备==================
-	// 所有可以选择的工序
-	const AllProcessesList = ref([]);
-	// 已选择的工序
-	const SelectedProcessesList = ref([]);
-	const queryParams = reactive({
-		pageNum: 1,
-		pageSize: 7,
-		status: 1,
-		name: '',
-		dictWorkType: '',
-		sort: 'createdTime',
-		sortType: 'desc'
-	})
-	// 重置查询操作
-	function handleQuery() {
-		getAllProcessesList();
-	}
-	// 重置查询操作
-	function resetQuery() {
-		proxy.resetForm('queryRef');
-		getAllProcessesList();
-	}
-
-	function getAllProcessesList() {
-		queryParams.routeID = props.routeId;
-		queryBaseWorkRoute_No_bind(queryParams).then(res => {
-			const { code, data } = res
-			if (code == 200) {
-				AllProcessesList.value = createDndPanelList(data.result);
-				theLogicFlowRef.value.setDndPanel(AllProcessesList.value);
-			}
-		})
-	}
-
-	function getLogicFlowData() {
-		getBaseWorkRoute(props.routeId).then((res) => {
-			const { code, data } = res
-			if (code === 200) {
-				const _logicFlowData = data.logicFlowData;
-				if (_logicFlowData != null && _logicFlowData != '' && _logicFlowData != undefined) {
-					try {
-						theLogicFlowRef.value.renderNodeData(JSON.parse(_logicFlowData));
-					} catch (e) {
-						proxy.$message.error('获取数据失败！' + e);
-						theLogicFlowRef.value.renderNodeData();
-					}
-				} else {
+function getLogicFlowData() {
+	getBaseWorkRoute(props.routeId).then((res) => {
+		const { code, data } = res
+		if (code === 200) {
+			const _logicFlowData = data.logicFlowData;
+			if (_logicFlowData != null && _logicFlowData != '' && _logicFlowData != undefined) {
+				try {
+					theLogicFlowRef.value.renderNodeData(JSON.parse(_logicFlowData));
+				} catch (e) {
+					proxy.$message.error('获取数据失败！' + e);
 					theLogicFlowRef.value.renderNodeData();
 				}
+			} else {
+				theLogicFlowRef.value.renderNodeData();
 			}
-		})
-	}
-
-	function createDndPanelList(data) {
-		try {
-			return data.map(item => {
-				return {
-					type: 'ProcessesNode',
-					text: `${item.dictWorkType} \n ${item.name}`,
-					label: `${item.dictWorkType} -- ${item.name}`,
-					icon: base64Icon.pndIcon,
-					properties: {
-						dictWorkType: item.dictWorkType,
-						processesId: item.id
-					}
-				}
-			})
-		} catch (e) {
-			return [];
-		}
-	}
-
-
-
-	// 数据准备==================
-	const isFullscreen = ref(false)
-	const open = ref(false)
-	// 关闭
-	function cancel() {
-		open.value = false
-	}
-	// 保存
-	async function save() {
-		// open.value = false
-		const strData = theLogicFlowRef.value.getNodeData();
-		if (strData === null) {
-			proxy.$message.error('保存数据失败！');
-			return;
-		}
-		const updateData = {
-			id: props.routeId,
-			logicFlowData: strData,
-		}
-		console.log("保存数据", updateData);
-		const res1 = await updateBaseWorkRoute(updateData);
-		if (res1.code != 200) {
-			proxy.$message.error('保存数据失败！');
-			return;
-		}
-		const bindData = {
-			routeID: props.routeId,
-			logicFlowData: strData
-		}
-		const res2 = await parseRouteBindProccess(bindData);
-		if (res2.code != 200) {
-			proxy.$message.error('保存数据失败！');
-			return;
-		}
-		proxy.$message.success('保存数据成功');
-		cancel();
-		proxy.$emit('refresh');
-
-	}
-	//测试代码===根据坐标点提取顺序
-	function getItem() {
-		const strData = theLogicFlowRef.value.getNodeData();
-		const jsonData = JSON.parse(strData);
-		console.log(jsonData);
-	}
-
-	watch(
-		() => props.modelValue,
-		(val) => {
-			open.value = val
-		}, { deep: true, immediate: true }
-	)
-	watch(
-		() => props.fullScreen,
-		(val) => {
-			isFullscreen.value = val
-		}, { deep: true, immediate: true }
-	)
-	// 全屏化
-	function handleScreen() {
-		isFullscreen.value = !isFullscreen.value
-	}
-	const expose = {}
-	const myDialogRef = ref()
-	onMounted(() => {
-		const entries = Object.entries(myDialogRef.value)
-		for (const [method, fn] of entries) {
-			expose[method] = fn
 		}
 	})
-	defineExpose(expose)
+}
+
+function createDndPanelList(data) {
+	try {
+		return data.map(item => {
+			return {
+				type: 'ProcessesNode',
+				text: `${item.dictWorkType} \n ${item.name}`,
+				label: `${item.dictWorkType} -- ${item.name}`,
+				icon: base64Icon.pndIcon,
+				properties: {
+					dictWorkType: item.dictWorkType,
+					processesId: item.id
+				}
+			}
+		})
+	} catch (e) {
+		return [];
+	}
+}
+
+
+
+// 数据准备==================
+const isFullscreen = ref(false)
+const open = ref(false)
+// 关闭
+function cancel() {
+	open.value = false
+}
+// 保存
+async function save() {
+	// open.value = false
+	const strData = theLogicFlowRef.value.getNodeData();
+	if (strData === null) {
+		proxy.$message.error('保存数据失败！');
+		return;
+	}
+	const updateData = {
+		id: props.routeId,
+		logicFlowData: strData,
+	}
+	console.log("保存数据", updateData);
+	const res1 = await updateBaseWorkRoute(updateData);
+	if (res1.code != 200) {
+		proxy.$message.error('保存数据失败！');
+		return;
+	}
+	const bindData = {
+		fkRouteCode: props.routeId,
+		logicFlowData: strData
+	}
+	const res2 = await parseRouteBindProccess(bindData);
+	if (res2.code != 200) {
+		proxy.$message.error('保存数据失败！');
+		return;
+	}
+	proxy.$message.success('保存数据成功');
+	cancel();
+	proxy.$emit('refresh');
+
+}
+//测试代码===根据坐标点提取顺序
+function getItem() {
+	const strData = theLogicFlowRef.value.getNodeData();
+	const jsonData = JSON.parse(strData);
+	console.log(jsonData);
+}
+
+watch(
+	() => props.modelValue,
+	(val) => {
+		open.value = val
+	}, { deep: true, immediate: true }
+)
+watch(
+	() => props.fullScreen,
+	(val) => {
+		isFullscreen.value = val
+	}, { deep: true, immediate: true }
+)
+// 全屏化
+function handleScreen() {
+	isFullscreen.value = !isFullscreen.value
+}
+const expose = {}
+const myDialogRef = ref()
+onMounted(() => {
+	const entries = Object.entries(myDialogRef.value)
+	for (const [method, fn] of entries) {
+		expose[method] = fn
+	}
+})
+defineExpose(expose)
 </script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/productManagement/WorkReport/ProReportwork.vue b/src/views/productManagement/WorkReport/ProReportwork.vue
deleted file mode 100644
index a943a65..0000000
--- a/src/views/productManagement/WorkReport/ProReportwork.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<!--
- * @Descripttion: (报工/pro_reportwork)
- * @Author: (mes)
- * @Date: (2024-12-03)
--->
-<template>
-  <div>
-    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-      <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 工具区域 -->
-    <el-row :gutter="15" class="mb10">
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['proreportwork:add']" plain icon="plus" @click="handleAdd">
-          {{ $t('btn.add') }}
-        </el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-    </el-row>
-
-    <el-table
-      :data="dataList"
-      v-loading="loading"
-      ref="table"
-      border
-      header-cell-class-name="el-table-header-cell"
-      highlight-current-row
-      @sort-change="sortChange"
-      >
-      <el-table-column prop="id" label="雪花" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('id')"/>
-      <el-table-column prop="workorder" label="工单code" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workorder')"/>
-      <el-table-column prop="routeCode" label="路线code" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('routeCode')"/>
-      <el-table-column prop="processCode" label="工序code" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('processCode')"/>
-      <el-table-column prop="planNum" label="计划数量" align="center" v-if="columns.showColumn('planNum')"/>
-      <el-table-column prop="finishNum" label="完成数量" align="center" v-if="columns.showColumn('finishNum')"/>
-      <el-table-column prop="badNum" label="不良数量" align="center" v-if="columns.showColumn('badNum')"/>
-      <el-table-column prop="worker" label="作业员" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('worker')"/>
-      <el-table-column prop="jobDate" label="作业日期" :show-overflow-tooltip="true"  v-if="columns.showColumn('jobDate')"/>
-      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')"/>
-      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')"/>
-      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true"  v-if="columns.showColumn('createdTime')"/>
-      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')"/>
-      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true"  v-if="columns.showColumn('updatedTime')"/>
-      <el-table-column label="操作" width="160">
-        <template #default="scope">
-          <el-button type="success" size="small" icon="edit" title="编辑" v-hasPermi="['proreportwork:edit']" @click="handleUpdate(scope.row)"></el-button>
-          <el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['proreportwork:delete']" @click="handleDelete(scope.row)"></el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-
-
-    <el-dialog :title="title" :lock-scroll="false" v-model="open" >
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="20">
-
-          <el-col :lg="12">
-            <el-form-item label="雪花" prop="id">
-              <el-input v-model="form.id" placeholder="请输入雪花" :disabled="opertype != 1"/>
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="工单code" prop="workorder">
-              <el-input v-model="form.workorder" placeholder="请输入工单code" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="路线code" prop="routeCode">
-              <el-input v-model="form.routeCode" placeholder="请输入路线code" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="工序code" prop="processCode">
-              <el-input v-model="form.processCode" placeholder="请输入工序code" />
-            </el-form-item>
-          </el-col>
-            
-          <el-col :lg="12">
-            <el-form-item label="计划数量" prop="planNum">
-              <el-input v-model.number="form.planNum" placeholder="请输入计划数量" />
-            </el-form-item>
-          </el-col>
-            
-          <el-col :lg="12">
-            <el-form-item label="完成数量" prop="finishNum">
-              <el-input v-model.number="form.finishNum" placeholder="请输入完成数量" />
-            </el-form-item>
-          </el-col>
-            
-          <el-col :lg="12">
-            <el-form-item label="不良数量" prop="badNum">
-              <el-input v-model.number="form.badNum" placeholder="请输入不良数量" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="作业员" prop="worker">
-              <el-input v-model="form.worker" placeholder="请输入作业员" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="作业日期" prop="jobDate">
-              <el-date-picker
-                v-model="form.jobDate"
-                type="datetime"
-                placeholder="选择日期时间"
-                value-format="YYYY-MM-DD HH:mm:ss">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="创建人" prop="createdBy">
-              <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="创建时间" prop="createdTime">
-              <el-date-picker
-                v-model="form.createdTime"
-                type="datetime"
-                placeholder="选择日期时间"
-                value-format="YYYY-MM-DD HH:mm:ss">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="更新人" prop="updatedBy">
-              <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="12">
-            <el-form-item label="更新时间" prop="updatedTime">
-              <el-date-picker
-                v-model="form.updatedTime"
-                type="datetime"
-                placeholder="选择日期时间"
-                value-format="YYYY-MM-DD HH:mm:ss">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer v-if="opertype != 3">
-        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="proreportwork">
-import { listProReportwork,
- addProReportwork, delProReportwork, 
- updateProReportwork,getProReportwork, 
- } 
-from '@/api/bZFM/proreportwork.js'
-const { proxy } = getCurrentInstance()
-const ids = ref([])
-const loading = ref(false)
-const showSearch = ref(true)
-const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  sort: '',
-  sortType: 'asc',
-})
-const columns = ref([
-  { visible: true, align: 'center', type: '', prop: 'id', label: '雪花'  ,showOverflowTooltip: true  },
-  { visible: true, align: 'center', type: '', prop: 'workorder', label: '工单code'  ,showOverflowTooltip: true  },
-  { visible: true, align: 'center', type: '', prop: 'routeCode', label: '路线code'  ,showOverflowTooltip: true  },
-  { visible: true, align: 'center', type: '', prop: 'processCode', label: '工序code'  ,showOverflowTooltip: true  },
-  { visible: true, align: 'center', type: '', prop: 'planNum', label: '计划数量'   },
-  { visible: true, align: 'center', type: '', prop: 'finishNum', label: '完成数量'   },
-  { visible: true, align: 'center', type: '', prop: 'badNum', label: '不良数量'   },
-  { visible: true, align: 'center', type: '', prop: 'worker', label: '作业员'  ,showOverflowTooltip: true  },
-  { visible: false, align: 'center', type: '', prop: 'jobDate', label: '作业日期'  ,showOverflowTooltip: true  },
-  { visible: false, align: 'center', type: '', prop: 'remark', label: '备注'  ,showOverflowTooltip: true  },
-  { visible: false, align: 'center', type: '', prop: 'createdBy', label: '创建人'  ,showOverflowTooltip: true  },
-  { visible: false, align: 'center', type: '', prop: 'createdTime', label: '创建时间'  ,showOverflowTooltip: true  },
-  { visible: false, align: 'center', type: '', prop: 'updatedBy', label: '更新人'  ,showOverflowTooltip: true  },
-  { visible: false, align: 'center', type: '', prop: 'updatedTime', label: '更新时间'  ,showOverflowTooltip: true  },
-  //{ visible: false, prop: 'actions', label: '操作', type: 'slot', width: '160' }
-])
-const total = ref(0)
-const dataList = ref([])
-const queryRef = ref()
-const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
-
-
-var dictParams = [
-]
-
-
-function getList(){
-  loading.value = true
-  listProReportwork(queryParams).then(res => {
-    const { code, data } = res
-    if (code == 200) {
-      dataList.value = data.result
-      total.value = data.totalNum
-      loading.value = false
-    }
-  })
-}
-
-// 查询
-function handleQuery() {
-  queryParams.pageNum = 1
-  getList()
-}
-
-// 重置查询操作
-function resetQuery(){
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
-// 自定义排序
-function sortChange(column) {
-  var sort = undefined
-  var sortType = undefined
-
-  if (column.prop != null && column.order != null) {
-    sort = column.prop
-    sortType = column.order
-
-  }
-  queryParams.sort = sort
-  queryParams.sortType = sortType
-  handleQuery()
-}
-
-/*************** form操作 ***************/
-const formRef = ref()
-const title = ref('')
-// 操作类型 1、add 2、edit 3、view
-const opertype = ref(0)
-const open = ref(false)
-const state = reactive({
-  single: true,
-  multiple: true,
-  form: {},
-  rules: {
-    id: [{ required: true, message: "雪花不能为空", trigger: "blur"     }],
-  },
-  options: {
-  }
-})
-
-const { form, rules, options, single, multiple } = toRefs(state)
-
-// 关闭dialog
-function cancel(){
-  open.value = false
-  reset()
-}
-
-// 重置表单
-function reset() {
-  form.value = {
-    id: null,
-    workorder: null,
-    routeCode: null,
-    processCode: null,
-    planNum: null,
-    finishNum: null,
-    badNum: null,
-    worker: null,
-    jobDate: null,
-    remark: null,
-    createdBy: null,
-    createdTime: null,
-    updatedBy: null,
-    updatedTime: null,
-  };
-  proxy.resetForm("formRef")
-}
-
-
-// 添加按钮操作
-function handleAdd() {
-  reset();
-  open.value = true
-  title.value = '添加报工'
-  opertype.value = 1
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  reset()
-  const id = row.id || ids.value
-  getProReportwork(id).then((res) => {
-    const { code, data } = res
-    if (code == 200) {
-      open.value = true
-      title.value = '修改报工'
-      opertype.value = 2
-
-      form.value = {
-        ...data,
-      }
-    }
-  })
-}
-
-// 添加&修改 表单提交
-function submitForm() {
-  proxy.$refs["formRef"].validate((valid) => {
-    if (valid) {
-
-      if (form.value.id != undefined && opertype.value === 2) {
-        updateProReportwork(form.value).then((res) => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addProReportwork(form.value).then((res) => {
-            proxy.$modal.msgSuccess("新增成功")
-            open.value = false
-            getList()
-          })
-      }
-    }
-  })
-}
-
-// 删除按钮操作
-function handleDelete(row) {
-  const Ids = row.id || ids.value
-
-  proxy
-    .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？', "警告", {
-      confirmButtonText: proxy.$t('common.ok'),
-      cancelButtonText: proxy.$t('common.cancel'),
-      type: "warning",
-    })
-    .then(function () {
-      return delProReportwork(Ids)
-    })
-    .then(() => {
-      getList()
-      proxy.$modal.msgSuccess("删除成功")
-    })
-}
-
-
-
-
-handleQuery()
-</script>
\ No newline at end of file
diff --git a/src/views/productManagement/WorkReport/index-old.vue b/src/views/productManagement/WorkReport/index-old.vue
new file mode 100644
index 0000000..aa057a0
--- /dev/null
+++ b/src/views/productManagement/WorkReport/index-old.vue
@@ -0,0 +1,479 @@
+<!--
+ * @Descripttion: (生产报工)
+ * @Author: (admin)
+ * @Date: (2024-07-16)
+-->
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item label="工单号" prop="workorder">
+        <el-input v-model.trim="queryParams.workorder" clearable placeholder="请输入工单号" />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="productionName">
+        <el-input v-model.trim="queryParams.productionName" clearable placeholder="请输入产品名称" />
+      </el-form-item>
+      <el-form-item label="物料编号" prop="productionCode">
+        <el-input v-model.trim="queryParams.productionCode" clearable placeholder="请输入物料编号" />
+      </el-form-item>
+      <el-form-item label="客户编码" prop="customCode">
+        <el-input v-model.trim="queryParams.customCode" clearable placeholder="请输入客户编码" />
+      </el-form-item>
+      <el-form-item label="工单日期" prop="workorderDate">
+        <el-date-picker
+          v-model="queryParams.workorderDate"
+          type="daterange"
+          range-separator="到"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          placeholder="请选择工单日期区间" />
+      </el-form-item>
+      <el-form-item label="工单状态" prop="status">
+        <el-radio-group v-model="queryParams.status" @change="handleQuery">
+          <el-radio-button :value="-1"> 全部 </el-radio-button>
+          <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+            {{ item.dictLabel }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-row-class-name="table-header"
+      :cell-class-name="tableCellClassName"
+      @sort-change="sortChange">
+      <el-table-column prop="id" label="雪花id" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('id')" />
+      <el-table-column prop="sort" label="序号" align="center" v-if="columns.showColumn('sort')" />
+      <el-table-column
+        prop="workorder"
+        label="工单号"
+        min-width="160"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('workorder')">
+        <template #default="scope">
+          <el-link style="font-size: 20px; font-weight: 600" @click="handleSchedule(scope.row)" type="primary">{{ scope.row.workorder }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="productionName"
+        label="产品名称"
+        min-width="160"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('productionName')" />
+      <el-table-column
+        prop="productionCode"
+        label="物料编号"
+        min-width="160"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('productionCode')" />
+      <el-table-column
+        prop="description"
+        label="物料描述"
+        min-width="160"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('description')" />
+      <el-table-column prop="color" label="颜色" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('color')" />
+      <el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('specification')" />
+      <el-table-column prop="customCode" label="客户编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('customCode')" />
+      <el-table-column prop="groupId" label="组别" align="center" v-if="columns.showColumn('groupId')" />
+      <el-table-column prop="fkRouteCode" label="工艺路线" align="center" v-if="columns.showColumn('fkRouteCode')" />
+      <el-table-column prop="deliveryNum" label="交货数量" align="center" v-if="columns.showColumn('deliveryNum')" />
+      <el-table-column prop="unit" label="单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
+      <el-table-column prop="packageNum" label="纸箱数量" align="center" v-if="columns.showColumn('packageNum')" />
+      <el-table-column
+        prop="workorderDate"
+        label="工单日期"
+        align="center"
+        min-width="140"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('workorderDate')">
+        <template #default="scope">
+          <span v-if="scope.row.workorderDate != '' && scope.row.workorderDate != null">{{
+            proxy.dayjs(scope.row.workorderDate).format('YYYY-MM-DD')
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="year" label="年" align="center" v-if="columns.showColumn('year')" />
+      <el-table-column prop="week" label="周" align="center" v-if="columns.showColumn('week')" />
+      <el-table-column prop="date" label="日" align="center" v-if="columns.showColumn('date')" />
+      <el-table-column prop="priority" label="优先级" align="center" v-if="columns.showColumn('priority')" />
+      <el-table-column prop="status" label="工单状态" align="center" v-if="columns.showColumn('status')">
+        <template #default="scope">
+          <dict-tag :options="options.statusOptions" :value="scope.row.status + ''" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      <el-table-column label="操作" align="center" fixed="right" width="80">
+        <template #default="scope">
+          <el-button
+            type="warning"
+            size="small"
+            title="更多"
+            v-hasPermi="['productManagement:proworkorder:edit']"
+            @click="handleSchedule(scope.row)"
+            >排产</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <!-- 添加或修改生产工单对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open" width="80%">
+      <el-form disabled ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-descriptions title="工单数据" border :column="5" class="mb10">
+          <el-descriptions-item label="产品名称">{{ form.productionName }}</el-descriptions-item>
+          <el-descriptions-item label="物料编号">{{ form.productionCode }}</el-descriptions-item>
+          <el-descriptions-item label="客户编码">{{ form.customCode }}</el-descriptions-item>
+          <el-descriptions-item label="工单日期">{{ form.workorderDate }}</el-descriptions-item>
+          <el-descriptions-item label="交货数量">{{ form.deliveryNum }}</el-descriptions-item>
+          <el-descriptions-item label="单位">{{ form.unit }}</el-descriptions-item>
+          <el-descriptions-item label="纸箱数量">{{ form.packageNum }}</el-descriptions-item>
+          <el-descriptions-item label="组别">{{ form.groupId }}</el-descriptions-item>
+          <el-descriptions-item label="工艺路线">{{ form.fkRouteCode }}</el-descriptions-item>
+          <el-descriptions-item label="优先级">{{ form.priority }}</el-descriptions-item>
+          <!-- <el-descriptions-item :span="2" label="工单状态">
+						<el-radio-group v-model="form.status">
+							<el-radio v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+								{{ item.dictLabel }}
+							</el-radio>
+						</el-radio-group>
+					</el-descriptions-item> -->
+          <el-descriptions-item :span="5" label="备注">{{ form.remark }}</el-descriptions-item>
+        </el-descriptions>
+        <el-row :gutter="20">
+          <el-col :lg="24">
+            <el-steps class="mb10" :active="stepActive" simple finish-status="success">
+              <el-step v-for="(item, index) in processList" :key="item.id" :title="`${item.name}`" @click="handleGetStationList(item.id, index)" />
+            </el-steps>
+          </el-col>
+          <el-col :lg="24">
+            <vxe-table
+              :loading="formTableLoading"
+              border
+              ref="xTableRef"
+              height="300"
+              :data="stationList"
+              :radio-config="{ highlight: true }"
+              @cell-click="cellClickEvent"
+              @radio-change="radioChangeEvent">
+              <vxe-column type="radio" width="60"></vxe-column>
+              <vxe-column field="workStationDescription" title="工位描述"></vxe-column>
+              <vxe-column field="dictWorkType" title="工序类别"></vxe-column>
+              <vxe-column field="bindedDeviceArray" title="工位设备"> </vxe-column>
+              <vxe-column field="remark" title="备注"></vxe-column>
+            </vxe-table>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="proworkorder">
+import {
+  listProWorkorder,
+  addProWorkorder,
+  delProWorkorder,
+  updateProWorkorder,
+  getProWorkorder,
+  Generate_workorder,
+  Insert_workOrder,
+  MoveWorkorder,
+  WorkOrderExport
+} from '@/api/productManagement/proworkorder.js'
+import {
+  QueryProWorkorder,
+  getWorkProcessListByWorkRouteID,
+  getWorkStationListByWorkProcessID,
+  getWorkDeviceByWorkStationID,
+  updateSelectedWorkstation
+} from '@/api/productManagement/workorderSchedule.js'
+import { getOneDict } from '@/utils/dict.js'
+import { downFile } from '@/utils/request.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  workorderDate: [proxy.dayjs(), proxy.dayjs()],
+  status: -1,
+  sort: 'sort',
+  sortType: 'asc'
+})
+const columns = ref([
+  { visible: false, prop: 'id', label: '数据库id' },
+  { visible: true, prop: 'workorder', label: '工单号' },
+  { visible: true, prop: 'productionName', label: '产品名称' },
+  { visible: true, prop: 'productionCode', label: '物料编号' },
+  { visible: true, prop: 'description', label: '物料描述' },
+  { visible: false, prop: 'color', label: '颜色' },
+  { visible: false, prop: 'specification', label: '规格' },
+  { visible: true, prop: 'customCode', label: '客户编码' },
+  { visible: true, prop: 'deliveryNum', label: '交货数量' },
+  { visible: true, prop: 'unit', label: '单位' },
+  { visible: true, prop: 'packageNum', label: '纸箱数量' },
+  { visible: true, prop: 'groupId', label: '组别' },
+  { visible: true, prop: 'fkRouteCode', label: '工艺路线' },
+  { visible: true, prop: 'sort', label: '序号' },
+  { visible: true, prop: 'workorderDate', label: '工单日期' },
+  { visible: false, prop: 'year', label: '年' },
+  { visible: false, prop: 'week', label: '周' },
+  { visible: false, prop: 'date', label: '日' },
+  { visible: true, prop: 'priority', label: '优先级 1-100' },
+  { visible: true, prop: 'status', label: '工单状态' },
+  { visible: true, prop: 'remark', label: '备注' },
+  { visible: false, prop: 'createdBy', label: '创建人' },
+  { visible: false, prop: 'createdTime', label: '创建时间' },
+  { visible: false, prop: 'updatedBy', label: '更新人' },
+  { visible: false, prop: 'updatedTime', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([proxy.dayjs(), proxy.dayjs()])
+
+var dictParams = []
+
+function getList() {
+  loading.value = true
+  QueryProWorkorder(queryParams).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      dataList.value = data.result
+      total.value = data.totalNum
+      loading.value = false
+    }
+  })
+}
+
+// 查询
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+  var sort = undefined
+  var sortType = undefined
+
+  if (column.prop != null && column.order != null) {
+    sort = column.prop
+    sortType = column.order
+  }
+  queryParams.sort = sort
+  queryParams.sortType = sortType
+  handleQuery()
+}
+
+function tableCellClassName({ row, column, rowIndex, columnIndex }) {
+  return 'common-row'
+}
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+const open = ref(false)
+const state = reactive({
+  formTableLoading: false,
+  single: true,
+  multiple: true,
+  stepActive: 1,
+  form: {},
+  rules: {
+    productionName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+    productionCode: [{ required: true, message: '物料编号不能为空', trigger: 'blur' }]
+  },
+  options: {
+    dictWorkTypeOptions: [],
+    // 工单状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    statusOptions: []
+  },
+
+  processList: [],
+  stationList: []
+})
+
+const { formTableLoading, form, rules, options, single, multiple, processList, stationList, stepActive } = toRefs(state)
+async function initDict() {
+  const dictSelectList = ['pro_workorder_type', 'base_work_type']
+  const statusRes = await getOneDict(dictSelectList[0])
+  if (statusRes.code === 200) {
+    state.options.statusOptions = statusRes.data[0].list
+  }
+  const workStationDescriptionRes = await getOneDict(dictSelectList[1])
+  if (workStationDescriptionRes.code === 200) {
+    state.options.dictWorkTypeOptions = workStationDescriptionRes.data[0].list
+  }
+}
+// 关闭dialog
+function cancel() {
+  open.value = false
+  reset()
+}
+// 重置表单
+function reset() {
+  form.value = {
+    id: null,
+    productionName: null,
+    productionCode: null,
+    customCode: null,
+    deliveryNum: null,
+    unit: null,
+    packageNum: null,
+    groupId: null,
+    fkRouteCode: null,
+    sort: 1,
+    workorderDate: new Date(),
+    year: null,
+    week: null,
+    date: null,
+    priority: null,
+    status: 1,
+    remark: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null
+  }
+  processList.value = []
+  stepActive.value = 1
+  proxy.resetForm('formRef')
+}
+// 插入生产工单
+const nextId = ref('')
+// 工单排产按钮操作
+async function handleSchedule(row) {
+  reset()
+  const id = row.id || ids.value
+  const workorderInfoRes = await getProWorkorder(id)
+  if (workorderInfoRes.code === 200) {
+    open.value = true
+    title.value = '工单排产'
+    form.value = {
+      ...workorderInfoRes.data
+    }
+    if (workorderInfoRes.data.fkRouteCode != null && workorderInfoRes.data.fkRouteCode != '') {
+      const processListRes = await getWorkProcessListByWorkRouteID({ workfkRouteCode: workorderInfoRes.data.fkRouteCode })
+      if (processListRes.code === 200) {
+        processList.value = processListRes.data
+        handleGetStationList(processList.value[0].id, 0)
+      }
+    } else {
+      proxy.$message.error('工单工艺路线未绑定！')
+    }
+  }
+}
+// 点击step 获取 工位列表
+async function handleGetStationList(id, index) {
+  formTableLoading.value = true
+  stationList.value = []
+  stepActive.value = index + 1
+  const { code, data } = await getWorkStationListByWorkProcessID({ WorkorderId: form.value.id, workProcessID: id })
+  if (code === 200) {
+    stationList.value = data
+    console.log(stationList.value)
+    for (let item of stationList.value) {
+      if (item.flag === 1) {
+        xTableRef.value.setRadioRow(item)
+      }
+    }
+    formTableLoading.value = false
+  }
+  //TODO 获取默认工位
+  // const data = {
+  // 	workorderId:form.value.id,
+  // 	processId:processList.value[stepActive.value].id,
+  // }
+}
+//vxetable功能
+const selectRow = ref(null)
+const xTableRef = ref(null)
+
+async function cellClickEvent({ row }) {
+  xTableRef.value.setRadioRow(row)
+  selectRow.value = row
+  saveWorkStationSelect()
+}
+
+function radioChangeEvent({ row }) {
+  selectRow.value = row
+  saveWorkStationSelect()
+}
+//  工单排产保存
+async function saveWorkStationSelect() {
+  const data = {
+    fkWorkorderId: form.value.id,
+    fkProcessId: processList.value[stepActive.value - 1].id,
+    fkStationId: selectRow.value.id
+  }
+  const res = await updateSelectedWorkstation(data)
+  if (res.code === 200) {
+    proxy.$message.success('修改成功')
+  }
+}
+function submitForm() {
+	open.value = false
+	reset()
+}
+
+initDict()
+handleQuery()
+</script>
+
+<style scoped>
+.tool-box {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+:deep(.table-header) {
+  font-size: 18px;
+  font-weight: 600;
+  background: black;
+  color: #303133;
+}
+
+:deep(.common-row) {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+:deep(.warning-cell-1) {
+  background-color: #e6a23c;
+  color: black;
+  font-size: 20px;
+  font-weight: 600;
+}
+
+:deep(.danger-cell-1) {
+  background: red;
+  color: black;
+  font-size: 20px;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/productManagement/WorkReport/index.vue b/src/views/productManagement/WorkReport/index.vue
index aa057a0..9505e63 100644
--- a/src/views/productManagement/WorkReport/index.vue
+++ b/src/views/productManagement/WorkReport/index.vue
@@ -1,185 +1,120 @@
 <!--
- * @Descripttion: (生产报工)
- * @Author: (admin)
- * @Date: (2024-07-16)
+ * @Descripttion: (报工/pro_reportwork)
+ * @Author: (mes)
+ * @Date: (2024-12-03)
 -->
 <template>
   <div>
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-      <el-form-item label="工单号" prop="workorder">
-        <el-input v-model.trim="queryParams.workorder" clearable placeholder="请输入工单号" />
-      </el-form-item>
-      <el-form-item label="产品名称" prop="productionName">
-        <el-input v-model.trim="queryParams.productionName" clearable placeholder="请输入产品名称" />
-      </el-form-item>
-      <el-form-item label="物料编号" prop="productionCode">
-        <el-input v-model.trim="queryParams.productionCode" clearable placeholder="请输入物料编号" />
-      </el-form-item>
-      <el-form-item label="客户编码" prop="customCode">
-        <el-input v-model.trim="queryParams.customCode" clearable placeholder="请输入客户编码" />
-      </el-form-item>
-      <el-form-item label="工单日期" prop="workorderDate">
-        <el-date-picker
-          v-model="queryParams.workorderDate"
-          type="daterange"
-          range-separator="到"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          placeholder="请选择工单日期区间" />
-      </el-form-item>
-      <el-form-item label="工单状态" prop="status">
-        <el-radio-group v-model="queryParams.status" @change="handleQuery">
-          <el-radio-button :value="-1"> 全部 </el-radio-button>
-          <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
-            {{ item.dictLabel }}
-          </el-radio-button>
-        </el-radio-group>
-      </el-form-item>
       <el-form-item>
         <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
         <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
       </el-form-item>
     </el-form>
-    <el-table
-      :data="dataList"
-      v-loading="loading"
-      ref="table"
-      border
-      header-row-class-name="table-header"
-      :cell-class-name="tableCellClassName"
-      @sort-change="sortChange">
-      <el-table-column prop="id" label="雪花id" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('id')" />
-      <el-table-column prop="sort" label="序号" align="center" v-if="columns.showColumn('sort')" />
-      <el-table-column
-        prop="workorder"
-        label="工单号"
-        min-width="160"
-        align="center"
-        :show-overflow-tooltip="true"
-        v-if="columns.showColumn('workorder')">
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['proreportwork:add']" plain icon="plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell"
+      highlight-current-row @sort-change="sortChange">
+      <el-table-column prop="id" label="雪花" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('id')" />
+      <el-table-column prop="workorder" label="工单编号" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('workorder')" />
+      <el-table-column prop="routeCode" label="线" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('routeCode')" />
+      <el-table-column prop="processCode" label="工序" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('processCode')" />
+      <el-table-column prop="planNum" label="计划数量" align="center" v-if="columns.showColumn('planNum')" />
+      <el-table-column prop="finishNum" label="完成数量" align="center" v-if="columns.showColumn('finishNum')" />
+      <el-table-column prop="badNum" label="不良数量" align="center" v-if="columns.showColumn('badNum')" />
+      <el-table-column prop="worker" label="作业员" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('worker')" />
+      <el-table-column prop="jobDate" label="作业日期" :show-overflow-tooltip="true" v-if="columns.showColumn('jobDate')" />
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('updatedTime')" />
+      <el-table-column label="操作" width="160">
         <template #default="scope">
-          <el-link style="font-size: 20px; font-weight: 600" @click="handleSchedule(scope.row)" type="primary">{{ scope.row.workorder }}</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="productionName"
-        label="产品名称"
-        min-width="160"
-        align="center"
-        :show-overflow-tooltip="true"
-        v-if="columns.showColumn('productionName')" />
-      <el-table-column
-        prop="productionCode"
-        label="物料编号"
-        min-width="160"
-        align="center"
-        :show-overflow-tooltip="true"
-        v-if="columns.showColumn('productionCode')" />
-      <el-table-column
-        prop="description"
-        label="物料描述"
-        min-width="160"
-        align="center"
-        :show-overflow-tooltip="true"
-        v-if="columns.showColumn('description')" />
-      <el-table-column prop="color" label="颜色" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('color')" />
-      <el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('specification')" />
-      <el-table-column prop="customCode" label="客户编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('customCode')" />
-      <el-table-column prop="groupId" label="组别" align="center" v-if="columns.showColumn('groupId')" />
-      <el-table-column prop="fkRouteCode" label="工艺路线" align="center" v-if="columns.showColumn('fkRouteCode')" />
-      <el-table-column prop="deliveryNum" label="交货数量" align="center" v-if="columns.showColumn('deliveryNum')" />
-      <el-table-column prop="unit" label="单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
-      <el-table-column prop="packageNum" label="纸箱数量" align="center" v-if="columns.showColumn('packageNum')" />
-      <el-table-column
-        prop="workorderDate"
-        label="工单日期"
-        align="center"
-        min-width="140"
-        :show-overflow-tooltip="true"
-        v-if="columns.showColumn('workorderDate')">
-        <template #default="scope">
-          <span v-if="scope.row.workorderDate != '' && scope.row.workorderDate != null">{{
-            proxy.dayjs(scope.row.workorderDate).format('YYYY-MM-DD')
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="year" label="年" align="center" v-if="columns.showColumn('year')" />
-      <el-table-column prop="week" label="周" align="center" v-if="columns.showColumn('week')" />
-      <el-table-column prop="date" label="日" align="center" v-if="columns.showColumn('date')" />
-      <el-table-column prop="priority" label="优先级" align="center" v-if="columns.showColumn('priority')" />
-      <el-table-column prop="status" label="工单状态" align="center" v-if="columns.showColumn('status')">
-        <template #default="scope">
-          <dict-tag :options="options.statusOptions" :value="scope.row.status + ''" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
-      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
-      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
-      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
-      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
-      <el-table-column label="操作" align="center" fixed="right" width="80">
-        <template #default="scope">
-          <el-button
-            type="warning"
-            size="small"
-            title="更多"
-            v-hasPermi="['productManagement:proworkorder:edit']"
-            @click="handleSchedule(scope.row)"
-            >排产</el-button
-          >
+          <el-button type="success" size="small" icon="edit" title="编辑" v-hasPermi="['proreportwork:edit']"
+            @click="handleUpdate(scope.row)"></el-button>
+          <el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['proreportwork:delete']"
+            @click="handleDelete(scope.row)"></el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    <!-- 添加或修改生产工单对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" v-model="open" width="80%">
-      <el-form disabled ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-descriptions title="工单数据" border :column="5" class="mb10">
-          <el-descriptions-item label="产品名称">{{ form.productionName }}</el-descriptions-item>
-          <el-descriptions-item label="物料编号">{{ form.productionCode }}</el-descriptions-item>
-          <el-descriptions-item label="客户编码">{{ form.customCode }}</el-descriptions-item>
-          <el-descriptions-item label="工单日期">{{ form.workorderDate }}</el-descriptions-item>
-          <el-descriptions-item label="交货数量">{{ form.deliveryNum }}</el-descriptions-item>
-          <el-descriptions-item label="单位">{{ form.unit }}</el-descriptions-item>
-          <el-descriptions-item label="纸箱数量">{{ form.packageNum }}</el-descriptions-item>
-          <el-descriptions-item label="组别">{{ form.groupId }}</el-descriptions-item>
-          <el-descriptions-item label="工艺路线">{{ form.fkRouteCode }}</el-descriptions-item>
-          <el-descriptions-item label="优先级">{{ form.priority }}</el-descriptions-item>
-          <!-- <el-descriptions-item :span="2" label="工单状态">
-						<el-radio-group v-model="form.status">
-							<el-radio v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
-								{{ item.dictLabel }}
-							</el-radio>
-						</el-radio-group>
-					</el-descriptions-item> -->
-          <el-descriptions-item :span="5" label="备注">{{ form.remark }}</el-descriptions-item>
-        </el-descriptions>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+
+
+    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
-          <el-col :lg="24">
-            <el-steps class="mb10" :active="stepActive" simple finish-status="success">
-              <el-step v-for="(item, index) in processList" :key="item.id" :title="`${item.name}`" @click="handleGetStationList(item.id, index)" />
-            </el-steps>
+          <el-col :lg="12">
+            <el-form-item label="工单编号" prop="workorder">
+              <el-input v-model="form.workorder" placeholder="请输入工单编号" />
+            </el-form-item>
           </el-col>
-          <el-col :lg="24">
-            <vxe-table
-              :loading="formTableLoading"
-              border
-              ref="xTableRef"
-              height="300"
-              :data="stationList"
-              :radio-config="{ highlight: true }"
-              @cell-click="cellClickEvent"
-              @radio-change="radioChangeEvent">
-              <vxe-column type="radio" width="60"></vxe-column>
-              <vxe-column field="workStationDescription" title="工位描述"></vxe-column>
-              <vxe-column field="dictWorkType" title="工序类别"></vxe-column>
-              <vxe-column field="bindedDeviceArray" title="工位设备"> </vxe-column>
-              <vxe-column field="remark" title="备注"></vxe-column>
-            </vxe-table>
+
+          <el-col :lg="12">
+            <el-form-item label="线" prop="routeCode">
+              <el-input v-model="form.routeCode" placeholder="请输入线" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="工序" prop="processCode">
+              <el-input v-model="form.processCode" placeholder="请输入工序" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="计划数量" prop="planNum">
+              <el-input v-model.number="form.planNum" placeholder="请输入计划数量" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="完成数量" prop="finishNum">
+              <el-input v-model.number="form.finishNum" placeholder="请输入完成数量" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="不良数量" prop="badNum">
+              <el-input v-model.number="form.badNum" placeholder="请输入不良数量" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="作业员" prop="worker">
+              <el-input v-model="form.worker" placeholder="请输入作业员" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="作业日期" prop="jobDate">
+              <el-date-picker v-model="form.jobDate" type="datetime" placeholder="选择日期时间"
+                value-format="YYYY-MM-DD HH:mm:ss">
+              </el-date-picker>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <template #footer>
+      <template #footer v-if="opertype != 3">
         <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
         <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
       </template>
@@ -187,27 +122,13 @@
   </div>
 </template>
 
-<script setup name="proworkorder">
+<script setup name="proreportwork">
 import {
-  listProWorkorder,
-  addProWorkorder,
-  delProWorkorder,
-  updateProWorkorder,
-  getProWorkorder,
-  Generate_workorder,
-  Insert_workOrder,
-  MoveWorkorder,
-  WorkOrderExport
-} from '@/api/productManagement/proworkorder.js'
-import {
-  QueryProWorkorder,
-  getWorkProcessListByWorkRouteID,
-  getWorkStationListByWorkProcessID,
-  getWorkDeviceByWorkStationID,
-  updateSelectedWorkstation
-} from '@/api/productManagement/workorderSchedule.js'
-import { getOneDict } from '@/utils/dict.js'
-import { downFile } from '@/utils/request.js'
+  listProReportwork,
+  addProReportwork, delProReportwork,
+  updateProReportwork, getProReportwork,
+}
+  from '@/api/productManagement/proreportwork.js'
 const { proxy } = getCurrentInstance()
 const ids = ref([])
 const loading = ref(false)
@@ -215,48 +136,39 @@ const showSearch = ref(true)
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  workorderDate: [proxy.dayjs(), proxy.dayjs()],
-  status: -1,
-  sort: 'sort',
-  sortType: 'asc'
+  sort: '',
+  sortType: 'asc',
 })
 const columns = ref([
-  { visible: false, prop: 'id', label: '数据库id' },
-  { visible: true, prop: 'workorder', label: '工单号' },
-  { visible: true, prop: 'productionName', label: '产品名称' },
-  { visible: true, prop: 'productionCode', label: '物料编号' },
-  { visible: true, prop: 'description', label: '物料描述' },
-  { visible: false, prop: 'color', label: '颜色' },
-  { visible: false, prop: 'specification', label: '规格' },
-  { visible: true, prop: 'customCode', label: '客户编码' },
-  { visible: true, prop: 'deliveryNum', label: '交货数量' },
-  { visible: true, prop: 'unit', label: '单位' },
-  { visible: true, prop: 'packageNum', label: '纸箱数量' },
-  { visible: true, prop: 'groupId', label: '组别' },
-  { visible: true, prop: 'fkRouteCode', label: '工艺路线' },
-  { visible: true, prop: 'sort', label: '序号' },
-  { visible: true, prop: 'workorderDate', label: '工单日期' },
-  { visible: false, prop: 'year', label: '年' },
-  { visible: false, prop: 'week', label: '周' },
-  { visible: false, prop: 'date', label: '日' },
-  { visible: true, prop: 'priority', label: '优先级 1-100' },
-  { visible: true, prop: 'status', label: '工单状态' },
-  { visible: true, prop: 'remark', label: '备注' },
-  { visible: false, prop: 'createdBy', label: '创建人' },
-  { visible: false, prop: 'createdTime', label: '创建时间' },
-  { visible: false, prop: 'updatedBy', label: '更新人' },
-  { visible: false, prop: 'updatedTime', label: '更新时间' }
+  { visible: false, align: 'center', type: '', prop: 'id', label: '雪花', showOverflowTooltip: true },
+  { visible: true, align: 'center', type: '', prop: 'workorder', label: '工单编号', showOverflowTooltip: true },
+  { visible: true, align: 'center', type: '', prop: 'routeCode', label: '线', showOverflowTooltip: true },
+  { visible: true, align: 'center', type: '', prop: 'processCode', label: '工序', showOverflowTooltip: true },
+  { visible: true, align: 'center', type: '', prop: 'planNum', label: '计划数量' },
+  { visible: true, align: 'center', type: '', prop: 'finishNum', label: '完成数量' },
+  { visible: true, align: 'center', type: '', prop: 'badNum', label: '不良数量' },
+  { visible: true, align: 'center', type: '', prop: 'worker', label: '作业员', showOverflowTooltip: true },
+  { visible: true, align: 'center', type: '', prop: 'jobDate', label: '作业日期', showOverflowTooltip: true },
+  { visible: true, align: 'center', type: '', prop: 'remark', label: '备注', showOverflowTooltip: true },
+  { visible: false, align: 'center', type: '', prop: 'createdBy', label: '创建人', showOverflowTooltip: true },
+  { visible: false, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true },
+  { visible: false, align: 'center', type: '', prop: 'updatedBy', label: '更新人', showOverflowTooltip: true },
+  { visible: false, align: 'center', type: '', prop: 'updatedTime', label: '更新时间', showOverflowTooltip: true },
+  //{ visible: false, prop: 'actions', label: '操作', type: 'slot', width: '160' }
 ])
 const total = ref(0)
 const dataList = ref([])
 const queryRef = ref()
-const defaultTime = ref([proxy.dayjs(), proxy.dayjs()])
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+
+var dictParams = [
+]
 
-var dictParams = []
 
 function getList() {
   loading.value = true
-  QueryProWorkorder(queryParams).then((res) => {
+  listProReportwork(queryParams).then(res => {
     const { code, data } = res
     if (code == 200) {
       dataList.value = data.result
@@ -274,7 +186,7 @@ function handleQuery() {
 
 // 重置查询操作
 function resetQuery() {
-  proxy.resetForm('queryRef')
+  proxy.resetForm("queryRef")
   handleQuery()
 }
 // 自定义排序
@@ -285,195 +197,128 @@ function sortChange(column) {
   if (column.prop != null && column.order != null) {
     sort = column.prop
     sortType = column.order
+
   }
   queryParams.sort = sort
   queryParams.sortType = sortType
   handleQuery()
 }
 
-function tableCellClassName({ row, column, rowIndex, columnIndex }) {
-  return 'common-row'
-}
 /*************** form操作 ***************/
 const formRef = ref()
 const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
 const open = ref(false)
 const state = reactive({
-  formTableLoading: false,
   single: true,
   multiple: true,
-  stepActive: 1,
   form: {},
   rules: {
-    productionName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-    productionCode: [{ required: true, message: '物料编号不能为空', trigger: 'blur' }]
+    id: [{ required: true, message: "雪花不能为空", trigger: "blur" }],
   },
   options: {
-    dictWorkTypeOptions: [],
-    // 工单状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-    statusOptions: []
-  },
-
-  processList: [],
-  stationList: []
+  }
 })
 
-const { formTableLoading, form, rules, options, single, multiple, processList, stationList, stepActive } = toRefs(state)
-async function initDict() {
-  const dictSelectList = ['pro_workorder_type', 'base_work_type']
-  const statusRes = await getOneDict(dictSelectList[0])
-  if (statusRes.code === 200) {
-    state.options.statusOptions = statusRes.data[0].list
-  }
-  const workStationDescriptionRes = await getOneDict(dictSelectList[1])
-  if (workStationDescriptionRes.code === 200) {
-    state.options.dictWorkTypeOptions = workStationDescriptionRes.data[0].list
-  }
-}
+const { form, rules, options, single, multiple } = toRefs(state)
+
 // 关闭dialog
 function cancel() {
   open.value = false
   reset()
 }
+
 // 重置表单
 function reset() {
   form.value = {
     id: null,
-    productionName: null,
-    productionCode: null,
-    customCode: null,
-    deliveryNum: null,
-    unit: null,
-    packageNum: null,
-    groupId: null,
-    fkRouteCode: null,
-    sort: 1,
-    workorderDate: new Date(),
-    year: null,
-    week: null,
-    date: null,
-    priority: null,
-    status: 1,
+    workorder: null,
+    routeCode: null,
+    processCode: null,
+    planNum: null,
+    finishNum: null,
+    badNum: null,
+    worker: null,
+    jobDate: null,
     remark: null,
     createdBy: null,
     createdTime: null,
     updatedBy: null,
-    updatedTime: null
-  }
-  processList.value = []
-  stepActive.value = 1
-  proxy.resetForm('formRef')
+    updatedTime: null,
+  };
+  proxy.resetForm("formRef")
 }
-// 插入生产工单
-const nextId = ref('')
-// 工单排产按钮操作
-async function handleSchedule(row) {
+
+
+// 添加按钮操作
+function handleAdd() {
+  reset();
+  open.value = true
+  title.value = '添加报工'
+  opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
   reset()
   const id = row.id || ids.value
-  const workorderInfoRes = await getProWorkorder(id)
-  if (workorderInfoRes.code === 200) {
-    open.value = true
-    title.value = '工单排产'
-    form.value = {
-      ...workorderInfoRes.data
-    }
-    if (workorderInfoRes.data.fkRouteCode != null && workorderInfoRes.data.fkRouteCode != '') {
-      const processListRes = await getWorkProcessListByWorkRouteID({ workfkRouteCode: workorderInfoRes.data.fkRouteCode })
-      if (processListRes.code === 200) {
-        processList.value = processListRes.data
-        handleGetStationList(processList.value[0].id, 0)
-      }
-    } else {
-      proxy.$message.error('工单工艺路线未绑定！')
-    }
-  }
-}
-// 点击step 获取 工位列表
-async function handleGetStationList(id, index) {
-  formTableLoading.value = true
-  stationList.value = []
-  stepActive.value = index + 1
-  const { code, data } = await getWorkStationListByWorkProcessID({ WorkorderId: form.value.id, workProcessID: id })
-  if (code === 200) {
-    stationList.value = data
-    console.log(stationList.value)
-    for (let item of stationList.value) {
-      if (item.flag === 1) {
-        xTableRef.value.setRadioRow(item)
+  getProReportwork(id).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      open.value = true
+      title.value = '修改报工'
+      opertype.value = 2
+
+      form.value = {
+        ...data,
       }
     }
-    formTableLoading.value = false
-  }
-  //TODO 获取默认工位
-  // const data = {
-  // 	workorderId:form.value.id,
-  // 	processId:processList.value[stepActive.value].id,
-  // }
-}
-//vxetable功能
-const selectRow = ref(null)
-const xTableRef = ref(null)
-
-async function cellClickEvent({ row }) {
-  xTableRef.value.setRadioRow(row)
-  selectRow.value = row
-  saveWorkStationSelect()
+  })
 }
 
-function radioChangeEvent({ row }) {
-  selectRow.value = row
-  saveWorkStationSelect()
-}
-//  工单排产保存
-async function saveWorkStationSelect() {
-  const data = {
-    fkWorkorderId: form.value.id,
-    fkProcessId: processList.value[stepActive.value - 1].id,
-    fkStationId: selectRow.value.id
-  }
-  const res = await updateSelectedWorkstation(data)
-  if (res.code === 200) {
-    proxy.$message.success('修改成功')
-  }
-}
+// 添加&修改 表单提交
 function submitForm() {
-	open.value = false
-	reset()
+  proxy.$refs["formRef"].validate((valid) => {
+    if (valid) {
+
+      if (form.value.id != undefined && opertype.value === 2) {
+        updateProReportwork(form.value).then((res) => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addProReportwork(form.value).then((res) => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
 }
 
-initDict()
+// 删除按钮操作
+function handleDelete(row) {
+  const Ids = row.id || ids.value
+
+  proxy
+    .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？', "警告", {
+      confirmButtonText: proxy.$t('common.ok'),
+      cancelButtonText: proxy.$t('common.cancel'),
+      type: "warning",
+    })
+    .then(function () {
+      return delProReportwork(Ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    })
+}
+
+
+
+
 handleQuery()
-</script>
-
-<style scoped>
-.tool-box {
-  font-size: 16px;
-  font-weight: 600;
-}
-
-:deep(.table-header) {
-  font-size: 18px;
-  font-weight: 600;
-  background: black;
-  color: #303133;
-}
-
-:deep(.common-row) {
-  font-size: 16px;
-  font-weight: 600;
-}
-
-:deep(.warning-cell-1) {
-  background-color: #e6a23c;
-  color: black;
-  font-size: 20px;
-  font-weight: 600;
-}
-
-:deep(.danger-cell-1) {
-  background: red;
-  color: black;
-  font-size: 20px;
-  font-weight: 600;
-}
-</style>
+</script>
\ No newline at end of file