From 7bcd64663e7ee20e3e79ddff483fe9107c12dbd5 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 17:04:40 +0800
Subject: [PATCH] 1704

---
 package.json                                  |   4 +
 src/components/DictTag/index.vue              |  14 +-
 src/views/baseManagement/BaseRoute/index.vue  | 460 ++++++++++--------
 .../productManagement/ProWorkorder/index.vue  |  16 +-
 4 files changed, 266 insertions(+), 228 deletions(-)

diff --git a/package.json b/package.json
index ea5c3ca..323e8ac 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,8 @@
   "repository": "https://gitee.com/izory/ZrAdminNetCore",
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
+    "@logicflow/core": "^2.0.0-beta.2",
+    "@logicflow/extension": "^2.0.0-beta.2",
     "@microsoft/signalr": "^8.0.0",
     "@vueuse/core": "^10.7.0",
     "@wangeditor/editor": "^5.1.1",
@@ -43,6 +45,8 @@
     "vue-i18n": "9.2.2",
     "vue-router": "^4.2.2",
     "vxe-pc-ui": "^4.0.12",
+    "vue3-print-nb": "^0.1.4",
+    "vue3-qr-reader": "^1.0.0",
     "vxe-table": "^4.7.14",
     "xe-utils": "^3.5.13"
   },
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index c8a650c..fbed747 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -1,13 +1,8 @@
 <template>
   <template v-for="(item, index) in dataList">
     <template v-if="values.includes(item.dictValue)">
-      <el-tag
-        v-if="dictValues.includes(item.listClass)"
-        size="small"
-        :disable-transitions="true"
-        :index="index"
-        :type="item.listClass"
-        :class="item.cssClass">
+      <el-tag v-if="dictValues.includes(item.listClass)" size="small" :disable-transitions="true" :index="index"
+        :type="item.listClass" :class="item.cssClass">
         <template v-if="item.langKey">
           {{ $t(item.langKey) }}
         </template>
@@ -67,6 +62,9 @@ const dataList = computed(() => {
 })
 const values = computed(() => {
   if (props.value !== null && typeof props.value !== 'undefined') {
+    if (typeof props.value === 'number') {
+      return [props.value]
+    }
     if (props.split != null && props.split != '') {
       return props.value.split(props.split) ?? []
     } else {
@@ -80,7 +78,7 @@ const dictValues = ref(['primary', 'danger', 'warning', 'info', 'success'])
 </script>
 
 <style scoped>
-.el-tag + .el-tag {
+.el-tag+.el-tag {
   margin-left: 10px;
 }
 </style>
diff --git a/src/views/baseManagement/BaseRoute/index.vue b/src/views/baseManagement/BaseRoute/index.vue
index 55fd1a9..f4bd5f0 100644
--- a/src/views/baseManagement/BaseRoute/index.vue
+++ b/src/views/baseManagement/BaseRoute/index.vue
@@ -17,8 +17,9 @@
 					<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 v-for="item in options.statusOptions" :key="item.dictValue"
+						:value="parseInt(item.dictValue)">
+						{{ item.dictLabel }}
 					</el-radio-button>
 				</el-radio-group>
 			</el-form-item>
@@ -30,41 +31,59 @@
 		<!-- 工具区域 -->
 		<el-row :gutter="15" class="mb10">
 			<el-col :span="1.5">
-				<el-button type="primary" v-hasPermi="['baseManagement:baseworkroute:add']" plain icon="plus" @click="handleAdd">
+				<el-button type="primary" v-hasPermi="['baseManagement:baseworkroute: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 :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" v-if="columns.showColumn('id')" />
-			<el-table-column prop="code" label="流程编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('code')" />
-			<el-table-column prop="name" label="流程名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('name')" />
-			<el-table-column prop="baseWorkProcessesList" label="绑定工序" min-width="260" align="left" v-if="columns.showColumn('baseWorkProcessesList')">
+			<el-table-column prop="code" label="流程编码" align="center" :show-overflow-tooltip="true"
+				v-if="columns.showColumn('code')" />
+			<el-table-column prop="name" label="流程名称" align="center" :show-overflow-tooltip="true"
+				v-if="columns.showColumn('name')" />
+			<el-table-column prop="productionCode" label="产成品编号" align="center" />
+			<el-table-column prop="baseWorkProcessesList" label="绑定工序" min-width="260" align="left"
+				v-if="columns.showColumn('baseWorkProcessesList')">
 				<template #default="scope">
-					<el-tag style="margin-right: 5px;" v-for="(item,index) in scope.row.baseWorkProcessesList" type="primary">{{`${index}-${item.name}`}}</el-tag>
+					<el-tag style="margin-right: 5px;" v-for="(item, index) in scope.row.baseWorkProcessesList"
+						type="primary">{{ `${index}-${item.name}` }}</el-tag>
 				</template>
 			</el-table-column>
 			<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 + ''" />
+					<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 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="240">
 				<template #default="scope">
-					<el-button type="warning" size="small" title="工艺流程" v-hasPermi="['baseManagement:baseworkroute:edit']" @click="handleRouteDialogShow(scope.row)">工艺流程</el-button>
-					<el-button type="success" size="small" icon="edit" title="编辑信息" v-hasPermi="['baseManagement:baseworkroute:edit']" @click="handleUpdate(scope.row)"></el-button>
-					<el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['baseManagement:baseworkroute:delete']" @click="handleDelete(scope.row)"></el-button>
+					<el-button type="warning" size="small" title="工艺流程"
+						v-hasPermi="['baseManagement:baseworkroute:edit']"
+						@click="handleRouteDialogShow(scope.row)">工艺流程</el-button>
+					<el-button type="success" size="small" icon="edit" title="编辑信息"
+						v-hasPermi="['baseManagement:baseworkroute:edit']" @click="handleUpdate(scope.row)"></el-button>
+					<el-button type="danger" size="small" icon="delete" title="删除"
+						v-hasPermi="['baseManagement:baseworkroute: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" />
+		<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+			@pagination="getList" />
 
 
 		<!-- 添加或修改工艺路线对话框 -->
@@ -81,11 +100,17 @@
 							<el-input v-model="form.name" placeholder="请输入流程名称" />
 						</el-form-item>
 					</el-col>
+					<el-col :lg="12">
+						<el-form-item label="产成品编号" prop="productionCode">
+							<el-input v-model="form.productionCode" placeholder="请输入产成品编号" />
+						</el-form-item>
+					</el-col>
 					<el-col :lg="12">
 						<el-form-item label="状态" prop="status">
 							<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 v-for="item in options.statusOptions" :key="item.dictValue"
+									:value="parseInt(item.dictValue)">
+									{{ item.dictLabel }}
 								</el-radio>
 							</el-radio-group>
 						</el-form-item>
@@ -103,216 +128,219 @@
 				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
 			</template>
 		</el-dialog>
-		<TheRouteDialog v-model="TheRouteDialogShow" title="工艺流程" :routeId="TheRouteDialogId" fullScreen @refresh="getList"></TheRouteDialog>
+		<TheRouteDialog v-model="TheRouteDialogShow" title="工艺流程" :routeId="TheRouteDialogId" fullScreen
+			@refresh="getList">
+		</TheRouteDialog>
 	</div>
 </template>
 
 <script setup name="baseworkroute">
-	import {
-		listBaseWorkRoute,
-		addBaseWorkRoute,
-		delBaseWorkRoute,
-		updateBaseWorkRoute,
-		getBaseWorkRoute,
-	}
+import {
+	listBaseWorkRoute,
+	addBaseWorkRoute,
+	delBaseWorkRoute,
+	updateBaseWorkRoute,
+	getBaseWorkRoute,
+}
 	from '@/api/baseManagement/baseworkroute.js'
-	import {
-		getOneDict
-	}
+import {
+	getOneDict
+}
 	from '@/utils/dict.js'
-	import { default as TheRouteDialog } from './TheRouteDialog'
-	const { proxy } = getCurrentInstance()
-	const ids = ref([])
-	const loading = ref(false)
-	const showSearch = ref(true)
-	const queryParams = reactive({
-		pageNum: 1,
-		pageSize: 10,
-		status: -1,
-		sort: 'createdTime',
-		sortType: 'desc',
-	})
-	const columns = ref([
-		{ visible: false, prop: 'id', label: '主键' },
-		{ visible: true, prop: 'name', label: '名称' },
-		{ visible: true, prop: 'code', label: '编号' },
-		{ 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: '更新时间' },
+import { default as TheRouteDialog } from './TheRouteDialog'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+	pageNum: 1,
+	pageSize: 10,
+	status: -1,
+	sort: 'createdTime',
+	sortType: 'desc',
+})
+const columns = ref([
+	{ visible: false, prop: 'id', label: '主键' },
+	{ visible: true, prop: 'name', label: '名称' },
+	{ visible: true, prop: 'code', label: '编号' },
+	{ 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([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+])
+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 = []
+var dictParams = []
 
 
-	function getList() {
-		loading.value = true
-		listBaseWorkRoute(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", type: "number" }],
-		},
-		options: {
-			// 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-			statusOptions: [],
+function getList() {
+	loading.value = true
+	listBaseWorkRoute(queryParams).then(res => {
+		const { code, data } = res
+		if (code == 200) {
+			dataList.value = data.result
+			total.value = data.totalNum
+			loading.value = false
 		}
 	})
+}
 
-	const { form, rules, options, single, multiple } = toRefs(state)
-	async function initDict() {
-		const dictSelectList = ['common_status'];
-		const statusRes = await getOneDict(dictSelectList[0]);
-		if (statusRes.code === 200) {
-			state.options.statusOptions = statusRes.data[0].list;
-		}
-	}
-	// 关闭dialog
-	function cancel() {
-		open.value = false
-		reset()
-	}
+// 查询
+function handleQuery() {
+	queryParams.pageNum = 1
+	getList()
+}
 
-	// 重置表单
-	function reset() {
-		form.value = {
-			id: null,
-			name: null,
-			code: null,
-			logicFlowData: null,
-			status: 1,
-			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
-		getBaseWorkRoute(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) {
-					updateBaseWorkRoute(form.value).then((res) => {
-						proxy.$modal.msgSuccess("修改成功")
-						open.value = false
-						getList()
-					})
-				} else {
-					addBaseWorkRoute(form.value).then((res) => {
-						proxy.$modal.msgSuccess("新增成功")
-						open.value = false
-						getList()
-					})
-				}
-			}
-		})
-	}
-
-	// 删除按钮操作
-	function handleDelete(row) {
-		const Ids = row.id || ids.value
-
-		proxy
-			.$confirm('是否确认删除主键为"' + Ids + '"的数据项？')
-			.then(function () {
-				return delBaseWorkRoute(Ids)
-			})
-			.then(() => {
-				getList()
-				proxy.$modal.msgSuccess("删除成功")
-			})
-	}
-
-
-	// dialog
-	const TheRouteDialogId = ref()
-	const TheRouteDialogShow = ref(false)
-	// 流程图按钮操作按钮操作
-	function handleRouteDialogShow(row) {
-		reset();
-		TheRouteDialogId.value = row.id
-		TheRouteDialogShow.value = true;
-	}
-
-	initDict()
+// 重置查询操作
+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", type: "number" }],
+	},
+	options: {
+		// 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+		statusOptions: [{ dictLabel: '停用', dictValue: 0 }, { dictLabel: '启用', dictValue: 1 }],
+	}
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+async function initDict() {
+	const dictSelectList = ['common_status'];
+	const statusRes = await getOneDict(dictSelectList[0]);
+	if (statusRes.code === 200) {
+		state.options.statusOptions = statusRes.data[0].list;
+	}
+}
+// 关闭dialog
+function cancel() {
+	open.value = false
+	reset()
+}
+
+// 重置表单
+function reset() {
+	form.value = {
+		id: null,
+		name: null,
+		code: null,
+		logicFlowData: null,
+		productionCode: '',
+		status: 1,
+		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
+	getBaseWorkRoute(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) {
+				updateBaseWorkRoute(form.value).then((res) => {
+					proxy.$modal.msgSuccess("修改成功")
+					open.value = false
+					getList()
+				})
+			} else {
+				addBaseWorkRoute(form.value).then((res) => {
+					proxy.$modal.msgSuccess("新增成功")
+					open.value = false
+					getList()
+				})
+			}
+		}
+	})
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+	const Ids = row.id || ids.value
+
+	proxy
+		.$confirm('是否确认删除主键为"' + Ids + '"的数据项？')
+		.then(function () {
+			return delBaseWorkRoute(Ids)
+		})
+		.then(() => {
+			getList()
+			proxy.$modal.msgSuccess("删除成功")
+		})
+}
+
+
+// dialog
+const TheRouteDialogId = ref()
+const TheRouteDialogShow = ref(false)
+// 流程图按钮操作按钮操作
+function handleRouteDialogShow(row) {
+	reset();
+	TheRouteDialogId.value = row.id
+	TheRouteDialogShow.value = true;
+}
+
+initDict()
+handleQuery()
 </script>
\ No newline at end of file
diff --git a/src/views/productManagement/ProWorkorder/index.vue b/src/views/productManagement/ProWorkorder/index.vue
index 0a3f436..a9ae34e 100644
--- a/src/views/productManagement/ProWorkorder/index.vue
+++ b/src/views/productManagement/ProWorkorder/index.vue
@@ -95,7 +95,11 @@
             header-row-class-name="table-header" :cell-class-name="tableCellClassName" @sort-change="sortChange">
             <el-table-column type="index" width="50" align="center" />
             <el-table-column prop="sort" label="编号" align="center" v-if="columns.showColumn('sort')" />
-            <el-table-column prop="workorder" label="工单号" />
+            <el-table-column prop="workorder" label="工单号" align="center" width="160">
+                <template #default="scope">
+                    <el-link @click="handleUpdate(scope.row)" type="primary">{{ scope.row.workorder }}</el-link>
+                </template>
+            </el-table-column>
             <el-table-column prop="productionName" label="主体品名" />
             <el-table-column prop="productionCode" label="主体型号" />
             <el-table-column prop="unit" label="单位" />
@@ -107,8 +111,12 @@
                         proxy.dayjs(scope.row.workorderDate).format('YYYY-MM-DD') }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="priority" label="优先级" />
-            <el-table-column prop="beat" label="节拍" />
+            <el-table-column prop="priority" label="优先级" align="center">
+                <template #default="scope">
+                    <dict-tag :options="options.priorityOptions" :value="scope.row.priority" />
+                </template>
+            </el-table-column>
+
             <el-table-column prop="status" label="状态">
                 <template #default="scope">
                     <dict-tag :options="options.statusOptions" :value="scope.row.status + ''" />
@@ -129,7 +137,7 @@
             <el-table-column prop="workshopCode" label="车间" />
             <el-table-column prop="routeCode" label="线" />
             <el-table-column prop="groupCode" label="组" />
-            <el-table-column prop="statusLabel" label="状态" />
+            <el-table-column prop="beat" label="节拍" />
             <el-table-column label="操作" align="center" fixed="right" width="80">
                 <template #default="scope">
                     <el-dropdown>