Merge branch 'projects/mes-test' into projects/mes-lb

src/views/base/coreAlarmLog/index.vue

@@ -0,0 +1,182 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getcoreAlarmLogPage
+} from '@/api/base/coreAlarmLog';
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+
+const tableProps = [
+	{
+		prop: 'alarmTime',
+		label: '报警时间',
+		filter: parseTime
+	},
+	{
+		prop: 'alarmSource',
+		label: '报警来源'
+	},
+	{
+		prop: 'alarmType',
+		label: '报警类型'
+	},
+	{
+		prop: 'alarmGrade',
+		label: '报警级别'
+	},
+	{
+		prop: 'alarmReason',
+		label: '报警原因'
+	},
+	{
+		prop: 'alarmContent',
+		label: '报警详细'
+	}
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getcoreAlarmLogPage
+			},
+			tableProps,
+			tableBtn: [].filter((v)=>v),
+			tableData: [],
+			listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+				alarmSource: undefined,
+				alarmGrade: undefined,
+				alarmTime: []
+      },
+			formConfig: [
+				{
+					type: 'input',
+					label: '报警来源',
+					placeholder: '报警来源',
+					param: 'name',
+				},
+				{
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          width: 350,
+          param: 'time'
+        },
+				{
+					type: 'select',
+					label: '报警级别',
+					placeholder: '请选择报警级别',
+					param: 'alarmGrade',
+					selectOptions: [],
+					filterable: true,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				}
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('base:core-alarm-log:create') ? 'button' : '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	color: 'success',
+				// 	plain: true
+				// },
+			],
+		};
+	},
+	created() {
+		this.getDict()
+	},
+	methods: {
+		// 获取下拉框
+    async getDict() {
+			const res = await getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL)
+			console.log('111', res)
+			this.formConfig[2].selectOptions = res.map(item => {
+				return {
+					id: item.value,
+					name: item.label
+				}
+			})
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.alarmSource = val.name ? val.name : undefined;
+					this.listQuery.alarmGrade = val.alarmGrade ? val.alarmGrade : undefined;
+					if (val.time) {
+						this.listQuery.alarmTime[0] = val.time[0]
+						this.listQuery.alarmTime[1] = val.time[1]
+					} else {
+						this.listQuery.alarmTime = []
+					}
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreCustomer/add-or-updata.vue

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 10:53:43
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="客户编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入客户编号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="客户名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入客户名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="联系人" prop="contact">
+					<el-input v-model="dataForm.contact" clearable placeholder="请输入联系人" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="联系电话" prop="telephone">
+					<el-input
+						v-model="dataForm.telephone"
+						maxlength="11"
+						placeholder="请输入联系电话" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="地址" prop="address">
+			<el-input
+				v-model="dataForm.address"
+				placeholder="请输入地址" />
+		</el-form-item>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCustomer, updateCustomer, getCustomer, getCode } from "@/api/base/coreCustomer";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCustomer,
+				updateURL: updateCustomer,
+				infoURL: getCustomer
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        telephone: undefined,
+				contact: undefined,
+				address: undefined,
+        remark: undefined
+			},
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
+				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				telephone: [
+					{ required: false, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+              if (value) {
+								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+									callback(new Error("手机号格式错误"));
+								}
+							} else {
+                callback();
+              }
+            }, trigger: "blur"
+          }
+        ]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>

src/views/base/coreCustomer/index.vue

@@ -0,0 +1,176 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCustomerPage,
+	deleteCustomer
+} from '@/api/base/coreCustomer';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '客户名称'
+	},
+	{
+		prop: 'code',
+		label: '客户编码'
+	},
+	{
+		prop: 'contact',
+		label: '联系人'
+	},
+	{
+		prop: 'telephone',
+		label: '联系电话'
+	},
+	{
+		prop: 'address',
+		label: '地址'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCustomerPage,
+				deleteURL: deleteCustomer
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-customer:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-customer:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '名称',
+					placeholder: '专业',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreDepartment/add-or-updata.vue

@@ -0,0 +1,107 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-02 14:16:30
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="部门名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入部门名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="部门编码" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入部门编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="上级部门" prop="parentId">
+					<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门"/>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreDepartment, updateCoreDepartment, getCoreDepartment, getCode, getCoreDepartmentList } from "@/api/base/coreDepartment";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+	mixins: [basicAdd],
+	components: { Treeselect },
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreDepartment,
+				updateURL: updateCoreDepartment,
+				infoURL: getCoreDepartment,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        parentId: undefined,
+        remark: undefined,
+			},
+			departmentlList: [],
+			menuOptions: [],
+			dataRule: {
+        code: [{ required: true, message: "部门编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 部门列表
+			this.menuOptions = []
+			const res = await getCoreDepartmentList();
+			this.departmentlList = res.data.map(item => {
+				item.parentId = item.parentId ? item.parentId : 0
+				return item
+			});
+			const menu = { id: 0, name: '总部门', children: [] };
+			menu.children = this.handleTree(this.departmentlList, "id")
+			this.menuOptions.push(menu)
+			console.log('你好', this.menuOptions)
+		},
+		/** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    }
+	},
+};
+</script>

src/views/base/coreDepartment/index.vue

@@ -0,0 +1,168 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreDepartmentPage,
+	deleteCoreDepartment
+} from '@/api/base/coreDepartment';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '部门名称'
+	},
+	{
+		prop: 'code',
+		label: '部门编码'
+	},
+	{
+		prop: 'parentName',
+		label: '上级部门'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreDepartmentPage,
+				deleteURL: deleteCoreDepartment
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-department:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-department:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '部门名',
+					placeholder: '部门名',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreMajor/add-or-updata.vue

@@ -0,0 +1,77 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-02 14:24:12
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="专业编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入专业编号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="专业名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入专业名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="缩写" prop="abbreviation">
+					<el-input v-model="dataForm.abbreviation" clearable placeholder="请输入缩写" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreMajor, updateCoreMajor, getCoreMajor, getCode } from "@/api/base/coreMajor";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreMajor,
+				updateURL: updateCoreMajor,
+				infoURL: getCoreMajor,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        abbreviation: undefined,
+        remark: undefined,
+			},
+			departmentlList: [],
+			menuOptions: [],
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>

src/views/base/coreMajor/index.vue

@@ -0,0 +1,168 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreMajorPage,
+	deleteCoreMajor
+} from '@/api/base/coreMajor';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'code',
+		label: '专业编码'
+	},
+	{
+		prop: 'name',
+		label: '专业名称'
+	},
+	{
+		prop: 'abbreviation',
+		label: '缩写'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreMajorPage,
+				deleteURL: deleteCoreMajor
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-major:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-major:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '名称',
+					placeholder: '专业',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreProduct/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/base/coreProduct/add-or-updata.vue

@@ -0,0 +1,417 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-04 17:57:18
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="50%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+				<el-form
+					:model="dataForm"
+					:rules="dataRule"
+					ref="dataForm"
+					@keyup.enter.native="dataFormSubmit()"
+					label-width="100px"
+					label-position="top">
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="产品名称" prop="name">
+								<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入产品名称" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="产品编码" prop="code">
+								<el-input
+									v-model="dataForm.code"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入产品编码" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="物料类型" prop="materialType">
+								<el-select
+									v-model="dataForm.materialType"
+									filterable
+									:disabled="isdetail"
+									style="width: 100%"
+									placeholder="请选择物料类型">
+									<el-option
+										v-for="dict in getDictDatas('material_type')"
+										:key="dict.value"
+										:label="dict.label"
+										:value="dict.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="产品类型" prop="productType">
+								<el-select
+									v-model="dataForm.productType"
+									filterable
+									:disabled="isdetail"
+									style="width: 100%"
+									placeholder="请选择产品类型">
+									<el-option
+										v-for="dict in getDictDatas(DICT_TYPE.PRODUCT_TYPE)"
+										:key="dict.value"
+										:label="dict.label"
+										:value="dict.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="单位" prop="unit">
+								<el-select
+									v-model="dataForm.unit"
+									filterable
+									:disabled="isdetail"
+									style="width: 100%"
+									placeholder="请选择单位">
+									<el-option
+										v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
+										:key="dict.value"
+										:label="dict.label"
+										:value="dict.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="单位平方数" prop="area">
+								<el-input-number v-model="dataForm.area" :precision="2" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入单位平方数" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="规格" prop="specifications">
+								<el-input v-model="dataForm.specifications" :disabled="isdetail" clearable placeholder="请输入规格" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="产线生产单位用时(S)" prop="processTime">
+								<el-input v-model.number="dataForm.processTime" type="number" :disabled="isdetail" clearable placeholder="请输入产线生产单位用时" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+					</el-form-item>
+				</el-form>
+			</div>
+			<div class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button v-if="isdetail" type="primary" @click="goEdit()">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+			</div>
+
+			<div class="attr-list" v-if="idAttrShow">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					产品属性
+				</small-title>
+
+				<div v-if="!isdetail" class="action_btn">
+					<template>
+						<span style="display: inline-block;" @click="addNew()">
+							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+							<span class="add">添加</span>
+						</span>
+					</template>
+				</div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="productAttrList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+
+				<div class="drawer-body__footer">
+					<el-button type="primary" @click="goback()">关闭</el-button>
+				</div>
+			</div>
+
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:product-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreProduct, updateCoreProduct, getCoreProduct, getCode, getCoreProductAttrPage, deleteCoreProductAttr } from "@/api/base/coreProduct";
+import SmallTitle from './SmallTitle';
+import { parseTime } from '../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'name',
+		label: '属性名',
+	},
+	{
+		prop: 'value',
+		label: '属性值',
+	},
+];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			topBtnConfig,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreProduct,
+				updateURL: updateCoreProduct,
+				infoURL: getCoreProduct,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: '',
+				materialType: undefined,
+				productType: undefined,
+        area: undefined,
+				specifications: undefined,
+				processTime: 0,
+        remark: undefined,
+				unit: undefined
+			},
+			productAttrList: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false,
+			dataRule: {
+        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
+				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
+				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }],
+				processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			this.productAttrList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.attrName
+							? '[名称=' + raw.data.attrName + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteCoreProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取产品属性列表
+			getCoreProductAttrPage({
+				...this.listQuery,
+				productId: this.dataForm.id,
+			}).then((response) => {
+				this.productAttrList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取产品详情
+					this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+						this.dataForm.unit = String(this.dataForm.unit)
+						this.dataForm.materialType = String(this.dataForm.materialType)
+						this.dataForm.productType = String(this.dataForm.productType)
+          });
+					// 获取产品属性列表
+					this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/base/coreProduct/attr-add.vue

@@ -0,0 +1,141 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="属性名" prop="name">
+				<el-input
+					v-model="dataForm.name"
+					placeholder="请输入属性名"
+					clearable />
+			</el-form-item>
+			<el-form-item label="属性值" prop="value">
+				<el-input
+					v-model="dataForm.value"
+					placeholder="请输入属性值"
+					clearable />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import {
+	createCoreProductAttr,
+	updateCoreProductAttr,
+	getCoreProductAttr
+} from '@/api/base/coreProduct';
+
+export default {
+	props: {
+		productId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				name: '',
+				value: '',
+			},
+			dataRule: {
+				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getCoreProductAttr({
+						id: this.dataForm.id
+					}).then((res) => {
+						const { name, value } = res.data;
+						this.dataForm.name = name;
+						this.dataForm.value = value;
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateCoreProductAttr({
+							...this.dataForm,
+							productId: this.productId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createCoreProductAttr({
+						...this.dataForm,
+						productId: this.productId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/base/coreProduct/index.vue

@@ -0,0 +1,186 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="successSubmit" />
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import { publicFormatter } from '@/utils/dict';
+import {
+	getCoreProductPage,
+	deleteCoreProduct
+} from '@/api/base/coreProduct';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '产品名称'
+	},
+	{
+		prop: 'code',
+		label: '产品编码'
+	},
+	{
+		prop: 'productType',
+		label: '产品类型',
+		filter: publicFormatter('product_type')
+	},
+	{
+		prop: 'specifications',
+		label: '规格'
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict')
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreProductPage,
+				deleteURL: deleteCoreProduct
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-product:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+					this.$auth.hasPermi(`base:core-product:detail`)
+					? {
+							type: 'detail',
+							btnName: '查看详情',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-product:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '工单名称',
+					placeholder: '工单名称',
+					param: 'name'
+				},
+				{
+					type: 'input',
+					label: '产品编号',
+					placeholder: '产品编号',
+					param: 'code'
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-product:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate
+	},
+	created() {},
+	methods: {
+		// 查看详情
+		otherMethods(val) {
+			if (val.type === 'detail') {
+				this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "详情";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id, true);
+        });
+			}
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.listQuery.code = val.code ? val.code : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreProductionLine/add-or-updata.vue

@@ -0,0 +1,114 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 19:28:06
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="产线名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入产线名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产线编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入产线编号" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="工厂名称" prop="factoryId">
+					<el-select
+						v-model="dataForm.factoryId"
+						filterable
+						placeholder="请选择工厂">
+						<el-option
+							v-for="dict in factoryList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="产线TT值(h)" prop="tvalue">
+					<el-input
+						v-model.number="dataForm.tvalue"
+						type="number"
+						placeholder="TT值" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="描述信息" prop="description">
+					<el-input
+						v-model="dataForm.description"
+						placeholder="请输入描述信息" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCorePL, updateCorePL, getCorePL, getCode } from "@/api/base/coreProductionLine";
+import { getFactoryList } from '@/api/core/base/factory';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCorePL,
+				updateURL: updateCorePL,
+				infoURL: getCorePL,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        description: undefined,
+				tvalue: 0,
+				factoryId: undefined,
+        remark: undefined,
+			},
+			factoryList: [],
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
+				factoryId: [{ required: true, message: "工厂不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 工厂列表
+			const factoryRes = await getFactoryList();
+			this.factoryList = factoryRes.data;
+		},
+	}
+};
+</script>

src/views/base/coreProductionLine/index.vue

@@ -0,0 +1,177 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCorePLPage,
+	deleteCorePL
+} from '@/api/base/coreProductionLine';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'factoryName',
+		label: '工厂'
+	},
+	{
+		prop: 'name',
+		label: '产线名称'
+	},
+	{
+		prop: 'code',
+		label: '产线编码'
+	},
+	{
+		prop: 'enabled',
+		label: '当前状态',
+		filter: (val) => ['停用', '启用'][val]
+	},
+	{
+		prop: 'description',
+		label: '描述'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCorePLPage,
+				deleteURL: deleteCorePL
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-production-line:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-production-line:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '产线名称',
+					placeholder: '产线名称',
+					param: 'name'
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreSupplier/add-or-updata.vue

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 11:00:47
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="供应商编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入供应商编号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="供应商名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入供应商名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="联系人" prop="contact">
+					<el-input v-model="dataForm.contact" clearable placeholder="请输入联系人" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="联系电话" prop="telephone">
+					<el-input
+						v-model="dataForm.telephone"
+						maxlength="11"
+						placeholder="请输入联系电话" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="地址" prop="address">
+			<el-input
+				v-model="dataForm.address"
+				placeholder="请输入地址" />
+		</el-form-item>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreSupplier, updateCoreSupplier, getCoreSupplier, getCode } from "@/api/base/coreSupplier";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreSupplier,
+				updateURL: updateCoreSupplier,
+				infoURL: getCoreSupplier
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        telephone: undefined,
+				contact: undefined,
+				address: undefined,
+        remark: undefined
+			},
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
+				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				telephone: [
+					{ required: false, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+							if (value) {
+								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+									callback(new Error("手机号格式错误"));
+								}
+							} else {
+                callback();
+              }
+            }, trigger: "blur"
+          }
+        ]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>

src/views/base/coreSupplier/index.vue

@@ -0,0 +1,176 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreSupplierPage,
+	deleteCoreSupplier
+} from '@/api/base/coreSupplier';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'code',
+		label: '供应商编码'
+	},
+	{
+		prop: 'name',
+		label: '供应商名称'
+	},
+	{
+		prop: 'contact',
+		label: '联系人'
+	},
+	{
+		prop: 'telephone',
+		label: '联系电话'
+	},
+	{
+		prop: 'address',
+		label: '地址'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreSupplierPage,
+				deleteURL: deleteCoreSupplier
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-supplier:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-supplier:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '关键字',
+					placeholder: '供应商名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreWorkOrder/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/base/coreWorkOrder/add-or-updata.vue

@@ -0,0 +1,306 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-06 14:38:20
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="50%">
+		<small-title slot="title" :no-padding="true">
+			{{ '预使用主原料信息' }}
+		</small-title>
+		<div class="content">
+			<div style="height: 10vh">
+				<div style="font-size: 18px;">工单名：{{ dataForm.name }}</div>
+			</div>
+
+			<div class="attr-list">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					批次信息
+				</small-title>
+
+				<div class="action_btn">
+					<template>
+						<span style="display: inline-block;" @click="addNew()">
+							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+							<span class="add">添加</span>
+						</span>
+					</template>
+				</div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="materialList">
+					<method-btn
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button type="primary" @click="goback()">关闭</el-button>
+			</div>
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:work-order-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { getCoreWOMaPage, deleteCoreWOMa } from "@/api/base/coreWorkOrder";
+import SmallTitle from './SmallTitle';
+import { parseTime } from '../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+import { publicFormatter } from "@/utils/dict";
+
+const tableBtn = [
+		{
+			type: 'edit',
+			btnName: '编辑',
+		},
+		{
+			type: 'delete',
+			btnName: '删除',
+		}
+];
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'material',
+		label: '原料名称'
+	},
+	{
+		prop: 'origin',
+		label: '来源',
+		filter: (val) => ['', '内部', '采购'][val]
+	},
+	{
+		prop: 'supplierId',
+		label: '供应商',
+	},
+	{
+		prop: 'batch',
+		label: '批次',
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict')
+	},
+];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			topBtnConfig,
+			addOrUpdateVisible: false,
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {
+        id: undefined,
+				name: ''
+			},
+			materialList: [],
+			visible: false,
+			isdetail: false
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			this.materialList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.attrName
+							? '[名称=' + raw.data.attrName + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteCoreWOMa(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取预使用原料列表
+			getCoreWOMaPage({
+				...this.listQuery,
+				workOrderId: this.dataForm.id,
+			}).then((response) => {
+				this.materialList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(row, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = row.id || undefined;
+			this.dataForm.name = row.name || '';
+			this.visible = true;
+			this.getList()
+
+			// this.$nextTick(() => {
+			// 	this.$refs['dataForm'].resetFields();
+
+			// 	if (this.dataForm.id) {
+			// 		// 获取产品详情
+			// 		this.urlOptions.infoURL(id).then(response => {
+      //       this.dataForm = response.data
+			// 			this.dataForm.unit = String(this.dataForm.unit)
+			// 			this.dataForm.materialType = String(this.dataForm.materialType)
+			// 			this.dataForm.productType = String(this.dataForm.productType)
+      //     });
+			// 		// 获取产品属性列表
+			// 		this.getList();
+			// 	} else {
+			// 		if (this.urlOptions.isGetCode) {
+      //       this.getCode()
+      //     }
+			// 	}
+			// });
+		},
+		goback() {
+			this.visible = false;
+			this.$emit('refreshDataList');
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			console.log('22', id)
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	/* max-height: 76vh; */
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -0,0 +1,301 @@
+<template>
+  <el-form ref="dataForm" :rules="rules" label-width="130px" :model="dataForm">
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="工单名称" prop="name">
+          <el-input v-model="dataForm.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="工单编码" prop="code">
+          <el-input v-model="dataForm.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="dataForm.planProductId" placeholder="请选择" style="width: 100%;" @change="selectProduct">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="产品规格" prop="productSpec">
+          <el-input v-model="dataForm.productSpec" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="计划开始时间">
+          <el-date-picker
+            v-model="planStartTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="计划完成时间">
+          <el-date-picker
+            v-model="planFinishTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="计划投入数量" prop="planAssignQuantity">
+          <el-input-number v-model="dataForm.planAssignQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="计划生产数量" prop="planQuantity">
+          <el-input-number v-model="dataForm.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="关联工艺" prop="processFlowId">
+          <el-select v-model="dataForm.processFlowId" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in processFlowList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="物料计算方式" prop="materialMethod">
+          <el-radio-group v-model="dataForm.materialMethod">
+            <el-radio :label="1">产品基础</el-radio>
+            <el-radio :label="2">工艺扩展</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="优先级" prop="priority">
+          <el-select v-model="dataForm.priority" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="工单类型" prop="type">
+          <el-select v-model="dataForm.type" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in workOrderTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="关联产线" prop="productLineIds">
+          <el-select v-model="dataForm.productLineIds" placeholder="请选择" multiple style="width: 100%;">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="dataForm.workers"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!-- <el-row>
+      <el-col :span='12'>
+        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
+          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row> -->
+  </el-form>
+</template>
+<script>
+import { getProductAll } from '@/api/base/product'
+import { getProcessFlowList, workOrderList } from '@/api/base/orderManage'
+import { createCoreWO, updateCoreWO, getCode, getCoreWO } from '@/api/base/coreWorkOrder'
+import { getLineAll } from '@/api/base/productionLine'
+import basicAdd from '../../core/mixins/basic-add';
+
+export default {
+  name: 'AddWorkOrder',
+  mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreWO,
+				updateURL: updateCoreWO,
+				infoURL: getCoreWO
+			},
+      dataForm: {
+        id: undefined,
+        workOrderId: '',
+        name: '',
+        code: '',
+        planProductId: '',
+        productSpec: '',
+        planStartTime: '',
+        planFinishTime: '',
+        planAssignQuantity: 0,
+        planQuantity: 0,
+        processFlowId: '',
+        materialMethod: 1,
+        priority: '',
+        productLineIds: [],
+        type: '',
+        workers: '',
+        status: 1
+      },
+      rules: {
+        name: [{ required: true, message: "工单名称不能为空", trigger: "blur" }],
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
+        planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
+        planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
+        productLineIds: [{ required: true, message: "产品不能为空", trigger: "change" }]
+      },
+      productList: [],
+      processFlowList: [],
+      productLineList: [],
+      workOrderTypeList: [
+        {id: 1,name:'标准工单'},
+        {id: 2, name:'特殊工单'}
+      ],
+      planStartTime: '',
+      planFinishTime: '',
+      isBind: false,
+      workOrderList: []
+    }
+  },
+  mounted() {
+    this.getDict()
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        this.planStartTime = ''
+        this.planFinishTime = ''
+        if (this.dataForm.id) {
+          getCoreWO(id).then(response => {
+            this.dataForm = response.data;
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$confirm('是否添加预使用主原料信息?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$emit("refreshDataList", true);
+          }).catch(() => {
+            this.$emit("refreshDataList");        
+          });
+        });
+      });
+    },
+    getCode() {
+			this.urlOptions.codeURL()
+				.then(({ data: res }) => {
+					this.dataForm.code = res;
+				})
+				.catch(() => {});
+		},
+    getDict() {
+      // 产品
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+      // 产线
+      getLineAll().then(res => {
+        this.productLineList = res.data || []
+      })
+      // 工艺
+      getProcessFlowList().then(res => {
+        this.processFlowList = res.data || []
+      })
+      // 工单list
+      workOrderList({
+        status: 1
+      }).then(res => {
+        this.workOrderList = res.data || []
+      })
+    },
+    // 选产品带出规格
+    selectProduct(val) {
+      if (val) {
+        this.productList.map(item => {
+          if (val === item.id) {
+            this.dataForm.productSpec = item.specifications
+          }
+        })
+      } else {
+        this.dataForm.productSpec = ''
+      }
+    }
+  }
+}
+</script>

src/views/base/coreWorkOrder/attr-add.vue

@@ -0,0 +1,211 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="原料" prop="material">
+				<el-select
+					v-model="dataForm.material"
+					filterable
+					style="width: 100%"
+					placeholder="请选择原料">
+					<el-option
+						v-for="dict in getDictDatas('material')"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="来源" prop="origin">
+				<el-select
+					v-model="dataForm.origin"
+					filterable
+					style="width: 100%"
+					placeholder="请选择来源">
+					<el-option
+						v-for="dict in originList"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="供应商" prop="supplierId">
+				<el-select
+					v-model="dataForm.supplierId"
+					filterable
+					style="width: 100%"
+					placeholder="请选择供应商">
+					<el-option
+						v-for="dict in supplierList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="批次号" prop="batch">
+				<el-input
+					v-model="dataForm.batch"
+					clearable
+					placeholder="请输入规格" />
+			</el-form-item>
+			<el-form-item label="数量" prop="num">
+				<el-input-number
+					v-model="dataForm.num"
+					clearable
+					style="width: 100%"
+					placeholder="请输入数量" />
+			</el-form-item>
+			<el-form-item label="单位" prop="unit">
+				<el-select
+					v-model="dataForm.unit"
+					filterable
+					style="width: 100%"
+					placeholder="请选择单位">
+					<el-option
+						v-for="dict in getDictDatas('unit_dict')"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value" />
+				</el-select>
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import {
+	createCoreWOMa,
+	updateCoreWOMa,
+	getCoreWOMa
+} from '@/api/base/coreWorkOrder';
+import { getSupplierList } from "@/api/base/material";
+import { getDictDatas} from "@/utils/dict";
+
+export default {
+	props: {
+		workOrderId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				material: '',
+				origin: undefined,
+				supplierId: undefined,
+				batch: undefined,
+				num: 0,
+				unit: undefined
+			},
+			originList: [
+				{ label: '内部', value: 1},
+				{ label: '采购', value: 2}
+			],
+			supplierList: [],
+			dataRule: {
+				material: [{ required: true, message: '物料不能为空', trigger: 'blur' }],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 供应商列表
+			const supplierRes = await getSupplierList();
+			this.supplierList = supplierRes.data;
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			console.log('1', this.dataForm.id)
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getCoreWOMa(this.dataForm.id).then((res) => {
+						this.dataForm = res.data
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateCoreWOMa({
+							...this.dataForm,
+							workOrderId: this.workOrderId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createCoreWOMa({
+						...this.dataForm,
+						workOrderId: this.workOrderId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/base/coreWorkOrder/detail.vue

@@ -0,0 +1,413 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-06 17:08:22
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="50%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title>
+		<div class="content">
+			<div>
+				<h2>工单编码：{{ dataForm.code }}</h2>
+			</div>
+			<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					基本信息
+			</small-title>
+			<div class="formContent">
+				<el-row :gutter="20">
+					<el-col :span="8">工单名称:{{ dataForm.name }}</el-col>
+					<el-col :span="8">工单来源:{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}</el-col>
+					<el-col :span="8">所属订单:
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px">{{ item.name }}</span>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">产品名称:{{ dataForm.productName }}</el-col>
+					<el-col :span="8">规  格:{{ dataForm.specifications }}</el-col>
+					<el-col :span="8">计划生产数量:{{ dataForm.planQuantity }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">预计用时(小时):{{ dataForm.expectedTime }}</el-col>
+					<el-col :span="8">计划投入数量:{{ dataForm.planAssignQuantity }}</el-col>
+					<el-col :span="8">优先级:{{ fitlerP(dataForm.priority) }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">负责人:{{ dataForm.workers }}</el-col>
+					<el-col :span="8">关联产线:{{ dataForm.productLineNames }}</el-col>
+					<el-col :span="8">物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}</el-col>
+				</el-row>
+			</div>
+
+			<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					生产信息
+			</small-title>
+			<div class="formContent">
+				<el-row :gutter="20">
+					<el-col :span="8">订单创建时间:
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px">{{ item.createTime }}</span>
+					</el-col>
+					<el-col :span="8">计划开始时间:{{ dataForm.planStartTime }}</el-col>
+					<el-col :span="8">计划完成时间:{{ dataForm.planFinishTime }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">预计结束时间:{{ dataForm.computeFinishTime }}</el-col>
+					<el-col :span="8">实际开始时间:{{ dataForm.startProduceTime }}</el-col>
+					<el-col :span="8">实际完成时间:{{ dataForm.finishProduceTime }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col>
+					<el-col :span="8">实际投入数量:{{ dataForm.assignQuantity }}</el-col>
+					<el-col :span="8">实际生产数量:{{ dataForm.actualQuantity }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">废片数量:{{ dataForm.nokQuantity }}</el-col>
+					<el-col :span="8">检测瑕疵数:{{ 0 }}</el-col>
+				</el-row>
+			</div>
+
+			<div class="attr-list">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					订单相关信息
+				</small-title>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="orderList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<!-- <pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" /> -->
+			</div>
+
+			<div class="attr-list">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					预计用料信息
+				</small-title>
+				<base-table
+					:table-props="tableProps1"
+					:page="listQuery1.pageNo"
+					:limit="listQuery1.pageSize"
+					:table-data="materialList" />
+				<!-- <pagination
+					v-show="listQuery1.total > 0"
+					:total="listQuery1.total"
+					:page.sync="listQuery1.pageNo"
+					:limit.sync="listQuery1.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" /> -->
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button type="primary" @click="goback()">关闭</el-button>
+			</div>
+		</div>
+	</el-drawer>
+</template>
+
+<script>
+// import basicAdd from '../../core/mixins/basic-add';
+import { getCoreWO, getMaterialBomPage, getConOrderList } from "@/api/base/coreWorkOrder";
+import { orderList } from "@/api/base/orderManage";
+import SmallTitle from './SmallTitle';
+import { publicFormatter } from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'orderName',
+		label: '订单名称',
+	},
+	{
+		prop: 'orderCode',
+		label: '订单编码',
+	},
+	{
+		prop: 'priority',
+		label: '优先级',
+		filter: (val) => ['', '低', '正常', '高'][val]
+	},
+	{
+		prop: 'planAssignmentQuantity',
+		label: '计划分配数量',
+	},
+	{
+		prop: 'actualAssignmentQuantity',
+		label: '实际分配数量',
+	}
+];
+
+const tableProps1 = [
+	{
+		prop: 'materialName',
+		label: '原料名称'
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict')
+	},
+	{
+		prop: 'num',
+		label: '剩余生产预计消耗'
+	},
+];
+
+export default {
+	components: { SmallTitle },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			tableProps1,
+			addOrUpdateVisible: false,
+			urlOptions: {
+				infoURL: getCoreWO
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			listQuery1: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {},
+			orderList: [],
+			materialList: [],
+			orderArray: [],
+			visible: false,
+			isdetail: false,
+		};
+	},
+	mounted() {},
+	methods: {
+		fitlerP(val) {
+			if (val) {
+				if (val === 1) {
+					return '低'
+				} else if (val ===  2) {
+					return '正常'
+				} else {
+					return '高'
+				}
+			}
+		},
+		fitlerS(val) {
+			if (val) {
+				if (val === 1) {
+					return '等待'
+				} else if (val ===  2) {
+					return '激活'
+				} else if (val ===  3) {
+					return '暂停'
+				} else if (val ===  4) {
+					return '完成'
+				} else {
+					return '作废'
+				}
+			}
+		},
+		initData() {
+			this.orderList.splice(0);
+			this.materialList.splice(0);
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.attrName
+							? '[名称=' + raw.data.attrName + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteCoreProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取订单列表
+			getConOrderList({
+				workOrderId: this.dataForm.id,
+			}).then((response) => {
+				this.orderList = response.data;
+				// this.listQuery.total = response.data.total;
+			});
+			// 获取预使用原料列表
+			if (this.dataForm.planProductId) {
+				getMaterialBomPage({
+					productId: this.dataForm.planProductId,
+				}).then((response) => {
+					this.materialList = response.data;
+					// this.listQuery.total = response.data.length;
+				});
+			}
+			// 获取订单相关信息
+			orderList({
+				workOrderId: this.dataForm.id
+			}).then((response) => {
+				this.orderArray = response.data;
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+
+			this.$nextTick(() => {
+
+				if (this.dataForm.id) {
+					// 获取工单详情
+					this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+						// 获取订单列表和用料列表
+						this.getList();
+          });
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.visible = false;
+			this.$emit('refreshDataList');
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 10px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.formContent {
+	font-size: 16px;
+	line-height: 1.5;
+	margin-bottom: 10px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/base/coreWorkOrder/index.vue

@@ -0,0 +1,401 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="300"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="70%">
+			<add-work-order
+				ref="addOrUpdate"
+				@refreshDataList="refreshWorkOrder"></add-work-order>
+		</base-dialog>
+		<!-- 预使用原料信息 -->
+		<add-or-update
+			v-if="materialVisible"
+			ref="material"
+			@refreshDataList="closeDetail"></add-or-update>
+			<!-- 查看详情 -->
+			<detail
+			v-if="detailVisible"
+			ref="detail"
+			@refreshDataList="closeDetail"></detail>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import AddWorkOrder from './addWorkOrder'
+import Detail from './detail.vue';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreWOPage,
+	deleteCoreWO,
+	statusChange
+} from '@/api/base/coreWorkOrder';
+
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '工单名称'
+	},
+	{
+		prop: 'code',
+		label: '工单编码'
+	},
+	{
+		prop: 'workers',
+		label: '负责人'
+	},
+	{
+		prop: 'priority',
+		label: '优先级',
+		filter: (val) => ['', '低', '正常', '高'][val]
+	},
+	{
+		prop: 'triggerOrigin',
+		label: '来源',
+		filter: (val) => ['', 'MES', 'ERP'][val]
+	},
+	{
+		prop: 'status',
+		label: '工单状态',
+		filter: (val) => ['', '等待', '激活', '暂停', '完成', '', '', '', '', '作废'][val]
+	},
+	{
+		prop: 'planFinishTime',
+		label: '计划完成时间',
+		filter: parseTime
+	},
+	{
+		prop: 'planQuantity',
+		label: '计划生产数量'
+	},
+	{
+		prop: 'actualQuantity',
+		label: '实际生产数量'
+	}
+];
+
+export default {
+	mixins: [basicPage],
+	components: {
+		AddWorkOrder,
+		AddOrUpdate,
+		Detail
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreWOPage,
+				deleteURL: deleteCoreWO
+			},
+			detailVisible: false,
+			materialVisible: false,
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									}
+								]
+							}
+					  }
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:material`)
+					? {
+							type: 'material',
+							btnName: '预使用原料信息',
+					  }
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:detail`)
+					? {
+							type: 'detail',
+							btnName: '查看详情',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-work-order:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									}
+								]
+							}
+					  }
+					: undefined,
+					{
+						type: 'active',
+						btnName: '激活',
+						showParam: {
+							type: '|',
+							data: [
+								{
+									name: 'status',
+									type: 'equal',
+									value: 1
+								},
+								{
+									name: 'status',
+									type: 'equal',
+									value: 3
+								}
+							]
+						}
+					},
+					{
+						type: 'pause',
+						btnName: '暂停',
+						showParam: {
+							type: '|',
+							data: [
+								{
+									name: 'status',
+									type: 'equal',
+									value: 2
+								}
+							]
+						}
+					},
+					{
+						type: 'nullify',
+						btnName: '作废',
+						showParam: {
+							type: '|',
+							data: [
+								{
+									name: 'status',
+									type: 'equal',
+									value: 3
+								},
+								{
+									name: 'status',
+									type: 'equal',
+									value: 3
+								},
+								{
+									name: 'status',
+									type: 'equal',
+									value: 4
+								}
+							]
+						}
+					},
+					{
+						type: 'finish',
+						btnName: '完成',
+						showParam: {
+							type: '|',
+							data: [
+								{
+									name: 'status',
+									type: 'equal',
+									value: 2
+								},
+								{
+									name: 'status',
+									type: 'equal',
+									value: 3
+								}
+							]
+						}
+					}
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '工单名称',
+					placeholder: '工单名称',
+					param: 'name'
+				},
+				{
+          type: 'select',
+          label: '状态',
+          selectOptions: [
+						{ id: 1, name: '等待' },
+						{ id: 2, name: '激活' },
+						{ id: 3, name: '暂停' },
+						{ id: 4, name: '完成' },
+						{ id: 9, name: '作废' }
+					],
+          param: 'status',
+          clearable: true
+        },
+				{
+          type: 'datePicker',
+          label: '工单实际开始时间',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          width: 350,
+          param: 'time'
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-work-order:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	created() {},
+	methods: {
+		refreshWorkOrder(val) {
+			console.log(val)
+			if (val) {
+				console.log('打印')
+			} else {
+				this.successSubmit()
+			}
+		},
+		closeDetail() {
+			this.detailVisible = false
+			this.materialVisible = false
+			this.getDataList()
+		},
+		// 其他方法
+		otherMethods(val) {
+			if (val.type === 'material') {
+				this.materialVisible = true;
+        this.addOrEditTitle = "预使用主原料信息";
+        this.$nextTick(() => {
+          this.$refs.material.init(val.data, true);
+        });
+			} else if (val.type === 'detail') {
+				this.detailVisible = true;
+        this.addOrEditTitle = "详情";
+        this.$nextTick(() => {
+          this.$refs.detail.init(val.data.id, true);
+        });
+			} else {
+				const param = {
+					id: val.data.id,
+					status: undefined
+				}
+				if (val.type === 'active') {
+					param.status = 2
+				}
+				if (val.type === 'pause') {
+					param.status = 3
+				}
+				if (val.type === 'nullify') {
+					param.status = 9
+				}
+				if (val.type === 'finish') {
+					param.status = 4
+				}
+				console.log('22',val)
+				this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+					statusChange(param).then(({ data }) => {
+						this.$message({
+							message: '暂停成功！',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
+						});
+					});
+				})
+				.catch(() => { });
+			}
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.listQuery.status = val.status ? val.status : undefined;
+					this.listQuery.startProduceTime = val.time ? val.time : undefined
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreWorker/add-or-updata.vue

@@ -0,0 +1,339 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 11:01:24
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="员工姓名" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入员工姓名" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="员工照片" prop="fileUrl">
+					<imageUpload v-model="dataForm.fileUrl" :limit="1"/>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="员工号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入员工号" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="性别" prop="sex">
+					<el-select
+						v-model="dataForm.sex"
+						filterable
+						placeholder="请选择性别">
+						<el-option
+							v-for="dict in sexList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="电话" prop="telephone">
+					<el-input v-model="dataForm.telephone" maxlength="11" clearable placeholder="请输入电话" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="部门" prop="departmentId">
+					<treeselect v-model="dataForm.departmentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择部门"/>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="职位" prop="position">
+					<el-input v-model="dataForm.position" clearable placeholder="请输入职位" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="专业" prop="majorIdList">
+					<el-select
+						v-model="majorIdList"
+						filterable
+						multiple
+						placeholder="请选择专业">
+						<el-option
+							v-for="dict in majorList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="入职时间" prop="entryTime">
+					<el-date-picker
+						v-model="dataForm.entryTime"
+						type="date"
+						format='yyyy-MM-dd'
+         		value-format='timestamp'
+						placeholder="选择入职时间" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="状态" prop="status">
+					<el-radio-group v-model="dataForm.status" @input="setOut">
+						<el-radio :label="1">在职</el-radio>
+						<el-radio :label="2">离职</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="离职时间" prop="outTime">
+					<el-date-picker
+						v-model="dataForm.outTime"
+						type="date"
+						:disabled="isOut"
+						format='yyyy-MM-dd'
+         		value-format='timestamp'
+						placeholder="选择离职时间" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="教育程度" prop="education">
+					<el-select
+						v-model="dataForm.education"
+						filterable
+						placeholder="请选择教育程度">
+						<el-option
+							v-for="dict in educationList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="劳务成本(元/班次)" prop="workCost">
+					<el-input type="number" v-model.number="dataForm.workCost" clearable placeholder="请输入劳务成本" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreWorker, updateCoreWorker, getCoreWorker, getCode, createWoBindMa, getWoBindMaPage, deleteWoBindMa } from "@/api/base/coreWorker";
+import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { getCoreMajorList } from "@/api/base/coreMajor";
+import ImageUpload from '@/components/ImageUpload';
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+	mixins: [basicAdd],
+	components: {
+    ImageUpload,
+		Treeselect
+  },
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreWorker,
+				updateURL: updateCoreWorker,
+				infoURL: getCoreWorker,
+			},
+			sexList: [
+				{ id: 0, name: '男' },
+				{ id: 1, name: '女' }
+			],
+			educationList: [
+				{ id: '1', name: '初中' },
+				{ id: '2', name: '高中' },
+				{ id: '3', name: '中专' },
+				{ id: '5', name: '大专' },
+				{ id: '6', name: '大学本科' },
+				{ id: '7', name: '研究生及以上' }
+			],
+			departmentList: [],
+			majorList: [],
+			isOut: true,
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+				fileUrl: undefined,
+				sex: 0,
+				telephone: undefined,
+				departmentId: undefined,
+				position: undefined,
+				entryTime: new Date().getTime(),
+				status: 1,
+				outTime: undefined,
+				education: undefined,
+				workCost: undefined,
+        remark: undefined,
+			},
+			majorIdList: undefined,
+			departmentlList: [],
+			menuOptions: [],
+			bindIds: [],
+			workerId: '',
+			dataRule: {
+        code: [{ required: true, message: "员工编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "员工姓名不能为空", trigger: "blur" }],
+				telephone: [
+					{ required: false, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+              if (value) {
+								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+									callback(new Error("手机号格式错误"));
+								}
+							} else {
+                callback();
+              }
+            }, trigger: "blur"
+          }
+        ],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 部门列表
+			this.menuOptions = []
+			const res = await getCoreDepartmentList();
+			this.departmentlList = res.data.map(item => {
+				item.parentId = item.parentId ? item.parentId : 0
+				return item
+			});
+			// const menu = { id: 0, name: '总部门', children: [] };
+			// menu.children = this.handleTree(this.departmentlList, "id")
+			this.menuOptions = this.handleTree(this.departmentlList, "id")
+			// 专业列表
+			const majorRes = await getCoreMajorList();
+			this.majorList = majorRes.data;
+		},
+		setOut(val) {
+			if (val === 1) {
+				this.isOut = true
+			} else {
+				this.isOut = false
+			}
+		},
+		// 表单提交
+    dataFormSubmit() {
+			console.log('111', this.dataForm)
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+
+				// 把员工--专业关系全删
+				this.bindIds.forEach(id => {
+					deleteWoBindMa(id).then(res => {})
+				});
+
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+					this.majorIdList.forEach(majorId => {
+						createWoBindMa({
+							workerId: this.dataForm.id,
+							majorId: majorId
+						}).then(res => {})
+					});
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+					// response.data = id
+					this.workerId = response.data
+					this.majorIdList.forEach(majorId => {
+						createWoBindMa({
+							workerId: this.workerId,
+							majorId: majorId
+						}).then(res => {})
+					});
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+		init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+          });
+					// 获取员工--专业
+					getWoBindMaPage({
+						pageSize: 99,
+						pageNo: 1,
+						workerId: id
+					}).then(res => {
+						this.majorIdList = res.data.list.map(item => {
+							return item.majorId
+						})
+						this.bindIds = res.data.list.map(item => {
+							return item.id
+						})
+					})
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
+		/** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    }
+	}
+};
+</script>

src/views/base/coreWorker/index.vue

@@ -0,0 +1,204 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreWorkerPage,
+	deleteCoreWorker
+} from '@/api/base/coreWorker';
+import moment from 'moment';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '姓名'
+	},
+	{
+		prop: 'code',
+		label: '员工号'
+	},
+	{
+		prop: 'sex',
+		label: '性别',
+		filter: (val) => ['男', '女'][val]
+	},
+	{
+		prop: 'entryTime',
+		label: '入职时间',
+		filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
+	},
+	{
+		prop: 'telephone',
+		label: '联系电话'
+	},
+	{
+		prop: 'status',
+		label: '状态',
+		filter: (val) => ['', '在职', '离职'][val]
+	},
+	{
+		prop: 'departmentName',
+		label: '部门'
+	},
+	{
+		prop: 'majorName',
+		label: '专业'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreWorkerPage,
+				deleteURL: deleteCoreWorker
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-worker:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-worker:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '员工姓名',
+					placeholder: '员工姓名',
+					param: 'name',
+				},
+				{
+					type: 'select',
+					label: '状态',
+					placeholder: '请选择状态',
+					param: 'status',
+					selectOptions: [
+						{ id: 1, name: '在职' },
+						{ id: 2, name: '离职' }
+					],
+					filterable: true
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-worker:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.listQuery.status = val.status ? val.status : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreWorkshopSection/add-or-updata.vue

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 19:31:25
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="工段名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入工段名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="工段编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入工段编号" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="产线" prop="productionLineId">
+					<el-select
+						v-model="dataForm.productionLineId"
+						filterable
+						placeholder="请选择产线">
+						<el-option
+							v-for="dict in proLineList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="排序" prop="sort">
+					<el-input-number
+						v-model="dataForm.sort"
+						placeholder="排序" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCWSection, updateCWSection, getCWSection, getCode } from "@/api/base/coreWorkshopSection";
+import { getCorePLList } from '@/api/base/coreProductionLine';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCWSection,
+				updateURL: updateCWSection,
+				infoURL: getCWSection
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        description: undefined,
+				sort: 0,
+				productionLineId: undefined,
+        remark: undefined,
+			},
+			proLineList: [],
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
+				productionLineId: [{ required: true, message: "产线不能为空", trigger: "blur" }],
+        sort: [{ required: true, message: "排序不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 产线列表
+			const res = await getCorePLList();
+			this.proLineList = res.data;
+		},
+	}
+};
+</script>

src/views/base/coreWorkshopSection/index.vue

@@ -0,0 +1,172 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCWSectionPage,
+	deleteCWSection
+} from '@/api/base/coreWorkshopSection';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'code',
+		label: '工段编码'
+	},
+	{
+		prop: 'name',
+		label: '工段名称'
+	},
+	{
+		prop: 'productionLineName',
+		label: '产线名'
+	},
+	{
+		prop: 'sort',
+		label: '排序'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCWSectionPage,
+				deleteURL: deleteCWSection
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-workshop-section:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-workshop-section:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '工段名称',
+					placeholder: '工段名称',
+					param: 'name'
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/custom/index.vue

@@ -134,7 +134,7 @@ import printPreview from './preview'
 import { MessageBox } from 'element-ui'
 import { hiprint } from 'vue-plugin-hiprint'
 import providers from './providers'
-import printData from './print-data'
+// import printData from './print-data'
 import $ from 'jquery'
 import SmallTitle from './SmallTitle.vue'
 let hiprintTemplate = null
@@ -160,6 +160,7 @@ export default {
         // width: 220,
         // height: 80
       },
+      printData:{},
       drawer: false,
       // 纸张类型
       paperTypes: {
@@ -355,13 +356,13 @@ export default {
     },
     preView() {
       const { width } = this.curPaper
-      this.$refs.preView.show(hiprintTemplate, printData, width)
+      this.$refs.preView.show(hiprintTemplate, this.printData, width)
     },
     print() {
       // if (window.hiwebSocket.opened) {
       const printerList = hiprintTemplate.getPrinterList()
       console.log(printerList)
-      hiprintTemplate.print2(printData, { printer: '', title: '预览打印' })
+      hiprintTemplate.print2(this.printData, { printer: '', title: '预览打印' })
       // return
       // }
       // this.$message.error('客户端未连接,无法直接打印')

src/views/base/material/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-10-27 15:11:02
+ * @LastEditTime: 2023-11-06 19:44:24
  * @Description:
 -->
 <template>
@@ -56,6 +56,7 @@
 									v-model="dataForm.type"
 									filterable
 									:disabled="isdetail"
+									style="width: 100%"
 									placeholder="请选择物料类型">
 									<el-option
 										v-for="dict in materialList"
@@ -83,6 +84,7 @@
 									filterable
 									clearable
 									:disabled="isdetail"
+									style="width: 100%"
 									placeholder="请选择供应商">
 									<el-option
 										v-for="dict in supplierList"
@@ -100,9 +102,10 @@
 									v-model="dataForm.unit"
 									filterable
 									:disabled="isdetail"
+									style="width: 100%"
 									placeholder="请选择物料单位">
 									<el-option
-										v-for="dict in unitList"
+										v-for="dict in getDictDatas('unit_dict')"
 										:key="dict.value"
 										:label="dict.label"
 										:value="dict.value" />
@@ -172,6 +175,7 @@ import { listData } from "@/api/system/dict/data";
 import SmallTitle from './SmallTitle';
 import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
+import { getDictDatas } from "@/utils/dict";
 
 const tableBtn = [
 	{
@@ -265,17 +269,17 @@ export default {
 			const supplierRes = await getSupplierList();
 			this.supplierList = supplierRes.data;
 			// 物料单位列表
-			const unitRes = await listData({
-				pageNo: 1,
-        pageSize: 99,
-        dictType: 'goods_unit',
-			});
-			this.unitList = unitRes.data.list.map(item => {
-				return {
-					label: item.label,
-					value: Number(item.value)
-				}
-			});
+			// const unitRes = await listData({
+			// 	pageNo: 1,
+      //   pageSize: 99,
+      //   dictType: 'goods_unit',
+			// });
+			// this.unitList = unitRes.data.list.map(item => {
+			// 	return {
+			// 		label: item.label,
+			// 		value: Number(item.value)
+			// 	}
+			// });
 		},
 		initData() {
 			this.materialAttrList.splice(0);
@@ -341,6 +345,9 @@ export default {
 					// 获取物料详情
 					this.urlOptions.infoURL(id).then(response => {
             this.dataForm = response.data;
+						if (this.dataForm.unit) {
+							this.dataForm.unit = String(this.dataForm.unit)
+						}
           });
 					// 获取物料的属性列表
 					this.getList();

src/views/base/material/index.vue

@@ -58,10 +58,6 @@ const tableProps = [
 		prop: 'engName',
 		label: '英文名称'
 	},
-	{
-		prop: 'abbr',
-		label: '缩写'
-	},
 	{
 		prop: 'materialType',
 		label: '物料类型'
@@ -117,13 +113,13 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '关键字',
+					label: '物料名称',
 					placeholder: '物料名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '关键字',
+					label: '物料编码',
 					placeholder: '物料编码',
 					param: 'code',
 				},
@@ -228,6 +224,27 @@ export default {
 					console.log(val);
 			}
 		},
+		// 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否删除物料名称为"${name}"的数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    }
 	},
 };
 </script>

src/views/base/materialDate/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-10-24 18:34:07
+ * @LastEditTime: 2023-11-06 19:55:59
  * @Description:
 -->
 <template>
@@ -64,7 +64,7 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-			  isGetCode: true,
+			  isGetCode: false,
         codeURL: getCode,
 				createURL: createMaterialDate,
 				updateURL: updateMaterialDate,
@@ -81,8 +81,8 @@ export default {
 			materialList: [],
 			dataRule: {
 				materialId: [{ required: true, message: "物料不能为空", trigger: "blur" }],
-        code: [{ required: true, message: "工厂编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "工厂名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "批次号不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "批次名称不能为空", trigger: "blur" }],
       }
 		};
 	},

src/views/base/materialDate/index.vue

@@ -164,6 +164,27 @@ export default {
 					console.log(val);
 			}
 		},
+		// 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否删除物料批次名称为"${name}"的数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    }
 	},
 };
 </script>

src/views/base/materialProductBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-10-27 16:06:44
+ * @LastEditTime: 2023-11-06 20:04:03
  * @Description:
 -->
 <template>
@@ -30,7 +30,9 @@
 								<el-select
 									v-model="dataForm.productId"
 									filterable
+									clearable
 									:disabled="isdetail"
+									style="width: 100%"
 									placeholder="请选择产品">
 									<el-option
 										v-for="dict in productList"
@@ -88,6 +90,7 @@
 							<el-select
 									v-model="scope.row.materialId"
 									filterable
+									clearable
 									:disabled="!scope.row.isEdit"
 									placeholder="请选择物料"
 									@change="setCode(scope.row)">
@@ -125,7 +128,7 @@
 									<!-- <span>{{ item.btnName | i18nFilter }}</span> -->
 								</el-button>
 							</el-tooltip>
-							<el-button v-else type="primary" size="small" @click="saveData(scope.row)">保存</el-button>
+							<el-button v-else type="text" size="small" @click="saveData(scope.row)">保存</el-button>
 							<el-tooltip placement="top" content="删除">
 								<el-button
 									type="text"
@@ -256,7 +259,7 @@ export default {
 			const unitRes = await listData({
 				pageNo: 1,
         pageSize: 99,
-        dictType: 'goods_unit',
+        dictType: 'unit_dict',
 			});
 			this.unitList = unitRes.data.list.map(item => {
 				return {
@@ -295,17 +298,17 @@ export default {
 				.catch(() => {});
 		},
 		setCode(row) {
-			this.materialList.filter(item => {
+			const tempM = this.materialList.filter(item => {
 				if (row.materialId === item.id) {
 					row.materialCode = item.code
 				}
-				this.unitList.filter(u => {
-					if (item.unit === u.value) {
-						row.unit = u.value
-						row.mUnit = u.label
-					}
-				})
-				// return row.materialId === item.id
+				return row.materialId === item.id
+			})
+			this.unitList.filter(u => {
+				if (tempM[0].unit === u.value) {
+					row.unit = u.value
+					row.mUnit = u.label
+				}
 			})
 			// row.materialCode = tempList[0].code
 			// row.unit = tempList[0].unit
@@ -343,8 +346,7 @@ export default {
 			// 获取产品Bom详细列表
 			getProBomList({
 				...this.listQuery,
-				bomId: this.dataForm.id,
-				createTime: ['2023-10-26 00:00:00', '2023-10-27 12:00:00']
+				bomId: this.dataForm.id
 			}).then((response) => {
 				this.tableData = response.data.records.map(item => {
 					this.unitList.filter(u => {
@@ -450,7 +452,7 @@ export default {
 
 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 76vh;
+	max-height: 30vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */

src/views/base/materialProductBom/index.vue

@@ -97,16 +97,10 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '关键字',
-					placeholder: '物料名称',
+					label: '产品名称',
+					placeholder: '产品名称',
 					param: 'name',
 				},
-				{
-					type: 'input',
-					label: '关键字',
-					placeholder: '物料编码',
-					param: 'code',
-				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -158,7 +152,6 @@ export default {
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name ? val.name : undefined;
-					this.listQuery.code = val.code ? val.code : undefined;
 					this.getDataList();
 					break;
 				case 'reset':

src/views/base/materialUseLog/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-10-26 09:43:51
+ * @LastEditTime: 2023-11-06 19:27:57
  * @Description:
 -->
 <template>
@@ -164,7 +164,7 @@ export default {
 				},
 				{
 					id: 2,
-					name: '自动'
+					name: 'PDA'
 				}
 			],
 			materialList: [],
@@ -187,7 +187,6 @@ export default {
 		async getDictData() {
 			const materRes = await getMaterialList()
 			this.materialList = materRes.data
-			console.log('你好', this.materialList)
 			const dateRes = await getMaterDateList()
 			this.materialDateList = dateRes.data
 			const eqRes = await getEqListAll()
@@ -252,6 +251,9 @@ export default {
 				return item.id === this.dataForm.materialId
 			})
 			this.dataForm.materialCode = tempMaterial[0].code
+			getMaterDateList({materialId: this.dataForm.materialId}).then(res =>{
+				this.materialDateList = res.data
+			})
 		}
 	},
 };

src/views/base/materialUseLog/index.vue

@@ -56,7 +56,7 @@ const tableProps = [
 		label: '物料编码'
 	},
 	{
-		prop: 'materialDateId',
+		prop: 'materialDateName',
 		label: '物料批次'
 	},
 	{
@@ -183,7 +183,6 @@ export default {
 					} else {
 						this.listQuery.useTime = []
 					}
-					console.log('222', this.listQuery, val.time)
 					this.getDataList();
 					break;
 				case 'reset':
@@ -207,6 +206,22 @@ export default {
 					console.log(val);
 			}
 		},
+		//tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.materialName, val.data._pageIndex)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    }
 	},
 };
 </script>

src/views/base/mixins/basic-page.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: DY
- * @LastEditTime: 2023-09-21 16:02:07
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-01 10:30:12
  * @Description:
  */
 export default {
@@ -101,7 +101,7 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
+      this.$confirm(`是否确认删除${name ? '[' + name + ']' : '[' + index + ']'}数据项?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-10-30 10:44:48
+ * @LastEditTime: 2023-11-07 19:28:18
  * @Description:
 -->
 <template>
@@ -47,6 +47,7 @@ import {
 import {
 	deletePacking,
   getPackingPage,
+  getWorkOrderList,
 	exportPackingExcel,
 } from '@/api/base/packingInfo';
 
@@ -102,37 +103,41 @@ export default {
 							btnName: '编辑',
 					  }
           : undefined,
-        {
-          type: 'print',
-          btnName: '打印',
-        },
         this.$auth.hasPermi(`base:packaging-print-log:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
           : undefined,
-
+        {
+          type: 'print',
+          btnName: '打印',
+        },
 			].filter((v) => v),
 			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
+      formConfig: [
+        {
+          type: 'select',
           label: '工单',
-          placeholder: '工单',
-          param: 'workOrderId',
-				},
-				{
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'workOrderId'
+        },
+        {
           // parent: 'dateFilterType',
-          // 日期选择
+          // 时间段选择
           type: 'datePicker',
-          label: '时间',
-          dateType: 'date',
-          placeholder: '选择日期',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
+          // label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          defaultTime: ['00:00:00', '00:00:00'],
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
           param: 'createTime',
-				},
+        },
 				{
 					type: 'button',
 					btnName: '搜索',
@@ -173,7 +178,9 @@ export default {
 	components: {
 		AddOrUpdate,
 	},
-	created() {},
+  created() {
+    this.getDict()
+  },
   methods: {
     getDataList() {
       this.dataListLoading = true;
@@ -183,6 +190,30 @@ export default {
         this.dataListLoading = false;
       });
     },
+    getDict() {
+      // 获取产品的属性列表
+      // getCustomerList().then((response) => {
+      //   console.log(response);
+      //   this.customerList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      // getModelList().then((response) => {
+      //   console.log(response);
+      //   this.modelList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      getWorkOrderList().then((response) => {
+        // console.log(response);
+        this.formConfig[0].selectOptions = response.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+    },
     handlePrint(id) {
       if (id) {
         getPackingModel(id).then(res => {
@@ -259,8 +290,14 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-          this.listQuery.packagingCode = val.packagingCode;
-          this.listQuery.createTime = val.createTime;
+          this.listQuery.workOrderId = val.workOrderId;
+          if (val.createTime && val.createTime.length != 0) {
+            this.listQuery.createTime = val.createTime
+            // this.listQuery.createTime[1] = val.timeVal[1]
+          } else {
+            this.listQuery.createTime = undefined
+            // this.listQuery.endTime = undefined
+          }
           this.getDataList();
           console.log(this.tableData)
 					break;

src/views/base/packagingPrintModel/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-10-30 10:45:23
+ * @LastEditTime: 2023-11-01 10:28:29
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@ const tableProps = [
 	{
     prop: 'printModel',
     label: '打印方式',
-    filter: (val) => val ==1 ? '自动打印' : '自动打印',
+    filter: (val) => val ==1 ? '自动打印' : '手动打印',
 	},
 	{
     prop: 'remark',
@@ -71,17 +71,16 @@ export default {
 							btnName: '编辑',
 					  }
           : undefined,
-        {
-          type: 'print',
-          btnName: '打印',
-        },
         this.$auth.hasPermi(`base:packaging-print-model:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
           : undefined,
-
+        {
+          type: 'print',
+          btnName: '查看',
+        },
 			].filter((v) => v),
 			tableData: [],
 			formConfig: [
@@ -102,12 +101,12 @@ export default {
         //   valueFormat: 'yyyy-MM-dd',
         //   param: 'createTime',
 				// },
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '搜索',
+				// 	name: 'search',
+				// 	color: 'primary',
+				// },
 				// {
 				// 	type: 'separate',
 				// },
@@ -121,7 +120,7 @@ export default {
 				},
 				{
           type: this.$auth.hasPermi('base:packaging-print-model:create') ? 'button' : '',
-					btnName: '新增',
+					btnName: '新增模板',
 					name: 'add',
 					color: 'success',
 					plain: true,

src/views/core/analysis/balanceAnalysis/index.vue

@@ -4,7 +4,7 @@
     <div v-if="tableData.length">
       <base-table v-loading="dataListLoading" :span-method="mergeColumnHandler" :table-props="tableProps" :table-data="tableData" />
       <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
-      <balance-chart ref="lineChart" />
+      <BalanceChart ref="lineChart" />
     </div>
     <div v-else class="no-data-bg"></div>
     <!-- <pagination
@@ -19,7 +19,7 @@
 // import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
 import { getCT } from '@/api/core/analysis/index';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
+import { getCorePLList } from '@/api/base/coreProductionLine';
 import BalanceChart from '../balanceChart'
 import { time } from 'echarts';
 // import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
@@ -68,7 +68,7 @@ export default {
       spanArr: [], 
       xData: [],
       yData: [],
-      optionArrUrl: [getProductionLinePage],
+      optionArrUrl: [getCorePLList],
       formConfig: [
         {
           type: 'select',
@@ -111,7 +111,7 @@ export default {
       }
       this.optionArrUrl.forEach((item, index) => {
         item(params).then((response) => {
-          this.formConfig[index].selectOptions = response.data.list
+          this.formConfig[index].selectOptions = response.data
         });
       });
     },
@@ -212,8 +212,10 @@ export default {
         }
         this.tableProps = arr
 
-        console.log('表格横坐标', this.xData)
-        this.$refs.lineChart.initChart(this.xData, this.yData)
+        console.log('表格横坐标', this.xData, this.yData)
+        this.$nextTick(() => {
+          this.$refs.lineChart.initChart(this.xData, this.yData)
+        })
         // this.total = response.data.total;
         // this.dataListLoading = false;
       });

src/views/core/analysis/balanceChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-13 09:02:25
- * @LastEditTime: 2023-10-08 16:36:37
+ * @LastEditTime: 2023-11-10 10:48:09
  * @LastEditors: DY
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <div style="margin: 20px">
       <el-button v-for="(item, index) in buttonList" :key="index" :class="[item.actived ? 'activeButton': 'normalButton']" @click="changeChart(index)">{{ item.name }}</el-button>
     </div>
-    <div ref="chartDiv" :class="className" :style="{height:height,width:width}" />
+    <div id="chart" ref="chartDiv" :class="className" :style="{height:height,width:width}" />
   </div>
 </template>
 
@@ -48,6 +48,7 @@ export default {
     }
   },
   mounted() {
+    // this.initChart()
   },
   methods: {
     changeChart(index) {
@@ -81,7 +82,8 @@ export default {
       console.log('看一下数据', this.dataArray)
       this.xDatas = xData
       this.chart = echarts.init(this.$refs.chartDiv, 'macarons')
-      this.setOptions(xData, yData[0], lineName)
+      // this.chart = echarts.init(document.getElementById('chart'), 'macarons')
+      // this.setOptions(xData, yData[0], lineName)
     },
     setOptions(xData, dataList, lineName) {
       // let seriesData = []

src/views/core/analysis/yieldAnalysis/index.vue

@@ -19,8 +19,9 @@
 // import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
 import { getYieldAnalysisPageData } from '@/api/core/analysis/index';
-import { getProductionLinePage } from '@/api/core/base/productionLine';
+// import { getProductionLinePage } from '@/api/core/base/productionLine';
 import lineChart from '../LineChart'
+import moment from 'moment';
 // import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
 // const tableProps = [
@@ -58,21 +59,23 @@ export default {
       dataListLoading:false,
       tableData: [],
       listQuery: {
-        lineIds: [],
-        time: ''
+        // lineIds: [],
+        recordTime: []
       },
       dateLabelList: [],
-      optionArrUrl: [getProductionLinePage ],
+      tempTtime: '',
+      day: 0,
+      xData: [],
 			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-          param: 'lineIds',
-          defaultSelect: '',
-          multiple:true,
-					filterable: true,
-				},
+				// {
+				// 	type: 'select',
+				// 	label: '产线',
+				// 	selectOptions: [],
+        //   param: 'lineIds',
+        //   defaultSelect: '',
+        //   multiple:true,
+				// 	filterable: true,
+				// },
 				{
 					type: 'datePicker',
 					label: '时间',
@@ -94,127 +97,93 @@ export default {
 		};
 	},
 	created() {
-		this.getArr();
+		// this.getArr();
 	},
 	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list
-          // this.formConfig[0].defaultSelect = response.data.list[0].id
-          this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id)
-				});
-			});
+		// getArr() {
+		// 	const params = {
+		// 		page: 1,
+		// 		limit: 500,
+		// 	};
+		// 	this.optionArrUrl.forEach((item, index) => {
+		// 		item(params).then((response) => {
+		// 			this.formConfig[index].selectOptions = response.data.list
+    //       // this.formConfig[0].defaultSelect = response.data.list[0].id
+    //       this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id)
+		// 		});
+		// 	});
+    // },
+    // 设置表头和横坐标
+    setHeader() {
+      const month = this.tempTtime.getMonth() + 1
+      let arr = [
+        {
+          prop: 'proName',
+          label: '产品名称',
+          fixed: 'left'
+        },
+        {
+          prop: 'specifications',
+          label: '产品规格',
+          fixed: 'left'
+        },
+        {
+          prop: 'sum',
+          label: '合计',
+          fixed: 'left'
+        },
+        {
+          label: this.tempTtime.getFullYear() + '年' + month + '月',
+          align: 'center',
+          children: []
+        }
+      ]
+      for (let d = 1; d <= this.day; d ++) {
+        arr[3].children.push({
+          prop: 'value' + d, label: month + '-' + d
+        })
+        // 横坐标
+        this.xData.push(month + '-' + d)
+      }
+      this.tableProps = arr
     },
     getData() {
-      // this.listQuery.lineIds = ['1672847052717821953']
-      // this.listQuery.productId = val.productId;
-      // this.listQuery.time = '1694486098000';
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
-        let arr = [
-          	{
-              prop: 'lineName',
-          		label: '产线',
-              fixed: 'left'
-          	},
-            {
-              prop: 'sum',
-              label: '合计',
-              fixed: 'left'
-            },
-            {
-              prop: res.data ? res.data.nameData[0].name : undefined,
-              label: res.data ? res.data.nameData[0].name : undefined,
-              align: 'center',
-              children:[
-
-              ]
-            }
-        ]
-        // console.log(res.data.nameData.slice(1))
-        let xData = []
-        let yAllData = []
-        let lineName = []
+        //构造数据
         if (res.data) {
-          let tempDateList = []
-          res.data.nameData.forEach(date => {
-            tempDateList.push(date.name)
-          })
-          this.dateLabelList = Array.from(new Set(tempDateList))
-
-          this.dateLabelList.forEach(item => {
-            if (item.indexOf('年') === -1) {
-              // 构造表头
-              const props = {
-                'prop': item,
-                'label': item
-              }
-              arr[2].children.push(props)
-
-              // 构造echarts横坐标
-              xData.push(item)
-            }
-          })
-          // res.data.nameData.slice(1).forEach(item => {
-          //   const props = {
-          //     'prop': item.name,
-          //     'label': item.name,
-          //     'align': 'center'
-          //   }
-          //   arr[2].children.push(props)
-          // })
-          let tableDataArr =[]
-          res.data.data.forEach(item => {
-            let obj = {}
-            obj.lineName= item.lineName,
-            obj.sum= item.sum,
-            item.data.forEach((ele, index) => {
-              // console.log(ele)
-              ele.children.forEach((e) => {
-                console.log(e.dynamicName)
-                obj['' + e.dynamicName + ''] = e.dynamicValue
-                console.log(obj['' + e.dynamicName + '']);
-              })
+          this.setHeader()
+          res.data.forEach(item => {
+            console.log('111', item.recordTime, moment(item.recordTime).format('DD'))
+            this.tableData.push({
+              proName: item.proName,
+              specifications: item.specifications
             })
-            tableDataArr.push(obj)
-          });
-          this.tableData = tableDataArr
-          this.tableProps = arr
-          
-          // let tempList = []
-          // res.data.nameData.slice(1).forEach(item => {
-          //   tempList.push(item.name)
-          //   // arr[2].children.push(props)
-          // })
-          // xData = Array.from(new Set(tempList))
-          
-          res.data.data.forEach(item => {
-            let yData = []
-            lineName.push(item.lineName)
-            // let obj = {}
-            // obj.lineName = item.lineName,
-            //   obj.sum = item.sum,
-            item.data.forEach((ele, index) => {
-                // console.log(ele)
-              ele.children.forEach((e) => {
-                // let yData = []
-                yData.push(e.dynamicValue)
-                })
-              })
-            yAllData.push(yData)
-          });
-          console.log(lineName)
-        } else {
-          this.tableProps = arr
-          this.tableData = []
-          xData = []
-          yAllData = []
-          lineName = []
+          })
         }
+        console.log('饿', this.tableData)
+        //   res.data.data.forEach(item => {
+        //     let yData = []
+        //     lineName.push(item.lineName)
+        //     // let obj = {}
+        //     // obj.lineName = item.lineName,
+        //     //   obj.sum = item.sum,
+        //     item.data.forEach((ele, index) => {
+        //         // console.log(ele)
+        //       ele.children.forEach((e) => {
+        //         // let yData = []
+        //         yData.push(e.dynamicValue)
+        //         })
+        //       })
+        //     yAllData.push(yData)
+        //   });
+        //   console.log(lineName)
+        // } else {
+        //   this.tableProps = arr
+        //   this.tableData = []
+        //   xData = []
+        //   yAllData = []
+        //   lineName = []
+        // }
         // res.data.data[0].data[0].children.forEach((item, index) => {
         //   // console.log(item)
         //   yData.push(item.dynamicValue)
@@ -222,7 +191,7 @@ export default {
         //   // obj['' + item.dynamicName + ''] = item.dynamicValue
         // })
         // console.log(this.yData)
-        this.$refs.lineChart.initChart(xData, yAllData, lineName)
+        // this.$refs.lineChart.initChart(this.xData, yAllData, lineName)
         // this.total = response.data.total;
         // this.dataListLoading = false;
       });
@@ -230,12 +199,24 @@ export default {
     buttonClick(val) {
 			switch (val.btnName) {
         case 'search':
-          this.listQuery.lineIds = val.lineIds ? val.lineIds :undefined
-          // this.listQuery.productId = val.productId;
-          this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined
-					// this.listQuery.pageNo = 1;
-          // this.listQuery.pageSize = 10;
+          // this.listQuery.recordTime = val.time ? new Date(val.time).getTime() : undefined
           if (val.time) {
+            this.tempTtime = new Date(val.time)
+            switch (this.tempTtime.getMonth() + 1) {
+              case 1, 3, 5, 7, 8, 10, 12:
+                this.day = 31;
+                break;
+              case 2:
+                this.day = 28;
+                break;
+              case 4, 6, 9, 11:
+                this.day = 30;
+                break;
+            }
+            this.listQuery.recordTime = [
+              val.time,
+              parseTime(new Date(this.tempTtime.getFullYear(), this.tempTtime.getMonth(), this.day, 23, 59, 59))
+            ]
             this.getData()
           } else {
             this.$message({

src/views/core/base/factory/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-10-16 11:16:48
+ * @LastEditTime: 2023-11-03 16:32:52
  * @Description:
 -->
 <template>
@@ -13,14 +13,6 @@
 		@keyup.enter.native="dataFormSubmit()"
 		label-width="80px">
 		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="工厂编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						clearable
-						placeholder="请输入工厂编码" />
-				</el-form-item>
-			</el-col>
 			<el-col :span="12">
 				<el-form-item label="工厂名称" prop="name">
 					<el-input
@@ -29,6 +21,14 @@
 						placeholder="请输入工厂名称" />
 				</el-form-item>
 			</el-col>
+			<el-col :span="12">
+				<el-form-item label="工厂编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						clearable
+						placeholder="请输入工厂编码" />
+				</el-form-item>
+			</el-col>
 		</el-row>
 		<el-row :gutter="20">
 			<el-col :span="12">

src/views/core/base/factory/index.vue

@@ -43,19 +43,23 @@ import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
 import {
 	deleteFactory,
-	getFactoryPage,
-	exportFactoryExcel,
+	getFactoryPage
 } from '@/api/core/base/factory';
 
 const tableProps = [
 	{
-		prop: 'code',
-		label: '工厂编码'
-	},																																																																						
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
 	{
 		prop: 'name',
 		label: '工厂名称'
 	},
+	{
+		prop: 'code',
+		label: '工厂编码'
+	},
 	{
 		prop: 'address',
 		label: '地址'
@@ -63,12 +67,7 @@ const tableProps = [
 	{
 		prop: 'remark',
 		label: '备注'
-	},
-	{
-		prop: 'createTime',
-		label: '创建时间',
-		filter: parseTime
-	},
+	}
 ];
 
 export default {
@@ -78,17 +77,17 @@ export default {
 			urlOptions: {
 				getDataListURL: getFactoryPage,
 				deleteURL: deleteFactory,
-				exportURL: exportFactoryExcel,
+				// exportURL: exportFactoryExcel,
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:factory:update`)
+				this.$auth.hasPermi(`base:core-factory:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-          this.$auth.hasPermi(`base:factory:delete`)
+          this.$auth.hasPermi(`base:core-factory:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -97,18 +96,18 @@ export default {
 			].filter((v)=>v),
 			tableData: [],
 			formConfig: [
-				{
-					type: 'input',
-					label: '工厂编码',
-					placeholder: '工厂编码',
-					param: 'code',
-				},
 				{
 					type: 'input',
 					label: '工厂名称',
 					placeholder: '工厂名称',
 					param: 'name',
 				},
+				{
+					type: 'input',
+					label: '工厂编码',
+					placeholder: '工厂编码',
+					param: 'code',
+				},
 				{
 					type: 'button',
 					btnName: '搜索',
@@ -127,7 +126,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:factory:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-factory:create') ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',

src/views/core/mixins/basic-add.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-03 14:21:04
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-06 15:59:53
  * @Description:
  */
 export default {
@@ -80,7 +80,7 @@ export default {
         if (this.dataForm.id) {
           this.urlOptions.updateURL(this.dataForm).then(response => {
             this.$modal.msgSuccess("修改成功");
-            this.visible = false;
+            this.visible = false; 
             this.$emit("refreshDataList");
           });
           return;

src/views/core/monitoring/auto/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-08-29 14:59:29
- * @LastEditTime: 2023-10-16 15:10:42
+ * @LastEditTime: 2023-11-07 18:48:35
  * @LastEditors: DY
  * @Description: 
 -->
@@ -175,7 +175,7 @@ export default {
           label: '统计开始时间',
           dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "yyyy-MM-ddTHH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',

src/views/core/monitoring/data24/index.vue

@@ -2,7 +2,7 @@
     filename: index.vue
     author: liubin
     date: 2023-08-04 14:44:58
-    description: 设备24小时生产记录
+    description: 近24小时产线生产数据
 -->
 <template>
 	<div class="app-container">
@@ -24,6 +24,8 @@
 
 <script>
 import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
+import { parseTime } from '../../mixins/code-filter';
+import { Loading } from 'element-ui';
 
 export default {
 	name: 'productionLineData24',
@@ -54,28 +56,32 @@ export default {
 	},
 	methods: {
 		/** 构建tableProps - 依据第一个元素所提供的信息 */
-		buildProps(plData) {
-			plData.forEach(item => {
-				this.timeList.push(item.name)
-			})
-			const timeArray = Array.from(new Set(this.timeList))
-			console.log('nihc', timeArray)
-			for (const times of timeArray) {
-				if (times !== '投入数量' && times !== '产出数量' && times !== '报废数量' && times !== '产出面积') {
-					const subprop = {
-						label: times.slice(0, 10) + ' ' + times.slice(11),
-						align: 'center',
-						children: [
-							{ prop: times + '_in', label: '投入数量' },
-							{ prop: times + '_out', label: '产出数量' },
-							{ prop: times + '_junk', label: '报废数量' },
-							{ prop: times + '_area', label: '产出面积' }
-						]
-					}
-					this.arr.push(subprop)
+		buildProps() {
+			// 获取当前时间
+			var currentTime = new Date();
+			let timeArr = []
+
+			// 添加24小时内的整点时间--时间戳格式
+			for (let i = 0; i < 24; i ++) {
+				timeArr.unshift(new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate(), currentTime.getHours() - i, 0, 0).getTime())
+			}
+			console.log("24小时内的开始时间：" + timeArr, timeArr.length);
+			for(const times of timeArr) {
+				const subprop = {
+					label: parseTime(times),
+					align: 'center',
+					children: [
+						{ prop: times + '_up', label: '上片数据' },
+						{ prop: times + '_down', label: '下片数据' },
+						{ prop: times + '_good', label: '良品面积' },
+						{ prop: times + '_bad', label: '报废数据' },
+						{ prop: times + '_percent', label: '报废比例(%)' }
+					]
 				}
+				this.arr.push(subprop)
 			}
 			this.tableProps = this.arr
+			console.log('111', this.tableProps)
 		},
 		setRowSpan(arr) {
       let count = 0
@@ -100,22 +106,13 @@ export default {
 			let sectionArr= []
 			console.log('打印看下数据list', list)
 			list.forEach((ele, index) => {
-				let tempData = []
-				ele.data.forEach(item => {
-					item.children.forEach(params => {
-						if (params.dynamicName === '投入数量') {
-							tempData[item.dynamicName + '_in'] = params.dynamicValue
-						} else if (params.dynamicName === '产出数量') {
-							tempData[item.dynamicName + '_out'] = params.dynamicValue
-						} else if (params.dynamicName === '报废数量') {
-							tempData[item.dynamicName + '_junk'] = params.dynamicValue
-						} else {
-							tempData[item.dynamicName + '_area'] = params.dynamicValue
-						}
-					})
-				})
-				tempData['proLineName'] = ele.proLineName
-				tempData['spec'] = ele.spec
+				let tempData = {}
+				tempData[ele.recordTime + '_up'] = ele.inputNum
+				tempData[ele.recordTime + '_down'] = ele.outputNum
+				tempData[ele.recordTime + '_up'] = ele.inputNum
+				tempData['proLineName'] = ele.lineName
+				tempData['workOrderName'] = ele.workOrderName
+				tempData['spec'] = ele.specifications
 				this.tableData.push(tempData)
 				console.log('看看数据', this.tableData, tempData)
 				const { proLineName } = tempData
@@ -151,17 +148,23 @@ export default {
             prop: 'proLineName',
             label: '生产线',
 						fixed: 'left',
-						showOverflowTooltip: true
+						'show-overflow-tooltip': true
+          },
+					{
+            prop: 'workOrderName',
+            label: '当前工单',
+						fixed: 'left',
+						'show-overflow-tooltip': true
           },
           {
             prop: 'spec',
             label: '产品规格',
 						fixed: 'left',
-						showOverflowTooltip: true
+						'show-overflow-tooltip': true
           }
 				]
-				this.buildProps(res.data.nameData);
-				this.buildData(res.data.data);
+				this.buildProps();
+				this.buildData(res.data);
       })
 
 			// // const data = this.res.data;

src/views/delivery/deliveryLog/components/addOrUpdate.vue

@@ -0,0 +1,162 @@
+<template>
+  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form">
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="订单名" prop="orderId">
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in orderList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="发货单名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="发货时间" prop="deliveryTime">
+          <el-date-picker
+            v-model="form.deliveryTime"
+            type="datetime"
+            format='yyyy-MM-dd HH:mm:ss'
+            value-format="timestamp"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="发货单号" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="发货负责人" prop="deliveryPersonId">
+          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in personList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="运输负责人" prop="principal">
+          <el-input v-model="form.principal"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="运输联系方式" prop="principalCall">
+          <el-input v-model="form.principalCall"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="运输费用" prop="principalCost">
+          <el-input-number v-model="form.principalCost" :min="0" :max='9999999999' :precision='2'></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='24'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { orderList } from '@/api/base/orderManage'
+import { getWorkerList } from '@/api/base/worker'
+import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog } from '@/api/base/delivery'
+export default {
+  name: 'AddOrUpdate',
+  data() {
+    return {
+      form: {
+        id: '',
+        orderId: '',
+        name: '',
+        code: '',
+        deliveryTime: null,
+        deliveryPersonId: '',
+        principal: '',
+        principalCall: '',
+        principalCost: 0.00,
+        remark: ''
+      },
+      isEdit: false,
+      rules: {
+        orderId: [{ required: true, message: "订单名不能为空", trigger: "change" }],
+        name: [{ required: true, message: "发货单名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "发货单号不能为空", trigger: "blur" }]
+      },
+      orderList: [],
+      personList: []
+    }
+  },
+  methods: {
+    init(id) {
+      this.getSelectList()
+      if (id) {
+        this.form.id = id
+        this.isEdit = true
+        getDeliveryLog({id}).then(res => {
+          this.form = res.data || {}
+        })
+      }
+    },
+    getSelectList() {
+      orderList().then(res => {
+        this.orderList = res.data || []
+      })
+      getWorkerList().then(res => {
+        this.personList = res.data || []
+      })
+    },
+    submitForm() {
+      this.$refs['addOrUpdate'].validate((valid) => {
+        if (valid) {
+          console.log(this.form)
+          if (this.isEdit) {
+            //编辑
+            deliveryLogUpdate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            deliveryLogCreate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.addOrUpdate.resetFields()
+      this.form.principalCost = 0.00
+      this.isEdit = false
+    }
+  }
+}
+</script>

src/views/delivery/deliveryLog/components/deliveryLogDetail.vue

@@ -0,0 +1,223 @@
+<template>
+  <div>
+    <el-drawer
+      title="发货清单详情"
+      size="60%"
+      :append-to-body="true"
+      :visible.sync="centervisible"
+      @close='close'>
+      <div class="box1">
+        <el-row>
+          <el-col :span='12'>
+            <span class="title">订单名：</span>
+            <span class="text">{{orderName ? orderName : '-'}}</span>
+          </el-col>
+          <el-col :span='12'>
+            <span class="title">发货单号：</span>
+            <span class="text">{{code ? code : '-'}}</span>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="box2">
+        <div class="boxTitle">
+          <span class="blueTitle"></span>
+          <span>详情</span>
+        </div>
+        <base-table
+          :page="queryParams.pageNo"
+          :limit="queryParams.pageSize"
+          :table-props="tableProps"
+          :table-data="tableData"
+          :max-height="tableH"
+        >
+          <method-btn
+            v-if="tableBtn.length"
+            slot="handleBtn"
+            :width="80"
+            label="操作"
+            :method-list="tableBtn"
+            @clickBtn="editDetDetail"
+          />
+        </base-table>
+        <pagination
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          :total="total"
+          @pagination="getList"
+        />
+      </div>
+    </el-drawer>
+    <!-- 编辑详情 -->
+    <base-dialog
+      dialogTitle="编辑"
+      :dialogVisible="detailEditVisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width="50%"
+    >
+			<edit-detail ref="editDetail" @successSubmit="successSubmit" />
+		</base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { deliveryLogDetPage } from '@/api/base/delivery'
+import EditDetail from './editDetail.vue'
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'deliveryCarCode',
+    label: '装车单号',
+    minWidth: 100,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'loadTime',
+    label: '装车时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'productName',
+    label: '装车产品'
+  },
+  {
+    prop: 'packagingSize',
+    label: '装箱规格(片/箱)',
+    width: 120
+  },
+  {
+    prop: 'packagingNum',
+    label: '箱数'
+  },
+  {
+    prop: 'quantity',
+    label: '装车总量'
+  },
+  {
+    prop: 'productDate',
+    label: '产品批次',
+    minWidth: 150,
+    showOverflowtooltip: true
+  }
+]
+export default {
+  name: 'DeliveryLogDetail',
+  data() {
+    return {
+      centervisible: false,
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        logId: ''
+      },
+      total: 0,
+      tableProps,
+      tableData: [],
+      tableBtn: [
+        this.$auth.hasPermi('extend:delivery-log:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined
+      ].filter((v) => v),
+      tableH: this.tableHeight(275),
+      orderName: '',
+      code: '',
+      detailEditVisible: false
+    }
+  },
+  components: { EditDetail },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(275)
+    })
+  },
+  methods: {
+    init(param) {
+      this.orderName = param.orderName
+      this.code = param.code
+      this.queryParams.logId = param.id
+      this.centervisible = true
+      this.getList()
+    },
+    getList() {
+      deliveryLogDetPage({...this.queryParams}).then(res => {
+        this.tableData = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    close() {
+      this.orderName = ''
+      this.code = ''
+      this.queryParams.pageNo = 1
+      this.queryParams.pageSize = 20
+      this.queryParams.logId = ''
+      this.tableData = []
+      this.total = 0
+    },
+    editDetDetail(val) {
+      this.detailEditVisible = true
+      this.$nextTick(() => {
+        this.$refs.editDetail.init(val.data.id)
+      })
+    },
+    handleCancel() {
+      this.$refs.editDetail.formClear()
+      this.detailEditVisible = false
+    },
+    handleConfirm() {
+      this.$refs.editDetail.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    }
+  }
+}
+</script>
+<style scoped lang='scss'>
+.boxTitle {
+  display: inline-block;
+  font-size: 16px;
+  font-weight: 400;
+  color: #000000;
+  margin:0 10px 10px 0;
+}
+.blueTitle {
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align: bottom;
+}
+.box1 {
+  padding: 8px 8px 8px 40px;
+  .title {
+    height: 16px;
+    font-size: 14px;
+    font-weight: 600;
+    color: rgba(0,0,0,0.85);
+  }
+  .text {
+    height: 16px;
+    font-size: 14px;
+    font-weight: 400;
+    color: rgba(102,102,102,0.75);
+  }
+}
+.box2 {
+  padding:32px 32px 30px 30px;
+  height: calc(100vh - 125px);
+}
+</style>

src/views/delivery/deliveryLog/components/editDetail.vue

@@ -0,0 +1,124 @@
+<template>
+  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form">
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车单号" prop="deliveryCarCode">
+          <el-input v-model="form.deliveryCarCode"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装车时间" prop="loadTime">
+          <el-date-picker
+            v-model="form.loadTime"
+            type="datetime"
+            format='yyyy-MM-dd HH:mm:ss'
+            value-format="timestamp"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车产品" prop="productId">
+          <el-select v-model="form.productId" disabled placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装箱规格(片/箱)" prop="packagingSize">
+          <el-input-number v-model="form.packagingSize" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="产品批次" prop="productDate">
+          <el-input v-model="form.productDate" placeholder="多个批次用','隔开"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="箱/托数" prop="packagingNum">
+          <el-input-number v-model="form.packagingNum" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车总量" prop="quantity">
+          <el-input-number v-model="form.quantity" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getProductAll } from '@/api/base/product'
+import { deliveryLogDetGet, deliveryLogDetUpdate } from '@/api/base/delivery'
+export default {
+  name: 'editDetail',
+  data() {
+    return {
+      form: {
+        logId: '',
+        deliveryCarCode: '',
+        loadTime: null,
+        productId: '',
+        packagingSize: null,
+        productDate: '',
+        packagingNum: null,
+        quantity: null
+      },
+      rules: {
+        deliveryCarCode: [{ required: true, message: "装车单号不能为空", trigger: "blur" }],
+        productId: [{ required: true, message: "装车产品不能为空", trigger: "change" }],
+        packagingSize: [{ required: true, message: "装箱规格不能为空", trigger: "blur" }],
+        packagingNum: [{ required: true, message: "箱/托数不能为空", trigger: "blur" }],
+        quantity: [{ required: true, message: "装车总量不能为空", trigger: "blur" }]
+      },
+      productList: []
+    }
+  },
+  mounted() {
+    this.getSelectList()
+  },
+  methods: {
+    init(id) {
+      deliveryLogDetGet({id}).then(res => {
+        console.log(res)
+        this.form = res.data
+      })
+    },
+    getSelectList() {
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+    },
+    submitForm() {
+      this.$refs['addOrUpdate'].validate((valid) => {
+        if (valid) {
+          console.log(this.form)
+          deliveryLogDetUpdate({ ...this.form }).then((res) => {
+            if (res.code === 0) {
+              this.$modal.msgSuccess("操作成功");
+              this.$emit('successSubmit')
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.addOrUpdate.resetFields()
+    }
+  }
+}
+</script>

src/views/delivery/deliveryLog/components/loadedPage.vue

@@ -0,0 +1,151 @@
+<template>
+  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form">
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="发货单号">
+          <el-input v-model="code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装车单号" prop="deliveryCarCode">
+          <el-input v-model="form.deliveryCarCode"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装车时间" prop="loadTime">
+          <el-date-picker
+            v-model="form.loadTime"
+            type="datetime"
+            format='yyyy-MM-dd HH:mm:ss'
+            value-format="timestamp"
+            style="width: 100%;"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="车辆联系人" prop="contactPerson">
+          <el-input v-model="form.contactPerson"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="联系方式" prop="contactPersonCall">
+          <el-input v-model="form.contactPersonCall"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装车产品" prop="productId">
+          <el-select v-model="form.productId" disabled placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="装箱规格(片/箱)" prop="packagingSize">
+          <el-input-number v-model="form.packagingSize" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="产品批次" prop="productDate">
+          <el-input v-model="form.productDate" placeholder="多个批次用','隔开"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span='12'>
+        <el-form-item label="箱/托数" prop="packagingNum">
+          <el-input-number v-model="form.packagingNum" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="装车总量" prop="quantity">
+          <el-input-number v-model="form.quantity" :min="0" :max='9999999999' style="width:100%"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getProductAll } from '@/api/base/product'
+import { deliveryLogDetCreate } from '@/api/base/delivery'
+import { orderDetail } from '@/api/base/orderManage'
+export default {
+  name: 'LoadedPage',
+  data() {
+    return {
+      form: {
+        logId: '',
+        deliveryCarCode: '',
+        loadTime: null,
+        contactPerson: '',
+        contactPersonCall: '',
+        productId: '',
+        packagingSize: null,
+        productDate: '',
+        packagingNum: null,
+        quantity: null
+      },
+      code: '',
+      rules: {
+        deliveryCarCode: [{ required: true, message: "装车单号不能为空", trigger: "blur" }],
+        productId: [{ required: true, message: "装车产品不能为空", trigger: "change" }],
+        packagingSize: [{ required: true, message: "装箱规格不能为空", trigger: "blur" }],
+        packagingNum: [{ required: true, message: "箱/托数不能为空", trigger: "blur" }],
+        quantity: [{ required: true, message: "装车总量不能为空", trigger: "blur" }]
+      },
+      productList: []
+    }
+  },
+  methods: {
+    init(id, code, orderId) {
+      this.getSelectList()
+      this.form.logId = id
+      this.code = code
+      this.getProductId(orderId)
+    },
+    getSelectList() {
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+    },
+    // 获得装车产品
+    getProductId(orderId) {
+      orderDetail({
+        id: orderId
+      }).then(res => {
+        this.form.productId = res.data.planProductId || ''
+      })
+    },
+    submitForm() {
+      this.$refs['addOrUpdate'].validate((valid) => {
+        if (valid) {
+          console.log(this.form)
+          deliveryLogDetCreate({ ...this.form }).then((res) => {
+            if (res.code === 0) {
+              this.$modal.msgSuccess("操作成功");
+              this.$emit('successSubmit')
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.addOrUpdate.resetFields()
+      this.code = ''
+    }
+  }
+}
+</script>

src/views/delivery/deliveryLog/index.vue

@@ -0,0 +1,308 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="160"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 新增 -->
+    <base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="centervisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%"
+    >
+			<add-or-update ref="addOrUpdate" @successSubmit="successSubmit" />
+		</base-dialog>
+    <!-- 装车 -->
+    <base-dialog
+			dialogTitle="装车"
+			:dialogVisible="centervisible2"
+			@cancel="handleCancel2"
+			@confirm="handleConfirm2"
+			:before-close="handleCancel2"
+			width="50%"
+    >
+			<loaded-page ref="loadedPage" @successSubmit="successSubmit2" />
+		</base-dialog>
+    <!-- 发货详情 -->
+    <delivery-log-detail ref='deliveryLogDetail' v-if='showDetail' />
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery'
+import AddOrUpdate from './components/addOrUpdate'
+import LoadedPage from './components/loadedPage'
+import DeliveryLogDetail from './components/deliveryLogDetail.vue'
+const tableProps = [
+  {
+    prop: 'orderName',
+    label: '订单名',
+    minWidth: 100,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'name',
+    label: '发货单名称',
+    minWidth: 100,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'deliveryTime',
+    label: '发货时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'code',
+    label: '发货单号',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'deliverPerName',
+    label: '发货负责人',
+    minWidth: 100
+  },
+  {
+    prop: 'principal',
+    label: '运输负责人',
+    minWidth: 100
+  },
+  {
+    prop: 'principalCall',
+    label: '运输联系方式',
+    minWidth: 110,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'principalCost',
+    label: '运输费用'
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    showOverflowtooltip: true
+  }
+]
+export default {
+  name: "DeliveryLog",
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名',
+          param: 'orderName',
+          defaultSelect: ''
+        },
+        {
+          type: 'input',
+          label: '发货单名称',
+          param: 'name'
+        },
+        {
+          type: 'input',
+          label: '发货单号',
+          param: 'code'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        orderName: '',
+        code: '',
+        name: ''
+      },
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      total: 0,
+      tableBtn: [
+      this.$auth.hasPermi('extend:delivery-log:loaded')
+          ? {
+              type: 'loaded',
+              btnName: '装车'
+            }
+          : undefined,
+      this.$auth.hasPermi('extend:delivery-log:detail')
+          ? {
+              type: 'detail',
+              btnName: '详情'
+            }
+          : undefined,
+        this.$auth.hasPermi('extend:delivery-log:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
+        this.$auth.hasPermi('extend:delivery-log:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除'
+            }
+          : undefined
+      ].filter((v) => v),
+      addOrEditTitle: '',
+      centervisible: false,
+      centervisible2: false,
+      showDetail: false
+    }
+  },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    if (location.href.indexOf('?') > 0) {
+      let arr = location.href.split('?')[1]
+      this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
+    } else {
+      this.formConfig[0].defaultSelect = ''
+    }
+    this.queryParams.orderName = this.formConfig[0].defaultSelect
+    this.getList();
+  },
+  components: { AddOrUpdate, LoadedPage, DeliveryLogDetail },
+  watch: {
+    $route: 'initData'
+  },
+  methods: {
+    initData(to) {
+      if (to.name === 'DeliveryLog') {
+        if (location.href.indexOf('?') > 0) {
+          let arr = location.href.split('?')[1]
+          this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
+        } else {
+          this.formConfig[0].defaultSelect = ''
+        }
+        this.queryParams.orderName = this.formConfig[0].defaultSelect
+        this.getList()
+      }
+    },
+    getList() {
+      deliveryLogPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    buttonClick(val) {
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.queryParams.orderName = val.orderName
+        this.queryParams.code = val.code
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.addOrUpdate.init(val.data.id)
+          })
+          break
+        case 'delete':
+          this.handleDelete(val.data)
+          break
+        case 'loaded':
+          this.centervisible2 = true
+          this.$nextTick(() => {
+            this.$refs.loadedPage.init(val.data.id, val.data.code, val.data.orderId)
+          })
+          break
+        default:
+          this.showDetail = true
+          this.$nextTick(() => {
+            this.$refs.deliveryLogDetail.init(val.data)
+          })
+      }
+    },
+    // 新增
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    },
+    // 删除
+    handleDelete(val) {
+      this.$modal.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?').then(function() {
+          return deliveryLogDelete({ id: val.id })
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("操作成功");
+        }).catch(() => {});
+    },
+    // 装车
+    handleCancel2() {
+      this.$refs.loadedPage.formClear()
+      this.centervisible2 = false
+    },
+    handleConfirm2() {
+      this.$refs.loadedPage.submitForm()
+    },
+    successSubmit2() {
+      this.handleCancel2()
+      this.getList()
+    }
+  }
+}
+</script>

src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue

@@ -0,0 +1,467 @@
+<template>
+  <el-drawer
+    title="发货进度"
+    :visible.sync="centervisible"
+    size="80%"
+    class="deliveryLogDetail"
+    @close='closeA'>
+    <div class="box1">
+      <div class="box_col">
+        <div class="blodTip">订单名</div>
+        <div class="lightTip">{{orderMsg.orderName ? orderMsg.orderName : '-'}}</div>
+      </div>
+      <div class="box_col">
+        <div class="blodTip">订单数量</div>
+        <div class="lightTip">{{orderMsg.orderNum ? orderMsg.orderNum : '-'}}</div>
+      </div>
+      <div class="box_col">
+        <div class="blodTip">装货数量</div>
+        <div class="lightTip">{{orderMsg.num ? orderMsg.num : '-'}}</div>
+      </div>
+      <div class="box_col">
+        <div class="blodTip">累计占比(%)</div>
+        <div class="lightTip">{{orderMsg.rate ? orderMsg.rate : '-'}}</div>
+      </div>
+      <div class="box_col">
+        <div class="blodTip">累计运输费用</div>
+        <div class="lightTip">{{orderMsg.cost ? orderMsg.cost : '-'}}</div>
+      </div>
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>发货清单</span>
+      </div>
+      <el-tabs v-model="activeName" @tab-click="toggleTab">
+        <el-tab-pane label="数据列表" name="dataList">
+          <!-- 列表 -->
+          <div v-if="activeName === 'dataList'">
+            <base-table
+              :page="queryParams.pageNo"
+              :limit="queryParams.pageSize"
+              :table-props="tableProps"
+              :table-data="tableData"
+              :max-height="tableH"
+            >
+              <method-btn
+                v-if="tableBtn.length"
+                slot="handleBtn"
+                :width="150"
+                label="操作"
+                :method-list="tableBtn"
+                @clickBtn="viewDetDetail"
+              />
+            </base-table>
+            <pagination
+              :page.sync="queryParams.pageNo"
+              :limit.sync="queryParams.pageSize"
+              :total="total"
+              @pagination="getList"
+            />
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="环形图" name="barChart">
+          <div v-if="activeName === 'barChart'">
+            <div 
+              id="logDetPieBar"
+              style="width: 100%"
+              :style="{ height: chartHeight + 'px' }"
+            ></div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <!-- 详情抽屉 -->
+    <el-drawer
+      title="发货详情"
+      size="60%"
+      :append-to-body="true"
+      :visible.sync="innerDrawer"
+      @close='closeB'>
+      <div class="box3">
+        <el-row>
+          <el-col :span='12'>
+            <span class="title">订单名：</span>
+            <span class="text">{{orderMsg.orderName ? orderMsg.orderName : '-'}}</span>
+          </el-col>
+          <el-col :span='12'>
+            <span class="title">发货单号：</span>
+            <span class="text">{{logCode ? logCode : '-'}}</span>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="box4">
+        <div class="boxTitle">
+          <span class="blueTitle"></span>
+          <span>详情</span>
+        </div>
+        <base-table
+          :page="queryParams2.pageNo"
+          :limit="queryParams2.pageSize"
+          :table-props="tableProps2"
+          :table-data="tableData2"
+          :max-height="tableH2"
+        />
+        <pagination
+          :page.sync="queryParams2.pageNo"
+          :limit.sync="queryParams2.pageSize"
+          :total="total2"
+          @pagination="getList2"
+        />
+      </div>
+    </el-drawer>
+  </el-drawer>
+</template>
+<script>
+import { deliveryLogPage, deliveryLogDetPage } from '@/api/base/delivery'
+import { parseTime } from '@/utils/ruoyi'
+import * as echarts from 'echarts'
+import resize from '@/utils/chartMixins/resize'
+const tableProps = [
+  {
+    prop: 'deliveryTime',
+    label: '发货时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'code',
+    label: '发货单号',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'orderNum',
+    label: '订单数量'
+  },
+  {
+    prop: 'num',
+    label: '发货数量'
+  },
+  {
+    prop: 'rate',
+    label: '发货比列(%)'
+  },
+  {
+    prop: 'principalCost',
+    label: '运输费用'
+  }
+]
+const tableProps2 = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'deliveryCarCode',
+    label: '装车单号',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'loadTime',
+    label: '装车时间',
+    filter: parseTime,
+    minWidth: 150
+  },
+  {
+    prop: 'productName',
+    label: '装车产品',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'packagingSize',
+    label: '装箱规格（片/箱）'
+  },
+  {
+    prop: 'packagingNum',
+    label: '箱数'
+  },
+  {
+    prop: 'quantity',
+    label: '装车总量'
+  },
+  {
+    prop: 'productDate',
+    label: '产品批次',
+    showOverflowtooltip: true
+  }
+]
+export default {
+  name: 'DeliveryLogDetDetail',
+  mixins: [resize],
+  data() {
+    return {
+      centervisible: false,
+      activeName: 'dataList',
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 100,
+        orderId: ''
+      },
+      orderMsg: {},
+      tableProps,
+      tableData: [],
+      total: 0,
+      tableH: this.tableHeight(350),
+      tableBtn: [
+        this.$auth.hasPermi('base:group-team:update')
+          ? {
+              type: 'detDetail',
+              btnName: '查看发货详情'
+            }
+          : undefined
+      ].filter((v) => v),
+      innerDrawer: false,
+      // 详情
+      queryParams2: {
+        pageNo: 1,
+        pageSize: 20,
+        logId: ''
+      },
+      tableProps2,
+      tableData2: [],
+      tableH2: this.tableHeight(275),
+      total2: 0,
+      logCode: '',
+      // 图
+      chartDom: '',
+      chart: '',
+      chartHeight: this.tableHeight(300)
+    }
+  },
+  // watch: {
+  //   chartData: function () {
+  //     this.getChart()
+  //   }
+  // },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(350)
+    })
+    window.addEventListener('resize', () => {
+      this.tableH2 = this.tableHeight(275)
+    })
+    window.addEventListener('resize', () => {
+      this.chartHeight = this.tableHeight(300)
+    })
+  },
+  methods: {
+    init(params) {
+      this.queryParams.orderId = params.orderId
+      this.orderMsg = params
+      this.centervisible = true
+      this.getList()
+    },
+    getList() {
+      deliveryLogPage({...this.queryParams}).then(res => {
+        this.tableData = res.data.list || []
+        this.taotal = res.data.total || 0
+      })
+    },
+    toggleTab() {
+      if (this.activeName  === 'barChart') {
+        this.$nextTick(() => {
+          this.getBar()
+        })
+      }
+    },
+    getBar() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+      }
+      this.chartDom = document.getElementById('logDetPieBar')
+      this.chart = echarts.init(this.chartDom)
+      let seriesData = []
+      let sumData = 0
+      this.tableData && this.tableData.map(item =>{
+        let obj = {}
+        obj.value = item.rate
+        obj.name = item.name
+        seriesData.push(obj)
+        sumData+=item.rate
+      })
+      if (sumData < 100) {
+        let obj = {}
+        obj.value = 100 - sumData
+        obj.name = "未发货"
+        seriesData.push(obj)
+      }
+      var option = {
+        color: ['#B0EB42', '#FF9747', '#FF6860', '#7164FF', '#288AFF', '#63BDFF', '#73DE93', '#FFCE6A'],
+        tooltip: {
+          trigger: 'item',
+          formatter: function(params) {
+            let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${params.color};"></span>`
+            return `<span>
+                <span style="color:rgba(0,0,0,0.85);">${str}${params.name}</span>
+                <span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${params.percent}</span>
+              </span>`
+          }
+        },
+        legend: {
+          type: 'scroll',
+          orient: 'vertical',
+          right: '10%',
+          top: 20,
+          bottom: 20,
+          icon: 'rect',
+          itemHeight: 8,
+          itemWidth: 8
+        },
+        series: [
+          {
+            type: 'pie',
+            radius: ['60%', '80%'],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: 'center'
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: 40,
+                fontWeight: 'bold'
+              },
+              scale: true ,
+              scaleSize: 20 ,
+            },
+            labelLine: {
+              show: false
+            },
+            data: seriesData
+          }
+        ]
+      };
+
+      option && this.chart.setOption(option);
+    },
+    viewDetDetail(val) {
+      this.logCode = val.data.code
+      this.innerDrawer = true
+      this.queryParams2.logId = val.data.id
+      this.getList2()
+    },
+    closeA() {
+      // 清空数据
+      this.activeName = 'dataList'
+      this.queryParams.orderId = ''
+      this.tableData = []
+      this.orderMsg = {}
+      this.innerDrawer = false
+    },
+    getList2() {
+      deliveryLogDetPage({...this.queryParams2}).then(res => {
+        this.tableData2 = res.data.list || []
+        this.total2 = res.data.total || 0
+      })
+    },
+    closeB() {
+      this.logCode = ''
+      this.queryParams2.pageNo = 1
+      this.queryParams2.pageSize = 20
+      this.queryParams2.logId = ''
+      this.tableData2 = []
+      this.total2 = 0
+    }
+  }
+}
+</script>
+<style scoped lang='scss'>
+.box1 {
+  height: 56px;
+  .box_col {
+    display: inline-block;
+    width: 20%;
+    padding: 8px 8px 8px 40px;
+    .blodTip {
+      height: 16px;
+      font-size: 14px;
+      font-weight: 600;
+      color: rgba(0,0,0,0.85);
+      margin-bottom: 8px;
+    }
+    .lightTip {
+      height: 16px;
+      font-size: 14px;
+      font-weight: 400;
+      color: rgba(102,102,102,0.75);
+    }
+  }
+}
+.box2 {
+    padding:32px 32px 30px 30px;
+    height: calc(100vh - 150px);
+}
+.boxTitle {
+  display: inline-block;
+  font-size: 16px;
+  font-weight: 400;
+  color: #000000;
+  margin:0 10px 10px 0;
+}
+.blueTitle {
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align: bottom;
+}
+.box3 {
+  padding: 8px 8px 8px 40px;
+  .title {
+    height: 16px;
+    font-size: 14px;
+    font-weight: 600;
+    color: rgba(0,0,0,0.85);
+  }
+  .text {
+    height: 16px;
+    font-size: 14px;
+    font-weight: 400;
+    color: rgba(102,102,102,0.75);
+  }
+}
+.box4 {
+  padding:32px 32px 30px 30px;
+  height: calc(100vh - 125px);
+}
+</style>
+<style lang='scss'>
+.deliveryLogDetail {
+  .el-tabs__nav::after {
+    content: "";
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 2px;
+    background-color: #e4e7ed;
+    /* z-index: 1; */
+  }
+  .el-tabs__nav-wrap::after {
+    width: 0;
+  }
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+  .el-tabs__item:hover {
+    color: rgba(0, 0, 0, 0.85);
+  }
+  .el-tabs__item.is-active {
+    color: rgba(0, 0, 0, 0.85);
+  }
+  .el-tabs__item {
+    color: rgba(0, 0, 0, 0.45);
+  }
+}
+</style>

src/views/delivery/deliveryLogDet/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="80"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 详情抽屉 -->
+    <delivery-log-det-detail ref='deliveryLogDetail'/>
+  </div>
+</template>
+<script>
+import { deliveryProgressPage } from '@/api/base/delivery'
+import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue'
+const tableProps = [
+  {
+    prop: 'orderName',
+    label: '订单名',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'customerName',
+    label: '客户名称',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'unit',
+    label: '单位'
+  },
+  {
+    prop: 'orderNum',
+    label: '订单数量'
+  },
+  {
+    prop: 'num',
+    label: '发货数量'
+  },
+  {
+    prop: 'rate',
+    label: '累计发货比例(%)'
+  }
+]
+export default {
+  name: "DeliveryLogDet",
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名',
+          param: 'orderName'
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        orderName: ''
+      },
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      total: 0,
+      tableBtn: [
+      this.$auth.hasPermi('extend:delivery-log-det:detail')
+          ? {
+              type: 'detail',
+              btnName: '详情'
+            }
+          : undefined
+      ].filter((v) => v)
+    }
+  },
+  components: { DeliveryLogDetDetail },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    this.getList();
+  },
+  methods: {
+    getList() {
+      deliveryProgressPage({...this.queryParams}).then(res => {
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      })
+    },
+    buttonClick(val) {
+      this.queryParams.orderName = val.orderName
+      this.getList()
+    },
+    handleClick(val) {
+      console.log(val)
+      this.$nextTick(() => {
+        this.$refs.deliveryLogDetail.init(val.data)
+      })
+    }
+  }
+}
+</script>

src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
       <div class="box">
         <el-form :inline="true">
           <el-form-item label="关联表名">
@@ -94,6 +94,7 @@ export default {
   data() {
     return {
       visible: false,
+      drawerTitle: '',
       tableProps,
       tableData: [],
       tableBtn: [],
@@ -131,9 +132,11 @@ export default {
       this.objName = data.objName
       this.getList()
       if (title === 'detail') {
+        this.drawerTitle = '查看参数'
         this.showBtn = false
         this.tableBtn = []
       } else {
+        this.drawerTitle = '参数绑定'
         this.showBtn = true
         this.tableBtn = [
           {

src/views/energy/base/energyType/index.vue

@@ -92,7 +92,7 @@ export default {
           color: 'primary'
         },
         {
-          type: 'separate'
+          type: this.$auth.hasPermi('base:energy-type:create') ? 'separate' : '',
         },
         {
           type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '',

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -62,8 +62,9 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="消耗量阈值" prop="limitValue">
-          <el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number>
+        <el-form-item label="消耗量阈值">
+          <el-input-number v-model="form.minValue" placeholder="最小值" :max="10000000000000000" style="width: 50%;"></el-input-number>
+          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="10000000000000000" style="width: 50%;"></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
@@ -96,14 +97,16 @@ export default {
         type: '',
         plcParamId: '',
         limitType: '',
-        limitValue: ''
+        minValue: null,
+        maxValue: null
       },
       objIds: [],// 回显数组
       isEdit: false, //是否是编辑
       rules: {
         objectId: [{ required: true, message: '对象不能为空', trigger: 'change' }],
         energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-        type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }]
+        type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }],
+        limitType: [{ required: true, message: '指标类型不能为空', trigger: 'change' }]
       },
       detailList: []
     }
@@ -199,6 +202,12 @@ export default {
             this.$modal.msgError("监控模式为详细时，详细参数为必填");
             return false
           }
+          if (this.form.minValue && this.form.maxValue) {
+            if (this.form.minValue > this.form.maxValue) {
+              this.$modal.msgError("消耗量阈值，最小值不能大于最大值");
+              return false
+            }
+          }
           // this.form.limitType = Number(this.form.limitType)
           if (this.isEdit) {
             // 编辑
@@ -223,6 +232,10 @@ export default {
     },
     formClear() {
       this.$refs.form.resetFields()
+      this.form.type = ''
+      this.form.plcParamId = ''
+      this.form.minValue = null
+      this.form.maxValue = null
       this.objIds = ''
       this.detailList = []
       this.isEdit = false

src/views/energy/monitoring/energyLimit/index.vue

@@ -37,6 +37,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
+      width='60%'
     >
       <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
     </base-dialog>
@@ -199,6 +200,15 @@ export default {
               item.type = i.label
             }
           })
+          if (item.minValue && item.maxValue) {
+            item.limitValue = item.minValue + '-' + item.maxValue
+          } else if(item.minValue){
+            item.limitValue = '最小值' + item.minValue
+          }else if(item.maxValue){
+            item.limitValue = '最大值' + item.maxValue
+          } else {
+            item.limitValue = ''
+          }
         })
         this.list = arr
         this.total = response.data.total;

src/views/energy/monitoring/energyOverlimitLog/index.vue

@@ -136,6 +136,15 @@ export default {
               item.type = i.name
             }
           })
+          if (item.minValue && item.maxValue) {
+            item.limitValue = item.minValue + '-' + item.maxValue
+          } else if(item.minValue){
+            item.limitValue = '最小值' + item.minValue
+          }else if(item.maxValue){
+            item.limitValue = '最大值' + item.maxValue
+          } else {
+            item.limitValue = ''
+          }
         })
         this.list = arr
         this.total = response.data.total;

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -121,8 +121,9 @@ export default {
       this.tableH = this.tableHeight(260)
       this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
     })
-    if (this.$route.params.startTime && this.$route.params.endTime) {
-      this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
+    if (location.href.indexOf('?') > 0) {
+      let arr = location.href.split('?')[1].split('&')
+      this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
     } else {
       this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
     }
@@ -138,8 +139,9 @@ export default {
   methods: {
     initData(to) {
       if (to.name === 'EnergyReportSearch') {
-        if (this.$route.params.startTime && this.$route.params.endTime) {
-          this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
+        if (location.href.indexOf('?') > 0) {
+          let arr = location.href.split('?')[1].split('&')
+          this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
         } else {
           this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
         }

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
       <div class="box">
         <el-form :inline="true">
           <el-form-item label="方案名称">
@@ -85,6 +85,7 @@ export default {
   data() {
     return {
       visible: false,
+      drawerTitle: '',
       tableProps,
       tableData: [],
       tableBtn: [],
@@ -125,9 +126,11 @@ export default {
       this.energyTypeId = data.energyTypeId
       this.getList()
       if (title === 'detail') {
+        this.drawerTitle = '查看参数'
         this.showBtn = false
         this.tableBtn = []
       } else {
+        this.drawerTitle = '参数绑定'
         this.showBtn = true
         this.tableBtn = [
           {

src/views/energy/monitoring/orderEnergy/index.vue

@@ -115,7 +115,7 @@ export default {
           type: 'select',
           label: '能源类型',
           selectOptions: [],
-          param: 'objType',
+          param: 'energyTypeId',
           filterable: true,
           width: 120,
           clearable: false
@@ -126,7 +126,7 @@ export default {
           selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
           labelField: 'label',
           valueField: 'value',
-          param: 'energyTypeId',
+          param: 'objType',
           width: 100,
           clearable: false
         },

src/views/equipment/analysis/Statistics/index.vue

@@ -0,0 +1,177 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../../core/mixins/basic-page';
+import { parseTime } from '../../../core/mixins/code-filter';
+import {
+	getEqAnalysis,
+	exportEqAnalysisExcel
+} from '@/api/equipment/analysis/statistics';
+
+const tableProps = [
+	{
+		prop: 'recordTime',
+		label: '时间段',
+		filter: parseTime
+	},
+	{
+		prop: 'lineName',
+		label: '产线'
+	},
+	{
+		prop: 'sectionName',
+		label: '工段'
+	},
+	{
+		prop: 'equipmentName',
+		label: '设备名称'
+	},
+	{
+		prop: 'equipmentType',
+		label: '设备类型'
+	},
+	{
+		prop: 'workTime',
+		label: '工作时间累积(h)'
+	},
+	{
+		prop: 'repairCount',
+		label: '维修次数'
+	},
+	{
+		prop: 'maintainCount',
+		label: '保养次数'
+	}
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getEqAnalysis,
+				exportURL: exportEqAnalysisExcel,
+			},
+			tableProps,
+			tableBtn: [].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '设备名称',
+					placeholder: '设备名称',
+					param: 'name',
+				},
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
+					// valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'recordTime',
+					defaultSelect: [],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:analysis-statistics:export') ? 'button' : '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+					plain: true
+				},
+			],
+		};
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.equipmentName = val.name ? val.name : undefined;
+					this.listQuery.recordTime = val.recordTime ? val.recordTime : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		 /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.listQuery };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '设备统计分析.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+	},
+};
+</script>

src/views/equipment/analysis/Visualization/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/equipment/analysis/Visualization/index.vue

@@ -0,0 +1,514 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备效率分析
+-->
+
+<template>
+	<div class="app-container allow-overflow">
+		<!-- 搜索工作栏 -->
+		<small-title
+			style="margin: 16px 0; padding-left: 8px"
+			:no-padding="true">
+			设备运行状态
+		</small-title>
+
+		<div
+			class="graph"
+			style="
+				overflow: inherit;
+				display: flex;
+				flex-direction: column;
+				position: relative;
+			">
+			<div class="blue-title">各设备加工数量</div>
+			<div class="legend">
+				<div class="legend-item">
+					<span class="icon blue"></span>
+					<span class="text">工作时长</span>
+				</div>
+				<div class="legend-item">
+					<span class="icon green"></span>
+					<span class="text">停机时长</span>
+				</div>
+				<div class="legend-item">
+					<span class="icon purple"></span>
+					<span class="text">故障时长</span>
+				</div>
+				<div class="legend-item">
+					<span class="icon yellow"></span>
+					<span class="text">速度开动率</span>
+				</div>
+			</div>
+			<div class="graph-grid">
+				<div class="bg-grid grid-line">
+					<div
+						class="grid-item"
+						v-for="item in list.length"
+						:key="item"></div>
+				</div>
+
+				<div class="bg-grid grid-charts">
+					<pie-chart
+						v-for="item in list"
+						:key="item.id"
+						:value="item" />
+					<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+// import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import PieChart from '../efficiency/components/pieChart.vue';
+
+export default {
+	name: 'EfficiencyAnalysis',
+	mixins: [basicPageMixin],
+	components: { PieChart },
+	props: {},
+	data() {
+		return {
+			visualizationOpen: false,
+			trendOpen: false,
+			// tableBtn: [
+			// 	this.$auth.hasPermi('base:equipment-group:update')
+			// 		? {
+			// 				type: 'edit',
+			// 				btnName: '修改',
+			// 		  }
+			// 		: undefined,
+			// 	this.$auth.hasPermi('base:equipment-group:delete')
+			// 		? {
+			// 				type: 'delete',
+			// 				btnName: '删除',
+			// 		  }
+			// 		: undefined,
+			// ].filter((v) => v),
+			tableProps: [
+				{ prop: 'factoryName', label: '工厂' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备' },
+				{
+					label: '有效时间',
+					children: [
+						{
+							width: 128,
+							prop: 'workTime',
+							label: '工作时长[h]',
+						},
+						{
+							width: 128,
+							prop: 'workRate',
+							label: '百分比[%]',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+						},
+					],
+				},
+				{
+					label: '关机时间',
+					children: [
+						{
+							width: 128,
+							prop: 'stopTime',
+							label: '停机时长[h]',
+						},
+						{ width: 128, prop: 'stopRate', label: '百分比[%]' },
+					],
+				},
+				{
+					label: '中断损失',
+					children: [
+						{
+							width: 128,
+							prop: 'downTime',
+							label: '故障时长[h]',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+						},
+						{ width: 128, prop: 'downRate', label: '百分比[%]' },
+						{
+							width: 128,
+							prop: 'timeEfficiency',
+							label: '时间开动率',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+						},
+					],
+				},
+				{
+					label: '速度损失',
+					children: [
+						{
+							width: 128,
+							prop: 'realProcSpeed',
+							label: '实际加工速度',
+						},
+						{
+							width: 128,
+							prop: 'designProcSpeed',
+							label: '理论加工速度',
+						},
+						{
+							width: 128,
+							prop: 'peEfficiency',
+							label: '速度开动率',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+						},
+					],
+				},
+				{
+					prop: 'oee',
+					label: 'OEE',
+					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				},
+				{
+					prop: 'teep',
+					label: 'TEEP',
+					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				},
+				// {
+				// 	_action: 'view-trend',
+				// 	label: '趋势',
+				// 	,
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								// value: _this.injectData.id,
+				// 								value: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看趋势'
+				// 			);
+				// 		},
+				// 	},
+				// },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '工厂',
+					placeholder: '请选择工厂',
+					param: 'factoryId',
+					selectOptions: [],
+				},
+				{
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
+					param: 'lineId',
+					selectOptions: [],
+				},
+				// 选项切换
+				{
+					type: 'select',
+					label: '时间类型',
+					param: 'dateFilterType',
+					defaultSelect: 0,
+					selectOptions: [
+						{ id: 0, name: '按时间段' },
+						{ id: 1, name: '按日期' },
+					],
+					index: 2,
+					extraOptions: [
+						{
+							parent: 'dateFilterType',
+							// 时间段选择
+							type: 'datePicker',
+							// label: '时间段',
+							dateType: 'daterange',
+							format: 'yyyy-MM-dd',
+							valueFormat: 'yyyy-MM-dd HH:mm:ss',
+							defaultTime: ['00:00:00', '00:00:00'],
+							rangeSeparator: '-',
+							startPlaceholder: '开始时间',
+							endPlaceholder: '结束时间',
+							param: 'timerange',
+						},
+						{
+							parent: 'dateFilterType',
+							// 日期选择
+							type: 'datePicker',
+							// label: '日期',
+							dateType: 'date',
+							placeholder: '选择日期',
+							format: 'yyyy-MM-dd',
+							valueFormat: 'yyyy-MM-dd',
+							param: 'timeday',
+						},
+					],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '设备可视化',
+				// 	name: 'visualization',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: 'OEE',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: 'TEEP',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'warning',
+				// },
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				lineId: null,
+				factoryId: null,
+				recordTime: [],
+			},
+			// 表单参数
+			form: {},
+			list: [],
+		};
+	},
+	created() {
+		// this.getFactory();
+		// this.getLine();
+		this.getList();
+	},
+	methods: {
+		/** 准备工厂数据 */
+		// async getFactory() {
+		// 	const { code, data } = await this.$axios({
+		// 		url: '/base/factory/listAll',
+		// 		method: 'get',
+		// 	});
+		// 	if (code == 0) {
+		// 		this.searchBarFormConfig[0].selectOptions = data.map((item) => {
+		// 			return {
+		// 				name: item.name,
+		// 				id: item.id,
+		// 			};
+		// 		});
+		// 	}
+		// },
+
+		/** 准备产线数据 */
+		// async getLine() {
+		// 	const { code, data } = await this.$axios({
+		// 		url: '/base/core-production-line/listAll',
+		// 		method: 'get',
+		// 	});
+		// 	if (code == 0) {
+		// 		this.searchBarFormConfig[1].selectOptions = data.map((item) => {
+		// 			return {
+		// 				name: item.name,
+		// 				id: item.id,
+		// 			};
+		// 		});
+		// 	}
+		// },
+
+		/** 覆盖 handleEmitFun 的默认实现 */
+		// handleEmitFun({ action, value }) {
+		// 	switch (action) {
+		// 		case 'view-trend':
+		// 			const { id } = value;
+		// 			this.open = true;
+		// 			this.trendOpen = true;
+		// 			break;
+		// 	}
+		// },
+		/** 查询列表 */
+		async getList() {
+			this.loading = true;
+			const { code, data } = await this.$axios({
+				url: '/analysis/equipment-analysis/efficiency',
+				method: 'get',
+				params: this.queryParams,
+			});
+			if (code == 0) {
+				this.list = data;
+			}
+		},
+		submitForm() {},
+
+		handleTabClick() {},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.visualization {
+	display: grid;
+	grid-template-columns: repeat(3, minmax(240px, 1fr));
+}
+
+:deep(.custom-tabs) {
+	.el-tabs__header {
+		margin-bottom: 8px;
+		display: inline-block;
+		transform: translateY(-12px);
+	}
+
+	.el-tabs__content {
+		overflow: visible;
+	}
+
+	.el-tabs__item {
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+		line-height: 36px !important;
+		height: 36px;
+	}
+}
+
+.blue-title {
+	position: relative;
+	padding: 4px 0;
+	padding-left: 12px;
+	font-size: 14px;
+
+	&::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 6px;
+		height: 16px;
+		width: 4px;
+		border-radius: 1px;
+		background: #0b58ff;
+	}
+}
+
+.graph-grid {
+	margin-top: 8px;
+	padding: 12px;
+	position: relative;
+	border-radius: 12px;
+	border: 1px solid #ccc;
+	// background: #0003;
+	overflow: inherit;
+}
+.bg-grid {
+	display: grid;
+	place-content: center;
+	grid-template-columns: repeat(4, minmax(280px, 1fr));
+	grid-auto-columns: 280px;
+	grid-auto-rows: 290px;
+	overflow: inherit;
+	position: relative;
+}
+
+.grid-line::after {
+	content: '';
+	position: absolute;
+	top: -1px;
+	left: -1px;
+	width: calc(100% + 2px);
+	height: calc(100% + 2px);
+	display: inline-block;
+	border: 8px solid #fff;
+}
+
+.grid-charts {
+	position: absolute;
+	width: calc(100% - 24px);
+	top: 12px;
+	left: 12px;
+}
+
+.grid-item {
+	border: 1px solid #ccc;
+}
+
+.grid-item:not(:first-child) {
+	border-left: 0;
+	border-top: 0;
+}
+
+.legend {
+	position: absolute;
+	top: 8px;
+	right: 12px;
+	display: flex;
+}
+
+.legend .legend-item {
+	display: flex;
+	align-items: center;
+	margin-left: 12px;
+}
+
+.legend .legend-item .icon {
+	width: 10px;
+	height: 10px;
+	border-radius: 1px;
+	margin-right: 4px;
+	margin-top: 1px;
+}
+
+.legend .legend-item .text {
+	color: #8c8c8c;
+}
+
+.blue {
+	background-color: #3da8fd;
+}
+
+.green {
+	background-color: #8ef0ab;
+}
+
+.purple {
+	background-color: #6b5cfd;
+}
+
+.yellow {
+	background-color: #ffc72a;
+}
+
+@media screen and (max-width: 1390px) {
+	.bg-grid {
+		grid-template-columns: repeat(3, minmax(280px, 1fr));
+	}
+}
+
+@media screen and (max-width: 1190px) {
+	.bg-grid {
+		grid-template-columns: repeat(2, minmax(280px, 1fr));
+	}
+}
+
+@media screen and (max-width: 640px) {
+	.bg-grid {
+		grid-template-columns: repeat(1, minmax(280px, 1fr));
+	}
+}
+</style>

src/views/equipment/analysis/efficiency/index.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2023-09-04 09:34:52
@@ -13,14 +13,21 @@
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<el-row>
+		<base-table
+			class="base-table__margin"
+			:table-props="tableProps"
+			:page="1"
+			:limit="10"
+			:table-data="list"
+			@emitFun="handleEmitFun" />
+
+		<!-- <el-row>
 			<el-col class="custom-tabs">
 				<el-tabs
 					v-model="activeName"
 					:stretch="true"
 					@tab-click="handleTabClick">
 					<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
-						<!-- 列表 -->
 						<base-table
 							class="base-table__margin"
 							:table-props="tableProps"
@@ -74,14 +81,13 @@
 										v-for="item in list"
 										:key="item.id"
 										:value="item" />
-									<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
 								</div>
 							</div>
 						</div>
 					</el-tab-pane>
 				</el-tabs>
 			</el-col>
-		</el-row>
+		</el-row> -->
 	</div>
 </template>
 
@@ -132,7 +138,7 @@ export default {
 							width: 128,
 							prop: 'workRate',
 							label: '百分比[%]',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 						},
 					],
 				},
@@ -161,7 +167,7 @@ export default {
 							width: 128,
 							prop: 'timeEfficiency',
 							label: '时间开动率',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 						},
 					],
 				},
@@ -182,19 +188,19 @@ export default {
 							width: 128,
 							prop: 'peEfficiency',
 							label: '速度开动率',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 						},
 					],
 				},
 				{
 					prop: 'oee',
 					label: 'OEE',
-					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+					filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 				},
 				{
 					prop: 'teep',
 					label: 'TEEP',
-					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+					filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'),
 				},
 				// {
 				// 	_action: 'view-trend',
@@ -332,7 +338,7 @@ export default {
 		/** 准备工厂数据 */
 		async getFactory() {
 			const { code, data } = await this.$axios({
-				url: '/base/factory/listAll',
+				url: '/base/core-factory/listAll',
 				method: 'get',
 			});
 			if (code == 0) {
@@ -348,7 +354,7 @@ export default {
 		/** 准备产线数据 */
 		async getLine() {
 			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
+				url: '/base/core-production-line/listAll',
 				method: 'get',
 			});
 			if (code == 0) {

src/views/equipment/analysis/exception/index.vue

@@ -75,7 +75,7 @@ export default {
 				},
 			],
 			tableProps: [
-				{ prop: 'lineName', label: '产线' },
+				{ prop: 'lineName', label: '产线名称' },
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备' },
 				{
@@ -136,7 +136,7 @@ export default {
 	methods: {
 		async fillLineOptions() {
 			const { data } = await this.$axios({
-				url: '/base/production-line/listAll',
+				url: '/base/core-production-line/listAll',
 				method: 'get',
 			});
 			const cfg = this.searchBarFormConfig.find(

src/views/equipment/analysis/quality/index.vue

@@ -262,7 +262,7 @@ export default {
 
 		async fillLineOptions() {
 			const { data } = await this.$axios({
-				url: '/base/production-line/listAll',
+				url: '/base/core-production-line/listAll',
 				method: 'get',
 			});
 			const cfg = this.searchBarFormConfig.find(
@@ -280,7 +280,7 @@ export default {
 
 		async fillProductOptions() {
 			const { data } = await this.$axios({
-				url: '/base/product/listAll',
+				url: '/base/core-product/listAll',
 				method: 'get',
 			});
 			const cfg = this.searchBarFormConfig.find(

src/views/equipment/base/alarm/Record/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/equipment/base/alarm/Record/add-or-updata.vue

@@ -0,0 +1,195 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-11 20:33:12
+ * @Description:
+-->
+<template>
+	<div>
+		<small-title
+			style="margin: 16px 0; padding-left: 8px"
+			:no-padding="true">
+			系统自带
+		</small-title>
+		<el-form
+			:model="dataForm1"
+			ref="dataForm1"
+			label-width="80px">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="设备编码" prop="equipment">
+						<el-input
+							v-model="dataForm1.equipment"
+							disabled
+							placeholder="请输入设备编码" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="报警时间" prop="createTime">
+						<el-input
+							v-model="dataForm1.createTime"
+							disabled
+							placeholder="请输入报警时间" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="报警编号" prop="code">
+						<!-- 接口缺参数 -->
+						<el-input
+							v-model="dataForm1.code"
+							disabled
+							placeholder="请输入报警编号" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="报警内容" prop="alarmContent">
+						<el-input
+							v-model="dataForm1.alarmContent"
+							disabled
+							placeholder="请输入报警内容" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<small-title
+			style="margin: 16px 0; padding-left: 8px"
+			:no-padding="true">
+			处理方式
+		</small-title>
+		<el-form
+			:model="dataForm"
+			:rules="dataRule"
+			ref="dataForm"
+			label-width="80px">
+			<el-form-item label="处理人" prop="hander">
+				<el-select
+					v-model="dataForm.hander"
+					:disabled="isdetail"
+					placeholder="请选择处理人"
+					>
+					<el-option
+						v-for="dict in workersList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.name" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="处理方式" prop="handerMode">
+				<editor v-model="dataForm.handerMode" :read-only="isdetail" :min-height="200"/>
+			</el-form-item>
+			<el-form-item label="附件" prop="file">
+				<!-- <el-input
+					v-model="dataForm.file"
+					type="textarea"
+					min-size="3"
+					placeholder="请输入处理方式" /> -->
+					<FileUpload v-model="file" :disabled="isdetail" />
+			</el-form-item>
+		</el-form>
+	</div>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+import SmallTitle from './SmallTitle';
+import { getworkerAll } from "@/api/base/materialUseLog";
+import { createAlarmHand, getAlarmLog } from '@/api/equipment/base/alarm/records';
+import FileUpload from "@/components/FileUpload";
+import Editor from "@/components/Editor";
+
+export default {
+	components: { SmallTitle, FileUpload, Editor },
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				createURL: createAlarmHand,
+				infoURL: getAlarmLog,
+			},
+			dataForm1: {
+        id: undefined,
+        equipment: undefined,
+        createTime: undefined,
+        alarmContent: undefined,
+				code: undefined
+			},
+			file: '',
+			dataForm: {
+        id: undefined,
+        hander: undefined,
+        handerMode: undefined
+			},
+			isdetail: false,
+			workersList: [],
+			dataRule: {
+				hander: [{ required: true, message: "处理人不能为空", trigger: "change" }],
+        handerMode: [{ required: true, message: "处理方式不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+		console.log('我看看', this.dataForm)
+	},
+	methods: {
+		async getDict() {
+			// 获得员工
+			const workerRes = await getworkerAll()
+			this.workersList = workerRes.data
+		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        // if (this.dataForm.id) {
+        //   this.urlOptions.updateURL(this.dataForm).then(response => {
+        //     this.$modal.msgSuccess("修改成功");
+        //     this.visible = false;
+        //     this.$emit("refreshDataList");
+        //   });
+        //   return;
+        // }
+        // 添加的提交
+				if (this.file) {
+					const temp = this.file.split(',') // 获取文件个数
+					let arry = []
+					temp.forEach(item => {
+						arry.push({
+							fileType: 2,
+							fileUrl: item
+						})
+					})
+					this.dataForm.files = arry
+				}
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+		init(id, isdetail) {
+      this.dataForm1.id = id || "";
+			this.isdetail = isdetail || false
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["dataForm1"].resetFields();
+				this.$refs["dataForm"].resetFields();
+        if (this.dataForm1.id) {
+          this.urlOptions.infoURL(id).then(response => {
+						if (response.data) {
+							this.dataForm1 = response.data;
+						}
+          });
+        }
+      });
+    },
+	},
+};
+</script>

src/views/equipment/base/alarm/Record/index.vue

@@ -0,0 +1,350 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="60%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<!-- <DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" /> -->
+			<add-or-update
+			ref="addOrUpdate"
+			@refreshDataList="successSubmit" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import AddOrUpdate from './add-or-updata.vue'
+import { publicFormatter } from '@/utils/dict';
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', { action: this.injectData.name, value: this.injectData });
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
+
+
+export default {
+	name: 'Record',
+	components: { AddOrUpdate },
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['equipmentName', 'recordTime'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'edit',
+				// 			btnName: '修改',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi('equipment:spare-parts-config:delete')
+				// 	? {
+				// 			type: 'delete',
+				// 			btnName: '删除',
+				// 	  }
+				// 	: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'workshopSection', label: '工段' },
+				{ prop: 'equipment', label: '设备名称' },
+				{ prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
+				{ prop: 'responsible', label: '报警时间' }, // 接口缺
+				{ prop: 'responsible1', label: '设备报警码' }, // 接口缺
+				{ prop: 'alarmContent', label: '报警内容' },
+				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
+				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },  // TODO: 是否换成按钮， 群里问
+				// { prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备名',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
+					// valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'recordTime',
+					// defaultSelect: [
+					// 	new Date(y, m, d)
+					// 		.toLocaleString()
+					// 		.split('/')
+					// 		.map((item, index) => {
+					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+					// 			return item;
+					// 		})
+					// 		.join('-'),
+					// 	new Date(y, m, d, 23, 59, 59)
+					// 		.toLocaleString()
+					// 		.split('/')
+					// 		.map((item, index) => {
+					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+					// 			return item;
+					// 		})
+					// 		.join('-'),
+					// ],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				lineId: null,
+				equipmentId: null,
+			},
+			basePath: '/base/equipment-alarm-log',
+			list: []
+		};
+	},
+	created() {
+		// this.getList();
+	},
+	methods: {
+		handleEmitFun(val) {
+			console.log('你好', val)
+			if (val.action === '报警处理') {
+				// 报警处理
+				this.open = true
+				this.title = '报警处理'
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.value.id);
+				});
+			} else {
+				// 查看
+				this.open = true
+				this.title = '查看'
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.value.id, true);
+				});
+			}
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		successSubmit() {
+      this.cancel()
+      this.getList()
+    },
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			// this.mode = null;
+			// this.reset();
+		},
+		/** 表单重置 */
+		// reset() {
+		// 	this.form = {
+		// 		id: null,
+		// 		name: null,
+		// 		equipmentId: null,
+		// 		description: null,
+		// 		responsible: null
+		// 	};
+		// 	this.resetForm('form');
+		// },
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加备品备件配置';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件配置';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs.addOrUpdate.dataFormSubmit()
+			// this.$refs['form'].validate((valid) => {
+			// 	if (!valid) {
+			// 		return;
+			// 	}
+			// 	// 修改的提交
+			// 	if (this.form.id != null) {
+			// 		this.put(this.form).then((response) => {
+			// 			this.$modal.msgSuccess('修改成功');
+			// 			this.open = false;
+			// 			this.getList();
+			// 		});
+			// 		return;
+			// 	}
+			// 	// 添加的提交
+			// 	this.post(this.form).then((response) => {
+			// 		this.$modal.msgSuccess('新增成功');
+			// 		this.open = false;
+			// 		this.getList();
+			// 	});
+			// });
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件配置';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有备品备件配置?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '备品备件配置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/inspection/Record/addRecord.vue

@@ -0,0 +1,393 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-10-31 15:55:13
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '查看详情' : '新增' }}
+		</small-title>
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			v-loading="formLoading">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="设备名称" prop="equipmentId">
+						<el-select
+							v-model="dataForm.equipmentId"
+							filterable
+							:disabled="isdetail"
+							style="width: 100%"
+							placeholder="请选择设备名称">
+							<el-option
+								v-for="dict in eqList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<!-- <el-form-item label="物料名称" prop="name">
+						<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
+					</el-form-item> -->
+					<el-form-item label="巡检配置名称" prop="configId">
+						<el-select
+							v-model="dataForm.configId"
+							filterable
+							:disabled="isdetail"
+							style="width: 100%"
+							placeholder="请选择巡检配置">
+							<el-option
+								v-for="dict in configList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="设备编码" prop="equipmentCode">
+						<el-input v-model="dataForm.equipmentCode" disabled clearable placeholder="请输入设备编码" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="巡检人" prop="responsible">
+						<el-input v-model="dataForm.responsible" :disabled="isdetail" clearable placeholder="请输入巡检人" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="巡检时间" prop="actualTime">
+						<el-date-picker
+							v-model="dataForm.actualTime"
+							type="date"
+							:disabled="isdetail"
+							format='yyyy-MM-dd'
+							value-format="yyyy-MM-dd HH:mm:ss"
+							placeholder="选择巡检时间" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-form-item label="巡检内容">
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="list" />
+			</el-form-item>
+			<el-form-item label="巡检详情" prop="description">
+				<editor v-model="dataForm.description" :read-only="isdetail" :min-height="380"/>
+			</el-form-item>
+			<el-form-item label="附件">
+				<FileUpload v-model="file" :disabled="isdetail" />
+			</el-form-item>
+			
+		</el-form>
+
+		<div class="drawer-body__footer">
+			<el-button type="primary" @click="goback()">取消</el-button>
+			<el-button v-if="isdetail" type="primary" @click="goEdit()">
+				编辑
+			</el-button>
+			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+		</div>
+
+		<!-- <attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:config-id="dataForm.id"
+			@refreshDataList="getList" /> -->
+	</el-drawer>
+</template>
+
+<script>
+import SmallTitle from '../../../base/alarm/Record/SmallTitle.vue';
+import { createCheckLog, updateCheckLog,  getcheckAllList, getcheckConfigByEqList, getEqCheckLog } from '@/api/equipment/base/inspection/record'
+import { getEquipmentAll } from '@/api/base/equipment'
+import Editor from "@/components/Editor";
+// import FileUpload from "@/components/FileUpload";
+// import { parseTime } from '../../../../core/mixins/code-filter';
+// import attrAdd from './attr-add';
+import FileUpload from "@/components/FileUpload";
+
+const tableBtn = [
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+
+const tableProps = [
+	{
+		prop: 'program',
+		label: '巡检项目',
+	},
+	{
+		prop: 'content',
+		label: '巡检内容',
+	}
+];
+
+export default {
+	name: 'AddRecord',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { SmallTitle, Editor, FileUpload },
+	props: {
+		// dataForm: {
+		// 	type: Object,
+		// 	default: () => ({}),
+		// },
+		// disabled: {
+		// 	type: Boolean,
+		// 	default: false
+		// },
+	},
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			formLoading: true,
+			visible: false,
+			isdetail: false,
+			dataForm: {
+				id: undefined,
+				configId: undefined,
+				equipmentId: undefined,
+				actualTime: undefined,
+				responsible: undefined,
+				description: undefined
+			},
+			list: [],
+			eqList: [],
+			configList: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			file: '',
+			dataRule: {
+        responsible: [{ required: true, message: "巡检人不能为空", trigger: "blur" }],
+        actualTime: [{ required: true, message: "巡检时间不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			const res = await getEquipmentAll()
+			this.eqList = res.data
+			const configres = await getcheckConfigByEqList()
+			this.configList = configres.data
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.dataForm.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.dataForm.resetFields(args);
+		},
+		init(id, isdetail) {
+			// this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取备品备件
+					getEqCheckLog(this.dataForm.id).then(response => {
+						this.formLoading = false
+            this.dataForm = response.data;
+          });
+				} else {
+					// if (this.urlOptions.isGetCode) {
+          //   this.getCode()
+          // }
+				}
+			});
+			this.formLoading = false
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定要删除名称为${raw.data.sparePartName}的数据?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteConfigDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取巡检内容分页
+			getcheckAllList({
+				...this.listQuery,
+				configId: this.dataForm.id,
+			}).then((response) => {
+				this.list = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+				if (this.file) {
+					const temp = this.file.split(',') // 获取文件个数
+					let arry = []
+					temp.forEach(item => {
+						arry.push({
+							fileType: 2,
+							fileUrl: item
+						})
+					})
+					this.dataForm.files = arry
+				}
+
+        // 修改的提交
+        if (this.dataForm.id) {
+          updateCheckLog(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        createCheckLog(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    }
+	},
+};
+</script>
+
+<style scoped>
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	margin: 10px 0;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/equipment/base/inspection/Record/attr-add.vue

@@ -0,0 +1,148 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="备品备件" prop="sparePartId">
+				<el-select
+					v-model="dataForm.sparePartId"
+					filterable
+					style="width: 100%"
+					placeholder="请选择备品备件">
+					<el-option
+						v-for="dict in partList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import {
+	createConfigDet,
+	getSparePartList
+} from  '@/api/equipment/base/spare-parts/config';
+
+export default {
+	props: {
+		configId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				sparePartId: ''
+			},
+			partList: [],
+			dataRule: {
+				sparePartId: [{ required: true, message: '备品备件不能为空', trigger: 'change' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			const res = await getSparePartList()
+			this.partList = res.data
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			// this.$nextTick(() => {
+			// 	this.$refs['dataForm'].resetFields();
+			// 	if (this.dataForm.id) {
+			// 		getCoreProductAttr({
+			// 			id: this.dataForm.id
+			// 		}).then((res) => {
+			// 			const { name, value } = res.data;
+			// 			this.dataForm.name = name;
+			// 			this.dataForm.value = value;
+			// 		});
+			// 	}
+			// });
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					// if (this.dataForm.id) {
+					// 	updateCoreProductAttr({
+					// 		...this.dataForm,
+					// 		productId: this.productId,
+					// 	}).then((response) => {
+					// 		this.$modal.msgSuccess('修改成功');
+					// 		this.visible = false;
+					// 		this.$emit('refreshDataList');
+					// 	});
+					// 	return;
+					// }
+					// 添加的提交
+					createConfigDet({
+						...this.dataForm,
+						configId: this.configId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/inspection/Record/index.vue

@@ -45,24 +45,32 @@
 				:has-files="true"
 				:rows="rows" />
 		</base-dialog>
+
+		<addRecord
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import addRecord from './addRecord.vue';
+import { exportCheckLogExcel } from '@/api/equipment/base/inspection/record'
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentRepair',
-	components: {},
+	components: { addRecord },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			addOrUpdateVisible: false,
 			searchBarKeys: ['equipmentId', 'createTime'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check-record:update')
+				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
 							type: 'detail',
 							btnName: '详情',
@@ -129,6 +137,9 @@ export default {
 					plain: true,
 					color: 'success',
 				},
+				{
+					type: 'separate',
+				},
 				{
 					type: this.$auth.hasPermi('equipment:check-record:export')
 						? 'button'
@@ -288,18 +299,26 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加维修记录';
+			// this.reset();
+			// this.open = true;
+			// this.title = '添加维修记录';
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+			});
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改维修记录';
+			// this.reset();
+			// const id = row.id;
+			// this.info({ id }).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改维修记录';
+			// });
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(row.id);
 			});
 		},
 		/** 提交按钮 */
@@ -340,12 +359,9 @@ export default {
 				.catch(() => {});
 		},
 		handleDetail({ id }) {
-			this.reset();
-			this.mode = 'detail';
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改维修记录';
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
 		/** 导出按钮操作 */
@@ -355,13 +371,13 @@ export default {
 			params.pageNo = undefined;
 			params.pageSize = undefined;
 			this.$modal
-				.confirm('是否确认导出所有维修记录?')
+				.confirm('是否确认导出所有设备巡检记录?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return exportCheckLogExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(response, '维修记录.xls');
+					this.$download.excel(response, '设备巡检记录.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});

src/views/equipment/base/inspection/Settings/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/equipment/base/inspection/Settings/add-or-updata.vue

@@ -0,0 +1,317 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-09 11:09:26
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="50%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : '添加巡检' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+				<el-form
+					:model="dataForm"
+					:rules="dataRule"
+					ref="dataForm"
+					@keyup.enter.native="dataFormSubmit()"
+					label-width="100px"
+					label-position="top">
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="设备名称" prop="equipmentName">
+								<el-input v-model="dataForm.equipmentName" disabled clearable placeholder="请输入设备名称" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="设备编码" prop="equipmentCode">
+								<el-input
+									v-model="dataForm.equipmentCode"
+									clearable
+									disabled
+									placeholder="请输入设备编码" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</div>
+
+			<div class="attr-list">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					巡检项目
+				</small-title>
+
+				<div v-if="!isdetail" class="action_btn">
+					<template>
+						<span style="display: inline-block;" @click="addNew()">
+							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+							<span class="add">添加</span>
+						</span>
+					</template>
+				</div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="checkDetList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+
+				<div class="drawer-body__footer">
+					<el-button type="primary" @click="goback()">关闭</el-button>
+				</div>
+			</div>
+
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:config-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import { getEqCheck, getCheckDetPage, deleteCheckDet } from "@/api/equipment/base/inspection/settings";
+import SmallTitle from './SmallTitle';
+import attrAdd from './attr-add';
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'program',
+		label: '巡检项目',
+	},
+	{
+		prop: 'content',
+		label: '巡检内容',
+	},
+	{
+		prop: 'code',
+		label: '巡检内容编码',
+	},
+	{
+		prop: 'description',
+		label: '备注',
+	},
+];
+
+export default {
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			urlOptions: {
+				infoURL: getEqCheck,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: '',
+				materialType: undefined,
+				productType: undefined,
+        area: undefined,
+				specifications: undefined,
+				processTime: 0,
+        remark: undefined,
+				unit: undefined
+			},
+			checkDetList: [],
+			visible: false,
+			isdetail: false,
+			dataRule: {
+        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
+				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
+				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }],
+				processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			this.checkDetList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.attrName
+							? '[名称=' + raw.data.attrName + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteCheckDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取巡检项目分页
+			getCheckDetPage({
+				...this.listQuery,
+				configId: this.dataForm.id,
+			}).then((response) => {
+				this.checkDetList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取设备巡检详情
+					this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+          });
+					// 获取设备项目列表
+					this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/equipment/base/inspection/Settings/attr-add.vue

@@ -0,0 +1,145 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="巡检" prop="checkId">
+				<el-select v-model="dataForm.checkId" filterable placeholder="请选择巡检" style="width: 100%">
+					<el-option v-for="dict in checkList" :key="dict.id" :label="dict.content"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="备注" prop="description">
+				<el-input
+					v-model="dataForm.description"
+					placeholder="请输入备注"
+					clearable />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import { getCheckDet, createCheckDet, updateCheckDet, getcheckList } from "@/api/equipment/base/inspection/settings";
+
+export default {
+	props: {
+		configId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				checkId: undefined,
+				configId: undefined,
+				description: ''
+			},
+			checkList: [],
+			dataRule: {
+				checkId: [{ required: true, message: '巡检不能为空', trigger: 'blur' }],
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			const res = await getcheckList()
+			this.checkList = res.data
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getCheckDet(this.dataForm.id).then((res) => {
+						// const { name, value } = res.data;
+						// this.dataForm.name = name;
+						// this.dataForm.value = value;
+						this.dataForm = res.data
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateCheckDet({
+							...this.dataForm,
+							configId: this.configId
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createCheckDet({
+						...this.dataForm,
+						configId: this.configId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/inspection/Settings/index.vue

@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -45,35 +45,49 @@
 				:has-files="false"
 				:rows="rows" />
 		</base-dialog>
+		<!-- 添加巡检，查看详情 -->
+		<addOrUpdata
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import addOrUpdata from './add-or-updata.vue';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentCheckSetting',
-	components: {},
+	components: { addOrUpdata },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			addOrUpdateVisible: false,
+			addOrEditTitle: '',
 			searchBarKeys: ['equipmentId', 'name'],
 			tableBtn: [
-				// this.$auth.hasPermi('equipment:check-setting:update')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '详情',
-				// 	  }
-				// 	: undefined,
 				this.$auth.hasPermi('equipment:check-setting:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
+				this.$auth.hasPermi('equipment:check-setting:update')
+					? {
+							type: 'detail',
+							btnName: '查看详情',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:check-setting:addInsp')
+					? {
+							type: 'add',
+							btnName: '添加巡检',
+					  }
+					: undefined,
 				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
@@ -285,13 +299,35 @@ export default {
 				})
 				.catch(() => {});
 		},
+		// 处理表格按钮
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleUpdate(data);
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				case 'add':
+					this.handleAddDetail(data);
+					break;
+			}
+		},
 		handleDetail({ id }) {
-			this.reset();
-			this.mode = 'detail';
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改巡检设置';
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = "详情";
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, true);
+			});
+		},
+		handleAddDetail({ id }) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = "添加巡检";
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
 			});
 		},
 		/** 导出按钮操作 */

src/views/equipment/base/maintain/Monitor/index.vue

@@ -92,7 +92,7 @@ const btn = {
 	},
 	methods: {
 		handleClick() {
-			this.$emit('emitData', { action: this.injectData.label, value: null });
+			this.$emit('emitData', { action: this.injectData.label, value: this.injectData });
 		},
 	},
 	render: function (h) {
@@ -224,11 +224,18 @@ export default {
  			switch (action) {
 				// 查看详情
 				case '设备保养':
-					alert('设备保养');
+					this.$router.push({ path: '/equipment/base/maintain/plan-config',query: {
+						equipmentId: value.equipmentId,
+						equipmentName: value.equipmentName
+					} })
 					break;
 				case '保养记录':
-					alert('保养记录');
-					break;
+					const queryData = {
+					equipmentId: value.equipmentId,
+					maintainPlanId: value.id
+				}
+				this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
+				break;
 			}
 		},
 		/** 查询列表 */

src/views/equipment/base/maintain/PlanConfig/index.vue

@@ -110,8 +110,8 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
-					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
@@ -239,6 +239,10 @@ export default {
 		};
 	},
 	created() {
+		if (this.$route.query) {
+			this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined
+			this.searchBarFormConfig[0].defaultSelect = this.$route.query.equipmentName ?? undefined
+		}
 		this.getList();
 	},
 	methods: {
@@ -288,9 +292,21 @@ export default {
 			this.open = true;
 			this.title = '添加保养计划';
 		},
-        handleDetail(id){
-            alert('跳转到 保养记录')
-        },
+		handleDetail(row){
+				// alert('跳转到 保养记录')
+				// console.log(row)
+				const queryData = {
+					equipmentId: row.equipmentId,
+					maintainPlanId: row.id,
+					relatePlan: row.enabled
+				}
+				if (this.queryParams.createTime) {
+					queryData.createTime = this.queryParams.createTime
+				}
+				console.log('你好', queryData)
+				this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
+				// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})
+		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();

src/views/equipment/base/maintain/Record/index.vue

@@ -52,6 +52,7 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import Editor from '@/components/Editor';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -192,13 +193,13 @@ export default {
 						select: true,
 						label: '保养人员',
 						prop: 'maintainWorker',
-						// url: '/base/core-equipment/listAll',
+						url: '/base/core-worker/listAll',
+						valueKey: 'name',
 						bind: {
 							filterable: true,
 							clearable: true,
 							multiple: true,
 						},
-						selectOptions: [{ name: 'test', id: 'test' }],
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
@@ -212,6 +213,11 @@ export default {
 						switch: true,
 						label: '是否计划保养',
 						prop: 'relatePlan',
+						bind: {
+							'active-value': 1,
+							'inactive-value': 2,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{},
 					{
@@ -266,7 +272,9 @@ export default {
 					},
 				],
 				// TODO: 富文本
-				[{ input: true, label: '保养描述', prop: 'maintenanceDes' }],
+				[{ label: '保养描述', prop: 'maintenanceDes', subcomponent: Editor, bind: {
+					'min-height': 192
+				} }],
 				[{ input: true, label: '备注', prop: 'remark' }],
 			],
 			// 是否显示弹出层
@@ -289,6 +297,16 @@ export default {
 	},
 	created() {
 		this.initSearchBar();
+		if (this.$route.query) {
+			this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined
+			this.queryParams.maintainPlanId = this.$route.query?.maintainPlanId ?? undefined
+			this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined
+			this.queryParams.startTime = this.$route.query?.createTime ?? undefined
+			this.searchBarFormConfig[0].defaultSelect = this.$route.query.equipmentId ?? undefined
+			this.searchBarFormConfig[1].defaultSelect = Number(this.$route.query.maintainPlanId) ?? undefined
+			this.searchBarFormConfig[2].defaultSelect = this.$route.query?.createTime ?? undefined
+			this.searchBarFormConfig[3].defaultSelect = Number(this.$route.query.relatePlan) ?? undefined
+		}
 		this.getList();
 	},
 	methods: {
@@ -380,6 +398,7 @@ export default {
 			this.info({ id }).then((response) => {
 				this.form = response.data;
 				this.open = true;
+				this.form.maintainWorker = this.form.maintainWorker.split(',')
 				this.title = '修改保养记录';
 			});
 		},
@@ -389,6 +408,7 @@ export default {
 				if (!valid) {
 					return;
 				}
+				this.form.maintainWorker = this.form.maintainWorker.join(',')
 				// 修改的提交
 				if (this.form.id != null) {
 					this.put(this.form).then((response) => {

src/views/equipment/base/repair/CustomDialogForm.vue

@@ -6,155 +6,179 @@
 -->
 
 <template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="维修单号" prop="code">
-					<span>{{ dataForm.code }}</span>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="设备名称" prop="code">
-					<span>{{ dataForm.code }}</span>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="维修工" prop="code">
-					<span>{{ dataForm.code }}</span>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="故障发生时间" prop="code">
-					<span>{{ dataForm.code }}</span>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="故障级别" prop="code">
-					<span>{{ dataForm.code }}</span>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8">
-				<el-form-item label="联系方式" prop="code">
-					<span>{{ dataForm.code }}</span>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item
-					label="维修开始时间"
-					prop="alarmCode"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="dataForm.startTIme"
-						type="datetime"
-						:disabled="disabled"
-						:placeholder="请选择维修开始时间"
-						value-format="timestamp"
-						@change="$emit('update', form)"></el-date-picker>
-				</el-form-item>
-			</el-col>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
+		</small-title>
+		<el-form
+			ref="form"
+			:model="dataForm"
+			label-width="100px"
+			v-loading="formLoading">
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item label="维修单号" prop="repairOrderNumber">
+						<span>{{ dataForm.repairOrderNumber }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="设备名称" prop="equipmentName">
+						<span>{{ dataForm.equipmentName }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="维修工" prop="repairman">
+						<span>{{ dataForm.repairman }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item label="故障发生时间" prop="faultTime">
+						<span>{{ dataForm.faultTime }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="故障级别" prop="faultLevel">
+						<span>{{ dataForm.faultLevel }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="联系方式" prop="repairmanPhone">
+						<span>{{ dataForm.repairmanPhone }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+				{{ '可编辑信息' }}
+			</small-title>
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item
+						label="维修开始时间"
+						prop="maintenanceStartTime"
+						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						<el-date-picker
+							v-model="dataForm.maintenanceStartTime"
+							type="datetime"
+							:disabled="disabled"
+							placeholder="请选择维修开始时间"
+							value-format="timestamp" />
+					</el-form-item>
+				</el-col>
 
-			<el-col :span="8">
-				<el-form-item
-					label="维修结束时间"
-					prop="alarmCode"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="dataForm.startTIme"
-						type="datetime"
-						:disabled="disabled"
-						:placeholder="请选择维修开始时间"
-						value-format="timestamp"
-						@change="$emit('update', form)"></el-date-picker>
-				</el-form-item>
-			</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="维修结束时间"
+						prop="maintenanceFinishTime"
+						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						<el-date-picker
+							v-model="dataForm.maintenanceFinishTime"
+							type="datetime"
+							:disabled="disabled"
+							placeholder="请选择维修开始时间"
+							value-format="timestamp" />
+					</el-form-item>
+				</el-col>
 
-			<el-col :span="8">
-				<el-form-item
-					label="维修方式"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<el-form-item label="故障类型" prop="alarmCode">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
+				<el-col :span="8">
+					<el-form-item
+						label="维修方式"
+						prop="repairMode"
+						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						<el-select
+							:disabled="disabled"
+							v-model="dataForm.repairMode"
+							placeholder="请选择维修方式">
+							<el-option
+								v-for="opt in getDictDatas('repair-mode')"
+								:key="opt.value"
+								:label="opt.label"
+								:value="opt.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">
+					<el-form-item label="故障类型" prop="faultType">
+						<el-select
+							:disabled="disabled"
+							v-model="dataForm.faultType"
+							placeholder="请选择故障类型">
+							<el-option
+								v-for="opt in getDictDatas('fault-type')"
+								:key="opt.value"
+								:label="opt.label"
+								:value="opt.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item
-					label="故障明细"
-					prop="dsfsdfasd"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<!-- // 富文本 -->
-				</el-form-item>
-			</el-col>
-		</el-row>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item
+						label="故障明细"
+						prop="faultDetail"
+						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						<!-- // 富文本 -->
+						<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="380"/>
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="维修记录" prop="dsfsdfasd">
-					<!-- // 富文本 -->
-				</el-form-item>
-			</el-col>
-		</el-row>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item label="维修记录" prop="maintenanceDetail">
+						<!-- // 富文本 -->
+						<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="380"/>
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="维修附件" prop="dsfsdfasd">
-					<el-upload></el-upload>
-				</el-form-item>
-			</el-col>
-		</el-row>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item label="维修附件" prop="file">
+						<FileUpload v-model="file" :disabled="disabled" />
+					</el-form-item>
+				</el-col>
+			</el-row>
 
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						@change="$emit('update', form)"
-						:placeholder="`请输入备注`"
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
+			<el-row :gutter="20">
+				<el-col>
+					<el-form-item label="备注" prop="remark">
+						<el-input
+							v-model="dataForm.remark"
+							:placeholder="`请输入备注`"
+							:disabled="disabled" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+
+		<div class="drawer-body__footer">
+			<el-button style="" @click="goback()">取消</el-button>
+			<el-button v-if="disabled" type="primary" @click="goEdit()">
+				编辑
+			</el-button>
+			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+		</div>
+	</el-drawer>
 </template>
 
 <script>
+import SmallTitle from '../../base/alarm/Record/SmallTitle.vue';
+import { getEqRepair, updateEqRepair } from '@/api/equipment/base/repair'
+import Editor from "@/components/Editor";
+import FileUpload from "@/components/FileUpload";
+import { getDictDatas } from "@/utils/dict";
+
 export default {
 	name: 'DialogForm',
 	model: {
@@ -162,32 +186,35 @@ export default {
 		event: 'update',
 	},
 	emits: ['update'],
-	components: {},
+	components: { SmallTitle, Editor, FileUpload },
 	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
+		// dataForm: {
+		// 	type: Object,
+		// 	default: () => ({}),
+		// },
+		// disabled: {
+		// 	type: Boolean,
+		// 	default: false
+		// },
 	},
 	data() {
 		return {
 			formLoading: true,
+			visible: false,
+			disabled: false,
+			dataForm: {},
+			file: ''
 		};
 	},
-	mounted() {
-		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
-			this.formLoading = false;
-			this.$emit('update', {
-				...this.dataForm,
-				code,
-			});
-		});
-	},
+	mounted() {},
 	methods: {
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
 		/** 模拟透传 ref  */
 		validate(cb) {
 			return this.$refs.form.validate(cb);
@@ -195,22 +222,124 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
-		async handleTypeChange(id) {
-			// debugger;
-			this.dataForm.alarmCode = '';
-			this.$emit('update', this.dataForm);
-		},
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
+		init(row, isdetail) {
+			// this.initData();
+			this.disabled = isdetail || false;
+			this.dataForm.id = row.id || undefined;
+			this.visible = true;
+			console.log('111', this.dataForm, row)
+
+			this.$nextTick(() => {
+				this.$refs['form'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取设备维修
+					getEqRepair(this.dataForm.id).then(response => {
+						this.formLoading = false
+            this.dataForm = response.data;
+						this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+          });
+				} else {
+					// if (this.urlOptions.isGetCode) {
+          //   this.getCode()
+          // }
+				}
+			});
 		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["form"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+				if (this.file) {
+					const temp = this.file.split(',') // 获取文件个数
+					let arry = []
+					temp.forEach(item => {
+						arry.push({
+							fileType: 2,
+							fileUrl: item
+						})
+					})
+					this.dataForm.files = arry
+				}
+        if (this.dataForm.id) {
+          updateEqRepair(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        // this.urlOptions.createURL(this.dataForm).then(response => {
+        //   this.$modal.msgSuccess("新增成功");
+        //   this.visible = false;
+        //   this.$emit("refreshDataList");
+        // });
+      });
+    },
 	},
 };
 </script>
 
-<style scoped lang="scss">
+<style scoped>
 .el-date-editor,
 .el-select {
 	width: 100%;
 }
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
 </style>

src/views/equipment/base/repair/index.vue

@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -45,21 +45,27 @@
 				:has-files="true"
 				:rows="rows" />
 		</base-dialog>
+		<CustomDialogForm
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import CustomDialogForm from './CustomDialogForm.vue';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentRepair',
-	components: {},
+	components: { CustomDialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			addOrUpdateVisible: false,
 			searchBarKeys: ['maintenanceStatus', 'createTime', 'equipmentId'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:repair:update')
@@ -68,6 +74,12 @@ export default {
 							btnName: '详情',
 					  }
 					: undefined,
+				this.$auth.hasPermi('equipment:repair:finish')
+					? {
+							type: 'finish',
+							btnName: '完成',
+					  }
+					: undefined,
 				this.$auth.hasPermi('equipment:repair:update')
 					? {
 							type: 'edit',
@@ -156,6 +168,7 @@ export default {
 						input: true,
 						label: '维修单号',
 						prop: 'repairOrderNumber',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						select: true,
@@ -172,16 +185,18 @@ export default {
 				[
 					{
 						// TODO: 和班组联动
-						select: true,
+						// select: true,
+						input: true,
 						label: '维修工',
 						prop: 'repairman',
-						// url: '/base/core-equipment/listAll',
+						// url: '/base/core-worker/listAll',
+						// valueKey: 'name',
 						bind: {
 							filterable: true,
 							clearable: true,
-							multiple: true,
+							// multiple: true,
 						},
-						options: [{ label: 'test', value: 'test' }],
+						// options: [{ label: 'test', value: 'test' }],
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
@@ -306,12 +321,28 @@ export default {
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改维修记录';
+			// this.reset();
+			// const id = row.id;
+			// this.info({ id }).then((response) => {
+			// 	this.form = response.data;
+			// 	// this.form.repairman = this.form.repairman.split(',')
+			// 	this.open = true;
+			// 	this.title = '修改维修记录';
+			// });
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init({id: row.id});
+			});
+		},
+		/** 完成按钮操作 */
+		handlFinish(row) {
+			this.addOrUpdateVisible = true
+			const params = {
+				id: row.id,
+				maintenanceStatus: 1
+			}
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(params);
 			});
 		},
 		/** 提交按钮 */
@@ -320,6 +351,9 @@ export default {
 				if (!valid) {
 					return;
 				}
+				// if (this.form.repairman) {
+					// this.form.repairman = this.form.repairman.join(',')
+				// }
 				// 修改的提交
 				if (this.form.id != null) {
 					this.put(this.form).then((response) => {
@@ -352,12 +386,9 @@ export default {
 				.catch(() => {});
 		},
 		handleDetail({ id }) {
-			this.reset();
-			this.mode = 'detail';
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改维修记录';
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init({id: id}, true);
 			});
 		},
 		/** 导出按钮操作 */
@@ -378,6 +409,23 @@ export default {
 				})
 				.catch(() => {});
 		},
+		// 处理表格按钮
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleUpdate(data);
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				case 'finish':
+					this.handlFinish(data);
+					break;
+			}
+		}
 	},
 };
 </script>

src/views/equipment/base/spareParts/Config/addSparts.vue

@@ -0,0 +1,315 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-10-31 15:55:13
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ disabled ? '查看备件' : '添加备件' }}
+		</small-title>
+		<el-form
+			ref="form"
+			:model="dataForm"
+			label-width="100px"
+			v-loading="formLoading">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="配置名" prop="name">
+						<span>{{ dataForm.name }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="设备名称" prop="equipmentName">
+						<span>{{ dataForm.equipmentName }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="负责人" prop="responsible">
+						<span>{{ dataForm.responsible }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-form-item label="描述" prop="faultTime">
+				<editor v-model="dataForm.description" read-only :min-height="200"/>
+			</el-form-item>
+		</el-form>
+			
+			<div v-if="!disabled" class="action_btn">
+				<template>
+					<span style="display: inline-block;" @click="addNew()">
+						<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+						<span class="add">添加</span>
+					</span>
+				</template>
+			</div>
+			<base-table
+				:table-props="tableProps"
+				:page="listQuery.pageNo"
+				:limit="listQuery.pageSize"
+				:table-data="list">
+				<method-btn
+					v-if="!disabled"
+					slot="handleBtn"
+					:width="120"
+					label="操作"
+					:method-list="tableBtn"
+					@clickBtn="handleClick" />
+			</base-table>
+			<pagination
+				v-show="listQuery.total > 0"
+				:total="listQuery.total"
+				:page.sync="listQuery.pageNo"
+				:limit.sync="listQuery.pageSize"
+				:page-sizes="[5, 10, 15]"
+				@pagination="getList" />
+
+		<div class="drawer-body__footer">
+			<el-button type="primary" @click="goback()">关闭</el-button>
+			<el-button v-if="disabled" type="primary" @click="goEdit()">
+				编辑
+			</el-button>
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:config-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import SmallTitle from '../../../base/alarm/Record/SmallTitle.vue';
+import { getSparePartConfig, deleteConfigDet,  getConfigDetPage } from '@/api/equipment/base/spare-parts/config'
+import Editor from "@/components/Editor";
+// import FileUpload from "@/components/FileUpload";
+import { parseTime } from '../../../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+
+const tableBtn = [
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'sparePartName',
+		label: '备品备件',
+	},
+	{
+		prop: 'life',
+		label: '使用寿命(h)',
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { SmallTitle, Editor, attrAdd },
+	props: {
+		// dataForm: {
+		// 	type: Object,
+		// 	default: () => ({}),
+		// },
+		// disabled: {
+		// 	type: Boolean,
+		// 	default: false
+		// },
+	},
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			formLoading: true,
+			visible: false,
+			disabled: false,
+			dataForm: {},
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+		};
+	},
+	mounted() {},
+	methods: {
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+		},
+		goEdit() {
+			this.disabled = false;
+		},
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		init(id, isdetail) {
+			// this.initData();
+			this.disabled = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+
+			this.$nextTick(() => {
+				this.$refs['form'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取备品备件
+					getSparePartConfig(this.dataForm.id).then(response => {
+						this.formLoading = false
+            this.dataForm = response.data;
+          });
+				} else {
+					// if (this.urlOptions.isGetCode) {
+          //   this.getCode()
+          // }
+				}
+			});
+			this.formLoading = false
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定要删除名称为${raw.data.sparePartName}的数据?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteConfigDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取备品备件详情分页
+			getConfigDetPage({
+				...this.listQuery,
+				configId: this.dataForm.id,
+			}).then((response) => {
+				this.list = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	},
+};
+</script>
+
+<style scoped>
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/equipment/base/spareParts/Config/attr-add.vue

@@ -0,0 +1,148 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="备品备件" prop="sparePartId">
+				<el-select
+					v-model="dataForm.sparePartId"
+					filterable
+					style="width: 100%"
+					placeholder="请选择备品备件">
+					<el-option
+						v-for="dict in partList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import {
+	createConfigDet,
+	getSparePartList
+} from  '@/api/equipment/base/spare-parts/config';
+
+export default {
+	props: {
+		configId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				sparePartId: ''
+			},
+			partList: [],
+			dataRule: {
+				sparePartId: [{ required: true, message: '备品备件不能为空', trigger: 'change' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			const res = await getSparePartList()
+			this.partList = res.data
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			// this.$nextTick(() => {
+			// 	this.$refs['dataForm'].resetFields();
+			// 	if (this.dataForm.id) {
+			// 		getCoreProductAttr({
+			// 			id: this.dataForm.id
+			// 		}).then((res) => {
+			// 			const { name, value } = res.data;
+			// 			this.dataForm.name = name;
+			// 			this.dataForm.value = value;
+			// 		});
+			// 	}
+			// });
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					// if (this.dataForm.id) {
+					// 	updateCoreProductAttr({
+					// 		...this.dataForm,
+					// 		productId: this.productId,
+					// 	}).then((response) => {
+					// 		this.$modal.msgSuccess('修改成功');
+					// 		this.visible = false;
+					// 		this.$emit('refreshDataList');
+					// 	});
+					// 	return;
+					// }
+					// 添加的提交
+					createConfigDet({
+						...this.dataForm,
+						configId: this.configId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/spareParts/Config/index.vue

@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="250"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -46,6 +46,10 @@
 				:has-files="false"
 				:rows="rows" />
 		</base-dialog>
+		<addSparts
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
 	</div>
 </template>
 
@@ -53,15 +57,18 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
+import Editor from '@/components/Editor';
+import addSparts from './addSparts.vue';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentSparePartsConfig',
-	components: {},
+	components: { addSparts },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			addOrUpdateVisible: false,
 			searchBarKeys: ['name', 'equipmentId', 'equipmentIdList'],
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
@@ -76,6 +83,18 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
+				this.$auth.hasPermi('equipment:spare-parts-config:queryParts')
+					? {
+							type: 'queryParts',
+							btnName: '查看备件',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:spare-parts-config:addParts')
+					? {
+							type: 'addParts',
+							btnName: '添加备件',
+					  }
+					: undefined,
 				this.$auth.hasPermi('equipment:spare-parts-config:delete')
 					? {
 							type: 'delete',
@@ -162,18 +181,23 @@ export default {
 						select: true, // TODO: or INPUT instead of SELECT
 						label: '负责人',
 						prop: 'responsible',
-						url: '/base/core-equipment/listAll', // TODO: 班组
+						url: '/base/core-worker/listAll', // TODO: 班组
+						valueKey: 'name',
 						bind: {
 							filterable: true,
 							clearable: true,
+							multiple: true
 						},
 					},
 				],
 				[
 					{
-						input: true,
 						label: '描述',
 						prop: 'description', // TODO: 富文本
+						subcomponent: Editor,
+						bind: {
+							'min-height': 192
+						}
 					},
 				],
 			],
@@ -258,6 +282,7 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
+				this.form.responsible = this.form.responsible.split(',')
 				this.open = true;
 				this.title = '修改备品备件配置';
 			});
@@ -268,6 +293,7 @@ export default {
 				if (!valid) {
 					return;
 				}
+				this.form.responsible = this.form.responsible.join(',')
 				// 修改的提交
 				if (this.form.id != null) {
 					this.put(this.form).then((response) => {
@@ -300,12 +326,15 @@ export default {
 				.catch(() => {});
 		},
 		handleDetail({ id }) {
-			this.reset();
-			this.mode = 'detail';
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改备品备件配置';
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, true);
+			});
+		},
+		handlAddParts({ id }) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
 			});
 		},
 		/** 导出按钮操作 */
@@ -326,6 +355,23 @@ export default {
 				})
 				.catch(() => {});
 		},
+		// 处理表格按钮
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleUpdate(data);
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'queryParts':
+					this.handleDetail(data);
+					break;
+				case 'addParts':
+					this.handlAddParts(data);
+					break;
+			}
+		},
 	},
 };
 </script>

src/views/equipment/base/spareParts/List/index.vue

@@ -148,7 +148,7 @@ export default {
 						select: true,
 						label: '供应商',
 						prop: 'supplierId',
-						url: '/base/core-supplier/listAll', // TODO: 课上关系
+						url: '/base/core-supplier/listAll', // TODO: 供应商
 						bind: {
 							filterable: true,
 							clearable: true,
@@ -161,12 +161,13 @@ export default {
 						select: true,
 						label: '物料类型',
 						prop: 'type',
-						url: '/base/core-equipment/listAll', // TODO: 物料
+						options: this.getDictDatas('material_type'),
+						// url: '/base/core-equipment/listAll', // TODO: 物料
 						bind: {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '物料类型不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,

src/views/equipment/base/spareParts/Monitor/addSparts.vue

@@ -0,0 +1,431 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-10-31 15:55:13
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ !isLog ? '操作页面' : '更换记录' }}
+		</small-title>
+		<el-form
+			ref="form"
+			:model="dataForm"
+			label-width="100px"
+			v-loading="formLoading">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item v-if="!isLog" label="配置名" prop="name">
+						<span>{{ dataForm.name }}</span>
+					</el-form-item>
+					<el-form-item v-else label="产线名称" prop="lineName">
+						<span>{{ dataForm.lineName }}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="设备名称" prop="equipmentName">
+						<span>{{ dataForm.equipmentName }}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-form-item label="描述" prop="faultTime">
+				<editor v-model="dataForm.description" read-only :min-height="200"/>
+			</el-form-item>
+		</el-form>
+		
+		<div v-if="!isLog">
+			<base-table
+				:table-props="tableProps"
+				:page="listQuery.pageNo"
+				:limit="listQuery.pageSize"
+				:table-data="list">
+				<method-btn
+					v-if="!isLog"
+					slot="handleBtn"
+					:width="120"
+					label="操作"
+					:method-list="tableBtn"
+					@clickBtn="handleClick" />
+			</base-table>
+			<pagination
+				v-show="listQuery.total > 0"
+				:total="listQuery.total"
+				:page.sync="listQuery.pageNo"
+				:limit.sync="listQuery.pageSize"
+				:page-sizes="[5, 10, 15]"
+				@pagination="getList" />
+		</div>
+
+		<div v-else>
+			<!-- 搜索工作栏 -->
+			<SearchBar
+				:formConfigs="formConfig"
+				ref="search-bar"
+				@headBtnClick="buttonClick" />
+			<base-table
+				:table-props="tableProps1"
+				:page="listQuery1.pageNo"
+				:limit="listQuery1.pageSize"
+				:table-data="list1" />
+			<pagination
+				v-show="listQuery1.total > 0"
+				:total="listQuery1.total"
+				:page.sync="listQuery1.pageNo"
+				:limit.sync="listQuery1.pageSize"
+				:page-sizes="[5, 10, 15]"
+				@pagination="getList1" />
+		</div>
+
+		<div class="drawer-body__footer">
+			<el-button type="primary" @click="goback()">关闭</el-button>
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:config-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import SmallTitle from '../../../base/alarm/Record/SmallTitle.vue';
+import { getSparePartConfig } from '@/api/equipment/base/spare-parts/config'
+import { getConfigDetMonitorPage, getSparePartLogPage, exportSparePartLogExcel } from '@/api/equipment/base/spare-parts/monitor'
+import Editor from "@/components/Editor";
+// import FileUpload from "@/components/FileUpload";
+import { parseTime } from '../../../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+
+const tableBtn = [
+	{
+		type: 'change',
+		btnName: '更换',
+	},
+];
+
+const tableProps = [
+	{
+		prop: 'sparePartName',
+		label: '备品备件',
+	},
+	{
+		prop: 'life',
+		label: '使用寿命(h)',
+	},
+	{
+		prop: 'timeUsed',
+		label: '更换耗时(min)',
+	},
+	{
+		prop: 'replacementTime',
+		label: '更换时间',
+		filter: parseTime
+	},
+	{
+		prop: 'nextReplacementTime',
+		label: '下次更换时间',
+		filter: parseTime
+	},
+	{
+		prop: 'color',
+		label: '是否超期',
+	},
+	{
+		prop: 'responsible',
+		label: '操作人',
+	},
+	{
+		prop: 'description',
+		label: '备注'
+	},
+];
+
+const tableProps1 = [
+	{
+		prop: 'sparePartName',
+		label: '备品备件',
+	},
+	{
+		prop: 'life',
+		label: '使用寿命(h)',
+	},
+	{
+		prop: 'timeUsed',
+		label: '更换耗时(min)',
+	},
+	{
+		prop: 'replacementTime',
+		label: '更换时间',
+		filter: parseTime
+	},
+	{
+		prop: 'nextReplacementTime',
+		label: '下次更换时间',
+		filter: parseTime
+	},
+	{
+		prop: 'responsible',
+		label: '操作人',
+	},
+	{
+		prop: 'description',
+		label: '备注'
+	},
+];
+
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { SmallTitle, Editor, attrAdd },
+	props: {
+		// dataForm: {
+		// 	type: Object,
+		// 	default: () => ({}),
+		// },
+		// disabled: {
+		// 	type: Boolean,
+		// 	default: false
+		// },
+	},
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			tableProps1,
+			addOrUpdateVisible: false,
+			formLoading: true,
+			visible: false,
+			isLog: false,
+			dataForm: {},
+			list: [],
+			list1: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			listQuery1: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+				replacementTime: undefined
+			},
+			formConfig: [
+				{
+					type: 'datePicker',
+					label: '更换时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'replacementTime',
+					// width: 350,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+					plain: true
+				},
+			],
+		};
+	},
+	mounted() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery1.pageNo = 1;
+					this.listQuery1.pageSize = 10;
+					this.listQuery1.replacementTime = val.replacementTime ? val.replacementTime : undefined;
+					this.getList1();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+		},
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		init(id, isLog) {
+			// this.initData();
+			this.isLog = isLog || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+
+			this.$nextTick(() => {
+				this.$refs['form'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取备品备件
+					getSparePartConfig(this.dataForm.id).then(response => {
+						this.formLoading = false
+            this.dataForm = response.data;
+          });
+				} else {
+					// if (this.urlOptions.isGetCode) {
+          //   this.getCode()
+          // }
+				}
+			});
+			this.getList()
+			this.formLoading = false
+		},
+		handleClick(raw) {
+			if (raw.type === 'change') {
+				// 更换
+				this.addNew();
+			} else {}
+		},
+		getList() {
+			// 获取备品备件详情分页
+			getConfigDetMonitorPage({
+				...this.listQuery,
+				configId: this.dataForm.id,
+			}).then((response) => {
+				this.list = response.data;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		getList1() {
+			// 获取备品备件更换log分页
+			getSparePartLogPage({
+				...this.listQuery1,
+				configId: this.dataForm.id,
+			}).then((response) => {
+				this.list1 = response.data.list;
+				this.listQuery1.total = response.data.total;
+			});
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.listQuery1 };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有设备备品备件更换log数据项?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportSparePartLogExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备备品备件更换log.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/equipment/base/spareParts/Monitor/attr-add.vue

@@ -0,0 +1,126 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="操作人" prop="responsible">
+				<el-input
+					v-model="dataForm.responsible"
+					clearable
+					placeholder="请输入操作人" />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import { createSparePartLog } from  '@/api/equipment/base/spare-parts/monitor';
+
+export default {
+	props: {
+		configId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				responsible: ''
+			},
+			partList: [],
+			dataRule: {
+				responsible: [{ required: true, message: '操作人不能为空', trigger: 'blur' }]
+			},
+		};
+	},
+	mounted() {
+		// this.getDict()
+	},
+	methods: {
+		// async getDict() {
+		// 	const res = await getSparePartList()
+		// 	this.partList = res.data
+		// },
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					// if (this.dataForm.id) {
+					// 	updateCoreProductAttr({
+					// 		...this.dataForm,
+					// 		productId: this.productId,
+					// 	}).then((response) => {
+					// 		this.$modal.msgSuccess('修改成功');
+					// 		this.visible = false;
+					// 		this.$emit('refreshDataList');
+					// 	});
+					// 	return;
+					// }
+					// 添加的提交
+					createSparePartLog({
+						...this.dataForm,
+						configId: this.configId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/spareParts/Monitor/index.vue

@@ -31,7 +31,7 @@
 			@pagination="getList" />
 
 		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
+		<!-- <base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
 			width="35%"
@@ -45,13 +45,20 @@
 				:disabled="mode == 'detail'"
 				:has-files="false"
 				:rows="rows" />
-		</base-dialog>
+		</base-dialog> -->
+
+		<addSparts
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import addSparts from './addSparts.vue';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -65,12 +72,18 @@ const remainBox = {
 	},
 	computed: {
 		value() {
+			const temp = this.injectData[this.injectData.prop] || null
+			if (temp) {
+				console.log('12', temp)
+				return temp === 'Green' ? 'green' : 'red'
+			}
 			return this.injectData[this.injectData.prop] || null;
 		},
 		color() {
 			if (this.value) {
-				const v = +this.value;
-				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+				// const v = +this.value;
+				// return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+				return this.value
 			}
 			return 'unset';
 		},
@@ -80,8 +93,10 @@ const remainBox = {
 			<div
 				style={`background: ${
 					this.color
+					// this.color == 'Green' ? 'green' : this.color == 'Red' ? 'red' : 'yellow'
 				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
-					this.color == 'red' ? '#fff' : 'unset'
+					'unset'
+					// this.color == 'red' ? '#fff' : 'unset'
 				}`}>
 				{this.injectData[this.injectData.prop] || ''}
 			</div>
@@ -97,13 +112,13 @@ const btn = {
 	},
 	methods: {
 		handleClick() {
-			this.$emit('emitData', { action: this.injectData.label, value: null });
+			this.$emit('emitData', { action: this.injectData.name, value: this.injectData });
 		},
 	},
 	render: function (h) {
 		return (
 			<el-button type="text" onClick={this.handleClick}>
-				{this.injectData.label}
+				{this.injectData.name}
 			</el-button>
 		);
 	},
@@ -113,11 +128,12 @@ const btn = {
 
 export default {
 	name: 'EquipmentSparePartsMonitor',
-	components: {},
+	components: { addSparts },
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['name', 'equipmentId', 'equipmentIdList'],
+			addOrUpdateVisible: false,
+			searchBarKeys: ['lineId', 'equipmentId'],
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -125,36 +141,36 @@ export default {
 				// 			btnName: '详情',
 				// 	  }
 				// 	: undefined,
-				this.$auth.hasPermi('equipment:spare-parts-config:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('equipment:spare-parts-config:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'edit',
+				// 			btnName: '修改',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi('equipment:spare-parts-config:delete')
+				// 	? {
+				// 			type: 'delete',
+				// 			btnName: '删除',
+				// 	  }
+				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
 				{ prop: 'name', label: '配置名' },
-				{ prop: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备' },
+				{ prop: 'lineName', label: '产线名称' },
+				{ prop: 'sectionName', label: '工段名' },
+				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'responsible', label: '负责人' },
-				{ prop: 'equipmentCode', label: '是否超期', subcomonent: remainBox },
-				{ prop: 'opt1', label: '备件更换' },
-				{ prop: 'opt2', label: '更新记录' },  // TODO: 是否换成按钮， 群里问
+				{ prop: 'color', label: '是否超期', subcomponent: remainBox },
+				{ prop: 'opt1', label: '备件更换', name: '操作', subcomponent: btn },
+				{ prop: 'opt2', label: '更换记录', name: '更新记录', subcomponent: btn },  // TODO: 是否换成按钮， 群里问
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
-					type: 'input',
+					type: 'select',
 					label: '产线',
 					placeholder: '请选择产线',
-					param: 'name',
+					param: 'lineId',
 				},
 				{
 					type: 'select',
@@ -237,7 +253,7 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				name: null,
+				lineId: null,
 				equipmentId: null,
 			},
 			// 表单参数
@@ -251,7 +267,43 @@ export default {
 		this.getList();
 	},
 	methods: {
+		handleEmitFun(val) {
+			console.log('emit unf', val);
+			switch (val.action) {
+				// 操作
+				case '操作':
+					this.eqOperation(val.value); // 交由每个组件自己实现
+					break;
+				// 更新记录
+				case '更新记录':
+					this.updateLog(val.value);
+					break;
+			}
+		},
+		eqOperation({ id }) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+		updateLog({ id }) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, true);
+			});
+		},
 		initSearchBar() {
+			// 产线列表
+			getCorePLList().then(res => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					'selectOptions',
+					res.data.map((item) => ({
+						name: item.name,
+						id: item.id
+					}))
+				);
+			})
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(
 					this.searchBarFormConfig[1],
@@ -267,7 +319,7 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv(this.queryParams).then((response) => {
+			this.http('/base/equipment-spare-part-config/monitor', 'get', this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;

src/views/equipment/monitor/StatusAndParams/index.vue

@@ -0,0 +1,338 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="60%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<!-- <DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" /> -->
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { publicFormatter } from '@/utils/dict';
+import { parseTime } from '@/utils/ruoyi'
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', { action: this.injectData.label, value: this.injectData });
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
+
+export default {
+	name: 'StatusAndParams',
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['equipmentName', 'recordTime'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'edit',
+				// 			btnName: '修改',
+				// 	  }
+				// 	: undefined,
+				// this.$auth.hasPermi('equipment:spare-parts-config:delete')
+				// 	? {
+				// 			type: 'delete',
+				// 			btnName: '删除',
+				// 	  }
+				// 	: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'productionLine', label: '设备名称' },
+				{ prop: 'workshopSection', label: '设备编码' },
+				{ prop: 'equipment', label: '投入数' },
+				{ prop: 'productionLine', label: '产出数' },
+				{ prop: 'workshopSection', label: '是否运行' },
+				{ prop: 'equipment22', label: '状态' },
+				// { prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
+				{ prop: 'productionLine', label: '是否故障' },
+				{ prop: 'workshopSection', label: '生产量记录时间', filter: parseTime },
+				{ prop: 'equipment1', label: '状态记录时间', filter: parseTime },
+				{ prop: 'opt1', label: '状态可视化', name: '查看', subcomponent: btn },
+				{ prop: 'opt2', label: '参数监控', name: '查看', subcomponent: btn }  // TODO: 是否换成按钮， 群里问
+				// { prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备名',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
+					// valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'recordTime',
+					// defaultSelect: [
+					// 	new Date(y, m, d)
+					// 		.toLocaleString()
+					// 		.split('/')
+					// 		.map((item, index) => {
+					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+					// 			return item;
+					// 		})
+					// 		.join('-'),
+					// 	new Date(y, m, d, 23, 59, 59)
+					// 		.toLocaleString()
+					// 		.split('/')
+					// 		.map((item, index) => {
+					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+					// 			return item;
+					// 		})
+					// 		.join('-'),
+					// ],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				lineId: null,
+				equipmentId: null,
+			},
+			basePath: '/base/equipment-alarm-log',
+			list: []
+		};
+	},
+	created() {
+		// this.getList();
+	},
+	methods: {
+		handleEmitFun(val) {
+			console.log('你好', val)
+			if (val.action === '状态可视化') {
+				// 状态可视化
+			} else {
+				// 参数监控
+			}
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		successSubmit() {
+      this.cancel()
+      this.getList()
+    },
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			// this.mode = null;
+			// this.reset();
+		},
+		/** 表单重置 */
+		// reset() {
+		// 	this.form = {
+		// 		id: null,
+		// 		name: null,
+		// 		equipmentId: null,
+		// 		description: null,
+		// 		responsible: null
+		// 	};
+		// 	this.resetForm('form');
+		// },
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加备品备件配置';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件配置';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs.addOrUpdate.dataFormSubmit()
+			// this.$refs['form'].validate((valid) => {
+			// 	if (!valid) {
+			// 		return;
+			// 	}
+			// 	// 修改的提交
+			// 	if (this.form.id != null) {
+			// 		this.put(this.form).then((response) => {
+			// 			this.$modal.msgSuccess('修改成功');
+			// 			this.open = false;
+			// 			this.getList();
+			// 		});
+			// 		return;
+			// 	}
+			// 	// 添加的提交
+			// 	this.post(this.form).then((response) => {
+			// 		this.$modal.msgSuccess('新增成功');
+			// 		this.open = false;
+			// 		this.getList();
+			// 	});
+			// });
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件配置';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有备品备件配置?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '备品备件配置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/timing-diagram/output/index.vue

@@ -432,7 +432,7 @@ export default {
 		/** 准备产线数据 */
 		async initProductline() {
 			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
+				url: '/base/core-production-line/listAll',
 				method: 'get',
 			});
 			if (code == 0) {
@@ -448,7 +448,7 @@ export default {
 		/** 准备工段数据 */
 		async initWorksection() {
 			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listAll',
+				url: '/base/core-workshop-section/listAll',
 				method: 'get',
 			});
 			if (code == 0) {
@@ -464,7 +464,7 @@ export default {
 		/** 根据产线获取工段 */
 		async getWorksectionById(lineId) {
 			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listByParentId',
+				url: '/base/core-workshop-section/listByParentId',
 				method: 'get',
 				params: {
 					id: lineId,

src/views/equipment/timing-diagram/status/index.vue

@@ -239,7 +239,7 @@ export default {
 		/** 准备产线数据 */
 		async initProductline() {
 			const { code, data } = await this.$axios({
-				url: '/base/production-line/listAll',
+				url: '/base/core-production-line/listAll',
 				method: 'get',
 			});
 			if (code == 0) {
@@ -255,7 +255,7 @@ export default {
 		/** 准备工段数据 */
 		async initWorksection() {
 			const { code, data } = await this.$axios({
-				url: '/base/workshop-section/listAll',
+				url: '/base/core-workshop-section/listAll',
 				method: 'get',
 			});
 			if (code == 0) {
@@ -276,7 +276,7 @@ export default {
 			switch (param) {
 				case 'lineId':
 					this.$axios({
-						url: '/base/workshop-section/listByParentId',
+						url: '/base/core-workshop-section/listByParentId',
 						method: 'get',
 						params: {
 							id: value,

src/views/extend/processEquMaterialBom/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-07 19:28:13
+ * @LastEditTime: 2023-11-08 14:11:43
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/extend/processEquMaterialBom/add-or-updata.vue

@@ -0,0 +1,379 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-10 16:26:08
+ * @Description:
+-->
+<template>
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
+    <small-title slot="title" :no-padding="true">
+      {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+    </small-title>
+    <div class="content">
+      <div class="visual-part">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+          label-width="100px" label-position="top">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="设备名称" prop="equipmentId">
+                <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
+                  @change="getCode" placeholder="请选择设备名称">
+                  <el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备编码" prop="equipmentCode">
+                <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="设备Bom编码" prop="code">
+                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入设备Bom编码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备物料BOM名称" prop="name">
+                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备物料BOM名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="当前状态" prop="enabled">
+                <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="drawer-body__footer">
+        <el-button style="" @click="goback()">取消</el-button>
+        <el-button v-if="isdetail" type="primary" @click="goEdit()">
+          编辑
+        </el-button>
+        <el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+      </div>
+
+      <div class="attr-list" v-if="idAttrShow">
+        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+          设备物料明细
+        </small-title>
+
+        <div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+            </span>
+          </template>
+        </div>
+        <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+          :table-data="productAttrList">
+          <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+            @clickBtn="handleClick" />
+        </base-table>
+        <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
+          :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
+
+        <div class="drawer-body__footer">
+          <el-button type="primary" @click="goback()">关闭</el-button>
+        </div>
+      </div>
+
+    </div>
+
+    <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id" @refreshDataList="getList" />
+  </el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import {
+  getProcessEquMaterialBom,
+  createProcessEquMaterialBom,
+  updateProcessEquMaterialBom,
+  getEquipmentList,
+  processEquMaterialBomDetPage,
+  deleteProcessEquMaterialBomDet
+} from '@/api/extend/processEquMaterialBom';
+import SmallTitle from './SmallTitle';
+import { parseTime } from '../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import { publicFormatter } from '@/utils/dict';
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+    prop: 'materialName',
+		label: '物料名称',
+	},
+	{
+    prop: 'materialCode',
+    label: '物料编码',
+	},
+	{
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
+  },
+  {
+    prop: 'num',
+    label: '数量',
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+  },
+];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			topBtnConfig,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: false,
+        // codeURL: getCode,
+        createURL:createProcessEquMaterialBom,
+        updateURL: updateProcessEquMaterialBom,
+        infoURL: getProcessEquMaterialBom,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+      },
+      equipmentList:[],
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: '',
+				equipmentId: undefined,
+        equipmentCode: undefined,
+        enabled:undefined,
+        // area: undefined,
+				// specifications: undefined,
+				// processTime: 0,
+        remark: undefined,
+				// unit: undefined
+			},
+			productAttrList: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false,
+			dataRule: {
+        // code: [{ required: true, message: "设备物料编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "设备物料名称不能为空", trigger: "blur" }],
+				equipmentId: [{ required: true, message: "设备名称不能为空", trigger: "change" }],
+				// : [{ required: true, message: "产品类型不能为空", trigger: "change" }],
+				// processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
+      }
+		};
+	},
+  mounted() {
+    this.getDict()
+  },
+  methods: {
+    getCode(val) {
+      this.equipmentList.forEach((ele) => {
+        if (val === ele.id) {
+          this.dataForm.equipmentCode = ele.code
+        }
+      })
+    },
+    // clickTopBtn(val) {
+    //   if (val === 'add') {
+    //     this.addNew()
+    //   }
+    // },
+		initData() {
+			this.productAttrList.splice(0);
+			this.listQuery.total = 0;
+    },
+    getDict() {
+      getEquipmentList().then((res) => {
+
+        // console.log(res);
+        // console.log(response);
+        this.equipmentList = res.data
+      })
+    },
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+          raw.data.materialName
+            ? '[物料名称为' + raw.data.materialName + ']'
+            : '[序号为' + raw.data.materialName + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+            deleteProcessEquMaterialBomDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取产品属性列表
+      processEquMaterialBomDetPage({
+				...this.listQuery,
+				bomId: this.dataForm.id,
+			}).then((response) => {
+				this.productAttrList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取产品详情
+          this.urlOptions.infoURL({
+            bomId: id,
+            pageNo: 1,
+            pageSize:10
+          }).then(response => {
+            this.dataForm = response.data
+						this.dataForm.unit = String(this.dataForm.unit)
+						this.dataForm.materialType = String(this.dataForm.materialType)
+						this.dataForm.productType = String(this.dataForm.productType)
+          });
+					// 获取产品属性列表
+					this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id,this.dataForm.id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/extend/processEquMaterialBom/attr-add.vue

@@ -0,0 +1,149 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-08 15:30:27
+ * @LastEditTime: 2023-11-09 14:11:02
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-dialog :visible.sync="visible" :width="'35%'" :append-to-body="true" :close-on-click-modal="false" class="dialog">
+    <template #title>
+      <slot name="title">
+        <div class="titleStyle">
+          {{ !dataForm.id ? '新增' : '编辑' }}
+        </div>
+      </slot>
+    </template>
+
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
+      @keyup.enter.native="dataFormSubmit()">
+      <el-form-item label="物料名称" prop="materialId">
+        <el-select v-model="dataForm.materialId" filterable placeholder="请选择物料名称">
+          <el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数量" prop="num">
+        <el-input v-model="dataForm.num" placeholder="请输入数量" clearable />
+      </el-form-item>
+    </el-form>
+
+    <el-row style="text-align: right">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  getProcessEquMaterialBomDet,
+  createProcessEquMaterialBomDet,
+  updateProcessEquMaterialBomDet,
+  getMaterialList
+} from '@/api/extend/processEquMaterialBom';
+
+export default {
+	props: {
+		productId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+      visible: false,
+      materialList:[],
+			dataForm: {
+				id: undefined,
+        bomId: undefined,
+        materialId:null,
+        num: undefined,
+			},
+			dataRule: {
+				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
+		};
+  },
+  mounted () {
+    this.getDict();
+  },
+	methods: {
+		init(id,bomId) {
+      this.dataForm.id = id || '';
+      this.dataForm.bomId = bomId || '';
+      console.log(bomId);
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+          getProcessEquMaterialBomDet({
+						id: this.dataForm.id
+					}).then((res) => {
+            this.dataForm = res.data;
+            // this.dataForm.materialId = materialId;
+						// this.dataForm.value = value;
+					});
+				}
+			});
+    },
+    getDict() {
+      getMaterialList().then((res) => [
+        this.materialList = res.data,
+        console.log(res)
+      ])
+    },
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateProcessEquMaterialBomDet({
+							...this.dataForm,
+							productId: this.productId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProcessEquMaterialBomDet({
+						...this.dataForm,
+						productId: this.productId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/extend/processEquMaterialBom/index.vue

@@ -0,0 +1,203 @@
+<template>
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+      :limit="listQuery.pageSize" :table-data="tableData">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
+    </base-table>
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+      @pagination="getDataList" />
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
+    <!-- <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" /> -->
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+// import DetailOrUpdate from './detail-or-updata';
+
+import basicPage from '../../core/mixins/basic-page';
+import StatusBtn from './statusBtn.vue'
+import {
+  processEquMaterialBomPage,
+  deleteProcessEquMaterialBom,
+  getEquipmentList
+} from '@/api/extend/processEquMaterialBom';
+
+const tableProps = [
+	{
+    prop: 'equipmentCode',
+		label: '设备编码',
+  },
+  {
+    prop: 'equipmentName',
+    label: '设备名称'
+  },
+  {
+    prop: 'code',
+    label: '物料配方编码'
+  },
+	{
+    prop: 'name',
+    label: '物料配方名称'
+	},
+	{
+    prop: 'enabled',
+    label: '当前激活状态',
+    subcomponent: StatusBtn
+	},
+	{
+    prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+        getDataListURL: processEquMaterialBomPage,
+        deleteURL: deleteProcessEquMaterialBom,
+				// exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+        this.$auth.hasPermi(`extend:process-equ-material-bom:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+          : undefined,
+        this.$auth.hasPermi(`extend:process-equ-material-bom:detail`)
+          ? {
+            type: 'detail',
+            btnName: '详情',
+          }
+          : undefined,
+        this.$auth.hasPermi(`extend:process-equ-material-bom:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+      tableData: [],
+      detailOrUpdateVisible:false,
+			formConfig: [
+        {
+          type: 'select',
+          label: '设备名称',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'equipmentId',
+        },
+        {
+          type: 'input',
+          label: '物料配方名称',
+          // selectOptions: [],
+          // labelField: 'name',
+          // valueField: 'id',
+          param: 'name',
+        },
+        {
+          type: 'input',
+          label: '物料配方编码',
+          // selectOptions: [],
+          // labelField: 'name',
+          // valueField: 'id',
+          param: 'code',
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+          type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+    AddOrUpdate,
+    // DetailOrUpdate
+	},
+  created() {
+    this.getDict()
+  },
+  methods: {
+    otherMethods(val) {
+      if (val.type === 'detail') {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "详情";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id, true);
+        });
+      }
+    },
+    getDict() {
+      getEquipmentList().then((res) => {
+        // console.log(res);
+        // console.log(response);
+        this.formConfig[0].selectOptions = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+      })
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+          this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined;
+          this.listQuery.name = val.name ? val.name : undefined;
+          this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/extend/processEquMaterialBom/statusBtn.vue

@@ -0,0 +1,67 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-08 14:00:52
+ * @LastEditTime: 2023-11-08 14:46:27
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-switch v-model="state" type="text" size="small"  @change="changeHandler" />
+</template>
+
+<script>
+import {
+  // processEquMaterialBomPage,
+  updateProcessEquMaterialBom,
+  // getWorkOrderList,
+  // getTeamList
+} from '@/api/extend/processEquMaterialBom';
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      state: false
+    }
+  },
+  // computed: {
+  //   readonly() {
+  //     return !!this.injectData.readonly
+  //   }
+  // },
+  mounted() {
+    this.mapToState()
+  },
+
+  methods: {
+    mapToState() {
+      if (this.injectData.prop === 'enabled') {
+        this.state = this.injectData.enabled === 1 ? true : false
+      }
+    },
+    changeHandler() {
+      // let params = {}
+      let payload = {}
+      // params.name = 'state'
+      payload.id = this.injectData.id
+      payload.enabled = this.state ? '1' : '0'
+      payload.code = this.injectData.code
+      payload.name = this.injectData.name
+      payload.equipmentId = this.injectData.equipmentId
+      payload.remark = this.injectData.remark
+
+      // params.payload = payload
+      updateProcessEquMaterialBom(payload).then((res) => {
+        if (res.code === 0) {
+          this.$modal.msgSuccess("操作成功");
+        }
+      })
+      // this.$emit('emitData', params)
+    }
+  }
+}
+</script>

src/views/extend/processEquValueBom/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-07 19:28:13
+ * @LastEditTime: 2023-11-08 14:11:43
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/extend/processEquValueBom/add-or-updata.vue

@@ -0,0 +1,391 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-09 14:49:16
+ * @Description:
+-->
+<template>
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
+    <small-title slot="title" :no-padding="true">
+      {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+    </small-title>
+    <div class="content">
+      <div class="visual-part">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+          label-width="100px" label-position="top">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="设备名称" prop="equipmentId">
+                <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
+                  @change="getCode" placeholder="请选择设备名称">
+                  <el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备编码" prop="equipmentCode">
+                <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="参数Bom编码" prop="code">
+                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入参数Bom编码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备参数BOM名称" prop="name">
+                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备参数BOM名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="当前状态" prop="enabled">
+                <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="drawer-body__footer">
+        <el-button style="" @click="goback()">取消</el-button>
+        <el-button v-if="isdetail" type="primary" @click="goEdit()">
+          编辑
+        </el-button>
+        <el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+      </div>
+
+      <div class="attr-list" v-if="idAttrShow">
+        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+          设备物料明细
+        </small-title>
+
+        <div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+            </span>
+          </template>
+        </div>
+        <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+          :table-data="productAttrList">
+          <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+            @clickBtn="handleClick" />
+        </base-table>
+        <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
+          :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
+
+        <div class="drawer-body__footer">
+          <el-button type="primary" @click="goback()">关闭</el-button>
+        </div>
+      </div>
+
+    </div>
+
+    <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id" @refreshDataList="getList" />
+  </el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import {
+  getProcessEquValueBom,
+  createProcessEquValueBom,
+  updateProcessEquValueBom,
+  getEquipmentList,
+  processEquValueBomDetPage,
+  deleteProcessEquValueBomDet
+} from '@/api/extend/processEquValueBom';
+import SmallTitle from './SmallTitle';
+import { parseTime } from '../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+    prop: 'valueName',
+		label: '参数名称',
+	},
+	{
+    prop: 'valueCode',
+    label: '参数编码',
+	},
+	{
+    prop: 'standardMinValue',
+    label: '最小值（标准）',
+  },
+  {
+    prop: 'standardMaxValue',
+    label: '最大值（标准）',
+  },
+  {
+    prop: 'minValue',
+    label: '最小值（工艺）',
+  },
+  {
+    prop: 'manValue',
+    label: '最大值（工艺）',
+  },
+  {
+    prop: 'defaultValue',
+    label: '标准值（工艺）',
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+  },
+];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			topBtnConfig,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: false,
+        // codeURL: getCode,
+        createURL:createProcessEquValueBom,
+        updateURL: updateProcessEquValueBom,
+        infoURL: getProcessEquValueBom,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+      },
+      equipmentList:[],
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: '',
+				equipmentId: undefined,
+        equipmentCode: undefined,
+        enabled:undefined,
+        // area: undefined,
+				// specifications: undefined,
+				// processTime: 0,
+        remark: undefined,
+				// unit: undefined
+			},
+			productAttrList: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false,
+			dataRule: {
+        // code: [{ required: true, message: "设备物料编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "设备参数名称不能为空", trigger: "blur" }],
+				equipmentId: [{ required: true, message: "设备名称不能为空", trigger: "change" }],
+				// : [{ required: true, message: "产品类型不能为空", trigger: "change" }],
+				// processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
+      }
+		};
+	},
+  mounted() {
+    this.getDict()
+  },
+  methods: {
+    getCode(val) {
+      this.equipmentList.forEach((ele) => {
+        if (val === ele.id) {
+          this.dataForm.equipmentCode = ele.code
+        }
+      })
+    },
+    // clickTopBtn(val) {
+    //   if (val === 'add') {
+    //     this.addNew()
+    //   }
+    // },
+		initData() {
+			this.productAttrList.splice(0);
+			this.listQuery.total = 0;
+    },
+    getDict() {
+      getEquipmentList().then((res) => {
+
+        // console.log(res);
+        // console.log(response);
+        this.equipmentList = res.data
+      })
+    },
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+          raw.data.valueName
+            ? '[物料名称为' + raw.data.valueName + ']'
+            : '[序号为' + raw.data.valueName + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+            deleteProcessEquValueBomDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取产品属性列表
+      processEquValueBomDetPage({
+				...this.listQuery,
+				bomId: this.dataForm.id,
+			}).then((response) => {
+				this.productAttrList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+      this.initData();
+      console.log(isdetail);
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取产品详情
+          this.urlOptions.infoURL({
+            bomId: id,
+            pageNo: 1,
+            pageSize:10
+          }).then(response => {
+            this.dataForm = response.data
+						// this.dataForm.unit = String(this.dataForm.unit)
+						// this.dataForm.ValueType = String(this.dataForm.ValueType)
+						// this.dataForm.productType = String(this.dataForm.productType)
+          });
+					// 获取产品属性列表
+					this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id,this.dataForm.id,this.dataForm.equipmentId);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/extend/processEquValueBom/attr-add.vue

@@ -0,0 +1,189 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-08 15:30:27
+ * @LastEditTime: 2023-11-09 14:44:49
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-dialog :visible.sync="visible" :width="'35%'" :append-to-body="true" :close-on-click-modal="false" class="dialog">
+    <template #title>
+      <slot name="title">
+        <div class="titleStyle">
+          {{ !dataForm.id ? '新增' : '编辑' }}
+        </div>
+      </slot>
+    </template>
+
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"
+      @keyup.enter.native="dataFormSubmit()">
+      <el-form-item label="参数名称" prop="paramId">
+        <el-select v-model="dataForm.paramId" filterable placeholder="参数名称" @change="getData">
+          <el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="参数编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="请输入参数编码" clearable />
+      </el-form-item> -->
+      <el-form-item label="标准最小值" prop="standardMinValue">
+        <el-input v-model="dataForm.standardMinValue" placeholder="请输入标准最小值" clearable />
+      </el-form-item>
+      <el-form-item label="标准最大值" prop="standardMaxValue">
+        <el-input v-model="dataForm.standardMaxValue" placeholder="请输入标准最大值" clearable />
+      </el-form-item>
+      <el-form-item label="工艺最小值" prop="minValue">
+        <el-input v-model="dataForm.minValue" placeholder="请输入工艺最小值" clearable />
+      </el-form-item>
+      <el-form-item label="工艺最大值" prop="maxValue">
+        <el-input v-model="dataForm.maxValue" placeholder="请输入工艺最大值" clearable />
+      </el-form-item>
+      <el-form-item label="工艺标准值" prop="defaultValue">
+        <el-input v-model="dataForm.defaultValue" placeholder="请输入工艺标准值" clearable />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="请输入备注" clearable />
+      </el-form-item>
+    </el-form>
+
+    <el-row style="text-align: right">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  getProcessEquValueBomDet,
+  createProcessEquValueBomDet,
+  updateProcessEquValueBomDet,
+  getValueList
+} from '@/api/extend/processEquValueBom';
+
+export default {
+	props: {
+		productId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+      visible: false,
+      materialList:[],
+			dataForm: {
+				id: undefined,
+        bomId: undefined,
+        paramId:undefined,
+        minValue:undefined,
+        maxValue: undefined,
+        defaultValue: undefined,
+        standardMinValue: undefined,
+        standardMaxValue: undefined,
+        remark:null
+      },
+      equipmentId:null,
+			dataRule: {
+				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
+		};
+  },
+  mounted () {
+  },
+  methods: {
+    getData(val) {
+      this.materialList.forEach((ele) => {
+        if (val === ele.id) {
+          console.log(ele)
+          this.dataForm.code = ele.code
+          this.dataForm.standardMinValue = ele.minValue
+          this.dataForm.standardMaxValue = ele.maxValue
+          // this.dataForm.code = ele.id
+        }
+      })
+    },
+    init(id, bomId, equipmentId) {
+      console.log(equipmentId);
+      this.dataForm.id = id || '';
+      this.dataForm.bomId = bomId || '';
+      this.equipmentId = equipmentId
+      this.getDict()
+      console.log(bomId);
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+          getProcessEquValueBomDet({
+						id: this.dataForm.id
+					}).then((res) => {
+            this.dataForm = res.data;
+            // this.dataForm.materialId = materialId;
+						// this.dataForm.value = value;
+					});
+				}
+			});
+    },
+    getDict() {
+      console.log(this.equipmentId);
+      getValueList({
+        id: this.equipmentId
+      }).then((res) => [
+        this.materialList = res.data,
+        console.log(res)
+      ])
+    },
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateProcessEquValueBomDet({
+							...this.dataForm,
+							productId: this.productId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProcessEquValueBomDet({
+						...this.dataForm,
+						productId: this.productId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/extend/processEquValueBom/index.vue

@@ -0,0 +1,203 @@
+<template>
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+      :limit="listQuery.pageSize" :table-data="tableData">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
+    </base-table>
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+      @pagination="getDataList" />
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
+    <!-- <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" /> -->
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+// import DetailOrUpdate from './detail-or-updata';
+
+import basicPage from '../../core/mixins/basic-page';
+import StatusBtn from './statusBtn.vue'
+import {
+  processEquValueBomPage,
+  deleteProcessEquValueBom,
+  getEquipmentList
+} from '@/api/extend/processEquValueBom';
+
+const tableProps = [
+	{
+    prop: 'equipmentCode',
+		label: '设备编码',
+  },
+  {
+    prop: 'equipmentName',
+    label: '设备名称'
+  },
+  {
+    prop: 'code',
+    label: '参数配方编码'
+  },
+	{
+    prop: 'name',
+    label: '参数配方名称'
+	},
+	{
+    prop: 'enabled',
+    label: '当前激活状态',
+    subcomponent: StatusBtn
+	},
+	{
+    prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+        getDataListURL: processEquValueBomPage,
+        deleteURL: deleteProcessEquValueBom,
+				// exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+        this.$auth.hasPermi(`extend:process-equ-value-bom:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+          : undefined,
+        this.$auth.hasPermi(`extend:process-equ-value-bom:detail`)
+          ? {
+            type: 'detail',
+            btnName: '详情',
+          }
+          : undefined,
+        this.$auth.hasPermi(`extend:process-equ-value-bom:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+      tableData: [],
+      detailOrUpdateVisible:false,
+			formConfig: [
+        {
+          type: 'select',
+          label: '设备名称',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'equipmentId',
+        },
+        {
+          type: 'input',
+          label: '物料配方名称',
+          // selectOptions: [],
+          // labelField: 'name',
+          // valueField: 'id',
+          param: 'name',
+        },
+        {
+          type: 'input',
+          label: '物料配方编码',
+          // selectOptions: [],
+          // labelField: 'name',
+          // valueField: 'id',
+          param: 'code',
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+          type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+    AddOrUpdate,
+    // DetailOrUpdate
+	},
+  created() {
+    this.getDict()
+  },
+  methods: {
+    otherMethods(val) {
+      if (val.type === 'detail') {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "详情";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id, true);
+        });
+      }
+    },
+    getDict() {
+      getEquipmentList().then((res) => {
+        // console.log(res);
+        // console.log(response);
+        this.formConfig[0].selectOptions = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+      })
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+          this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined;
+          this.listQuery.name = val.name ? val.name : undefined;
+          this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>