diff --git a/.env.dev b/.env.dev
index 15db0a04..9171993b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-21 10:36:47
+ # @LastEditTime: 2024-07-29 15:00:13
  # @LastEditors: DY
  # @Description:
 ###
@@ -13,10 +13,10 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.164:48082'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-VUE_APP_BASE_API = 'http://192.168.1.81:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.81:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48082'
diff --git a/package.json b/package.json
index 570a5c86..b51a8bc6 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
     "clipboard": "2.0.8",
-    "code-brick-zj": "^1.0.2",
+    "code-brick-zj": "^1.0.5",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",
diff --git a/src/assets/images/choicepart/Produce.png b/src/assets/images/choicepart/Produce.png
new file mode 100644
index 00000000..7c8a3216
Binary files /dev/null and b/src/assets/images/choicepart/Produce.png differ
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 046e334a..50ae3e74 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -125,11 +125,8 @@ export default {
 			// 取消自动聚焦 start
 			this.Quill?.enable(false);
 			this.$nextTick(() => {
-				this.Quill?.enable(true);
 				this.Quill?.blur();
-				// if (!this.readOnly) {
-				// 	this.Quill?.enable();
-				// }
+				this.Quill?.enable(true);
 			});
 			// 如果设置了上传地址则自定义图片上传事件
 			if (this.type === 'url') {
diff --git a/src/views/choicePart/index.vue b/src/views/choicePart/index.vue
index 58bd8aed..e506cb60 100644
--- a/src/views/choicePart/index.vue
+++ b/src/views/choicePart/index.vue
@@ -56,214 +56,207 @@
 import Navbar from './components/Navbar';
 import { debounce } from '@/utils/debounce';
 export default {
-	components: { Navbar },
-	name: 'choicePart',
-	data() {
-		return {
-			boxReset: '',
-			scale: 1,
-			menuArr1: [
-				{
-					name: 'Core',
-					title: '基础核心',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Order',
-					title: '订单管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Equipment',
-					title: '设备管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Group',
-					title: '班组管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Quality',
-					title: '质量管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Warehouse',
-					title: '仓库管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Energy',
-					title: '能源管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-			],
-			menuArr2: [
-				{
-					name: 'Packaging',
-					title: '包装管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Material',
-					title: '物料管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Extend',
-					title: '工艺管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Delivery',
-					title: '成品发货',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Report',
-					title: '报表管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'System',
-					title: '系统管理',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-				{
-					name: 'Devconfig',
-					title: '开发配置',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
-			],
-			showItem: false,
-		};
-	},
-	// computed:{
-	//   ...mapGetters(['sidebarRouters'])
-	// },
-	mounted() {
-		this.getMsg();
-		this.boxReset = debounce(() => {
-			this.resetSize();
-		}, 300);
-		this.boxReset();
-		window.addEventListener('resize', () => {
-			this.boxReset();
-		});
-	},
-	methods: {
-		getMsg() {
-			let menuList = this.$store.state.permission.sidebarRouters;
-			console.log(menuList);
-			if (menuList.length > 0) {
-				for (let i = 0; i < menuList.length; i++) {
-					for (let k = 0; k < 7; k++) {
-						if (menuList[i].name === this.menuArr1[k].name) {
-							this.menuArr1[k].visible = true;
-							this.menuArr1[k].id = menuList[i].id;
-							this.menuArr1[k].choicepart = i;
-							this.menuArr1[k].children = menuList[i].children;
-							this.menuArr1[k].meta = menuList[i].meta;
-						}
-					}
-					for (let j = 0; j < 7; j++) {
-						if (menuList[i].name === this.menuArr2[j].name) {
-							this.menuArr2[j].visible = true;
-							this.menuArr2[j].id = menuList[i].id;
-							this.menuArr2[j].choicepart = i;
-							this.menuArr2[j].children = menuList[i].children;
-							this.menuArr2[j].meta = menuList[i].meta;
-						}
-					}
-				}
-			}
-			console.log(this.menuArr1);
-			console.log(this.menuArr2);
-		},
-		handelClick(item, index) {
-			// this.$router.push({name: 'SystemUser'})
-			this.$store.dispatch('app/setChoicepart', index);
-			this.toRouter(item);
-			// if (item.meta.unuse) {
-			//   this.$message.warning(this.$t('暂无数据'))
-			// } else {
-			//   this.toRouter(item)
-			// }
-		},
-		toRouter(item) {
-			console.log(item);
-			if (item.children) {
-				this.toRouter(item.children[0]);
-			} else {
-				this.$router.push({ name: item.name });
-			}
-		},
-		resetSize() {
-			let _this = this;
-			_this.showItem = false;
-			_this.loading = true;
-			let choicepartBox = document.querySelector('#choicepartBox');
-			let rw = parseFloat(window.innerWidth);
-			let rh = parseFloat(window.innerHeight);
-			let bw = parseFloat(choicepartBox.style.width);
-			let bh = parseFloat(choicepartBox.style.height);
-			let wx = 0.82 / (bw / rw);
-			let hx = 0.56 / (bh / rh);
-			_this.scale = wx > hx ? hx : wx;
-			setTimeout(_this.showItemFun, 700);
-		},
-		showItemFun() {
-			this.loading = false;
-			this.showItem = true;
-		},
-	},
-	beforeDestroy() {
-		this.showItem = false;
-	},
-};
+  components: { Navbar },
+  name: 'choicePart',
+  data() {
+    return {
+      boxReset: '',
+      scale: 1,
+      menuArr1: [
+        {
+          name: 'Core',
+          title: '基础核心',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Produce',
+          title: '生产管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Equipment',
+          title: '设备管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Group',
+          title: '班组管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Quality',
+          title: '质量管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Warehouse',
+          title: '仓库管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Energy',
+          title: '能源管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        }
+      ],
+      menuArr2: [
+        {
+          name: 'Packaging',
+          title: '包装管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Material',
+          title: '物料管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Extend',
+          title: '工艺管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Delivery',
+          title: '成品发货',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'Report',
+          title: '报表管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        },
+        {
+          name: 'System',
+          title: '系统管理',
+          visible: false,
+          meta: {
+            title: ''
+          }
+        }
+      ],
+      showItem: false
+    }
+  },
+  // computed:{
+  //   ...mapGetters(['sidebarRouters'])
+  // },
+  mounted() {
+    this.getMsg()
+    this.boxReset = debounce(() => {
+      this.resetSize()
+    }, 300)
+    this.boxReset()
+    window.addEventListener('resize', () => {
+      this.boxReset()
+    })
+  },
+  methods: {
+    getMsg() {
+      let menuList = this.$store.state.permission.sidebarRouters
+      console.log('sss', menuList)
+      console.log(menuList)
+      if (menuList.length > 0) {
+        for (let i = 0; i < menuList.length; i ++) {
+          for (let k = 0; k < 7; k++) {
+            if (menuList[i].name === this.menuArr1[k].name) {
+              this.menuArr1[k].visible = true
+              this.menuArr1[k].id = menuList[i].id
+              this.menuArr1[k].choicepart = i
+              this.menuArr1[k].children = menuList[i].children
+              this.menuArr1[k].meta = menuList[i].meta
+            }
+          }
+          for (let j = 0; j < 6; j++) {
+            if (menuList[i].name === this.menuArr2[j].name) {
+              this.menuArr2[j].visible = true
+              this.menuArr2[j].id = menuList[i].id
+              this.menuArr2[j].choicepart = i
+              this.menuArr2[j].children = menuList[i].children
+              this.menuArr2[j].meta = menuList[i].meta
+            }
+          }
+        }
+      }
+      console.log(this.menuArr1)
+      console.log(this.menuArr2)
+    },
+    handelClick(item, index) {
+      // this.$router.push({name: 'SystemUser'})
+      this.$store.dispatch('app/setChoicepart', index)
+      this.toRouter(item)
+      // if (item.meta.unuse) {
+      //   this.$message.warning(this.$t('暂无数据'))
+      // } else {
+      //   this.toRouter(item)
+      // }
+    },
+    toRouter(item) {
+      console.log(item)
+      if (item.children) {
+        this.toRouter(item.children[0])
+      } else {
+        this.$router.push({ name: item.name })
+      }
+    },
+    resetSize() {
+      let _this = this
+      _this.showItem = false
+      _this.loading = true
+      let choicepartBox = document.querySelector('#choicepartBox')
+      let rw = parseFloat(window.innerWidth)
+      let rh = parseFloat(window.innerHeight)
+      let bw = parseFloat(choicepartBox.style.width)
+      let bh = parseFloat(choicepartBox.style.height)
+      let wx = 0.82/(bw / rw)
+      let hx = 0.56/(bh / rh)
+      _this.scale = wx > hx ? hx : wx
+      setTimeout(_this.showItemFun, 700)
+    },
+    showItemFun() {
+      this.loading = false
+      this.showItem = true
+    }
+  },
+  beforeDestroy() {
+    this.showItem = false
+  }
+}
 </script>
 <style lang="scss" scoped>
 .choicepart-container {
diff --git a/src/views/core/base/factory/add-or-updata.vue b/src/views/core/oldBase/factory/add-or-updata.vue
similarity index 100%
rename from src/views/core/base/factory/add-or-updata.vue
rename to src/views/core/oldBase/factory/add-or-updata.vue
diff --git a/src/views/core/base/factory/index.vue b/src/views/core/oldBase/factory/index.vue
similarity index 100%
rename from src/views/core/base/factory/index.vue
rename to src/views/core/oldBase/factory/index.vue
diff --git a/src/views/core/oldBase/lineBindProduct/index.vue b/src/views/core/oldBase/lineBindProduct/index.vue
new file mode 100644
index 00000000..3abff327
--- /dev/null
+++ b/src/views/core/oldBase/lineBindProduct/index.vue
@@ -0,0 +1,100 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-02 15:12:42
+ * @LastEditors: DY
+ * @LastEditTime: 2023-10-13 16:35:03
+ * @Description:
+-->
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="[{ label: '产线在制产品', type: 'title' }]"
+			ref="searchBarForm" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData"
+			@emitFun="inputChange" />
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import { getLineBindProductPage } from '@/api/core/base/lineBindProduct';
+import selectProduct from './selectProduct';
+import { getProductPage } from '@/api/core/base/product';
+
+const tableProps = [
+	{
+		prop: 'lineName',
+		label: '产线'
+	},
+	{
+		prop: 'productName',
+		label: '在制产品',
+		list: [],
+		subcomponent: selectProduct,
+	},
+	{
+		prop: 'recordTime',
+		label: '开始时间',
+		filter: parseTime,
+	},
+];
+
+export default {
+	mixins: [basicPage, selectProduct],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineBindProductPage,
+			},
+			tableProps,
+			tableData: [],
+			// formConfig: [
+			// 	{
+			// 		type: 'button',
+			// 		btnName: '同步',
+			// 		name: 'search',
+			// 		color: 'primary',
+			// 	},
+			// ],
+		};
+	},
+	components: {},
+	created() {
+		const params = {
+			pageSize: 100,
+			pageNo: 1,
+		};
+		getProductPage(params).then((response) => {
+			this.tableProps[1].list = response.data.list;
+			console.log('打印', this.tableProps[1].list)
+		});
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		inputChange() {
+			this.getDataList();
+		},
+	},
+};
+</script>
diff --git a/src/views/core/oldBase/lineBindProduct/selectProduct.vue b/src/views/core/oldBase/lineBindProduct/selectProduct.vue
new file mode 100644
index 00000000..d0442ac2
--- /dev/null
+++ b/src/views/core/oldBase/lineBindProduct/selectProduct.vue
@@ -0,0 +1,79 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-03 14:09:18
+ * @LastEditors: DY
+ * @LastEditTime: 2023-10-13 16:47:25
+ * @Description:
+-->
+<template>
+	<div class="tableInner">
+		<el-popover
+    placement="top"
+    title="切换在制产品"
+    width="160"
+    v-model="visible">
+			<el-select v-model="list.string" style="margin: 5px;" filterable>
+				<el-option
+					v-for="item in injectData.list"
+					:key="item.id"
+					:label="item.name"
+					:value="item.id + '+' + item.name"></el-option>
+			</el-select>
+			<div style="text-align: right; margin: 0">
+				<el-button size="mini" type="text" @click="visible = false">
+					取消
+				</el-button>
+				<el-button type="primary" size="mini" @click="changeInput">
+					确定
+				</el-button>
+			</div>
+			<el-button type="text" slot="reference">
+				<svg-icon icon-class="changelogo"/>
+			</el-button>
+		</el-popover>
+		<el-input readonly v-model="list.productName" style="width: 50%;margin-left: 5px" ></el-input>
+	</div>
+</template>
+<script>
+import { switchLineBindProduct } from '@/api/core/base/lineBindProduct';
+
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			list: this.injectData,
+			visible: false,
+		};
+	},
+	mounted() {
+		console.log('hello', this.list)
+	},
+	methods: {
+		changeInput() {
+			const data = {
+				id: this.list.id,
+				productId: this.list.string.split('+')[0],
+				productName: this.list.string.split('+')[1],
+			};
+			switchLineBindProduct(data).then((response) => {
+				this.$modal.msgSuccess('修改成功');
+				this.visible = false;
+				this.list.productName = this.list.string.split('+')[1]
+				this.$emit('emitData');
+			});
+		},
+	},
+};
+</script>
+<style scoped>
+.tableInner .el-input__inner {
+	border: none;
+	padding: 0;
+	height: 33px;
+}
+</style>
diff --git a/src/views/core/oldBase/lineBindProductLog/index.vue b/src/views/core/oldBase/lineBindProductLog/index.vue
new file mode 100644
index 00000000..e8a1f613
--- /dev/null
+++ b/src/views/core/oldBase/lineBindProductLog/index.vue
@@ -0,0 +1,144 @@
+<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" />
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getProductionLinePage } from '@/api/core/base/productionLine';
+import { getProductPage } from '@/api/core/base/product';
+
+const tableProps = [
+	{
+		prop: 'productionLineName',
+		label: '产线'
+	},
+	{
+		prop: 'productName',
+		label: '在制产品'
+	},
+	{
+		prop: 'startTime',
+		label: '开始时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'endTime',
+		label: '结束时间',
+		filter: parseTime,
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineBindProductLogPage,
+			},
+			tableProps,
+			tableData: [],
+			optionArrUrl: [getProductionLinePage, getProductPage],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'productionLineId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '在制产品',
+					selectOptions: [],
+					param: 'productId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'startTime',
+					valueFormat: 'timestamp'
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '重置',
+					name: 'reset',
+				},
+			],
+		};
+	},
+	components: {
+	},
+	created() {
+		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;
+				});
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.productionLineId = val.productionLineId;
+					this.listQuery.productId = val.productId;
+					this.listQuery.startTime = val.startTime;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
diff --git a/src/views/base/coreProduct/SmallTitle.vue b/src/views/core/oldBase/product/SmallTitle.vue
similarity index 100%
rename from src/views/base/coreProduct/SmallTitle.vue
rename to src/views/core/oldBase/product/SmallTitle.vue
diff --git a/src/views/core/oldBase/product/add-or-updata.vue b/src/views/core/oldBase/product/add-or-updata.vue
new file mode 100644
index 00000000..eb5b51b1
--- /dev/null
+++ b/src/views/core/oldBase/product/add-or-updata.vue
@@ -0,0 +1,448 @@
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title>
+
+		<div class="content">
+			<div class="visual-part">
+				<el-form
+					ref="dataForm"
+					:model="dataForm"
+					:rules="dataRule"
+					label-width="100px"
+					label-position="top"
+					@keyup.enter.native="dataFormSubmit">
+					<el-row :gutter="20">
+						<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-col :span="12">
+							<el-form-item label="产品名称" prop="name">
+								<el-input
+									v-model="dataForm.name"
+									clearable
+									:disabled="isdetail"
+									placeholder="请输入产品名称" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="产品类型" prop="typeDictValue">
+								<el-select
+									v-model="dataForm.typeDictValue"
+									style="width: 100%"
+									:disabled="isdetail"
+									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-col :span="12">
+							<el-form-item label="单位" prop="unitDictValue">
+								<el-select
+									v-model="dataForm.unitDictValue"
+									style="width: 100%"
+									:disabled="isdetail"
+									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-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<el-form-item label="规格" prop="specifications">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.specifications"
+									placeholder="请输入规格" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="单位平方数" prop="area">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.area"
+									placeholder="请输入单位平方数" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="24">
+							<el-form-item label="完成单位产品用时" prop="processTime">
+								<el-input
+									:disabled="isdetail"
+									v-model="dataForm.processTime"
+									placeholder="请输入完成单位产品用时" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					产品属性列表
+				</small-title>
+
+				<div class="attr-list">
+					<base-table
+						:table-props="tableProps"
+						:page="listQuery.pageNo"
+						:limit="listQuery.pageSize"
+						:add-button-show="isdetail ? null : '添加属性'"
+						@emitButtonClick="addNew()"
+						:table-data="productAttributeList">
+						<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>
+		</div>
+
+		<!-- <div style="position: absolute; bottom: 24px; right: 24px">
+			<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
+			<el-button v-if="isdetail" type="primary" @click="goEdit()">
+				编辑
+			</el-button>
+			<span v-if="!isdetail">
+				<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
+				<el-button
+					v-if="dataForm.id && !isdetail"
+					type="primary"
+					@click="addNew()">
+					添加属性
+				</el-button>
+			</span>
+		</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>
+
+		<product-attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:product-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import {
+	deleteProductAttr,
+	getProductAttrPage,
+} from '@/api/core/base/productAttr';
+
+import {
+	createProduct,
+	updateProduct,
+	getProduct,
+	getCode,
+} from '@/api/core/base/product';
+import productAttrAdd from './attr-add';
+import { parseTime } from '../../mixins/code-filter';
+import SmallTitle from './SmallTitle';
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'name',
+		label: '属性名',
+	},
+	{
+		prop: 'value',
+		label: '属性值',
+	},
+];
+
+export default {
+	components: { productAttrAdd, SmallTitle },
+	data() {
+		return {
+			visible: false,
+			addOrUpdateVisible: false,
+			tableBtn,
+			tableProps,
+			productAttributeList: [],
+			dataForm: {
+				id: null,
+				name: '', // 产品名称
+				code: '', // 产品编码
+				area: 0, // 单位平方数(float only)
+				typeDictValue: null, // 产品类型id
+				processTime: null, // 单位产品用时 (s)
+				specifications: '', // 规格
+				unitDictValue: '', // 单位id
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataRule: {
+				code: [
+					{
+						required: true,
+						message: '产品编码不能为空',
+						trigger: 'blur',
+					},
+					// {
+					// 	type: 'number',
+					// 	message: '产品编码为数字类型',
+					// 	trigger: 'blur',
+					// 	transfom: 'val => Number(val)',
+					// },
+				],
+				name: [
+					{
+						required: true,
+						message: '产品名称不能为空',
+						trigger: 'blur',
+					},
+				],
+				typeDictValue: [
+					{
+						required: true,
+						message: '产品类型不能为空',
+						trigger: 'blur',
+					},
+				],
+				area: [
+					{
+						type: 'number',
+						message: '请输入正确的数值',
+						trigger: 'change',
+						transform: (val) => Number(val),
+					},
+				],
+				processTime: [
+					{
+						required: true,
+						message: '完成单位产品用时不能为空',
+						trigger: 'blur',
+					},
+					{
+						type: 'number',
+						message: '请输入正确的数值',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
+				],
+			},
+			isdetail: false,
+		};
+	},
+	methods: {
+		initData() {
+			this.productAttributeList.splice(0);
+			this.listQuery.total = 0;
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || null;
+			this.visible = true;
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取产品详情
+					getProduct(id).then((response) => {
+						this.dataForm = response.data;
+					});
+					// 获取产品的属性列表
+					this.getList();
+				} else {
+					getCode().then((res) => {
+						this.dataForm.code = res.data;
+					});
+				}
+			});
+		},
+
+		getList() {
+			// 获取产品的属性列表
+			getProductAttrPage({
+				...this.listQuery,
+				productId: this.dataForm.id,
+			}).then((response) => {
+				this.productAttributeList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateProduct(this.dataForm).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProduct(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			this.initData();
+		},
+	},
+};
+</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;
+}
+</style>
diff --git a/src/views/core/oldBase/product/attr-add.vue b/src/views/core/oldBase/product/attr-add.vue
new file mode 100644
index 00000000..d5c46d11
--- /dev/null
+++ b/src/views/core/oldBase/product/attr-add.vue
@@ -0,0 +1,139 @@
+<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 {
+	createProductAttr,
+	updateProductAttr,
+	getProductAttr,
+} from '@/api/core/base/productAttr';
+
+export default {
+	props: {
+		productId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				name: '',
+				value: '',
+			},
+			dataRule: {
+				name: [{ 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) {
+					getProductAttr(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) {
+						updateProductAttr({
+							...this.dataForm,
+							productId: this.productId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createProductAttr({
+						...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>
diff --git a/src/views/core/oldBase/product/index.vue b/src/views/core/oldBase/product/index.vue
new file mode 100644
index 00000000..7090b1bf
--- /dev/null
+++ b/src/views/core/oldBase/product/index.vue
@@ -0,0 +1,200 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 14:55:51
+ * @LastEditors: DY
+ * @LastEditTime: 2023-10-13 10:27:00
+ * @Description:
+-->
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			: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" />
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import unitDict from './unitDict';
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	deleteProduct,
+	getProductPage,
+	exportProductExcel,
+} from '@/api/core/base/product';
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '产品编码'
+	},
+	{
+		prop: 'name',
+		label: '产品名称'
+	},
+	{
+		prop: 'specifications',
+		label: '规格'
+	},
+	{
+		prop: 'unitDictValue',
+		label: '单位',
+		subcomponent: unitDict,
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getProductPage,
+				deleteURL: deleteProduct,
+				exportURL: exportProductExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:product:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:product:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:product:update`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '产品编码',
+					placeholder: '产品编码',
+					param: 'code',
+				},
+				{
+					type: 'input',
+					label: '产品名称',
+					placeholder: '产品名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:product:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+				// {
+				// 	type: 'separate',
+				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('base:product:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.code = val.code;
+					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);
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/base/packagingPrintLog/unitDict.vue b/src/views/core/oldBase/product/unitDict.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/unitDict.vue
rename to src/views/core/oldBase/product/unitDict.vue
diff --git a/src/views/core/oldBase/productAttr/index.vue b/src/views/core/oldBase/productAttr/index.vue
new file mode 100644
index 00000000..a78e71b2
--- /dev/null
+++ b/src/views/core/oldBase/productAttr/index.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="产品id,关联产品表" prop="productId">
+        <el-input v-model="queryParams.productId" placeholder="请输入产品id,关联产品表" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="属性值" prop="value">
+        <el-input v-model="queryParams.value" placeholder="请输入属性值" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['base:product-attr:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:product-attr:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="产品id,关联产品表" align="center" prop="productId" />
+      <el-table-column label="属性值" align="center" prop="value" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['base:product-attr:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:product-attr:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="产品id,关联产品表" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入产品id,关联产品表" />
+        </el-form-item>
+        <el-form-item label="属性值" prop="value">
+          <el-input v-model="form.value" placeholder="请输入属性值" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createProductAttr, updateProductAttr, deleteProductAttr, getProductAttr, getProductAttrPage, exportProductAttrExcel } from "@/api/core/base/productAttr";
+
+export default {
+  name: "ProductAttr",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产品属性列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        productId: null,
+        value: null,
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        productId: [{ required: true, message: "产品id,关联产品表不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getProductAttrPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        productId: undefined,
+        value: undefined,
+      };
+      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;
+      getProductAttr(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改产品属性";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateProductAttr(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createProductAttr(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除产品属性编号为"' + id + '"的数据项?').then(function() {
+          return deleteProductAttr(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有产品属性数据项?').then(() => {
+          this.exportLoading = true;
+          return exportProductAttrExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '产品属性.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/core/oldBase/productionLine/add-or-updata.vue b/src/views/core/oldBase/productionLine/add-or-updata.vue
new file mode 100644
index 00000000..32b83db5
--- /dev/null
+++ b/src/views/core/oldBase/productionLine/add-or-updata.vue
@@ -0,0 +1,153 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: DY
+ * @LastEditTime: 2023-09-21 15:45:07
+ * @Description:
+-->
+<template>
+	<el-form
+		class="dialog-inner__form"
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="90px">
+		<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 prop="factoryId" label="工厂名称">
+					<el-select
+						v-model="dataForm.factoryId"
+						filterable
+						clearable
+						placeholder="请选择工厂">
+						<el-option
+							v-for="item in urlOptions.optionArr.arr0"
+							: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="产线TT值(h)" prop="tvalue">
+					<el-input
+						v-model="dataForm.tvalue"
+						clearable
+						placeholder="请输入每小时下片数量" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="额外编码" prop="externalCode">
+					<el-input
+						v-model="dataForm.externalCode"
+						clearable
+						placeholder="请输入额外编码" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+
+		<el-row>
+			<el-col>
+				<el-form-item label="描述" prop="description">
+					<el-input
+						v-model="dataForm.description"
+						type="textarea"
+						placeholder="请输入内容" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	createProductionLine,
+	updateProductionLine,
+	getProductionLine,
+	getCode,
+} from '@/api/core/base/productionLine';
+import { getFactoryPage } from '@/api/core/base/factory';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+				getOption: true,
+				isGetCode: true,
+				codeURL: getCode,
+				createURL: createProductionLine,
+				updateURL: updateProductionLine,
+				infoURL: getProductionLine,
+				optionArrUrl: [getFactoryPage],
+			},
+			dataForm: {
+				id: undefined,
+				code: undefined,
+				name: undefined,
+				tvalue: undefined,
+				factoryId: undefined,
+				externalCode: undefined,
+				remark: undefined,
+				description: undefined,
+			},
+			dataRule: {
+				code: [
+					{ required: true, message: '产线编码不能为空', trigger: 'blur' },
+				],
+				name: [
+					{ required: true, message: '产线名称不能为空', trigger: 'blur' },
+				],
+				factoryId: [
+					{ required: true, message: '工厂不能为空', trigger: 'change' },
+				],
+				tvalue: [
+					{
+						type: 'number',
+						message: '请输入正确的数字',
+						trigger: 'change',
+						transform: (val) => Number(val),
+					},
+				],
+			},
+		};
+	},
+	methods: {},
+};
+</script>
+
+<style scoped>
+.dialog-inner__form >>> .el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/core/oldBase/productionLine/index.vue b/src/views/core/oldBase/productionLine/index.vue
new file mode 100644
index 00000000..474bfcad
--- /dev/null
+++ b/src/views/core/oldBase/productionLine/index.vue
@@ -0,0 +1,217 @@
+<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 '../../mixins/basic-page';
+import codeFilter from '../../mixins/code-filter';
+import { parseTime } from '../../mixins/code-filter';
+import {
+	deleteProductionLine,
+	getProductionLinePage,
+	exportProductionLineExcel,
+	getStatus,
+} from '@/api/core/base/productionLine';
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '产线编码'
+	},
+	{
+		prop: 'name',
+		label: '产线名称'
+	},
+	{
+		prop: 'factoryName',
+		label: '工厂'
+	},
+	{
+		prop: 'externalCode',
+		label: '额外编码'
+	},
+	{
+		prop: 'status',
+		label: '当前状态',
+		filter: codeFilter('lineStatus'),
+	},
+	{
+		prop: 'description',
+		label: '描述'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getProductionLinePage,
+				deleteURL: deleteProductionLine,
+				exportURL: exportProductionLineExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:production-line:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base: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: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:production-line:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:production-line:create') ? 'separate' : '',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('base:production-line:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true;
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+				this.listQuery.total = response.data.total;
+				this.getStatus(response.data.list);
+				this.dataListLoading = false;
+			});
+		},
+		getStatus(list) {
+			const ids = list.map((i) => {
+				return i.id;
+			});
+			getStatus(ids).then((response) => {
+				response.forEach((a) => {
+					list.forEach((b) => {
+						if (b.id === a.id) b.status = a.status;
+					});
+				});
+				this.tableData = list;
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					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>
diff --git a/src/views/core/oldBase/productionLineRecDay/index.vue b/src/views/core/oldBase/productionLineRecDay/index.vue
new file mode 100644
index 00000000..6b09138a
--- /dev/null
+++ b/src/views/core/oldBase/productionLineRecDay/index.vue
@@ -0,0 +1,271 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="产线id" prop="productionLineId">
+        <el-input v-model="queryParams.productionLineId" placeholder="请输入产线id" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="上一次记录时间至该条记录时间段内上片数量" prop="inputNum">
+        <el-input v-model="queryParams.inputNum" placeholder="请输入上一次记录时间至该条记录时间段内上片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="上一次记录时间至该条记录时间段内下片数量" prop="outputNum">
+        <el-input v-model="queryParams.outputNum" placeholder="请输入上一次记录时间至该条记录时间段内下片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
+        <el-input v-model="queryParams.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
+        <el-input v-model="queryParams.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="记录时间" prop="recordTime">
+        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="合格率（%）" prop="passRate">
+        <el-input v-model="queryParams.passRate" placeholder="请输入合格率（%）" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['base:production-line-rec-day:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:production-line-rec-day:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="产线id" align="center" prop="productionLineId" />
+      <el-table-column label="上一次记录时间至该条记录时间段内上片数量" align="center" prop="inputNum" />
+      <el-table-column label="上一次记录时间至该条记录时间段内下片数量" align="center" prop="outputNum" />
+      <el-table-column label="该记录时间点的累计上片数量" align="center" prop="sumInputNum" />
+      <el-table-column label="该记录时间点的累计下片数量" align="center" prop="sumOutputNum" />
+      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recordTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="合格率（%）" align="center" prop="passRate" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['base:production-line-rec-day:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:production-line-rec-day:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产线id" prop="productionLineId">
+          <el-input v-model="form.productionLineId" placeholder="请输入产线id" />
+        </el-form-item>
+        <el-form-item label="上一次记录时间至该条记录时间段内上片数量" prop="inputNum">
+          <el-input v-model="form.inputNum" placeholder="请输入上一次记录时间至该条记录时间段内上片数量" />
+        </el-form-item>
+        <el-form-item label="上一次记录时间至该条记录时间段内下片数量" prop="outputNum">
+          <el-input v-model="form.outputNum" placeholder="请输入上一次记录时间至该条记录时间段内下片数量" />
+        </el-form-item>
+        <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
+          <el-input v-model="form.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" />
+        </el-form-item>
+        <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
+          <el-input v-model="form.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" />
+        </el-form-item>
+        <el-form-item label="记录时间" prop="recordTime">
+          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
+        </el-form-item>
+        <el-form-item label="合格率（%）" prop="passRate">
+          <el-input v-model="form.passRate" placeholder="请输入合格率（%）" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createProductionLineRecDay, updateProductionLineRecDay, deleteProductionLineRecDay, getProductionLineRecDay, getProductionLineRecDayPage, exportProductionLineRecDayExcel } from "@/api/core/base/productionLineRecDay";
+
+export default {
+  name: "ProductionLineRecDay",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产线生产定时记录表 一天添加一次数据列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        productionLineId: null,
+        inputNum: null,
+        outputNum: null,
+        sumInputNum: null,
+        sumOutputNum: null,
+        recordTime: [],
+        passRate: null,
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        inputNum: [{ required: true, message: "上一次记录时间至该条记录时间段内上片数量不能为空", trigger: "blur" }],
+        outputNum: [{ required: true, message: "上一次记录时间至该条记录时间段内下片数量不能为空", trigger: "blur" }],
+        sumInputNum: [{ required: true, message: "该记录时间点的累计上片数量不能为空", trigger: "blur" }],
+        sumOutputNum: [{ required: true, message: "该记录时间点的累计下片数量不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getProductionLineRecDayPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        productionLineId: undefined,
+        inputNum: undefined,
+        outputNum: undefined,
+        sumInputNum: undefined,
+        sumOutputNum: undefined,
+        recordTime: undefined,
+        passRate: undefined,
+      };
+      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;
+      getProductionLineRecDay(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改产线生产定时记录表 一天添加一次数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateProductionLineRecDay(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createProductionLineRecDay(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除产线生产定时记录表 一天添加一次数据编号为"' + id + '"的数据项?').then(function() {
+          return deleteProductionLineRecDay(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有产线生产定时记录表 一天添加一次数据数据项?').then(() => {
+          this.exportLoading = true;
+          return exportProductionLineRecDayExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '产线生产定时记录表 一天添加一次数据.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/core/oldBase/productionLineRecSch/index.vue b/src/views/core/oldBase/productionLineRecSch/index.vue
new file mode 100644
index 00000000..5801e932
--- /dev/null
+++ b/src/views/core/oldBase/productionLineRecSch/index.vue
@@ -0,0 +1,271 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="产线id" prop="productionLineId">
+        <el-input v-model="queryParams.productionLineId" placeholder="请输入产线id" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="上一次记录时间至该条记录时间端内上片数量" prop="inputNum">
+        <el-input v-model="queryParams.inputNum" placeholder="请输入上一次记录时间至该条记录时间端内上片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="上一次记录时间至该条记录时间端内下片数量" prop="outputNum">
+        <el-input v-model="queryParams.outputNum" placeholder="请输入上一次记录时间至该条记录时间端内下片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
+        <el-input v-model="queryParams.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
+        <el-input v-model="queryParams.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="记录时间" prop="recordTime">
+        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="合格率（%）" prop="passRate">
+        <el-input v-model="queryParams.passRate" placeholder="请输入合格率（%）" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['base:production-line-rec-sch:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:production-line-rec-sch:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="产线id" align="center" prop="productionLineId" />
+      <el-table-column label="上一次记录时间至该条记录时间端内上片数量" align="center" prop="inputNum" />
+      <el-table-column label="上一次记录时间至该条记录时间端内下片数量" align="center" prop="outputNum" />
+      <el-table-column label="该记录时间点的累计上片数量" align="center" prop="sumInputNum" />
+      <el-table-column label="该记录时间点的累计下片数量" align="center" prop="sumOutputNum" />
+      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recordTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="合格率（%）" align="center" prop="passRate" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['base:production-line-rec-sch:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:production-line-rec-sch:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产线id" prop="productionLineId">
+          <el-input v-model="form.productionLineId" placeholder="请输入产线id" />
+        </el-form-item>
+        <el-form-item label="上一次记录时间至该条记录时间端内上片数量" prop="inputNum">
+          <el-input v-model="form.inputNum" placeholder="请输入上一次记录时间至该条记录时间端内上片数量" />
+        </el-form-item>
+        <el-form-item label="上一次记录时间至该条记录时间端内下片数量" prop="outputNum">
+          <el-input v-model="form.outputNum" placeholder="请输入上一次记录时间至该条记录时间端内下片数量" />
+        </el-form-item>
+        <el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
+          <el-input v-model="form.sumInputNum" placeholder="请输入该记录时间点的累计上片数量" />
+        </el-form-item>
+        <el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
+          <el-input v-model="form.sumOutputNum" placeholder="请输入该记录时间点的累计下片数量" />
+        </el-form-item>
+        <el-form-item label="记录时间" prop="recordTime">
+          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
+        </el-form-item>
+        <el-form-item label="合格率（%）" prop="passRate">
+          <el-input v-model="form.passRate" placeholder="请输入合格率（%）" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createProductionLineRecSch, updateProductionLineRecSch, deleteProductionLineRecSch, getProductionLineRecSch, getProductionLineRecSchPage, exportProductionLineRecSchExcel } from "@/api/core/base/productionLineRecSch";
+
+export default {
+  name: "ProductionLineRecSch",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        productionLineId: null,
+        inputNum: null,
+        outputNum: null,
+        sumInputNum: null,
+        sumOutputNum: null,
+        recordTime: [],
+        passRate: null,
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        inputNum: [{ required: true, message: "上一次记录时间至该条记录时间端内上片数量不能为空", trigger: "blur" }],
+        outputNum: [{ required: true, message: "上一次记录时间至该条记录时间端内下片数量不能为空", trigger: "blur" }],
+        sumInputNum: [{ required: true, message: "该记录时间点的累计上片数量不能为空", trigger: "blur" }],
+        sumOutputNum: [{ required: true, message: "该记录时间点的累计下片数量不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getProductionLineRecSchPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        productionLineId: undefined,
+        inputNum: undefined,
+        outputNum: undefined,
+        sumInputNum: undefined,
+        sumOutputNum: undefined,
+        recordTime: undefined,
+        passRate: undefined,
+      };
+      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;
+      getProductionLineRecSch(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateProductionLineRecSch(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createProductionLineRecSch(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加编号为"' + id + '"的数据项?').then(function() {
+          return deleteProductionLineRecSch(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加数据项?').then(() => {
+          this.exportLoading = true;
+          return exportProductionLineRecSchExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '产线生产定时记录表 一小时添加一次数据	至少需要一个上片设备和下片设备才会自动添加.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/core/oldBase/workshopSection/add-or-updata.vue b/src/views/core/oldBase/workshopSection/add-or-updata.vue
new file mode 100644
index 00000000..d0b5afc9
--- /dev/null
+++ b/src/views/core/oldBase/workshopSection/add-or-updata.vue
@@ -0,0 +1,112 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 13:52:10
+ * @LastEditors: DY
+ * @LastEditTime: 2023-10-16 13:40:00
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="90px">
+		<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 prop="productionLineId" label="产线">
+					<el-select
+					v-model="dataForm.productionLineId" filterable clearable placeholder="请选择产线">
+						<el-option
+							v-for="item in urlOptions.optionArr.arr0"
+							: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="sort">
+					<el-input-number v-model="dataForm.sort" :min="1" :max="100" clearable placeholder="请输入排序" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="备注" prop="remark">
+			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../mixins/basic-add';
+import {
+	createWorkshopSection,
+	updateWorkshopSection,
+	getWorkshopSection,
+	getCode,
+} from '@/api/core/base/workshopSection';
+import {
+	getProductionLinePage,
+} from '@/api/core/base/productionLine';
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+        getOption: true,
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createWorkshopSection,
+				updateURL: updateWorkshopSection,
+				infoURL: getWorkshopSection,
+        optionArrUrl: [getProductionLinePage],
+			},
+			dataForm: {
+				id: undefined,
+				code: undefined,
+				productionLineId: undefined,
+				sort: undefined,
+				name: undefined,
+				remark: undefined,
+			},
+			dataRule: {
+				code: [
+					{ required: true, message: '工段编码不能为空', trigger: 'blur' },
+				],
+				name: [
+					{ required: true, message: '工段名称不能为空', trigger: 'blur' },
+				],
+				sort: [
+					{ required: true, message: '排序不能为空', trigger: 'blur' },
+				],
+        productionLineId: [
+					{ required: true, message: '产线不能为空', trigger: 'change' },
+				],
+			},
+		};
+	},
+	methods: {
+	},
+};
+</script>
diff --git a/src/views/core/oldBase/workshopSection/index.vue b/src/views/core/oldBase/workshopSection/index.vue
new file mode 100644
index 00000000..7bc1514f
--- /dev/null
+++ b/src/views/core/oldBase/workshopSection/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" />
+		<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 '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import {
+  deleteWorkshopSection,
+  getWorkshopSectionPage,
+  exportWorkshopSectionExcel
+} from "@/api/core/base/workshopSection";
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '工段编码'
+	},
+	{
+		prop: 'name',
+		label: '工段名称'
+	},
+	{
+		prop: 'productionLineName',
+		label: '产线'
+	},
+	{
+		prop: 'sort',
+		label: '排序'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWorkshopSectionPage,
+				deleteURL: deleteWorkshopSection,
+				exportURL: exportWorkshopSectionExcel,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:workshop-section:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base: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: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:workshop-section:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:workshop-section:create') ? 'separate' : '',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('base:workshop-section:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					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>
diff --git a/src/views/equipment/base/inspection/Content/index.vue b/src/views/equipment/base/inspection/Content/index.vue
index e79cf7b7..ccd56a5f 100644
--- a/src/views/equipment/base/inspection/Content/index.vue
+++ b/src/views/equipment/base/inspection/Content/index.vue
@@ -84,10 +84,10 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'program', label: '巡检项目' },
-				{ prop: 'content', label: '巡检内容' },
-				{ prop: 'code', label: '巡检内容编码' },
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'program', label: '巡检项目', showOverflowtooltip: true },
+				{ prop: 'content', label: '巡检内容', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'code', label: '巡检内容编码', showOverflowtooltip: true },
+				{ prop: 'remark', label: '备注', showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue
index 7649f3ee..664c4ebe 100644
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@@ -60,110 +60,112 @@
 						</el-col>
 					</el-row>
 
-					<el-divider style="margin-top: -10px" />
+					<el-divider />
 					
-					<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-						{{ '设备维修信息' }}
-					</small-title>
-					<el-row :gutter="20">
-						<el-col :span="6">
-							<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="6">
-							<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="6">
-							<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-col :span="6">
-							<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>
+					<div v-if=" disabled && dataForm.maintenanceStatus === 1 ? true : !disabled ? true : false">
+						<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+							{{ '设备维修信息' }}
+						</small-title>
+						<el-row :gutter="20">
+							<el-col :span="6">
+								<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="6">
+								<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="6">
+								<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-col :span="6">
+								<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="faultDetail"
-								:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
-								<!-- // 富文本 -->
-								<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150"/>
-							</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="150"/>
+								</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="150"/>
-							</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="150"/>
+								</el-form-item>
+							</el-col>
+						</el-row>
 
-					<el-row :gutter="20">
-						<el-col>
-							<el-form-item label="维修附件" prop="file">
-								<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
-							</el-form-item>
-						</el-col>
-					</el-row>
+						<el-row :gutter="20">
+							<el-col>
+								<el-form-item label="维修附件" prop="file">
+									<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
+								</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"
-									:placeholder="`请输入备注`"
-									: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"
+										:placeholder="`请输入备注`"
+										:disabled="disabled" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</div>
 				</el-form>
 
 				<div v-if="!disabled" class="drawer-body__footer">
@@ -249,7 +251,7 @@ export default {
 					getEqRepair(this.dataForm.id).then(response => {
 						this.formLoading = false
             this.dataForm = response.data;
-						this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+						this.dataForm.maintenanceStatus = this.dataForm.maintenanceStatus || 0
 						if (this.dataForm.files.length > 0) {
 							this.file = this.dataForm.files[0].fileUrl
 							this.fileName = this.dataForm.files[0].fileName
diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue
index fe7c4768..a96bc900 100644
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@@ -121,7 +121,7 @@ export default {
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'maintenanceDetail', label: '维修明细' },
+				{ prop: 'maintenanceDetail', label: '维修明细', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true },
diff --git a/src/views/equipment/base/spareParts/Config/addSparts.vue b/src/views/equipment/base/spareParts/Config/addSparts.vue
index 85975edd..06edaab2 100644
--- a/src/views/equipment/base/spareParts/Config/addSparts.vue
+++ b/src/views/equipment/base/spareParts/Config/addSparts.vue
@@ -9,72 +9,80 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="disabled"
 		class="drawer"
-		size="60%">
+		size="60%"
+		@closed="$emit('destroy')">
 		<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 class="content">
+			<el-form
+				ref="form"
+				:model="dataForm"
+				label-width="100px"
+				label-position="top"
+				v-loading="formLoading">
+				<el-row :gutter="20">
+					<el-col :span="6">
+						<el-form-item label="配置名" prop="name">
+							<span>{{ dataForm.name }}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="设备名称" prop="equipmentName">
+							<span>{{ dataForm.equipmentName }}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="负责人" prop="responsible">
+							<span>{{ dataForm.responsible }}</span>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-form-item label="描述" prop="description">
+					<div v-html="dataForm.description" style="padding: 5px; margin: 0; border: 1px solid #dfdfdf" />
+					<!-- <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>
+				<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+					{{ '备品备件' }}
+				</small-title>
+				<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>	
 
-		<div class="drawer-body__footer">
-			<el-button type="primary" @click="goback()">关闭</el-button>
+			<div v-if="!disabled" class="drawer-body__footer">
+				<el-button type="primary" @click="goback()">关闭</el-button>
+			</div>
 		</div>
 
 		<attr-add
@@ -255,10 +263,10 @@ export default {
 	padding: 18px;
 }
 .action_btn {
-  /* float: right; */
+  float: right;
 	display: flex;
 	justify-content: right;
-  margin: 5px 15px;
+  margin: -35px 15px;
   font-size: 14px;
 }
 .add {
@@ -312,4 +320,7 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
+.content {
+	padding: 0 20px;
+}
 </style>
diff --git a/src/views/equipment/base/spareParts/Config/index.vue b/src/views/equipment/base/spareParts/Config/index.vue
index d76d9616..36acbf2d 100644
--- a/src/views/equipment/base/spareParts/Config/index.vue
+++ b/src/views/equipment/base/spareParts/Config/index.vue
@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="250"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -34,7 +34,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="35%"
+			width="50%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@@ -44,12 +44,14 @@
 				v-model="form"
 				:disabled="mode == 'detail'"
 				:has-files="false"
-				:rows="rows" />
+				:rows="rows"
+				style="margin: 0 30px" />
 		</base-dialog>
 		<addSparts
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList" />
+			@refreshDataList="getList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -79,22 +81,24 @@ export default {
 				// 			btnName: '详情',
 				// 	  }
 				// 	: undefined,
-				this.$auth.hasPermi('equipment:spare-parts-config:update')
+				this.$auth.hasPermi('equipment:spare-parts-config:addParts')
 					? {
-							type: 'edit',
-							btnName: '修改',
+							type: 'addParts',
+							btnName: '添加',
+							showTip: '添加备件'
 					  }
 					: undefined,
 				this.$auth.hasPermi('equipment:spare-parts-config:queryParts')
 					? {
 							type: 'queryParts',
-							btnName: '查看备件',
+							btnName: '查看',
+							showTip: '查看备件'
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:spare-parts-config:addParts')
+				this.$auth.hasPermi('equipment:spare-parts-config:update')
 					? {
-							type: 'addParts',
-							btnName: '添加备件',
+							type: 'edit',
+							btnName: '修改',
 					  }
 					: undefined,
 				this.$auth.hasPermi('equipment:spare-parts-config:delete')
@@ -105,15 +109,15 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '配置名' },
-				{ prop: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名' },
-				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'responsible', label: '负责人' },
+				{ prop: 'name', label: '配置名', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'sectionName', label: '工段', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentCode', label: '设备编码', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'responsible', label: '负责人', minWidth: 150, showOverflowtooltip: true },
 				// { prop: 'unit', label: '单位', filter: publicFormatter('unit_dict') },
-				{ prop: 'description', label: '描述', subcomponent: htmls },
-				{ prop: 'sparePartNumber', label: '备品备件数量' },
+				{ prop: 'description', label: '描述', subcomponent: htmls, minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'sparePartNumber', label: '备品备件数量', width: 130 },
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -198,7 +202,7 @@ export default {
 						prop: 'description', // TODO: 富文本
 						subcomponent: Editor,
 						bind: {
-							'min-height': 192
+							'min-height': 150
 						}
 					},
 				],
diff --git a/src/views/equipment/base/spareParts/Monitor/addSparts.vue b/src/views/equipment/base/spareParts/Monitor/addSparts.vue
index a39a8dc5..24f68db2 100644
--- a/src/views/equipment/base/spareParts/Monitor/addSparts.vue
+++ b/src/views/equipment/base/spareParts/Monitor/addSparts.vue
@@ -9,81 +9,84 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="!isLog"
 		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 class="content">
+			<el-form
+				ref="form"
+				:model="dataForm"
+				label-width="90px"
+				v-loading="formLoading">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item v-if="!isLog" label="配置名" prop="name">
+							<span style="margin-left: 5px">{{ dataForm.name }}</span>
+						</el-form-item>
+						<el-form-item v-else label="产线名称" prop="lineName">
+							<span style="margin-left: 5px">{{ dataForm.lineName }}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="设备名称" prop="equipmentName">
+							<span style="margin-left: 5px">{{ dataForm.equipmentName }}</span>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-form-item label="描述" prop="description">
+					<div v-html="dataForm.description" style="padding: 5px; margin-left: 5px; border: 1px solid #dfdfdf" />
+					<!-- <editor v-model="dataForm.description" :read-only="true" :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>
 
-		<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">
+		<div v-if="isLog" class="drawer-body__footer">
 			<el-button type="primary" @click="goback()">关闭</el-button>
 		</div>
 
@@ -429,4 +432,7 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
+.content {
+	padding: 0 20px;
+}
 </style>
diff --git a/src/views/equipment/base/spareParts/Monitor/index.vue b/src/views/equipment/base/spareParts/Monitor/index.vue
index e11c65e0..4682649b 100644
--- a/src/views/equipment/base/spareParts/Monitor/index.vue
+++ b/src/views/equipment/base/spareParts/Monitor/index.vue
@@ -74,8 +74,7 @@ const remainBox = {
 		value() {
 			const temp = this.injectData[this.injectData.prop] || null;
 			if (temp) {
-				console.log('12', temp);
-				return temp === 'Green' ? 'green' : 'red';
+				return temp === 'Green' ? '未超期' : temp === 'Red' ? '已超期' : '即将超期';
 			}
 			return this.injectData[this.injectData.prop] || null;
 		},
@@ -83,7 +82,7 @@ const remainBox = {
 			if (this.value) {
 				// const v = +this.value;
 				// return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
-				return this.value;
+				return this.value === '未超期' ? '#37D97F' : this.value === '已超期' ? '#FF5454' : '#FFD767';
 			}
 			return 'unset';
 		},
@@ -95,9 +94,9 @@ const remainBox = {
 					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' || this.color == 'green' ? '#fff' : 'unset'
+					'#fff'
 				}`}>
-				{this.injectData[this.injectData.prop] || ''}
+				{this.value}
 			</div>
 		);
 	},
@@ -155,18 +154,19 @@ export default {
 				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '配置名' },
-				{ prop: 'lineName', label: '产线名称' },
-				{ prop: 'sectionName', label: '工段名' },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'responsible', label: '负责人' },
+				{ prop: 'name', label: '配置名', showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线名称', showOverflowtooltip: true },
+				{ prop: 'sectionName', label: '工段名', showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名称', showOverflowtooltip: true },
+				{ prop: 'responsible', label: '负责人', minWidth: 130, showOverflowtooltip: true },
 				{ prop: 'color', label: '是否超期', subcomponent: remainBox },
-				{ prop: 'opt1', label: '备件更换', name: '操作', subcomponent: btn },
+				{ prop: 'opt1', label: '备件更换', name: '操作', subcomponent: btn, width: 110 },
 				{
 					prop: 'opt2',
 					label: '更换记录',
 					name: '更新记录',
 					subcomponent: btn,
+					width: 110
 				}, // TODO: 是否换成按钮， 群里问
 				// { prop: 'remark', label: '备注' },
 			],
diff --git a/src/views/base/coreAlarmLog/index.vue b/src/views/oldBase/coreAlarmLog/index.vue
similarity index 100%
rename from src/views/base/coreAlarmLog/index.vue
rename to src/views/oldBase/coreAlarmLog/index.vue
diff --git a/src/views/oldBase/coreCustomer/add-or-updata.vue b/src/views/oldBase/coreCustomer/add-or-updata.vue
new file mode 100644
index 00000000..5156cc42
--- /dev/null
+++ b/src/views/oldBase/coreCustomer/add-or-updata.vue
@@ -0,0 +1,105 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-22 10:27:50
+ * @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();
+								}
+							} else {
+								callback();
+							}
+            }, trigger: "blur"
+          }
+        ]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>
diff --git a/src/views/oldBase/coreCustomer/index.vue b/src/views/oldBase/coreCustomer/index.vue
new file mode 100644
index 00000000..0a1a9a1a
--- /dev/null
+++ b/src/views/oldBase/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>
diff --git a/src/views/base/coreDepartment/add-or-updata.vue b/src/views/oldBase/coreDepartment/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreDepartment/add-or-updata.vue
rename to src/views/oldBase/coreDepartment/add-or-updata.vue
diff --git a/src/views/base/coreDepartment/index.vue b/src/views/oldBase/coreDepartment/index.vue
similarity index 100%
rename from src/views/base/coreDepartment/index.vue
rename to src/views/oldBase/coreDepartment/index.vue
diff --git a/src/views/base/coreEquipment/components/AssetsUpload.vue b/src/views/oldBase/coreEquipment/components/AssetsUpload.vue
similarity index 100%
rename from src/views/base/coreEquipment/components/AssetsUpload.vue
rename to src/views/oldBase/coreEquipment/components/AssetsUpload.vue
diff --git a/src/views/base/coreEquipment/components/DialogForm.vue b/src/views/oldBase/coreEquipment/components/DialogForm.vue
similarity index 100%
rename from src/views/base/coreEquipment/components/DialogForm.vue
rename to src/views/oldBase/coreEquipment/components/DialogForm.vue
diff --git a/src/views/base/coreEquipment/components/EquipmentDrawer.vue b/src/views/oldBase/coreEquipment/components/EquipmentDrawer.vue
similarity index 100%
rename from src/views/base/coreEquipment/components/EquipmentDrawer.vue
rename to src/views/oldBase/coreEquipment/components/EquipmentDrawer.vue
diff --git a/src/views/base/coreEquipment/components/EquipmentInfoForm.vue b/src/views/oldBase/coreEquipment/components/EquipmentInfoForm.vue
similarity index 100%
rename from src/views/base/coreEquipment/components/EquipmentInfoForm.vue
rename to src/views/oldBase/coreEquipment/components/EquipmentInfoForm.vue
diff --git a/src/views/base/coreEquipment/index.vue b/src/views/oldBase/coreEquipment/index.vue
similarity index 100%
rename from src/views/base/coreEquipment/index.vue
rename to src/views/oldBase/coreEquipment/index.vue
diff --git a/src/views/base/coreEquipmentLineBind/index.vue b/src/views/oldBase/coreEquipmentLineBind/index.vue
similarity index 100%
rename from src/views/base/coreEquipmentLineBind/index.vue
rename to src/views/oldBase/coreEquipmentLineBind/index.vue
diff --git a/src/views/base/coreEquipmentType/index.vue b/src/views/oldBase/coreEquipmentType/index.vue
similarity index 100%
rename from src/views/base/coreEquipmentType/index.vue
rename to src/views/oldBase/coreEquipmentType/index.vue
diff --git a/src/views/base/coreHotMaterial/add-or-updata.vue b/src/views/oldBase/coreHotMaterial/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreHotMaterial/add-or-updata.vue
rename to src/views/oldBase/coreHotMaterial/add-or-updata.vue
diff --git a/src/views/base/coreHotMaterial/index.vue b/src/views/oldBase/coreHotMaterial/index.vue
similarity index 100%
rename from src/views/base/coreHotMaterial/index.vue
rename to src/views/oldBase/coreHotMaterial/index.vue
diff --git a/src/views/base/coreMajor/add-or-updata.vue b/src/views/oldBase/coreMajor/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreMajor/add-or-updata.vue
rename to src/views/oldBase/coreMajor/add-or-updata.vue
diff --git a/src/views/base/coreMajor/index.vue b/src/views/oldBase/coreMajor/index.vue
similarity index 100%
rename from src/views/base/coreMajor/index.vue
rename to src/views/oldBase/coreMajor/index.vue
diff --git a/src/views/base/coreWorkOrder/SmallTitle.vue b/src/views/oldBase/coreProduct/SmallTitle.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/SmallTitle.vue
rename to src/views/oldBase/coreProduct/SmallTitle.vue
diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/oldBase/coreProduct/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreProduct/add-or-updata.vue
rename to src/views/oldBase/coreProduct/add-or-updata.vue
diff --git a/src/views/base/coreProduct/attr-add.vue b/src/views/oldBase/coreProduct/attr-add.vue
similarity index 100%
rename from src/views/base/coreProduct/attr-add.vue
rename to src/views/oldBase/coreProduct/attr-add.vue
diff --git a/src/views/base/coreProduct/index.vue b/src/views/oldBase/coreProduct/index.vue
similarity index 100%
rename from src/views/base/coreProduct/index.vue
rename to src/views/oldBase/coreProduct/index.vue
diff --git a/src/views/base/coreProductionLine/add-or-updata.vue b/src/views/oldBase/coreProductionLine/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreProductionLine/add-or-updata.vue
rename to src/views/oldBase/coreProductionLine/add-or-updata.vue
diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/oldBase/coreProductionLine/index.vue
similarity index 100%
rename from src/views/base/coreProductionLine/index.vue
rename to src/views/oldBase/coreProductionLine/index.vue
diff --git a/src/views/oldBase/coreSupplier/add-or-updata.vue b/src/views/oldBase/coreSupplier/add-or-updata.vue
new file mode 100644
index 00000000..bcdfb8a3
--- /dev/null
+++ b/src/views/oldBase/coreSupplier/add-or-updata.vue
@@ -0,0 +1,130 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-22 10:27:43
+ * @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();
+								}
+							} else {
+								callback();
+							}
+            }, trigger: "blur"
+          }
+        ]
+      }
+		};
+	},
+	mounted() {},
+	methods: {
+		// 表单提交
+    dataFormSubmit() {
+			console.log('你好', this.dataForm)
+      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.$emit("refreshDataList");
+        });
+      });
+    },
+	}
+};
+</script>
diff --git a/src/views/oldBase/coreSupplier/index.vue b/src/views/oldBase/coreSupplier/index.vue
new file mode 100644
index 00000000..6be77494
--- /dev/null
+++ b/src/views/oldBase/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>
diff --git a/src/views/base/custom/SmallTitle.vue b/src/views/oldBase/coreWorkOrder/SmallTitle.vue
similarity index 100%
rename from src/views/base/custom/SmallTitle.vue
rename to src/views/oldBase/coreWorkOrder/SmallTitle.vue
diff --git a/src/views/base/coreWorkOrder/add-or-updata.vue b/src/views/oldBase/coreWorkOrder/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/add-or-updata.vue
rename to src/views/oldBase/coreWorkOrder/add-or-updata.vue
diff --git a/src/views/base/coreWorkOrder/addWorkOrder.vue b/src/views/oldBase/coreWorkOrder/addWorkOrder.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/addWorkOrder.vue
rename to src/views/oldBase/coreWorkOrder/addWorkOrder.vue
diff --git a/src/views/base/coreWorkOrder/allocation.vue b/src/views/oldBase/coreWorkOrder/allocation.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/allocation.vue
rename to src/views/oldBase/coreWorkOrder/allocation.vue
diff --git a/src/views/base/coreWorkOrder/attr-add.vue b/src/views/oldBase/coreWorkOrder/attr-add.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/attr-add.vue
rename to src/views/oldBase/coreWorkOrder/attr-add.vue
diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/oldBase/coreWorkOrder/detail.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/detail.vue
rename to src/views/oldBase/coreWorkOrder/detail.vue
diff --git a/src/views/base/coreWorkOrder/index.vue b/src/views/oldBase/coreWorkOrder/index.vue
similarity index 100%
rename from src/views/base/coreWorkOrder/index.vue
rename to src/views/oldBase/coreWorkOrder/index.vue
diff --git a/src/views/base/coreWorker/add-or-updata.vue b/src/views/oldBase/coreWorker/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreWorker/add-or-updata.vue
rename to src/views/oldBase/coreWorker/add-or-updata.vue
diff --git a/src/views/base/coreWorker/index.vue b/src/views/oldBase/coreWorker/index.vue
similarity index 100%
rename from src/views/base/coreWorker/index.vue
rename to src/views/oldBase/coreWorker/index.vue
diff --git a/src/views/base/coreWorkshopSection/add-or-updata.vue b/src/views/oldBase/coreWorkshopSection/add-or-updata.vue
similarity index 100%
rename from src/views/base/coreWorkshopSection/add-or-updata.vue
rename to src/views/oldBase/coreWorkshopSection/add-or-updata.vue
diff --git a/src/views/base/coreWorkshopSection/index.vue b/src/views/oldBase/coreWorkshopSection/index.vue
similarity index 100%
rename from src/views/base/coreWorkshopSection/index.vue
rename to src/views/oldBase/coreWorkshopSection/index.vue
diff --git a/src/views/base/packagingPrintLog/SmallTitle.vue b/src/views/oldBase/custom/SmallTitle.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/SmallTitle.vue
rename to src/views/oldBase/custom/SmallTitle.vue
diff --git a/src/views/base/custom/index.vue b/src/views/oldBase/custom/index.vue
similarity index 100%
rename from src/views/base/custom/index.vue
rename to src/views/oldBase/custom/index.vue
diff --git a/src/views/base/custom/preview.vue b/src/views/oldBase/custom/preview.vue
similarity index 100%
rename from src/views/base/custom/preview.vue
rename to src/views/oldBase/custom/preview.vue
diff --git a/src/views/base/custom/print-data.js b/src/views/oldBase/custom/print-data.js
similarity index 100%
rename from src/views/base/custom/print-data.js
rename to src/views/oldBase/custom/print-data.js
diff --git a/src/views/base/custom/providers.js b/src/views/oldBase/custom/providers.js
similarity index 100%
rename from src/views/base/custom/providers.js
rename to src/views/oldBase/custom/providers.js
diff --git a/src/views/base/dataBoard/index.vue b/src/views/oldBase/dataBoard/index.vue
similarity index 100%
rename from src/views/base/dataBoard/index.vue
rename to src/views/oldBase/dataBoard/index.vue
diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/oldBase/equipmentBindSection/dialogForm.vue
similarity index 100%
rename from src/views/base/equipmentBindSection/dialogForm.vue
rename to src/views/oldBase/equipmentBindSection/dialogForm.vue
diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/oldBase/equipmentBindSection/index.vue
similarity index 100%
rename from src/views/base/equipmentBindSection/index.vue
rename to src/views/oldBase/equipmentBindSection/index.vue
diff --git a/src/views/base/equipmentGroupAlarm/dialogForm.vue b/src/views/oldBase/equipmentGroupAlarm/dialogForm.vue
similarity index 100%
rename from src/views/base/equipmentGroupAlarm/dialogForm.vue
rename to src/views/oldBase/equipmentGroupAlarm/dialogForm.vue
diff --git a/src/views/base/equipmentGroupAlarm/index.vue b/src/views/oldBase/equipmentGroupAlarm/index.vue
similarity index 100%
rename from src/views/base/equipmentGroupAlarm/index.vue
rename to src/views/oldBase/equipmentGroupAlarm/index.vue
diff --git a/src/views/base/equipmentPlc/index.vue b/src/views/oldBase/equipmentPlc/index.vue
similarity index 100%
rename from src/views/base/equipmentPlc/index.vue
rename to src/views/oldBase/equipmentPlc/index.vue
diff --git a/src/views/base/equipmentPlcConnect/components/BasicDrawer.vue b/src/views/oldBase/equipmentPlcConnect/components/BasicDrawer.vue
similarity index 100%
rename from src/views/base/equipmentPlcConnect/components/BasicDrawer.vue
rename to src/views/oldBase/equipmentPlcConnect/components/BasicDrawer.vue
diff --git a/src/views/base/equipmentPlcConnect/http.js b/src/views/oldBase/equipmentPlcConnect/http.js
similarity index 100%
rename from src/views/base/equipmentPlcConnect/http.js
rename to src/views/oldBase/equipmentPlcConnect/http.js
diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/oldBase/equipmentPlcConnect/index.vue
similarity index 100%
rename from src/views/base/equipmentPlcConnect/index.vue
rename to src/views/oldBase/equipmentPlcConnect/index.vue
diff --git a/src/views/base/equipmentPlcParam/index.vue b/src/views/oldBase/equipmentPlcParam/index.vue
similarity index 100%
rename from src/views/base/equipmentPlcParam/index.vue
rename to src/views/oldBase/equipmentPlcParam/index.vue
diff --git a/src/views/base/packagingPrintModel/SmallTitle.vue b/src/views/oldBase/material/SmallTitle.vue
similarity index 100%
rename from src/views/base/packagingPrintModel/SmallTitle.vue
rename to src/views/oldBase/material/SmallTitle.vue
diff --git a/src/views/base/material/add-or-updata.vue b/src/views/oldBase/material/add-or-updata.vue
similarity index 100%
rename from src/views/base/material/add-or-updata.vue
rename to src/views/oldBase/material/add-or-updata.vue
diff --git a/src/views/oldBase/material/attr-add.vue b/src/views/oldBase/material/attr-add.vue
new file mode 100644
index 00000000..a200c3a4
--- /dev/null
+++ b/src/views/oldBase/material/attr-add.vue
@@ -0,0 +1,141 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'30%'"
+		: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="70px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="属性名" prop="attrName">
+				<el-input
+					v-model="dataForm.attrName"
+					placeholder="请输入属性名"
+					clearable />
+			</el-form-item>
+			<el-form-item label="属性值" prop="attrValue">
+				<el-input
+					v-model="dataForm.attrValue"
+					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 {
+	createMaterialAttr,
+	updateMaterialAttr,
+	getMaterialAttr
+} from '@/api/base/material';
+
+export default {
+	props: {
+		materialId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				attrName: '',
+				attrValue: '',
+			},
+			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) {
+					getMaterialAttr({
+						id: this.dataForm.id
+					}).then((res) => {
+						const { attrName, attrValue } = res.data;
+						this.dataForm.attrName = attrName;
+						this.dataForm.attrValue = attrValue;
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateMaterialAttr({
+							...this.dataForm,
+							materialId: this.materialId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createMaterialAttr({
+						...this.dataForm,
+						materialId: this.materialId,
+					}).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>
diff --git a/src/views/base/material/index.vue b/src/views/oldBase/material/index.vue
similarity index 100%
rename from src/views/base/material/index.vue
rename to src/views/oldBase/material/index.vue
diff --git a/src/views/base/materialDate/add-or-updata.vue b/src/views/oldBase/materialDate/add-or-updata.vue
similarity index 100%
rename from src/views/base/materialDate/add-or-updata.vue
rename to src/views/oldBase/materialDate/add-or-updata.vue
diff --git a/src/views/base/materialDate/index.vue b/src/views/oldBase/materialDate/index.vue
similarity index 100%
rename from src/views/base/materialDate/index.vue
rename to src/views/oldBase/materialDate/index.vue
diff --git a/src/views/base/materialProductBom/add-or-updata.vue b/src/views/oldBase/materialProductBom/add-or-updata.vue
similarity index 100%
rename from src/views/base/materialProductBom/add-or-updata.vue
rename to src/views/oldBase/materialProductBom/add-or-updata.vue
diff --git a/src/views/base/materialProductBom/attr-add.vue b/src/views/oldBase/materialProductBom/attr-add.vue
similarity index 100%
rename from src/views/base/materialProductBom/attr-add.vue
rename to src/views/oldBase/materialProductBom/attr-add.vue
diff --git a/src/views/base/materialProductBom/index.vue b/src/views/oldBase/materialProductBom/index.vue
similarity index 100%
rename from src/views/base/materialProductBom/index.vue
rename to src/views/oldBase/materialProductBom/index.vue
diff --git a/src/views/base/materialUseLog/add-or-updata.vue b/src/views/oldBase/materialUseLog/add-or-updata.vue
similarity index 100%
rename from src/views/base/materialUseLog/add-or-updata.vue
rename to src/views/oldBase/materialUseLog/add-or-updata.vue
diff --git a/src/views/base/materialUseLog/index.vue b/src/views/oldBase/materialUseLog/index.vue
similarity index 100%
rename from src/views/base/materialUseLog/index.vue
rename to src/views/oldBase/materialUseLog/index.vue
diff --git a/src/views/base/mixins/basic-add.js b/src/views/oldBase/mixins/basic-add.js
similarity index 100%
rename from src/views/base/mixins/basic-add.js
rename to src/views/oldBase/mixins/basic-add.js
diff --git a/src/views/base/mixins/basic-page.js b/src/views/oldBase/mixins/basic-page.js
similarity index 100%
rename from src/views/base/mixins/basic-page.js
rename to src/views/oldBase/mixins/basic-page.js
diff --git a/src/views/base/mixins/code-filter.js b/src/views/oldBase/mixins/code-filter.js
similarity index 100%
rename from src/views/base/mixins/code-filter.js
rename to src/views/oldBase/mixins/code-filter.js
diff --git a/src/views/base/packagingPrintType/SmallTitle.vue b/src/views/oldBase/packagingPrintLog/SmallTitle.vue
similarity index 100%
rename from src/views/base/packagingPrintType/SmallTitle.vue
rename to src/views/oldBase/packagingPrintLog/SmallTitle.vue
diff --git a/src/views/base/packagingPrintLog/add-or-updata.vue b/src/views/oldBase/packagingPrintLog/add-or-updata.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/add-or-updata.vue
rename to src/views/oldBase/packagingPrintLog/add-or-updata.vue
diff --git a/src/views/base/packagingPrintLog/index.vue b/src/views/oldBase/packagingPrintLog/index.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/index.vue
rename to src/views/oldBase/packagingPrintLog/index.vue
diff --git a/src/views/base/packagingPrintModel/unitDict.vue b/src/views/oldBase/packagingPrintLog/unitDict.vue
similarity index 100%
rename from src/views/base/packagingPrintModel/unitDict.vue
rename to src/views/oldBase/packagingPrintLog/unitDict.vue
diff --git a/src/views/oldBase/packagingPrintModel/SmallTitle.vue b/src/views/oldBase/packagingPrintModel/SmallTitle.vue
new file mode 100644
index 00000000..93b4a18f
--- /dev/null
+++ b/src/views/oldBase/packagingPrintModel/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>
diff --git a/src/views/base/packagingPrintModel/add-or-updata.vue b/src/views/oldBase/packagingPrintModel/add-or-updata.vue
similarity index 100%
rename from src/views/base/packagingPrintModel/add-or-updata.vue
rename to src/views/oldBase/packagingPrintModel/add-or-updata.vue
diff --git a/src/views/base/packagingPrintModel/index.vue b/src/views/oldBase/packagingPrintModel/index.vue
similarity index 100%
rename from src/views/base/packagingPrintModel/index.vue
rename to src/views/oldBase/packagingPrintModel/index.vue
diff --git a/src/views/base/packagingPrintType/unitDict.vue b/src/views/oldBase/packagingPrintModel/unitDict.vue
similarity index 100%
rename from src/views/base/packagingPrintType/unitDict.vue
rename to src/views/oldBase/packagingPrintModel/unitDict.vue
diff --git a/src/views/oldBase/packagingPrintType/SmallTitle.vue b/src/views/oldBase/packagingPrintType/SmallTitle.vue
new file mode 100644
index 00000000..93b4a18f
--- /dev/null
+++ b/src/views/oldBase/packagingPrintType/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>
diff --git a/src/views/base/packagingPrintType/add-or-updata.vue b/src/views/oldBase/packagingPrintType/add-or-updata.vue
similarity index 100%
rename from src/views/base/packagingPrintType/add-or-updata.vue
rename to src/views/oldBase/packagingPrintType/add-or-updata.vue
diff --git a/src/views/base/packagingPrintType/index.vue b/src/views/oldBase/packagingPrintType/index.vue
similarity index 100%
rename from src/views/base/packagingPrintType/index.vue
rename to src/views/oldBase/packagingPrintType/index.vue
diff --git a/src/views/oldBase/packagingPrintType/unitDict.vue b/src/views/oldBase/packagingPrintType/unitDict.vue
new file mode 100644
index 00000000..94702ab4
--- /dev/null
+++ b/src/views/oldBase/packagingPrintType/unitDict.vue
@@ -0,0 +1,15 @@
+<template>
+  <dict-tag
+    :type="DICT_TYPE.UNIT_DICT"
+    :value="injectData.unitDictValue" />
+</template>
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+};
+</script>
diff --git a/src/views/oldOrder/base/orderManage/components/addWorkOrder.vue b/src/views/oldOrder/base/orderManage/components/addWorkOrder.vue
new file mode 100644
index 00000000..45f2a62e
--- /dev/null
+++ b/src/views/oldOrder/base/orderManage/components/addWorkOrder.vue
@@ -0,0 +1,304 @@
+<template>
+  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="工单名称" prop="name" v-if='!isBind'>
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
+            <el-option
+              v-for="item in workOrderList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="工单编码" prop="code">
+          <el-input v-model="form.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" disabled  style="width: 100%;">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name+' | '+item.specifications"
+              :value="item.id">
+              <span style="float: left">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划开始时间">
+          <el-date-picker
+            v-model="planStartTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;"
+            placeholder="选择日期"
+            :disabled="isBind">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="计划完成时间">
+          <el-date-picker
+            v-model="planFinishTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 100%;"
+            placeholder="选择日期"
+            :disabled="isBind">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划投入数量" prop="planAssignQuantity">
+          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划生产数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="关联工艺" prop="processFlowId">
+          <el-select v-model="form.processFlowId" placeholder="请选择" disabled 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-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="物料计算方式" prop="materialMethod">
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
+            <el-option label="产品基础BOM" :value="1"></el-option>
+            <el-option label="工艺扩展BOM" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="优先级" prop="priority">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+            <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='6'>
+        <el-form-item label="工单类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+            <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-col :span='6'>
+        <el-form-item label="关联产线" prop="productLineId">
+          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
+            <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-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="form.workers" :disabled="isBind"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <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, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
+import { getLineAll } from '@/api/base/productionLine'
+import moment from 'moment'
+export default {
+  name: 'AddWorkOrder',
+  data() {
+    return {
+      form: {
+        workOrderId: '',
+        orderId: '',
+        name: '',
+        code: '',
+        planProductId: '',
+        planStartTime: '',
+        planFinishTime: '',
+        planAssignQuantity: 0,
+        planQuantity: 0,
+        processFlowId: '',
+        materialMethod: 1,
+        priority: '',
+        productLineId: [],
+        type: '',
+        workers: '',
+        planAssignmentQuantity: ''
+      },
+      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" }],
+        productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
+        planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
+      },
+      productList: [],
+      processFlowList: [],
+      productLineList: [],
+      workOrderTypeList: [
+        {id: 1,name:'标准工单'},
+        {id: 2, name:'特殊工单'}
+      ],
+      planStartTime: '',
+      planFinishTime: '',
+      isBind: false,
+      workOrderList: []
+    }
+  },
+  methods: {
+    init(data, param) {
+      this.form.orderId = data.id
+      this.getList()
+      if (param === 'add') {
+        this.isBind = false
+        getWorkOrderCode().then(res => {
+          this.form.code = res.data || ''
+        })
+        this.form.planProductId = data.planProductId
+        this.form.processFlowId = data.processFlowId
+        this.form.materialMethod = data.materialMethod
+      }else{//绑定
+        this.isBind = true
+      }
+    },
+    getList() {
+      // 产品
+      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 || []
+      })
+    },
+    addWorkOrderSubmit() {
+      this.$refs['addWorkOrder'].validate((valid) => {
+        if (valid) {
+          if (this.isBind) {
+            //绑定工单
+            orderIssue({
+              workOrderId: this.form.workOrderId,
+              orderId: this.form.orderId,
+              planAssignmentQuantity: this.form.planAssignmentQuantity
+             }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功")
+                this.$emit('addWorkOrderSubmit')
+              }
+            })
+          } else {
+            // 新增工单
+            let _this = this
+            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+            orderIssue({ ..._this.form }).then(res => {
+              if (res.code === 0) {
+                _this.$modal.msgSuccess("操作成功")
+                let name = this.form.name
+                _this.$emit('addWorkOrderSubmit')
+                // 询问是否添加预使用主原料
+                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                    _this.$router.push({
+                      path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                    })
+                  })
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.addWorkOrder.resetFields()
+      this.form.materialMethod = 1
+      this.form.planAssignQuantity = 0
+      this.form.planQuantity = 0
+      this.planFinishTime = ''
+      this.planStartTime = ''
+      this.form.planFinishTime = ''
+      this.form.planStartTime = ''
+      this.isBind = false
+    },
+    // 绑定工单，选择工单时获取工单信息
+    getWorkOrderMsg() {
+      if (this.form.workOrderId) {
+        getWorkOrderById({id:this.form.workOrderId}).then(res => {
+          if (res.code === 0) {
+            this.form.code = res.data.code
+            this.form.planProductId = res.data.planProductId
+            this.planStartTime = res.data.planStartTime ? moment.unix(res.data.planStartTime).format('YYYY-MM-DD HH:mm:ss') : null
+            this.planFinishTime = res.data.planFinishTime ? moment.unix(res.data.planFinishTime).format('YYYY-MM-DD HH:mm:ss') : null
+            this.form.planAssignQuantity = res.data.planAssignQuantity
+            this.form.planQuantity = res.data.planQuantity
+            this.form.processFlowId = res.data.processFlowId
+            this.form.materialMethod = res.data.materialMethod
+            this.form.priority = res.data.priority ? res.data.priority + '' : ''
+            this.form.productLineId = res.data.productLineIds
+            this.form.type = res.data.type
+            this.form.workers = res.data.workers
+          }
+        })
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/oldOrder/base/orderManage/components/orderAdd.vue b/src/views/oldOrder/base/orderManage/components/orderAdd.vue
new file mode 100644
index 00000000..df871a9e
--- /dev/null
+++ b/src/views/oldOrder/base/orderManage/components/orderAdd.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form" label-position='top'>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="订单名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="订单号" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划加工数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name+' | '+(item.specifications || '')"
+              :value="item.id">
+              <span style="float: left">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="单价" prop="price">
+          <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="客户" prop="customerId">
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
+            <el-option
+              v-for="item in customerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="优先级" prop="priority">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable>
+            <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='6'>
+        <el-form-item label="包装规格" prop="packSpec">
+          <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="form.workers"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="关联工艺" prop="processFlowId">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
+            <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='6'>
+        <el-form-item label="物料计算方式" prop="materialMethod">
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" @change='materialMethodChange'>
+            <el-option label="产品基础BOM" :value="1"></el-option>
+            <el-option label="工艺扩展BOM" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="订单计划开始时间" prop="planStartTime">
+          <el-date-picker
+            v-model="form.planStartTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            @change="timeChange"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="订单计划完成时间" prop="planFinishTime">
+          <el-date-picker
+            v-model="form.planFinishTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            @change="timeChange"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!-- <el-row>
+      <el-col :span='24'>
+        <el-form-item label="描述信息" prop="description">
+          <el-input v-model="form.description"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row> -->
+  </el-form>
+</template>
+<script>
+import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage'
+import { getProductAll } from '@/api/base/product'
+import { getCustomerList } from '@/api/base/customer'
+export default {
+  name: 'OrderAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        planQuantity: '',
+        planProductId: '',
+        price: '',
+        customerId: '',
+        priority: '',
+        packSpec: '',
+        workers: '',
+        processFlowId: '',
+        materialMethod: 1,
+        remark: '',
+        // description: '',
+        planStartTime: '',
+        planFinishTime: ''
+      },
+      rules: {
+        name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
+        planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
+      },
+      productList: [],
+      customerList: [],
+      processFlowList: [],
+      isEdit: false //是否是编辑
+    }
+  },
+  methods: {
+    init(id) {
+      this.getList()
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        getOrderById({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.planQuantity = res.data.planQuantity
+            this.form.planProductId = res.data.planProductId
+            this.form.price = res.data.price
+            this.form.customerId = res.data.customerId
+            this.form.priority = res.data.priority ? res.data.priority + '' : ''
+            this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
+            this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
+            this.form.workers = res.data.workers
+            this.form.processFlowId = res.data.processFlowId
+            this.form.materialMethod = res.data.materialMethod
+            this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
+            this.form.remark = res.data.remark
+            // this.form.description = res.data.description
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 订单号
+        getOrderCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    getList() {
+      // 产品
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+      // 客户
+      getCustomerList().then(res => {
+        this.customerList = res.data || []
+      })
+      // 工艺
+      getProcessFlowList().then(res => {
+        this.processFlowList = res.data || []
+      })
+    },
+    timeChange() {
+      if (this.form.planStartTime && this.form.planFinishTime) {
+        if (this.form.planStartTime > this.form.planFinishTime) {
+          this.$modal.msgError('计划开始时间不能大于结束时间')
+        }
+      }
+    },
+    // 工艺变更
+    materialMethodChange(val) {
+      if (val === 2 && !this.form.processFlowId) {
+        this.form.materialMethod = 1
+        this.$modal.msgError("请先选择关联工艺");
+      }
+    },
+    // 工艺变更
+    processFlowIdChange(val) {
+      console.log(val)
+      if (!val) {
+        this.form.materialMethod = 1
+      }
+    },
+    submitForm() {
+      this.$refs['orderAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.form.planStartTime && this.form.planFinishTime) {
+            if (this.form.planStartTime > this.form.planFinishTime) {
+              this.$modal.msgError('计划开始时间不能大于结束时间')
+              return false
+            }
+          }
+          // console.log(this.form)
+          if (this.isEdit) {
+            //编辑
+            orderUpdate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            this.form.status = 1
+            this.form.triggerOrigin = 1
+            orderCreate({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.orderAddForm.resetFields()
+      this.form.materialMethod = 1
+      this.form.price = 0.00
+      this.form.planQuantity = 0
+      this.isEdit = false
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/oldOrder/base/orderManage/index.vue b/src/views/oldOrder/base/orderManage/index.vue
new file mode 100644
index 00000000..b398b76e
--- /dev/null
+++ b/src/views/oldOrder/base/orderManage/index.vue
@@ -0,0 +1,470 @@
+<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="240"
+        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='60%'
+    >
+      <order-add ref="orderAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+    <!-- 查看详情 -->
+    <!-- 新增工单 -->
+    <base-dialog
+      :dialogTitle="workIssueTitle"
+      :dialogVisible="addWorkOrdervisible"
+      @cancel="addWorkOrderCancel"
+      @confirm="addWorkOrderConfirm"
+      :before-close="addWorkOrderCancel"
+      width='70%'
+    >
+      <add-work-order ref="addWorkOrder" @addWorkOrderSubmit="addWorkOrderSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { getOrderPage, orderDelete, customerList, orderFinish } from '@/api/base/orderManage'
+import OrderAdd from './components/orderAdd'
+import AddWorkOrder from './components/addWorkOrder'
+import { publicFormatter } from '@/utils/dict'
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'name',
+    label: '订单名称',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '订单编码',
+    minWidth: 180
+  },
+  {
+    prop: 'customerId',
+    label: '客户',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'triggerOrigin',
+    label: '来源',
+    filter: publicFormatter('order_Origin')
+  },
+  {
+    prop: 'priority',
+    label: '优先级',
+    filter: publicFormatter('order_priority')
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    filter: publicFormatter('order_status')
+  },
+  {
+    prop: 'planQuantity',
+    label: '计划加工量',
+    width: 100
+  },
+  {
+    prop: 'actualQuantity',
+    label: '实际加工量',
+    width: 100
+  },
+  {
+    prop: 'productName',
+    label: '产品',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
+  },
+  {
+    prop: 'price',
+    label: '单价(元)',
+    align: 'right'
+  },
+  {
+    prop: 'workOrderNum',
+    label: '工单数量'
+  }
+]
+export default {
+  name: 'OrderManage',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名称',
+          placeholder: '订单名称',
+          param: 'name'
+        },
+        {
+          type: 'select',
+          label: '状态',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'status'
+        },
+        {
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        status: null,
+        lastIssuedTime: []
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+      this.$auth.hasPermi('base:order-manage:addWorkOrder')
+          ? {
+              type: 'add',
+              btnName: '新增',
+              showTip: '新增工单',
+              showParam: {
+                type: '|',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 1
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          ? {
+              type: 'bind',
+              btnName: '绑定',
+              showTip: '绑定工单',
+              showParam: {
+                type: '|',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 1
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+          ? {
+              type: 'complete',
+              btnName: '完成',
+              showTip: '完成订单',
+              showParam: {
+                type: '|',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:detail')
+          ? {
+              type: 'detail',
+              btnName: '详情'
+            }
+          : undefined,
+        this.$auth.hasPermi('base:order-manage:edit')
+          ? {
+              type: 'edit',
+              btnName: '编辑',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'triggerOrigin',
+                    value: 1
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 1
+                  }
+                ]
+              }
+            }
+          : undefined,
+        this.$auth.hasPermi('base:order-manage:delete')
+          ? {
+              type: 'delete',
+              btnName: '删除',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'triggerOrigin',
+                    value: 1
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 1
+                  }
+                ]
+              }
+            }
+          : undefined
+      ].filter((v) => v),
+      addOrEditTitle: '',
+      centervisible: false,
+      priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
+      workIssueTitle: '',
+      addWorkOrdervisible: false,
+      orderDetailVisible: false
+    }
+  },
+  components: { OrderAdd, AddWorkOrder },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      getOrderPage({...this.queryParams}).then(res => {
+        let arr = res.data.records || []
+        this.total = res.data.total || 0
+        if (arr.length > 0) {
+          customerList().then(result => {
+            let tempData = result.data || []
+            if (tempData.length > 0) {
+              arr.map(item => {
+                for (let i of tempData) {
+                  if (item.customerId === i.id) {
+                    item.customerId = i.name
+                  }
+                }
+                item.price = item.price.toFixed(2)
+              })
+              this.list = arr
+            }
+          })
+        }else {
+          this.list = arr
+        }
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.queryParams.status = val.status
+        if (val.timeVal && val.timeVal.length > 0) {
+          this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
+          this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
+        } else {
+          this.queryParams.lastIssuedTime = []
+        }
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.orderAdd.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.orderAdd.init(val.data.id)
+          })
+          break
+        case 'delete':
+          this.handleDelete(val.data)
+          break
+        case 'detail':
+          this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
+          break
+        case 'add':
+          this.workIssueTitle = '新增工单'
+          this.addWorkOrdervisible = true
+          this.$nextTick(() => {
+            this.$refs.addWorkOrder.init(val.data, 'add')
+          })
+          break
+        case 'bind':
+          this.workIssueTitle = '绑定工单'
+          this.addWorkOrdervisible = true
+          this.$nextTick(() => {
+            this.$refs.addWorkOrder.init(val.data, 'bind')
+          })
+          break
+        case 'complete':
+          this.handleComplete(val.data)
+          break
+        default:
+      }
+    },
+    // 删除
+    handleDelete(val) {
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
+          return orderDelete({ id: val.id })
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("操作成功");
+        }).catch(() => {});
+    },
+    // 完成
+    handleComplete(val) {
+      this.$modal.confirm('是否确认完成订单"' + val.name + '"?').then(function() {
+          return orderFinish({ id: val.id })
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("操作成功");
+        }).catch(() => {});
+    },
+    // 新增
+    handleCancel() {
+      this.$refs.orderAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.orderAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    },
+    // 下发新增
+    addWorkOrderCancel() {
+      this.$refs.addWorkOrder.formClear()
+      this.addWorkOrdervisible = false
+    },
+    addWorkOrderConfirm() {
+      this.$refs.addWorkOrder.addWorkOrderSubmit()
+    },
+    addWorkOrderSubmit() {
+      this.addWorkOrderCancel()
+      this.getList()
+    }
+    // bindWorkOrderCancel() {
+    //   this.$refs.bindWorkOrder.formClear()
+    //   this.bindWorkOrdervisible = false
+    // },
+    // bindWorkOrderConfirm() {
+    //   this.$refs.bindWorkOrder.bindWorkOrderSubmit()
+    // },
+    // bindWorkOrderSubmit() {
+    //   this.bindWorkOrderCancel()
+    //   this.getList()
+    // }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/oldOrder/base/orderManage/orderDetailData.vue b/src/views/oldOrder/base/orderManage/orderDetailData.vue
new file mode 100644
index 00000000..cffafbe2
--- /dev/null
+++ b/src/views/oldOrder/base/orderManage/orderDetailData.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class="orderDetailData">
+    <div class="box1">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>订单编码: {{orderMsg.code}}</span>
+      </div>
+      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+      <div style="padding-left: 14px;">
+        <el-row>
+          <el-col :span='3'>
+            <div class="blodTip">订单名</div>
+            <div class="lightTip">{{orderMsg.name}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">产品信息</div>
+            <div class="lightTip">{{orderMsg.productName}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">产品规格</div>
+            <div class="lightTip">{{orderMsg.specifications}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">客户</div>
+            <div class="lightTip">{{orderMsg.customerName}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">包装规格</div>
+            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec)}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">物料计算方式</div>
+            <div class="lightTip">{{orderMsg.materialMethod ? (orderMsg.materialMethod === 1 ? '产品基础' : '工艺扩展') : ''}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">创建时间</div>
+            <div class="lightTip">{{ parseTime(orderMsg.createTime) }}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">计划开始时间</div>
+            <div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='3'>
+            <div class="blodTip">计划完成时间</div>
+            <div class="lightTip">{{ parseTime(orderMsg.planFinishTime) }}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">计划加工数量</div>
+            <div class="lightTip">{{orderMsg.planQuantity}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">加工平方数(平方米)</div>
+            <div class="lightTip">{{orderMsg.planArea}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">预计用时(时)</div>
+            <div class="lightTip">{{ orderMsg.expectTime }}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">状态</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status)}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">实际开始时间</div>
+            <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">实际完成时间</div>
+            <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">实际生产数量</div>
+            <div class="lightTip">{{orderMsg.actualQuantity	}}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='3'>
+            <div class="blodTip">完成比%</div>
+            <div class="lightTip">{{orderMsg.completeProp}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">废片数量</div>
+            <div class="lightTip">{{orderMsg.nokQuantity}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">负责人</div>
+            <div class="lightTip">{{orderMsg.workers}}</div>
+          </el-col>
+          <el-col :span='3'>
+            <div class="blodTip">关联工艺</div>
+            <div class="lightTip">{{processFlowName}}</div>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <div class="box2">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>工单信息</span>
+      </div>
+      <!-- 列表 -->
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps1"
+        :table-data="list1"
+        :max-height="tableH"
+      />
+    </div>
+    <div class="box3">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>预计用料信息</span>
+      </div>
+      <!-- 列表 -->
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps2"
+        :table-data="list2"
+        :max-height="tableH"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { publicFormatter } from '@/utils/dict'
+import { getProcessFlowList } from '@/api/base/orderManage'
+const tableProps1 = [
+  {
+    prop: 'issueTime',
+    label: '下发时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'name',
+    label: '工单名',
+    minWidth: 100,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '工单编码',
+    minWidth: 150
+  },
+  {
+    prop: 'planAssignmentQuantity',
+    label: '计划加工量',
+    width: 100
+  },
+  {
+    prop: 'actualQuantity',
+    label: '实际加工量',
+    width: 100
+  },
+  {
+    prop: 'actualArea',
+    label: '加工平方数',
+    width: 100
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    filter: publicFormatter('order_status')
+  },
+  {
+    prop: 'startProduceTime',
+    label: '开始时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'finishProduceTime',
+    label: '结束时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'productLineNames',
+    label: '关联产线',
+    filter: (val) => val ? val.join(',') : '',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'workers',
+    label: '负责人'
+  },
+  {
+    prop: 'remark',
+    label: '备注'
+  }
+]
+const tableProps2 = [
+  {
+    prop: 'materialName',
+    label: '物料名称'
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
+  },
+  {
+    prop: 'num',
+    label: '剩余生产预计消耗'
+  }
+]
+import { orderDetail, bomUseNum } from '@/api/base/orderManage'
+export default {
+  name: 'OrderDetailData',
+  data() {
+    return {
+      orderId: '',
+      tableProps1,
+      tableProps2,
+      list1: [],
+      list2: [],
+      tableH: this.tableHeight(510) / 2,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 500
+      },
+      orderMsg: {},
+      processFlowName: ''
+    }
+  },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(510) / 2
+    })
+    this.orderId = location.href.split('?')[1].split('=')[1]
+    this.getMsg()
+  },
+  watch: {
+    $route: 'initData'
+  },
+  methods: {
+    initData(to) {
+      if (to.name === 'OrderDetailData') {
+        this.orderId = location.href.split('?')[1].split('=')[1]
+        this.getMsg()
+      }
+    },
+    getMsg() {
+      orderDetail({
+        id: this.orderId
+      }).then(res => {
+        this.orderMsg = res.data
+        this.list1 = res.data.coreWorkOrderRespVOS
+        bomUseNum({
+          productId: this.orderMsg.planProductId
+        }).then(res2 => {
+          if (res2.data && res2.data.length > 0) {
+            let arr = res2.data
+            arr.map(item => {
+              if (item) {
+                let a = item.num * this.orderMsg.remainingQuantity
+                item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
+              }
+            })
+            this.list2 = arr
+          }else {
+            this.list2 = []
+          }
+        })
+        // 工艺
+        getProcessFlowList().then(res => {
+          let arr = res.data || []
+          if (arr.length > 0) {
+            arr.map(item => {
+              if (item.id === this.orderMsg.processFlowId) {
+                this.processFlowName = item.name
+              }
+            })
+          }
+        })
+      })
+    },
+    // 返回
+    returnOrderManage() {
+      this.$router.push({path: '/order/base/order-manage'})
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.orderDetailData {
+  background-color: rgb(242, 244, 249);
+  .box1, .box2, .box3 {
+    background-color: #fff;
+    border-radius: 9px;
+  }
+  .box2 {
+    height: calc((100vh - 360px) / 2);
+    padding: 12px 16px 0;
+    margin: 8px 0;
+  }
+  .box1 {
+    height: 215px;
+    padding: 16px 16px 0 16px;
+    .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);
+      margin-bottom: 12px;
+    }
+  }
+  .box3 {
+    padding: 16px;
+    height: calc((100vh - 360px) / 2);
+    }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    content: '';
+    display: inline-block;
+    width: 4px;
+    height: 18px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: bottom;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/oldOrder/monitoring/components/monitoringRingCharts.vue b/src/views/oldOrder/monitoring/components/monitoringRingCharts.vue
new file mode 100644
index 00000000..54a55a19
--- /dev/null
+++ b/src/views/oldOrder/monitoring/components/monitoringRingCharts.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <div class="boxTitle">
+      <span class="blueTitle"></span>
+      <span>各订单环形图</span>
+    </div>
+    <div class="chartBox" id='orderChartBox' v-show='chartList.length'>
+      <div class="chartItem" v-for="(item, index) in chartList" :key='index' :style="{width: 388*beilv+'px',height: 286*beilv+'px',padding:14*beilv+'px',marginRight:9*beilv+'px',marginBottom:9*beilv+'px'}">
+        <div class="topTitle" :style="{fontSize: 14 * beilv + 'px'}">
+          <svg-icon icon-class="order-monitoring" :style="{fontSize: 16*beilv+'px'}"/>
+          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderName}}</span>
+          <span>订单计划数量{{item.num}}</span>
+        </div>
+        <div
+          :id="item.id"
+          :style="{width: 166*beilv+'px',height: 166*beilv+'px',margin: 'auto'}"
+        ></div>
+        <div class="legend" :style="{height: 54 * beilv + 'px', marginTop: 10*beilv+'px'}">
+          <div class="legendItem" v-for="(subItem, i) in item.workOrder" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
+            <span class="itemNum" :style="{fontSize: 18 * beilv + 'px'}">{{subItem.value}}</span>
+            <div>
+              <span class="itemName" :style="{fontSize: 14 * beilv + 'px'}">
+                <span class="smallBlock" :style="{backgroundColor:subItem.color,width:8*beilv+'px',height:8*beilv+'px'}"></span>
+                {{subItem.name}}
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 空图 -->
+    <div class="no-data-bg" v-show='!chartList.length'></div>
+  </div>
+</template>
+<script>
+import * as echarts from 'echarts'
+import { debounce } from '@/utils/debounce'
+export default {
+  name: 'MonitoringRingCharts',
+  props: {
+    chartList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      myChart: [],
+      beilv: 1,
+      canvasReset: ''
+    }
+  },
+  mounted() {
+    this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
+    this.canvasReset = debounce(() => {
+      this.initChart()
+    }, 500)
+    window.addEventListener('resize', () => {
+      this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
+      this.canvasReset()
+    })
+  },
+  methods: {
+    // 饼图
+    initChart() {
+      if (this.chartList.length <= 0) {
+        return false
+      }
+      // 销毁实例
+      for (let j = 0;j < this.chartList.length; j++) {
+        if (this.myChart[j]) {
+          this.myChart[j].dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+        }
+      }
+      for (let i = 0; i < this.chartList.length; i++) {
+        var chartDom = document.getElementById(this.chartList[i].id);
+        this.myChart[i] = echarts.init(chartDom);
+        let colorList = []
+        this.chartList[i].workOrder.map(item => {
+          colorList.push(item.color)
+        })
+        let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
+        var option = {
+          color: colorList,
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['75%', '95%'],
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 5,
+                borderColor: '#fff',
+                borderWidth: 2
+              },
+              label: {
+                show: true,
+                position: 'center',
+                color: '#000',
+                formatter: [
+                    '{a|'+percentage+'%}',
+                    '{b|生产'+this.chartList[i].sunNum+'}'
+                ].join('\n\n'),
+                rich: {
+                  a: {
+                      fontSize: this.beilv*24 +'px'
+                  },
+                  b: {
+                      fontSize: this.beilv*12 +'px'
+                  }
+                }
+              },
+              emphasis: {
+                disabled: true
+              },
+              labelLine: {
+                show: false
+              },
+              data: this.chartList[i].workOrder
+            }
+          ]
+        };
+        option && this.myChart[i].setOption(option)
+      }
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.chartBox {
+  width: 100%;
+  padding-right: 6px;
+  height: calc(100vh - 310px);
+  display: flex;
+  flex-flow: row wrap;
+  overflow: auto;
+  align-content: flex-start;
+  .chartItem {
+    border-radius: 8px;
+    border: 1px solid #CACACA;
+    .topTitle {
+      margin-bottom: 10px;
+      .orderName {
+        border-right: 1px solid #CACACA;
+      }
+    }
+    .legend {
+      text-align: center;
+      white-space: nowrap;
+      overflow: auto;
+      .legendItem {
+        display: inline-block;
+        border-right: 1px solid #E8E8E8;
+        .itemName {
+          .smallBlock {
+            display: inline-block;
+          }
+        }
+      }
+      .legendItem:last-child {
+        border: none;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/oldOrder/monitoring/orderCompletionMonitoring/index.vue b/src/views/oldOrder/monitoring/orderCompletionMonitoring/index.vue
new file mode 100644
index 00000000..b2a469cd
--- /dev/null
+++ b/src/views/oldOrder/monitoring/orderCompletionMonitoring/index.vue
@@ -0,0 +1,371 @@
+<template>
+  <div class="app-container orderMonitoring">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <el-tabs v-model="activeName" @tab-click="toggleTab">
+      <el-tab-pane label="数据列表" name="dataList"></el-tab-pane>
+      <el-tab-pane label="环形图" name="barChart"></el-tab-pane>
+    </el-tabs>
+    <!-- 表 -->
+    <div v-if="activeName === 'dataList'">
+      <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="140"
+          label="操作"
+          :method-list="tableBtn"
+          @clickBtn="handleClick"
+        />
+      </base-table>
+      <pagination
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        :total="total"
+        @pagination="getPage"
+      />
+    </div>
+    <!-- 图 -->
+    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { publicFormatter } from '@/utils/dict'
+import { orderMonitor, orderAssignmentList } from '@/api/base/orderManage'
+import MonitoringRingCharts from './../components/monitoringRingCharts'
+import moment from "moment"
+const tableProps = [
+  {
+    prop: 'name',
+    label: '订单名称'
+  },
+  {
+    prop: 'customerName',
+    label: '客户'
+  },
+  {
+    prop: 'productname',
+    label: '产品'
+  },
+  {
+    prop: 'planStartTime',
+    label: '计划开始时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'planFinishTime',
+    label: '计划完成时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    filter: publicFormatter('order_status')
+  },
+  {
+    prop: 'startProduceTime',
+    label: '实际开始时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'finishProduceTime',
+    label: '实际完成时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'lineNames',
+    label: '加工线',
+    filter: (val) => val ? val.join(',') : '',
+    minWidth: 180
+  },
+  {
+    prop: 'planQuantity',
+    label: '计划生产量',
+    width: 100
+  },
+  {
+    prop: 'actualquantity',
+    label: '实际产出量',
+    width: 100
+  },
+  {
+    prop: 'completeRate',
+    label: '订单完成率',
+    width: 100
+  },
+  {
+    prop: 'workOrderNum',
+    label: '关联工单数量',
+    width: 110
+  }
+]
+export default {
+  name: 'OrderCompletionMonitoring',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名称',
+          param: 'name'
+        },
+        {
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        }
+      ],
+      activeName: 'dataList',
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        startProduceTime: []
+      },
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(305),
+      total: 0,
+      tableBtn: [
+      this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
+          ? {
+              type: 'orderDetail',
+              btnName: '工单',
+              showTip: '工单详情',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'more',
+                    name: 'workOrderNum',
+                    value: 1
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
+          ? {
+              type: 'qualityDetail',
+              btnName: '质量',
+              showTip: '质量详情',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'more',
+                    name: 'workOrderNum',
+                    value: 1
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
+          ? {
+              type: 'sendOutDetail',
+              btnName: '发货',
+              showTip: '发货详情',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'more',
+                    name: 'workOrderNum',
+                    value: 1
+                  }
+                ]
+              }
+            }
+          : undefined
+      ].filter((v) => v),
+      chartList: []
+    }
+  },
+  components: { MonitoringRingCharts },
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(305)
+    })
+    let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
+    let end = moment().format('yyyy-MM-DD')
+    this.formConfig[1].defaultSelect = [start, end]
+    this.queryParams.startProduceTime[0] = start + ' 00:00:00'
+    this.queryParams.startProduceTime[1] = end + ' 23:59:59'
+    this.getPage()
+  },
+  methods: {
+    getPage() {
+      // 表数据
+      orderMonitor({...this.queryParams}).then(res => {
+        this.list = res.data.records || []
+        this.total = res.data.total || 0
+        if (this.list.length > 0) {
+          let orderIdList = []
+          this.list.map(item => {
+            orderIdList.push(item.orderid)
+          })
+          // 图的数据
+          orderAssignmentList({orderIdList:orderIdList}).then(res => {
+            let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
+            let tempArr = res.data || {}
+            let tempArr2 = []
+            for (let key in tempArr) {
+              let tempArr3 = []
+              let obj = {}
+              obj.orderName = tempArr[key][0].orderName
+              obj.id = key
+              obj.num = tempArr[key][0].planQuantity
+              let sunNum = 0
+              for (let i = 0; i < tempArr[key].length; i++) {
+                let subObj = {}
+                subObj.value = tempArr[key][i].actualAssignmentQuantity
+                subObj.name = tempArr[key][i].woName
+                if (i < 5) {
+                  subObj.color = color[i]
+                } else {
+                  subObj.color = color[i%5]
+                }
+                sunNum+=tempArr[key][i].actualAssignmentQuantity
+                tempArr3.push(subObj)
+              }
+              tempArr3.push({
+                value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
+                name: '未下发',
+                color: '#F5F5F5'
+              })
+              obj.sunNum = sunNum
+              obj.workOrder = tempArr3
+              tempArr2.push(obj)
+            }
+            this.chartList = tempArr2
+            if (this.activeName === 'barChart' && this.chartList.length > 0) {
+              this.$nextTick(() => {
+                this.$refs.monitoringRingCharts.initChart()
+              })
+            }
+          })
+        }else{
+          // 显示无数据的图片
+          this.chartList = []
+        }
+      })
+    },
+    // 查询
+    buttonClick(val) {
+      this.queryParams.name = val.name
+      if (val.timeVal && val.timeVal.length > 0) {
+        this.queryParams.startProduceTime[0] = val.timeVal[0] + ' 00:00:00'
+        this.queryParams.startProduceTime[1] = val.timeVal[1] + ' 23:59:59'
+      } else {
+        this.queryParams.startProduceTime = []
+      }
+      this.getPage()
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'orderDetail':
+          this.$router.push({
+            path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
+          })
+          break
+        case 'qualityDetail':
+          this.$router.push({
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString
+          })
+          break
+        default:
+          this.$router.push({
+            path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
+          })
+        }
+    },
+    toggleTab() {
+      if (this.activeName === 'barChart' && this.chartList.length > 0) {
+        this.$nextTick(() => {
+          this.$refs.monitoringRingCharts.initChart()
+        })
+      }
+    }
+}
+}
+</script>
+<style lang='scss'>
+.orderMonitoring {
+  .el-tabs__nav::after {
+    content: "";
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 2px;
+    background-color: #e4e7ed;
+  }
+  .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);
+  }
+  .searchBarBox {
+    margin-bottom: 0;
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 16px 0;
+  }
+  .blueTitle {
+    content: '';
+    display: inline-block;
+    width: 4px;
+    height: 18px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: bottom;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/produce/workOrder/SmallTitle.vue b/src/views/produce/workOrder/SmallTitle.vue
new file mode 100644
index 00000000..93b4a18f
--- /dev/null
+++ b/src/views/produce/workOrder/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>
diff --git a/src/views/produce/workOrder/add-or-updata.vue b/src/views/produce/workOrder/add-or-updata.vue
new file mode 100644
index 00000000..0ba46ebd
--- /dev/null
+++ b/src/views/produce/workOrder/add-or-updata.vue
@@ -0,0 +1,306 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-28 14:09:09
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="true"
+		class="drawer"
+		size="50%">
+		<small-title slot="title" :no-padding="true">
+			{{ '工单名称：' + dataForm.name }}
+		</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;">
+              <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="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: '原料名称',
+		filter: publicFormatter('material')
+	},
+	{
+		prop: 'origin',
+		label: '来源',
+		filter: (val) => ['', '内部', '采购'][val]
+	},
+	{
+		prop: 'supplierName',
+		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.records;
+				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: -40px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>
diff --git a/src/views/produce/workOrder/addWorkOrder.vue b/src/views/produce/workOrder/addWorkOrder.vue
new file mode 100644
index 00000000..d8314256
--- /dev/null
+++ b/src/views/produce/workOrder/addWorkOrder.vue
@@ -0,0 +1,324 @@
+<template>
+  <el-form ref="dataForm" :rules="rules" label-width="130px" :model="dataForm" label-position="top">
+    <el-row :gutter="20">
+      <el-col :span='8'>
+        <el-form-item label="工单名称" prop="name">
+          <el-input v-model="dataForm.name" placeholder="请输入工单名称"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <el-form-item label="工单编码" prop="code">
+          <el-input v-model="dataForm.code" disabled placeholder="请输入工单编码"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" filterable @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-row>
+    <el-row :gutter="20">
+      <el-col :span='8'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="dataForm.specifications" placeholder="请输入产品规格" />
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <el-form-item label="计划开始时间">
+          <el-date-picker
+            v-model="dataForm.planStartTime"
+            type="datetime"
+            value-format="timestamp"
+            style="width: 100%;"
+            placeholder="请选择计划开始时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <el-form-item label="计划完成时间">
+          <el-date-picker
+            v-model="dataForm.planFinishTime"
+            type="datetime"
+            value-format="timestamp"
+            style="width: 100%;"
+            placeholder="请选择计划完成时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='8'>
+        <el-form-item label="计划投入数量" prop="planAssignQuantity">
+          <el-input-number v-model="dataForm.planAssignQuantity" :min="0" :max="9999999999999" style="width: 100%;" placeholder="请输入计划投入数量"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <el-form-item label="计划生产数量" prop="planQuantity">
+          <el-input-number v-model="dataForm.planQuantity" :min="0" :max="9999999999999" style="width: 100%;" placeholder="请输入计划生产数量"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <el-form-item label="关联工艺" prop="processFlowId">
+          <el-select v-model="dataForm.processFlowId" placeholder="请选择关联工艺" clearable filterable style="width: 100%;" @change="processFlowIdChange">
+            <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-row>
+    <el-row :gutter="20">
+      <el-col :span='8'>
+        <el-form-item label="物料计算方式" prop="materialMethod">
+          <!-- <el-radio-group v-model="dataForm.materialMethod" @change="materialMethodChange">
+            <el-radio :label="1">产品基础BOM</el-radio>
+            <el-radio :label="2">工艺扩展BOM</el-radio>
+          </el-radio-group> -->
+          <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" @change="materialMethodChange">
+            <el-option key="1" label="产品基础BOM" :value="1" />
+            <el-option key="2" label="工艺扩展BOM" :value="2" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='8'>
+        <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='8'>
+        <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 :gutter="20">
+      <el-col :span='8'>
+        <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='8'>
+        <el-form-item label="负责人" prop="workers">
+          <el-input v-model="dataForm.workers" placeholder="请输入负责人"></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: '',
+        specifications: '',
+        planStartTime: '',
+        planFinishTime: '',
+        planAssignQuantity: 0,
+        planQuantity: 0,
+        processFlowId: '',
+        materialMethod: 1,
+        triggerOrigin: 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: {
+    // 工艺变更
+    materialMethodChange(val) {
+      if (val === 2 && !this.dataForm.processFlowId) {
+        this.dataForm.materialMethod = 1
+        this.$modal.msgError("请先选择关联工艺");
+      }
+    },
+    // 工艺变更
+    processFlowIdChange(val) {
+      console.log(val)
+      if (!val) {
+        this.dataForm.materialMethod = 1
+      }
+    },
+    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;
+            if (this.dataForm.priority !== undefined) {
+              this.dataForm.priority = String(this.dataForm.priority)
+            }
+            this.dataForm.priority 
+          });
+        } 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(() => {
+            console.log('121', this.dataForm.name)
+            this.$emit("refreshDataList", {
+              id: response.data,
+              name: this.dataForm.name
+            });
+          }).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.specifications = item.specifications
+          }
+        })
+      } else {
+        this.dataForm.specifications = ''
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/produce/workOrder/allocation.vue b/src/views/produce/workOrder/allocation.vue
new file mode 100644
index 00000000..9fc2dd85
--- /dev/null
+++ b/src/views/produce/workOrder/allocation.vue
@@ -0,0 +1,298 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-07-19 18:59:13
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="55%">
+		<small-title slot="title" :no-padding="true">
+			{{ '分配产量' }}
+		</small-title>
+		<div class="content">
+			<div class="formContent">
+				<el-row :gutter="20">
+					<el-col :span="12">工单名称:{{ dataForm.name }}</el-col>
+					<el-col :span="12">工单编码:{{ dataForm.code }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="12">产品名称:{{ dataForm.productName }}</el-col>
+					<el-col :span="12">产品规格:{{ dataForm.specifications }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="12">实际生产数量:{{ dataForm.expectedTime }}</el-col>
+				</el-row>
+			</div>
+
+			<div class="attr-list">
+				<!-- <el-button v-show="!isdetail" type="success" size="small" style="float: right" @click="addRow()">添加一行</el-button> -->
+				<el-table
+					:data="tableData"
+      		style="width: 100%">
+					<el-table-column type="index" label="序号" />
+					<el-table-column prop="orderName" label="订单名称" />
+					<el-table-column prop="orderCode" label="订单编码" />
+					<el-table-column prop="priority" label="优先级" />
+					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
+						<template slot-scope="scope">
+							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+						</template>
+					</el-table-column>
+					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
+						<template slot-scope="scope">
+							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作">
+						<template slot-scope="scope">
+							<el-button type="text" size="small" @click="saveData(scope.row)">保存</el-button>
+							<!-- <el-tooltip v-if="!scope.row.isEdit" placement="top" content="编辑">
+								<el-button
+									type="text"
+									:style="{color:'#0B58FF'}"
+									size="mini"
+									@click="edit(scope.row)"
+								>
+									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="edit" />
+								</el-button>
+							</el-tooltip> -->
+							
+							<!-- <el-tooltip placement="top" content="删除">
+								<el-button
+									type="text"
+									:style="{color:'#FF5454'}"
+									size="mini"
+									@click="deleteDetail(scope.row)"
+								>
+									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="table_delete" />
+								</el-button>
+							</el-tooltip> -->
+						</template>
+					</el-table-column>
+				</el-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 style="" 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>
+		</div>
+
+		<!-- <attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:material-id="dataForm.id"
+			@refreshDataList="getList" /> -->
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { getConOrderList, createConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
+import SmallTitle from './SmallTitle';
+// import { parseTime } from '../../core/mixins/code-filter';
+// import attrAdd from './attr-add';
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle },
+	data() {
+		return {
+			addOrUpdateVisible: false,
+			urlOptions: {
+				infoURL: getCoreWO,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        productId: '',
+        remark: undefined,
+			},
+			productList: [],
+			materialAttrList: [],
+			materialList: [],
+			tableData: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			// this.materialAttrList.splice(0);
+			this.listQuery.total = 0;
+		},
+		edit(row) {
+			row.isEdit = true
+		},
+		saveData(row) {
+			if (row.actualAssignmentQuantity) {
+				if (row.id) {
+					// updateMaterialPBDet({
+					// 	...row
+					// }).then((response) => {
+					// 	this.$modal.msgSuccess('修改成功');
+					// 	// this.visible = false;
+					// 	this.getList();
+					// });
+					// return;
+				}
+					// 添加的提交
+				createConCoreWOr({
+					...row,
+					workOrderId: this.dataForm.id
+				}).then((response) => {
+					this.$modal.msgSuccess('分配成功');
+					// this.visible = false;
+					this.getList();
+				});
+			} else {
+				this.$message.warning('请填写实际分配数量');
+			}
+		},
+		getList() {
+			// 获取产品Bom详细列表
+			getConOrderList({
+				...this.listQuery,
+				workOrderId: this.dataForm.id
+			}).then((response) => {
+				this.tableData = response.data.map(item => {
+					item.isEdit = false
+					return item
+				});
+				this.listQuery.total = response.data.total;
+			});
+		},
+		// 构造一行
+		// addRow() {
+		// 	const row = {
+		// 		bomId: this.dataForm.id,
+		// 		materialId: '',
+		// 		num: 0,
+		// 		materialCode: undefined,
+		// 		unit: undefined,
+		// 		remark: '',
+		// 		isEdit: true
+		// 	}
+		// 	this.tableData.push(row)
+		// },
+		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.getList();
+				} else {}
+			});
+		},
+		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: 30vh;
+	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;
+	width: 100%;
+}
+</style>
diff --git a/src/views/produce/workOrder/attr-add.vue b/src/views/produce/workOrder/attr-add.vue
new file mode 100644
index 00000000..f32953ef
--- /dev/null
+++ b/src/views/produce/workOrder/attr-add.vue
@@ -0,0 +1,236 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'50%'"
+		: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="80px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<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-col>
+				<el-col :span="12">
+					<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-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<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-col>
+				<el-col :span="12">
+					<el-form-item label="批次号" prop="batch">
+						<el-input
+							v-model="dataForm.batch"
+							clearable
+							placeholder="请输入批次号" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+						<el-input-number
+							v-model="dataForm.num"
+							clearable
+							controls-position="right"
+							style="width: 100%"
+							placeholder="请输入数量" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<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-col>
+			</el-row>
+		</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 || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getCoreWOMa(this.dataForm.id).then((res) => {
+						this.dataForm = res.data
+						if (this.dataForm.unit !== undefined) {
+							this.dataForm.unit = String(this.dataForm.unit)
+						}
+						if (this.dataForm.material !== undefined) {
+							this.dataForm.material = String(this.dataForm.material)
+						}
+						console.log('111', this.dataForm)
+					});
+				}
+			});
+		},
+		// 表单提交
+		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>
diff --git a/src/views/produce/workOrder/detail.vue b/src/views/produce/workOrder/detail.vue
new file mode 100644
index 00000000..d3859ebf
--- /dev/null
+++ b/src/views/produce/workOrder/detail.vue
@@ -0,0 +1,456 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-23 18:45:15
+ * @Description:
+-->
+<template>
+	<!-- <el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="50%"> -->
+	<div class="app-container">
+		<!-- <small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title> -->
+		<el-button style="float: right" type="primary" @click="goback()">返回</el-button>
+		<div v-show="workOrderButton.length">
+			<el-button  v-for="(work, index) in workOrderButton" :key="index" type="primary" @click="init(work.id, true)">{{ work.name }}</el-button>
+		</div>
+		<div class="content">
+			<div>
+				<h1>工单编码：{{ dataForm.code }}</h1>
+			</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 orderList" :key="index" style="margin-right: 10px">{{ item.orderName }}</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.remainingTime }}</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">关联产线:
+						<span v-for="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px">{{ item }}</span>
+					</el-col>
+					<el-col :span="8">物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">关联工艺:{{ dataForm.processFlowName }}</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">工单创建时间:{{ parseTime(dataForm.createTime) }}</el-col>
+					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
+					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col>
+					<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col>
+					<el-col :span="8">实际完成时间:{{ parseTime(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">检测瑕疵数:{{ }}</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>
+	</div>
+</template>
+
+<script>
+// import basicAdd from '../../core/mixins/basic-add';
+import { getCoreWO, getMaterialBomPage, getConOrderList, getCoreWOListById } from "@/api/base/coreWorkOrder";
+// import { orderList } from "@/api/base/orderManage";
+import { getProcessFlowList } from '@/api/base/orderManage'
+import SmallTitle from './SmallTitle';
+import { publicFormatter } from "@/utils/dict";
+import { parseTime } from '@/utils/ruoyi'
+
+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,
+			workOrderButton: [],
+			processFlowList: []
+		};
+	},
+	created() {
+		this.getDict()
+	},
+	mounted() {
+		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
+			const idList = this.$route.query.woIdString.split(',')
+			getCoreWOListById(idList).then(res => {
+				this.workOrderButton = res.data.map(work => {
+					return {
+						id: work.id,
+						name: work.name
+					}
+				})
+				this.init(this.workOrderButton[0].id, true)
+			})
+		}  else {
+			this.init(this.$route.query.id, true)
+		}
+	},
+	methods: {
+		getDict() {
+			// 工艺
+      getProcessFlowList().then(res => {
+        this.processFlowList = res.data || []
+      })
+		},
+		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;
+			// });
+		},
+		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
+						// 工艺名称
+						if (this.dataForm.processFlowId) {
+							this.processFlowList.filter(item => {
+								if (item.id === this.dataForm.processFlowId) {
+									this.dataForm.processFlowName = item.name
+								}
+							})
+						}
+						// 获取订单列表和用料列表
+						this.getList();
+          });
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$router.go(-1);
+			// 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;
+	width: 100%;
+}
+.action_btn {
+  float: right;
+  margin: 5px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>
diff --git a/src/views/produce/workOrder/index.vue b/src/views/produce/workOrder/index.vue
new file mode 100644
index 00000000..f03890b6
--- /dev/null
+++ b/src/views/produce/workOrder/index.vue
@@ -0,0 +1,490 @@
+<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="350"
+				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>
+			<!-- 分配产量 -->
+			<allocation
+			v-if="allocationVisible"
+			ref="allocation"
+			@refreshDataList="getDataList" />
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import AddWorkOrder from './addWorkOrder'
+import Allocation from './allocation.vue';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreWOPage,
+	deleteCoreWO,
+	statusChange,
+	getConOrderList,
+	getCoreWOList
+} from '@/api/base/coreWorkOrder';
+
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime,
+		minWidth: 150,
+		showOverflowtooltip: true
+	},
+	{
+		prop: 'name',
+		label: '工单名称',
+		minWidth: 120,
+		showOverflowtooltip: true
+	},
+	{
+		prop: 'code',
+		label: '工单编码',
+		minWidth: 150,
+		showOverflowtooltip: true
+	},
+	{
+		prop: 'workers',
+		label: '负责人',
+		minWidth: 100,
+		showOverflowtooltip: true
+	},
+	{
+		prop: 'priority',
+		label: '优先级',
+		filter: (val) => ['', '低', '正常', '高'][val]
+	},
+	{
+		prop: 'triggerOrigin',
+		label: '来源',
+		filter: (val) => ['', 'MES-手动', 'MES-订单下发', 'ERP'][val]
+	},
+	{
+		prop: 'status',
+		label: '工单状态',
+		filter: (val) => ['', '等待', '激活', '暂停', '完成', '', '', '', '', '作废'][val]
+	},
+	{
+		prop: 'planFinishTime',
+		label: '计划完成时间',
+		filter: parseTime,
+		minWidth: 150,
+		showOverflowtooltip: true
+	},
+	{
+		prop: 'planQuantity',
+		label: '计划生产数量',
+		minWidth: 120,
+	},
+	{
+		prop: 'actualQuantity',
+		label: '实际生产数量',
+		minWidth: 120,
+	}
+];
+
+export default {
+	mixins: [basicPage],
+	components: {
+		AddWorkOrder,
+		AddOrUpdate,
+		Allocation
+	},
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreWOPage,
+				deleteURL: deleteCoreWO
+			},
+			detailVisible: false,
+			materialVisible: false,
+			allocationVisible: false,
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-work-order:material`)
+					? {
+							type: 'material',
+							btnName: '原料信息',
+					  }
+					: 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: 2
+								},
+								{
+									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
+								}
+							]
+						}
+					},
+					this.$auth.hasPermi(`base:core-work-order:detail`)
+					? {
+							type: 'detail',
+							btnName: '查看详情',
+					  }
+					: undefined,
+					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:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									}
+								]
+							}
+					  }
+					: undefined
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '工单名称',
+				// 	placeholder: '工单名称',
+				// 	param: 'name',
+				// 	defaultSelect: '',
+				// 	selectOptions: [],
+				// 	allowCreate: true,
+				// 	filterable: true
+				// },
+				{
+					type: 'input',
+					label: '工单名称',
+					placeholder: '工单名称',
+					param: 'name',
+					defaultSelect: ''
+				},
+				{
+          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
+				},
+			],
+		};
+	},
+	mounted() {
+		console.log(this.$route.query.workOrderName)
+		if (this.$route.query.workOrderName) {
+			this.listQuery.name = this.$route.query.workOrderName;
+			this.formConfig[0].defaultSelect = this.$route.query.workOrderName;
+		}
+		// this.getWorkOrder()
+		this.getDataList()
+	},
+	methods: {
+		getWorkOrder() {
+			getCoreWOList().then(res => {
+				this.formConfig[0].selectOptions = res.data.map(item => {
+					return {
+						name: item.name,
+						id: item.name
+					}
+				})
+			})
+		},
+		refreshWorkOrder(val) {
+			console.log(val)
+			if (val) {
+				// 预使用原料信息
+				console.log('预使用原料信息')
+				this.handleCancel()
+      	this.getDataList()
+				this.materialVisible = true;
+        this.addOrEditTitle = "预使用主原料信息";
+        this.$nextTick(() => {
+          this.$refs.material.init(val, true);
+        });
+			} 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.$router.push({
+					path: '/core/core-work-order-detail',
+					query:{
+						id: val.data.id
+					}
+				});
+				// this.detailVisible = true;
+        // this.addOrEditTitle = "详情";
+        // this.$nextTick(() => {
+        //   this.$refs.detail.init(val.data.id, true);
+        // });
+			} else {
+				const param = {
+					id: val.data.id,
+					status: undefined
+				}
+				let opration = ''
+				if (val.type === 'active') {
+					param.status = 2
+					opration = '激活'
+				}
+				if (val.type === 'pause') {
+					param.status = 3
+					opration = '暂停'
+				}
+				if (val.type === 'nullify') {
+					param.status = 9
+					opration = '报废'
+				}
+				if (val.type === 'finish') {
+					param.status = 4
+					opration = '完成'
+				}
+				console.log('22',val)
+				this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				})
+        .then(() => {
+					statusChange(param).then(({ data }) => {
+						this.$message({
+							message: '操作成功！工单状态稍后将会更新！',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+								// 分配产量
+								if (param.status === 4) {
+									this.allocationOrder(param);
+								}
+							},
+						});
+					});
+				})
+				.catch(() => { });
+			}
+		},
+		allocationOrder(val) {
+			// 获取订单列表
+			getConOrderList({
+				workOrderId: val.id,
+			}).then((response) => {
+				if (response.data.length > 0) {
+					this.$confirm('工单结束，可分配产量', "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.allocationVisible = true;
+						this.$nextTick(() => {
+							this.$refs.allocation.init(val.id, true);
+						});
+					})
+					.catch(() => { });
+				}
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		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>
diff --git a/yarn.lock b/yarn.lock
index 4d30cb73..9b428797 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -46,7 +46,8 @@
   "resolved" "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/highlight" "^7.22.5"
+    "@babel/highlight" "^7.22.13"
+    "chalk" "^2.4.2"
 
 "@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
   "integrity" "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
@@ -79,7 +80,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.9.tgz"
   "version" "7.22.9"
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     "jsesc" "^2.5.1"
@@ -96,7 +97,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.22.15"
 
 "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9", "@babel/helper-compilation-targets@^7.9.6":
   "integrity" "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw=="
@@ -117,7 +118,7 @@
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.9"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
@@ -154,8 +155,8 @@
   "resolved" "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-hoist-variables@^7.22.5":
   "integrity" "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="
@@ -169,25 +170,25 @@
   "resolved" "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
   "integrity" "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg=="
   "resolved" "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.22.15"
 
 "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
   "integrity" "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ=="
   "resolved" "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz"
   "version" "7.22.9"
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-simple-access" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
   "integrity" "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="
@@ -207,16 +208,16 @@
   "version" "7.22.9"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-wrap-function" "^7.22.9"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
 "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
   "integrity" "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg=="
   "resolved" "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz"
   "version" "7.22.9"
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
@@ -261,17 +262,17 @@
   "version" "7.22.9"
   dependencies:
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
 "@babel/helpers@^7.22.6":
   "integrity" "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA=="
   "resolved" "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.22.6.tgz"
   "version" "7.22.6"
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.6"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
 
 "@babel/highlight@^7.22.5":
   "integrity" "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw=="
@@ -321,7 +322,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.15"
 
 "@babel/plugin-proposal-class-properties@^7.8.3":
   "integrity" "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="
@@ -336,11 +337,11 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.7.tgz"
   "version" "7.22.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.6"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/plugin-syntax-decorators" "^7.22.5"
+    "@babel/plugin-syntax-decorators" "^7.22.10"
 
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   "integrity" "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w=="
@@ -508,9 +509,9 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz"
   "version" "7.22.7"
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-transform-async-to-generator@^7.22.5":
@@ -549,7 +550,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.11"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
@@ -559,12 +560,12 @@
   "version" "7.22.6"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
     "@babel/helper-split-export-declaration" "^7.22.6"
     "globals" "^11.1.0"
 
@@ -673,7 +674,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-modules-commonjs@^7.22.5":
@@ -681,7 +682,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
@@ -691,9 +692,9 @@
   "version" "7.22.5"
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/plugin-transform-modules-umd@^7.22.5":
   "integrity" "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="
@@ -739,11 +740,11 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/compat-data" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-parameters" "^7.22.15"
 
 "@babel/plugin-transform-object-super@^7.22.5":
   "integrity" "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="
@@ -791,7 +792,7 @@
   "version" "7.22.5"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.11"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
@@ -822,7 +823,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz"
   "version" "7.22.9"
   dependencies:
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "babel-plugin-polyfill-corejs2" "^0.4.4"
     "babel-plugin-polyfill-corejs3" "^0.8.2"
@@ -901,12 +902,12 @@
   "resolved" "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.22.9.tgz"
   "version" "7.22.9"
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/compat-data" "^7.23.2"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -927,50 +928,50 @@
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.22.7"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
     "@babel/plugin-transform-async-to-generator" "^7.22.5"
     "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.23.0"
     "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.5"
-    "@babel/plugin-transform-classes" "^7.22.6"
+    "@babel/plugin-transform-class-static-block" "^7.22.11"
+    "@babel/plugin-transform-classes" "^7.22.15"
     "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.23.0"
     "@babel/plugin-transform-dotall-regex" "^7.22.5"
     "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.11"
     "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
-    "@babel/plugin-transform-for-of" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
+    "@babel/plugin-transform-for-of" "^7.22.15"
     "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.11"
     "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
     "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.23.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
     "@babel/plugin-transform-modules-umd" "^7.22.5"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
     "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
-    "@babel/plugin-transform-numeric-separator" "^7.22.5"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
+    "@babel/plugin-transform-numeric-separator" "^7.22.11"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
     "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.6"
-    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
+    "@babel/plugin-transform-parameters" "^7.22.15"
     "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
     "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.10"
     "@babel/plugin-transform-reserved-words" "^7.22.5"
     "@babel/plugin-transform-shorthand-properties" "^7.22.5"
     "@babel/plugin-transform-spread" "^7.22.5"
     "@babel/plugin-transform-sticky-regex" "^7.22.5"
     "@babel/plugin-transform-template-literals" "^7.22.5"
     "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
     "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-regex" "^7.22.5"
     "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
@@ -988,8 +989,6 @@
   "version" "0.1.6"
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
     "esutils" "^2.0.2"
 
@@ -1010,19 +1009,19 @@
   "resolved" "https://registry.npmmirror.com/@babel/template/-/template-7.22.5.tgz"
   "version" "7.22.5"
   dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
 
 "@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.7.0":
   "integrity" "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw=="
   "resolved" "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.8.tgz"
   "version" "7.22.8"
   dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.7"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/parser" "^7.22.7"
@@ -1161,8 +1160,8 @@
   "resolved" "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"
   "version" "0.3.18"
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   "integrity" "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="
@@ -1733,8 +1732,24 @@
   "resolved" "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz"
   "version" "3.3.4"
   dependencies:
-    "@vue/compiler-core" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-core" "3.3.6"
+    "@vue/shared" "3.3.6"
+
+"@vue/compiler-sfc@^3.0.0-beta.14", "@vue/compiler-sfc@^3.0.1":
+  "integrity" "sha512-/Kms6du2h1VrXFreuZmlvQej8B1zenBqIohP0690IUBkJjsFvJxY0crcvVRJ0UhMgSR9dewB+khdR1DfbpArJA=="
+  "resolved" "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.6.tgz"
+  "version" "3.3.6"
+  dependencies:
+    "@babel/parser" "^7.23.0"
+    "@vue/compiler-core" "3.3.6"
+    "@vue/compiler-dom" "3.3.6"
+    "@vue/compiler-ssr" "3.3.6"
+    "@vue/reactivity-transform" "3.3.6"
+    "@vue/shared" "3.3.6"
+    "estree-walker" "^2.0.2"
+    "magic-string" "^0.30.5"
+    "postcss" "^8.4.31"
+    "source-map-js" "^1.0.2"
 
 "@vue/compiler-sfc@^3.0.0-beta.14", "@vue/compiler-sfc@^3.0.1":
   "integrity" "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ=="
@@ -2487,7 +2502,7 @@
   "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz"
   "version" "0.5.2"
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
 
 "babel-runtime@^6.9.2", "babel-runtime@6.x":
   "integrity" "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="
@@ -11199,7 +11214,7 @@
   "version" "8.5.2"
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/http-streaming" "3.5.3"
+    "@videojs/http-streaming" "3.6.0"
     "@videojs/vhs-utils" "^4.0.0"
     "@videojs/xhr" "2.6.0"
     "aes-decrypter" "^4.0.1"