更新物料、班组、仓库

Reviewed-on: #134

.env.dev

@@ -16,7 +16,7 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.49: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'
@@ -31,9 +31,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.front

@@ -14,9 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.prod

@@ -28,9 +28,6 @@ VUE_APP_APP_NAME ='yudao-admin'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.stage

@@ -15,9 +15,6 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.static

@@ -17,9 +17,6 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

src/api/base/coreProduct.js

@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-04 10:42:50
- * @LastEditors: DY
+ * @LastEditTime: 2024-07-08 14:35:17
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -61,7 +61,7 @@ export function getCoreProductPage(query) {
 // 获得所有列表
 export function getCoreProductList(query) {
   return request({
-    url: '/base/core-product/listAll',
+    url: '/base/core-product-material/listAll',
     method: 'get',
     params: query
   })

src/api/base/delivery.js

@@ -18,6 +18,15 @@ export function deliveryProgressPage(data) {
   })
 }
 
+// 获取订单列表
+export function listOrderList(query) {
+  return request({
+    url: '/extend/delivery-log/listOrderList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获取发货进度分页
 export function deliveryLogDetPage(data) {
   return request({

src/api/base/groupClasses.js

@@ -51,6 +51,13 @@ export function getCode() {
   })
 }
 
+// 获得可用的班次列表
+export function listClassesEnabled() {
+  return request({
+    url: '/base/group-classes/listEnable',
+    method: 'get'
+  })
+}
 // 导出班次基础信息 Excel
 export function exportGroupClassesExcel(query) {
   return request({

src/api/base/groupSchedulingPlan.js

@@ -0,0 +1,125 @@
+import request from '@/utils/request'
+
+// 创建排班计划配置基础信息
+export function createGroupPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班计划配置基础信息
+export function updateGroupPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排班计划配置基础信息
+export function deleteGroupPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得排班计划配置基础信息
+export function getGroupPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得排班计划配置基础信息分页
+export function getGroupPlanPage(query) {
+  return request({
+    url: '/base/group-scheduling-plan/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有排班计划列表
+export function groupPlanList() {
+  return request({
+    url: '/base/group-scheduling-plan/listAll',
+    method: 'get'
+  })
+}
+// 获得排班计划相关班组列表
+export function groupPlanTeamList(id) {
+  return request({
+    url: '/base/group-scheduling-plan-team/teamListByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+// 获得排班计划相关班次列表
+export function groupPlanClassesList(id) {
+  return request({
+    url: '/base/group-scheduling-plan-classes/classesListByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/group-scheduling-plan/getCode',
+    method: 'get'
+  })
+}
+
+// 导出排班计划配置基础信息 Excel
+export function exportGroupPlanExcel(query) {
+  return request({
+    url: '/base/group-scheduling-plan/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得产线工段树形结构
+export function getGroupPlanTree() {
+  return request({
+    url: '/base/group-scheduling-plan/getLineSectionTree',
+    method: 'get'
+  })
+}
+
+// 创建排班计划产线工段
+export function createGroupPlanLine(data) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/createPlanLineSection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班计划产线工段
+export function updateGroupPlanLine(data) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/updatePlanLineSection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得排班计划配置基础信息
+export function getGroupPlanLine(id) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/getLineSectionByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+
+// 获得当前登录用户所在部门id
+export function getLoginUserDeptId() {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/getLoginUserDeptId',
+    method: 'get'
+  })
+}

src/api/base/groupSchedulingRule.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建排班规则基础信息
+export function createGroupRule(data) {
+  return request({
+    url: '/base/group-scheduling-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班规则基础信息
+export function updateGroupRule(data) {
+  return request({
+    url: '/base/group-scheduling-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排班规则基础信息
+export function deleteGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得排班规则基础信息
+export function getGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得排班规则基础信息分页
+export function getGroupRulePage(query) {
+  return request({
+    url: '/base/group-scheduling-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出排班规则基础信息 Excel
+export function exportGroupRuleExcel(query) {
+  return request({
+    url: '/base/group-scheduling-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/base/groupTeamScheduling.js

@@ -8,7 +8,14 @@ export function getPreset(query) {
     params: query
   })
 }
-
+// 获取某月预排班
+export function getScheduling(query) {
+  return request({
+    url: '/base/group-team-scheduling/getScheduling',
+    method: 'get',
+    params: query
+  })
+}
 // 批量创建-更新排班信息
 export function createOrUpdateList(data) {
   return request({

src/api/base/material.js

@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-24 11:22:28
- * @LastEditors: DY
+ * @LastEditTime: 2024-07-05 10:09:18
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -61,7 +61,7 @@ export function getMaterialPage(query) {
 // 获得物料列表
 export function getMaterialList(query) {
   return request({
-    url: '/base/material/listbyfilter',
+    url: '/base/core-product-material/listAll',
     method: 'get',
     params: query
   })
@@ -119,3 +119,84 @@ export function getMaterialAttr(query) {
     params: query
   })
 }
+// 获得物料树结构
+export function getMaterialTree() {
+  return request({
+    url: '/base/core-product-material-type/listTree',
+    method: 'get'
+  })
+}
+
+// 创建物料树
+export function createMaterialTree(data) {
+  return request({
+    url: '/base/core-product-material-type/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新物料树
+export function updateMaterialTree(data) {
+  return request({
+    url: '/base/core-product-material-type/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料树
+export function deleteMaterialTree(id) {
+  return request({
+    url: '/base/core-product-material-type/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得产品物料分页
+export function getProductMaterialPage(query) {
+  return request({
+    url: '/base/core-product-material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 删除产品物料
+export function deleteProductMaterial(id) {
+  return request({
+    url: '/base/core-product-material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 创建产品物料
+export function createProductMaterial(data) {
+  return request({
+    url: '/base/core-product-material/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新产品物料
+export function updateProductMaterial(data) {
+  return request({
+    url: '/base/core-product-material/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得产品物料
+export function getProductMaterial(id) {
+  return request({
+    url: '/base/core-product-material/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得产品物料code
+export function getProductMaterialCode() {
+  return request({
+    url: '/base/core-product-material/getCode',
+    method: 'POST'
+  })
+}

src/api/base/materialProductBom.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-26 20:06:29
+ * @LastEditTime: 2023-11-27 17:54:28
  * @LastEditors: DY
  * @Description:
  */
@@ -70,7 +70,7 @@ export function getMaterialPBList(query) {
 // 获得产品列表
 export function getProList(query) {
   return request({
-    url: '/base/core-product/listAll',
+    url: '/base/core-product-material/listAll',
     method: 'get',
     params: query
   })
@@ -110,3 +110,11 @@ export function deleteMaterialPBDet(id) {
     method: 'delete'
   })
 }
+
+// 获得产品Bom详细
+export function getMaterialPBDet(id) {
+  return request({
+    url: '/base/material-product-bom-det/get?id=' + id,
+    method: 'get'
+  })
+}

src/api/base/product.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 获得产品列表
 export function getProductAll() {
   return request({
-    url: '/base/core-product/listAll',
+    url: '/base/core-product-material/listAll',
     method: 'get'
   })
 }

src/api/equipment/base/inspection/settings.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-20 16:38:18
+ * @LastEditTime: 2023-11-25 16:22:49
  * @LastEditors: DY
  * @Description: 
  */
@@ -74,3 +74,29 @@ export function deleteCheck(id) {
     method: 'delete'
   })
 }
+
+// 获得设备巡检设置code
+export function getCode() {
+  return request({
+    url: '/base/equipment-check-config/getCode',
+    method: 'get'
+  })
+}
+
+// 创建巡检配置
+export function createCheckConfig(data) {
+  return request({
+    url: '/base/equipment-check-config/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新巡检配置
+export function updateCheckConfig(data) {
+  return request({
+    url: '/base/equipment-check-config/update',
+    method: 'put',
+    data: data
+  })
+}

src/api/extend/processEquMaterialBom.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-07 19:47:48
- * @LastEditTime: 2023-11-23 13:57:41
- * @LastEditors: zhp
+ * @LastEditTime: 2024-07-08 14:33:12
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -99,7 +99,7 @@ export function getProcessEquMaterialBomDet(data) {
 
 export function getMaterialList(data) {
   return request({
-    url: '/base/material/listbyfilter',
+    url: '/base/core-product-material/listAll',
     method: 'get',
     data: data
   })

src/api/monitoring/statisticalData.js

@@ -25,7 +25,7 @@ export function getWorkOrderList(query) {
 }
 export function getProductList(query) {
   return request({
-    url: '/base/core-product/listAll',
+    url: '/base/core-product-material/listAll',
     method: 'get',
     params: query,
   })

src/api/quality/processTraceability.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-10-31 15:05:06
- * @LastEditTime: 2023-11-03 09:05:50
+ * @LastEditTime: 2023-11-28 09:28:05
  * @LastEditors: zhp
  * @Description:
  */
@@ -24,6 +24,14 @@ export function getWorkOrderList(query) {
     params: query,
   })
 }
+
+export function getCoreProduct(id) {
+  return request({
+    url: '/base/core-product/get?id=' + id,
+    method: 'get'
+  })
+}
+
 // 导出物料信息
 // export function exportEnergyPlcExcel(query) {
 //   return request({

src/assets/icons/svg/table_edit.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="1_基础资料" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="1-1工厂信息" transform="translate(-1834.000000, -253.000000)">
+            <g id="icon/界面内/编辑" transform="translate(1834.000000, 253.000000)">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <g id="常用购票人／编辑32" fill-rule="nonzero">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M13.5,7.8285 C13.5,7.55235763 13.7238576,7.3285 14,7.3285 C14.2761424,7.3285 14.5,7.55235763 14.5,7.8285 L14.5,12 C14.5,13.3807119 13.3807119,14.5 12,14.5 L4,14.5 C2.61928813,14.5 1.5,13.3807119 1.5,12 L1.5,4 C1.5,2.61928813 2.61928813,1.5 4,1.5 L8.759,1.5 C8.9376328,1.5 9.10269631,1.59529946 9.19201271,1.75 C9.28132911,1.90470054 9.28132911,2.09529946 9.19201271,2.25 C9.10269631,2.40470054 8.9376328,2.5 8.759,2.5 L4,2.5 C3.17157288,2.5 2.5,3.17157288 2.5,4 L2.5,12 C2.5,12.8284271 3.17157288,13.5 4,13.5 L12,13.5 C12.8284271,13.5 13.5,12.8284271 13.5,12 L13.5,7.8285 Z M13.284,2.312 C13.4738226,2.11757837 13.784168,2.11034095 13.9828473,2.2957025 C14.1815266,2.48106405 14.1958051,2.79116533 14.015,2.994 L8.56,8.845 C8.43817243,8.97566989 8.25588756,9.03141962 8.08181033,8.9912488 C7.90773311,8.95107798 7.76830999,8.82108951 7.71606033,8.65024879 C7.66381067,8.47940808 7.70667243,8.29366989 7.8285,8.163 L13.284,2.312 Z" id="形状" stroke="#0B58FF" stroke-width="0.1" fill="#0B58FF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/components/DialogForm/index.vue

@@ -76,6 +76,7 @@
 						class="upload-area"
 						:class="uploadOpen ? '' : 'height-48'"
 						ref="uploadArea"
+						:key="col.prop"
 						v-if="col.upload">
 						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
 							<el-button
@@ -87,13 +88,18 @@
 						<el-upload
 							class="upload-in-dialog"
 							v-if="col.upload"
+							:key="col.prop + '__el-upload'"
 							:action="uploadUrl"
 							:headers="uploadHeaders"
 							:show-file-list="false"
 							icon="el-icon-upload2"
 							:disabled="disabled"
 							:before-upload="beforeUpload"
-							:on-success="handleUploadSuccess"
+							:on-success="
+								(response, file, fileList) => {
+									handleUploadSuccess(response, file, col.prop);
+								}
+							"
 							v-bind="col.bind">
 							<el-button size="mini" :disabled="col.bind?.disabled || false">
 								<svg-icon
@@ -108,10 +114,10 @@
 
 						<uploadedFile
 							class="file"
-							v-for="file in form[col.prop] || []"
+							v-for="file in form[col.prop]"
 							:file="file"
 							:key="file.fileUrl"
-							@delete="!disabled && handleDeleteFile(file)" />
+							@delete="!disabled && handleDeleteFile(file, col.prop)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -136,6 +142,9 @@ function findMaxLabelWidth(rows) {
 			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
+				if (opt.label.includes('(')) {
+					max = max - 3
+				}
 			}
 		});
 	});
@@ -152,12 +161,30 @@ const uploadedFile = {
 		handleDelete() {
 			this.$emit('delete', this.file);
 		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
 	},
 	mounted() {},
 	render: function (h) {
 		return (
 			<div
 				title={this.file.fileName}
+				onClick={this.handleDownload}
 				style={{
 					background: `url(${tupleImg}) no-repeat`,
 					backgroundSize: '14px',
@@ -205,7 +232,7 @@ export default {
 			default: false,
 		},
 		hasFiles: {
-			type: Boolean,
+			type: Boolean | Array,
 			default: false,
 		},
 		labelPosition: {
@@ -215,7 +242,7 @@ export default {
 		size: {
 			type: String,
 			default: '',
-		},
+		}
 	},
 	data() {
 		return {
@@ -251,7 +278,13 @@ export default {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
 				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
 						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
 				}
 			},
 			deep: true,
@@ -348,7 +381,7 @@ export default {
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
 									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
-									this.$emit('update', this.form)
+									this.$emit('update', this.form);
 								}
 							});
 						}
@@ -377,11 +410,12 @@ export default {
 		// 上传成功的特殊处理
 		beforeUpload() {},
 		// 上传前的验证规则可通过 bind 属性传入
-		handleUploadSuccess(response, file, fileList) {
-			this.form.files.push({
+		handleUploadSuccess(response, file, prop) {
+			console.log('[handleUploadSuccess]', response, file, prop);
+			this.form[prop].push({
 				fileName: file.name,
 				fileUrl: response.data,
-				fileType: 2,
+				fileType: prop == 'files' ? 2 : 1,
 			});
 			this.$modal.msgSuccess('上传成功');
 			this.$emit('update', this.form);
@@ -395,8 +429,8 @@ export default {
 			this.uploadOpen = !this.uploadOpen;
 		},
 
-		handleDeleteFile(file) {
-			this.form.files = this.form.files.filter(
+		handleDeleteFile(file, prop) {
+			this.form[prop] = this.form[prop].filter(
 				(item) => item.fileUrl != file.fileUrl
 			);
 			this.$emit('update', this.form);

src/components/Editor/index.vue

@@ -83,7 +83,7 @@ export default {
 					],
 				},
 				placeholder: '请输入内容',
-				readOnly: true,
+				// readOnly: false,
 			},
 		};
 	},
@@ -123,11 +123,13 @@ export default {
 			const editor = this.$refs.editor;
 			this.Quill = new Quill(editor, this.options);
 			// 取消自动聚焦 start
+			this.Quill?.enable(false);
 			this.$nextTick(() => {
-				this.Quill.blur();
-				if (!this.readOnly) {
-					this.Quill.enable();
-				}
+				this.Quill?.enable(true);
+				this.Quill?.blur();
+				// if (!this.readOnly) {
+				// 	this.Quill?.enable();
+				// }
 			});
 			// 如果设置了上传地址则自定义图片上传事件
 			if (this.type === 'url') {
@@ -196,7 +198,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .editor-wrapper {
 	position: relative;
   cursor: not-allowed;

src/components/FileUpload/index.vue

@@ -29,10 +29,10 @@
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
         <el-link :href="`${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+          <span class="el-icon-document"> {{ fileName }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+          <el-link :underline="false" @click="handleDelete(index)" :disabled="disabled" type="danger">删除</el-link>
         </div>
       </li>
     </transition-group>
@@ -71,6 +71,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    //文件名称
+    fName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -81,6 +86,7 @@ export default {
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
       headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
       fileList: [],
+      fileName: ''
     };
   },
   watch: {
@@ -105,6 +111,14 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    fName: {
+      handler(val) {
+        if (val) {
+          console.log('11', val)
+          this.fileName = val
+        }
+      }
     }
   },
   computed: {
@@ -117,6 +131,7 @@ export default {
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
       // 校检文件类型
+      this.fileName = file.name
       if (this.fileType) {
         let fileExtension = "";
         if (file.name.lastIndexOf(".") > -1) {
@@ -150,7 +165,7 @@ export default {
     },
     // 上传失败
     handleUploadError(err) {
-      this.$modal.msgError("上传图片失败，请重试");
+      this.$modal.msgError("上传文件失败，请重试");
       this.$modal.closeLoading()
     },
     // 上传成功回调
@@ -180,8 +195,12 @@ export default {
         this.number = 0;
         this.$emit("input", this.listToString(this.fileList));
         this.$modal.closeLoading();
+        this.returnFileName()
       }
     },
+    returnFileName() {
+      this.$emit('name', this.fileName)
+    },
     // 获取文件名称
     getFileName(name) {
       console.log('你好', name)

src/layout/components/DialogWithMenu.vue

@@ -1,978 +0,0 @@
-<template>
-  <el-dialog class="dialog-with-menu" :visible="dialogVisible" :destroy-on-close="false" @close="handleClose"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
-    <!-- title  -->
-    <div slot="title" class="dialog-title">
-      <h1 class="">
-        {{ detailMode ? "查看详情" : dataForm.id ? "编辑" : "新增" }}
-      </h1>
-    </div>
-
-    <div class="dialog-body__inner relative">
-      <!-- v-if="dataForm.id && !detailMode && /属性|详情/.test(activeMenu) && $hasPermission()" -->
-      <el-button v-if="configs.allowAdd ?? (dataForm.id && !detailMode && /属性|详情|参数/.test(activeMenu))" plain
-        type="primary" size="small" class="at-right-top" style="margin-bottom: 16px" @click="handleAddParam()">+
-        添加</el-button>
-      <template v-if="dataForm.id && !detailMode && /附件/.test(activeMenu)">
-        <el-upload style="position: absolute; width: 100%; height: 0" name="files" :action="uploadUrl"
-          :show-file-list="false" :headers="uploadHeaders" :on-success="handleUploadSuccess"
-          :before-upload="handleUploadCheck">
-          <el-button plain type="primary" size="small" class="at-right-top" style=""> <i class="el-icon-upload"></i> 上传
-          </el-button>
-        </el-upload>
-      </template>
-
-      <!-- menu  -->
-      <el-tabs v-model="activeMenu" type="card" @tab-click="handleTabClick">
-        <!-- <el-tab-pane v-for="(tab, index) in configs.menu" :key="index" :label="tab.name" :name="tab.name"> -->
-        <el-tab-pane v-for="(tab, index) in actualMenus" :key="index" :name="tab.name">
-          <span class="slot" slot="label">
-            <i :class="{
-              'el-icon-edit': tab.key === 'info',
-              'el-icon-s-data': tab.key === 'attr',
-              'el-icon-folder-opened': tab.key === 'attachment',
-            }"></i>
-            {{ tab.name }}
-          </span>
-
-          <!-- 表单标签页 -->
-          <div v-if="tab.key === 'info'">
-            <!-- form  -->
-            <el-form ref="dataForm" :model="dataForm" v-loading="loadingStatus">
-              <el-row v-for="(row, rowIndex) in configs.form.rows" :key="'row_' + rowIndex" :gutter="20">
-                <el-col v-for="(col, colIndex) in row" :key="colIndex" :span="24 / row.length">
-                  <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules || null"
-                    v-show="!col.forceDisabled || (col.forceDisabled && dataForm.id)">
-                    <div v-if="col.forceDisabled && dataForm.id" class="force-disabled">
-                      <el-tag :key="col.key" :type="col.type">{{ dataForm[col.prop] || "-" }}</el-tag>
-                    </div>
-                    <el-input v-if="col.input" v-model="dataForm[col.prop]" clearable
-                      :disabled="disableCondition(col.prop)" v-bind="col.elparams" />
-                    <el-cascader v-if="col.cascader" v-model="dataForm[col.prop]" :options="col.options"
-                      :disabled="detailMode" v-bind="col.elparams"></el-cascader>
-                    <el-select v-if="col.select" v-model="dataForm[col.prop]" clearable
-                      :disabled="disableCondition(col.prop)" v-bind="col.elparams"
-                      @change="handleSelectChange(col, $event)">
-                      <el-option v-for="(opt, optIdx) in col.options" :key="'option_' + optIdx" :label="opt.label"
-                        :value="opt.value" />
-                    </el-select>
-                    <el-switch v-if="col.switch" v-model="dataForm[col.prop]" :active-value="1" :inactive-value="0"
-                      @change="handleSwitchChange" :disabled="disableCondition(col.prop)" />
-                    <el-input v-if="col.textarea" type="textarea" v-model="dataForm[col.prop]"
-                      :disabled="disableCondition(col.prop)" v-bind="col.elparams" />
-                    <quillEditor v-if="col.richInput" ref="quill-editor" v-model="dataForm[col.prop]"
-                      :options="col.quillConfig ?? defaultQuillConfig" style="margin-top: 42px"
-                      :disabled="disableCondition(col.prop)" />
-
-                    <div class="" v-if="col.component" style="margin: 42px 0 0">
-                      <!-- 下面这个 component 几乎是为 富文本 quill 定制的了... TODO：后续可能会根据业务需求创建新的版本  -->
-                      <component :is="col.component" :key="'component_' + col.prop"
-                        @update:modelValue="handleComponentModelUpdate(col.prop, $event)" :modelValue="dataForm[col.prop]"
-                        :mode="detailMode ? 'detail' : dataForm.id ? 'edit' : 'create'" />
-                    </div>
-                    <!-- add more...  -->
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-
-          <!-- 表格标签页 -->
-          <div v-if="dataForm.id && tab.key === 'attr'" key="attr-list">
-            <BaseListTable :table-config="null" :column-config="filteredTableProps" :table-data="subList"
-              @operate-event="handleTableRowOperate" :current-page="attrPage" :current-size="attrSize"
-              :refresh-layout-key="Math.random()" v-loading="loadingStatus" />
-            <!-- paginator  -->
-            <el-pagination class="" style="text-align: left" background @size-change="handleSizeChange"
-              @current-change="handlePageChange" :current-page.sync="attrPage" :page-sizes="[5, 10, 20]"
-              :page-size="attrSize" :total="attrTotal" layout="total, sizes, prev, next"></el-pagination>
-          </div>
-
-          <!-- 附件标签页 -->
-          <div v-if="dataForm.id && tab.key === 'attachment'" key="attachment">
-            <div class="upload-tips" style="font-size: 0.8em; margin-bottom: 12px">文件大小不要超过 2MB</div>
-            <!-- 附件列表 -->
-            <div class="" v-loading="loadingStatus">
-              <ul class="file-list">
-                <li v-for="(file, index) in fileList" :key="index">
-                  <span class="file-name">{{ file.name }}</span>
-                  <span class="file-operations">
-                    <span class="file-icon preview" @click="handleFileClick('view', file)">
-                      <i class="el-icon-view" style="cursor: pointer"></i>
-                    </span>
-                    <span class="file-icon download" @click="handleFileClick('download', file)">
-                      <i class="el-icon-download" style="color: #0b58ff; cursor: pointer"></i>
-                    </span>
-                    <span class="file-icon delete" @click="handleFileClick('delete', file)">
-                      <i class="el-icon-delete" style="color: red; cursor: pointer"></i>
-                    </span>
-                  </span>
-                </li>
-              </ul>
-            </div>
-            <!-- img preview dialog  -->
-            <el-dialog key="image-preview-dialog" class="image-preview-dialog" :visible.sync="imgPreviewDialogVisible"
-              :append-to-body="true">
-              <div class="img-container">
-                <img width="100%" :src="currentImgUrl" alt="" />
-              </div>
-            </el-dialog>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-
-    <!-- sub dialog  -->
-    <small-dialog :append-to-body="true" v-if="showSubDialog" ref="subDialog" :url="urls.subase"
-      :configs="configs.subDialog" :related-id="dataForm.id" @refreshDataList="getSubList"></small-dialog>
-
-    <!-- footer  -->
-    <div slot="footer">
-      <template v-for="(operate, index) in configs.form.operations">
-        <el-button v-if="showButton(operate)" :key="'operation_' + index" :type="operate.type"
-          @click="handleBtnClick(operate)"
-          :loading="(operate.name === 'add' || operate.name === 'update') && btnLoading">{{ operate.label }}</el-button>
-      </template>
-      <el-button @click="handleBtnClick({ name: 'cancel' })">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { pick as __pick } from "@/utils/filters";
-import SmallDialog from "@/components/SmallDialog.vue";
-import BaseListTable from "@/components/BaseListTable.vue";
-import Cookies from "js-cookie";
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-
-import { quillEditor } from "vue-quill-editor";
-
-function reConstructTreeData(listObj) {
-  const entry = [];
-  Object.keys(listObj).map((key) => {
-    const currentNode = listObj[key];
-    currentNode.label = currentNode.name;
-    currentNode.value = currentNode.id;
-    if (currentNode.parentId === "0") {
-      entry.push(listObj[key]);
-      return; // return { label: currentNode.name, value: currentNode.id, children: currentNode.children ?? [] };
-    }
-    const parentNode = listObj[currentNode.parentId];
-    if (!parentNode.children) {
-      parentNode.children = [];
-    }
-    parentNode.children.push(currentNode);
-  });
-  return entry;
-}
-
-export default {
-  name: "DialogWithMenu",
-  components: { SmallDialog, BaseListTable, quillEditor },
-  props: {
-    configs: {
-      type: Object,
-      default: () => ({}),
-    },
-    dialogVisible: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  inject: ["urls"],
-  data() {
-    const dataForm = {};
-    const autoDisabledQueue = [];
-    const watingToRefreshQueue = [];
-    const cached = {}
-
-    this.configs.form.rows.forEach((row) => {
-      row.forEach((col) => {
-        if (col.upload) dataForm[col.prop] = col.default ?? [];
-        else dataForm[col.prop] = col.default ?? null;
-
-        if (col.autoDisabled) autoDisabledQueue.push(col.prop);
-        if (!!col.refreshOptionsAfterConfirm) watingToRefreshQueue.push(col);
-
-        if (col.fetchData)
-          col.fetchData().then(({ data: res }) => {
-            console.log("[Fetch Data]", "list" in res.data, res.data, res.data.list);
-            if (res.code === 0) {
-              if (col.cacheFetchedData) {
-                // cache fetched data
-                cached[col.prop] = 'list' in res.data ? res.data.list : (Array.isArray(res.data) ? res.data : [])
-              }
-
-              if (!col.options || !col.options.length) {
-                this.$set(
-                  col,
-                  "options",
-                  "list" in res.data
-                    ? res.data.list.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                    : res.data.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                );
-              }
-              // col.options = res.data.list;
-              else if (col.options.length) {
-                "list" in res.data ? res.data.list.unshift(...col.options) : res.data.unshift(...col.options);
-                this.$set(
-                  col,
-                  "options",
-                  "list" in res.data
-                    ? res.data.list.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                    : res.data.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                );
-              }
-            } else {
-              col.options.splice(0);
-            }
-            // dataForm[col.prop] = col.default ?? null; // not perfect!
-          });
-        else if (col.fetchTreeData) {
-          // 获取设备类型时触发的，用于前端构建属性结构，约定，parentId 为0时是顶级节点
-          col.fetchTreeData().then(({ data: res }) => {
-            console.log("[Fetch Tree Data]", res.data);
-            if (res.code === 0) {
-              // 先把数据先重构成一个对象
-              const obj = {};
-
-              if ("list" in res.data) {
-                res.data.list.map((item) => {
-                  obj[item.id] = item;
-                });
-              } else if (Array.isArray(res.data)) {
-                res.data.map((item) => {
-                  obj[item.id] = item;
-                });
-              }
-              // 再过滤这个对象
-              let filteredList = reConstructTreeData(obj);
-              console.log("** filteredList **", filteredList);
-              // 最后设置 options
-              this.$set(col, "options", filteredList);
-            } else {
-              col.options.splice(0);
-              this.$message.error(res.msg);
-            }
-          });
-        }
-      });
-    });
-
-    return {
-      // configs,
-      btnLoading: false,
-      loadingStatus: false,
-      activeMenu: this.configs.menu[0].name,
-      dataForm,
-      detailMode: false,
-      autoDisabledQueue,
-      watingToRefreshQueue,
-      cached,
-      showBaseDialog: false,
-      baseDialogConfig: null,
-      subList: [],
-      showSubDialog: false,
-      disableXXX: false,
-      defaultQuillConfig: {
-        modules: {
-          toolbar: [
-            [{ font: [] }],
-            [{ size: ["small", false, "large", "huge"] }], // custom dropdown
-            ["bold", "italic", "underline", "strike"], // toggled buttons
-            [{ color: [] }, { background: [] }], // dropdown with defaults from theme
-            ["blockquote", "code-block"],
-            [{ header: 1 }, { header: 2 }], // custom button values
-            [{ list: "ordered" }, { list: "bullet" }],
-            // [{ 'script': 'sub'}, { 'script': 'super' }],      // superscript/subscript
-            [{ indent: "-1" }, { indent: "+1" }], // outdent/indent
-            // [{ 'direction': 'rtl' }],                         // text direction
-            // [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-            // [{ 'align': [] }],
-            // ['clean']                                         // remove formatting button
-          ],
-        },
-        theme: "snow",
-        readOnly: false,
-        placeholder: "在这里输入描述信息...",
-        scrollingContainer: null,
-      },
-      attrPage: 1,
-      attrSize: 10,
-      attrTotal: 0,
-      fileList: [],
-      imgPreviewDialogVisible: false,
-      currentImgUrl: "",
-    };
-  },
-  mounted() {
-    this.configs.form.rows.forEach((row) => {
-      row.forEach((col) => {
-        if (col.changeReflects && typeof col.changeReflects === 'object' && 'fromKey' in col.changeReflects && 'toProp' in col.changeReflects) {
-          this.$watch(
-            () => this.dataForm[col.prop],
-            val => {
-              if (val && (col.prop in this.cached)) {
-                console.log("here changeReflects", col.prop, col.changeReflects.toProp, this.cached[col.prop])
-                if (typeof col.changeReflects.fromKey === 'string') {
-                  this.dataForm[col.changeReflects.toProp] = this.cached[col.prop].find(item => item.id === val)?.[col.changeReflects.fromKey]
-                } else if (Array.isArray(col.changeReflects.fromKey) && col.changeReflects.delimiter) {
-                  const foundItem = this.dataForm[col.changeReflects.toProp] = this.cached[col.prop].find(item => item.id === val)
-                  if (foundItem) {
-                    const values = col.changeReflects.fromKey.map(key => foundItem[key])
-                    this.dataForm[col.changeReflects.toProp] = values.join(col.changeReflects.delimiter)
-                  } else {
-                    this.dataForm[col.changeReflects.toProp] = col.changeReflects.delimiter
-                    console.log("[DialogWithMenu] mounted() 没找到对应数据")
-                  }
-                }
-              }
-            },
-            {
-              immediate: false
-            }
-          )
-        }
-      });
-    });
-  },
-
-  watch: {
-    dialogVisible: function (val) {
-      if (!!val) {
-        this.attrPage = 1
-        this.attrSize = 10
-      }
-    },
-  },
-  computed: {
-    actualMenus() {
-      return this.configs.menu.filter((m) => {
-        if (m.onlyEditMode && !this.dataForm.id) {
-          return false;
-        }
-        return true;
-      });
-    },
-    filteredTableProps() {
-      return this.detailMode ? this.configs.table.props.filter((v) => v.prop !== "operations") : this.configs.table.props;
-    },
-    uploadHeaders() {
-      return {
-        token: Cookies.get("token") || "",
-      };
-    },
-    uploadUrl() {
-      return this.configs.menu.find((item) => item.key === "attachment")?.actionUrl || "#";
-    },
-  },
-
-  methods: {
-    disableCondition(prop) {
-      return this.detailMode || (this.disableXXX && this.autoDisabledQueue.indexOf(prop) !== -1);
-    },
-    /** utitilities */
-    showButton(operate) {
-      const notDetailMode = !this.detailMode;
-      const showAlways = operate.showAlways ?? false;
-      const editMode = operate.showOnEdit && this.dataForm.id;
-      const addMode = !operate.showOnEdit && !this.dataForm.id;
-      const permission = operate.permission ? this.$hasPermission(operate.permission) : true;
-      const currentMenuKey = this.configs.menu.find((item) => item.name === this.activeMenu)?.key;
-      return notDetailMode && (showAlways || ((editMode || addMode) && permission)) && currentMenuKey === "info";
-    },
-
-    resetForm(excludeId = false, immediate = false) {
-      setTimeout(
-        () => {
-          Object.keys(this.dataForm).forEach((key) => {
-            if (excludeId && key === "id") return;
-            if ("files" in this.dataForm) this.dataForm.files = [];
-            if ("fileIds" in this.dataForm) this.dataForm.fileIds = [];
-            else this.dataForm[key] = null;
-            if (Array.isArray(this.fileList)) {
-              this.fileList = [];
-            }
-          });
-          this.activeMenu = this.configs.menu[0].name;
-          this.$refs.dataForm[0].clearValidate();
-        },
-        immediate ? 0 : 200
-      );
-    },
-
-    updateOptions() {
-      return new Promise((resolve, reject) => {
-        if (this.watingToRefreshQueue.length) {
-          this.watingToRefreshQueue.forEach((opt) => {
-            console.log("[刷新数据, ", opt, "]");
-            if ("fetchData" in opt) {
-              opt.fetchData(this.dataForm.id ? this.dataForm.id : -1).then(({ data: res }) => {
-                if (res.code === 0) {
-                  this.$set(
-                    opt,
-                    "options",
-                    "list" in res.data
-                      ? res.data.list.map((i) => ({ label: i.code, value: i.id }))
-                      : res.data.map((i) => ({ label: i.code, value: i.id }))
-                  );
-
-                  resolve({ done: true });
-                } else {
-                  this.$message({
-                    message: `${res.code}: ${res.msg}`,
-                    type: "error",
-                    duration: 1500,
-                  });
-
-                  resolve({ done: false });
-                }
-              });
-            }
-          });
-        } else resolve(null);
-      });
-    },
-
-    /** init **/
-    init(id, detailMode, menu) {
-      // this.dialogVisible = true;
-      if (this.$refs.dataForm && this.$refs.dataForm.length) {
-        // 当不是首次渲染dialog的时候，一开始就清空验证信息，本组件的循环里只有一个 dataForm 所以只用取 [0] 即可
-        this.$refs.dataForm[0].clearValidate();
-      }
-      console.log("[dialog] DialogWithHead init():", id, detailMode);
-
-      this.detailMode = detailMode ?? false;
-      this.$nextTick(() => {
-        this.dataForm.id = id || null;
-        if (this.dataForm.id) {
-          // 如果是编辑
-          this.loadingStatus = true;
-          // 提前获取属性列表
-          this.getSubList();
-          // 获取详情
-          this.updateOptions().then((result) => {
-            if (result === null || (typeof result === "object" && result.done)) {
-              this.$http.get(this.urls.base + `/${this.dataForm.id}`).then(({ data: res }) => {
-                if (res && res.code === 0) {
-                  const dataFormKeys = Object.keys(this.dataForm);
-                  this.dataForm = __pick(res.data, dataFormKeys);
-                  if ("files" in res.data) {
-                    console.log("[DialogWithMenu] fileList===>", res.data.files, this.fileList);
-                    /** 返回的文件列表 */
-                    this.fileList = res.data.files
-                      ? res.data.files.map((file) => ({
-                        id: file.id,
-                        name: file.fileUrl.split("/").pop(),
-                        url: file.fileUrl,
-                        typeCode: file.typeCode,
-                      }))
-                      : [];
-                  }
-                }
-                this.loadingStatus = false;
-                // 是否要跳转到附件页
-                if (menu && menu.key) {
-                  this.activeMenu = this.configs.menu.find((item) => item.key === menu.key)?.name;
-                }
-              });
-            }
-          });
-        } else {
-          // 如果不是编辑
-          this.updateOptions();
-        }
-      });
-    },
-
-    /** handlers */
-    handleFileClick(type, file) {
-      switch (type) {
-        case "view": {
-          // 加载图片
-          this.$http
-            .get("/pms/attachment/downloadFile", {
-              params: {
-                attachmentId: file.id,
-                type: 0, // 0 预览，1 下载
-              },
-              responseType: "blob",
-            })
-            .then(({ data: res }) => {
-              console.log("preivew", res);
-              if (/image/i.test(res.type)) {
-                // 显示图片
-                this.currentImgUrl = URL.createObjectURL(res);
-                this.imgPreviewDialogVisible = true;
-              } else if (/pdf/i.test(res.type)) {
-                // 预览pdf 
-                let a = document.createElement('a')
-                a.setAttribute('target', '_blank')
-                a.href = URL.createObjectURL(res)
-                a.click()
-                console.log('before remove a ', a)
-                a.remove()
-                console.log('removed a ', a)
-              } else {
-                this.$message({
-                  message: "非图片和PDF文件请下载后预览",
-                  type: "error",
-                  duration: 1500,
-                });
-              }
-            });
-          break;
-        }
-
-        case "download": {
-          // 下载图片
-          this.$http
-            .get("/pms/attachment/downloadFile", {
-              params: {
-                attachmentId: file.id,
-                type: 1, // 0 预览，1 下载
-              },
-              responseType: "blob",
-            })
-            .then(({ data: res }) => {
-              const blob = new Blob([res]);
-
-              /** 通知 */
-              this.$notify({
-                title: "成功",
-                message: "开始下载",
-                type: "success",
-                duration: 1200,
-              });
-
-              if ("download" in document.createElement("a")) {
-                const alink = document.createElement("a");
-                alink.download = file.name;
-                alink.style.display = "none";
-                alink.target = "_blank";
-                alink.href = URL.createObjectURL(blob);
-                document.body.appendChild(alink);
-                alink.click();
-                URL.revokeObjectURL(alink.href);
-                document.body.removeChild(alink);
-              } else {
-                navigator.msSaveBlob(blob, fileName);
-              }
-            });
-
-          break;
-        }
-
-        case "delete": {
-          return this.$confirm(`确定删除图片: ${file.name}`, "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "我再想想",
-            type: "warning",
-          })
-            .then(() => {
-              this.loadingStatus = true;
-              const newFilelist = this.fileList.filter((f) => f.id !== file.id);
-              this.updateRemoteFiles(newFilelist).then((msg) => {
-                if (msg && msg === "success") {
-                  this.fileList = newFilelist;
-                  this.loadingStatus = false;
-                  /** 通知 */
-                  this.$notify({
-                    title: "成功",
-                    message: "已删除",
-                    type: "success",
-                    duration: 1200,
-                  });
-                }
-              });
-            })
-            .catch((err) => { });
-        }
-      }
-    },
-
-    handleUploadSuccess(response, file, fileList) {
-      console.log("[DialogWithMenu] uploadedFileList", response, file, fileList);
-
-      if (response.code === 0) {
-        const uploadedFile = response.data[0];
-        const fileItem = {
-          id: uploadedFile.id,
-          name: uploadedFile.fileUrl.split("/").pop(),
-          url: uploadedFile.fileUrl,
-          typeCode: file.typeCode,
-        };
-
-        this.loadingStatus = true;
-        this.updateRemoteFiles([...this.fileList, fileItem]).then((msg) => {
-          if (msg && msg === "success") {
-            this.fileList.push(fileItem);
-            this.loadingStatus = false;
-            /** 通知 */
-            this.$notify({
-              title: "成功",
-              message: "上传成功",
-              type: "success",
-              duration: 1200,
-            });
-          }
-        });
-      }
-    },
-
-    updateRemoteFiles(filelist) {
-      return this.$http
-        .put("/pms/product", {
-          id: "id" in this.dataForm ? this.dataForm.id : "DEFAULT_ID",
-          fileIds: filelist.map((f) => f.id),
-        })
-        .then(({ data: res }) => {
-          if (res.code === 0) return "success";
-        });
-    },
-
-    handleUploadCheck(file) {
-      console.log("[before upload]", file);
-      const LIMIT = 2 * 1024 * 1024; // bytes
-      if (file.size > LIMIT) {
-        this.$message({
-          message: "文件大小不能超过 2MB",
-          type: "error",
-          duration: 1500,
-        });
-        return false;
-      } else return true;
-    },
-
-    handleComponentModelUpdate(propName, { subject, payload: { data } }) {
-      this.dataForm[propName] = JSON.stringify(data);
-      console.log("[DialogJustForm] handleComponentModelUpdate", this.dataForm[propName]);
-    },
-    handleSelectChange(col, eventValue) {
-      console.log("[dialog] select change: ", col, eventValue);
-    },
-    handleSwitchChange(val) {
-      console.log("[dialog] switch change: ", val, this.dataForm);
-    },
-    handleBtnClick(payload) {
-      console.log("btn click payload: ", payload);
-
-      if ("name" in payload) {
-        switch (payload.name) {
-          case "cancel":
-            this.handleClose();
-            break;
-          case "reset":
-            this.resetForm(true, true); // true means exclude id
-            break;
-          case "add":
-          case "update": {
-            this.$refs.dataForm[0].validate((passed, result) => {
-              if (passed) {
-                // 如果通过验证
-                this.btnLoading = true
-                this.loadingStatus = true;
-                const method = payload.name === "add" ? "POST" : "PUT";
-
-                // 判断是否有附件选项
-                const hasAttachment = !!this.configs.menu.find((item) => item.key === "attachment");
-                if (hasAttachment) {
-                  const fileIds = this.fileList.map((item) => item.id);
-                  this.$set(this.dataForm, "fileIds", fileIds);
-                }
-
-                // 加载额外需要的 id
-                let extraIds = {};
-                if (this.configs.extraIds && typeof this.configs.extraIds === "object") {
-                  // 如果配置里，有 extraIds 选项
-                  Object.entries(this.configs.extraIds).forEach(([key, value]) => {
-                    extraIds[key] = value;
-                  });
-                }
-
-                // 实际发送请求
-                this.btnLoading = true
-                this.$http({
-                  url: this.urls.base,
-                  method,
-                  data: {
-                    ...extraIds,
-                    ...this.dataForm,
-                  },
-                })
-                  .then(({ data: res }) => {
-                    this.btnLoading = false
-                    this.loadingStatus = false;
-                    console.log("[add&update] res is: ", res);
-                    if (res.code === 0) {
-                      this.$message.success(payload.name === "add" ? "添加成功" : "更新成功");
-                      this.$emit("refreshDataList");
-
-                      // 如果 watingToRefreshQueue 队列里有数据
-                      // if (this.watingToRefreshQueue.length) {
-                      //   // 刷新队列
-                      //   this.watingToRefreshQueue.forEach((opt) => {
-                      //     console.log("[刷新数据, ", opt, "]");
-                      //     if ("fetchData" in opt) {
-                      //       opt.fetchData().then(({ data: res }) => {
-                      //         if (res.code === 0) {
-                      //           this.$set(
-                      //             opt,
-                      //             "options",
-                      //             "list" in res.data
-                      //               ? res.data.list.map((i) => ({ label: i.name, value: i.id }))
-                      //               : res.data.map((i) => ({ label: i.name, value: i.id }))
-                      //           );
-                      //         }
-                      //       });
-                      //     }
-                      //   });
-                      // }
-
-                      this.handleClose();
-                    } else {
-                      this.$message({
-                        message: `${res.code}: ${res.msg}`,
-                        type: "error",
-                        duration: 2000,
-                      });
-                      if (this.btnLoading) this.btnLoading = false
-                    }
-                  })
-                  .catch((errMsg) => {
-                    this.$message.error("参数错误：" + errMsg);
-                    if (this.loadingStatus) this.loadingStatus = false;
-                    if (this.btnLoading) this.btnLoading = false
-                  });
-              } else {
-                this.$message.error("请核查字段信息");
-              }
-            });
-          }
-        }
-      }
-    },
-    handleTabClick(payload) {
-      //   console.log("tab click payload: ", this.activeMenu);
-      //   if (this.activeMenu === this.configs.menu[1].name) {
-      //     // 获取数据
-      //     this.getSubList();
-      //   }
-    },
-
-    handlePageChange(val) {
-      this.getSubList(val, this.attrSize);
-    },
-    handleSizeChange(val) {
-      this.attrPage = 1;
-      this.attrSize = val
-      this.getSubList(1, val);
-    },
-
-    getSubList(page, size) {
-      const params = {};
-      params.page = page ?? this.attrPage;
-      params.limit = size ?? this.attrSize;
-
-      const requiredParams = this.configs.table.extraParams;
-      if (requiredParams) {
-        if (Array.isArray(requiredParams)) {
-          requiredParams.forEach((str) => {
-            if (/id/i.test(str)) {
-              params[str] = this.dataForm.id;
-            } else {
-              params[str] = "";
-            }
-          });
-        } else if (typeof requiredParams === "string") {
-          // 如果需要额外参数，一般肯定需要
-          params[this.configs.table.extraParams] = this.dataForm.id;
-          // 此时 dataForm.id 一定是存在的
-        }
-      }
-      this.$http.get(this.urls.subpage, { params }).then(({ data: res }) => {
-        console.log("[DialogWithMenu] getSubList:", res);
-        if (res.code === 0 && res.data?.list) {
-          // 有数据
-          this.subList = res.data.list;
-          this.attrTotal = res.data.total;
-        } else {
-          this.subList.splice(0);
-          this.attrTotal = 0;
-        }
-      });
-    },
-
-    handleAddParam(id) {
-      this.showSubDialog = true;
-      this.$nextTick(() => {
-        this.$refs.subDialog.init(id ?? null);
-      });
-    },
-
-    handleClose() {
-      this.resetForm();
-      this.$emit("update:dialogVisible", false);
-    },
-
-    /** 列表handlers */
-    handleAddItem() {
-      // console.log('[dialog] handleAddItem ot list...');
-      this.showBaseDialog = true;
-      this.$nextTick(() => {
-        console.log("[sub-dialog] ", this.$refs["sub-dialog"].init());
-      });
-    },
-    handleTableRowOperate({ type, data }) {
-      console.log("handleTableRowOperate", type, data);
-
-      switch (type) {
-        case "delete": {
-          // 确认是否删除
-          console.log('delete....', data)
-          const itemName = typeof data === 'object' ? (data.attrName || data.name || data.material || data.id) : data
-          return this.$confirm(`是否删除条目: ${itemName}`, "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "我再想想",
-            type: "warning",
-          })
-            .then(() => {
-              // this.$http.delete(this.urls.base + `/${data}`).then((res) => {
-              this.$http({
-                url: this.urls.subase,
-                method: "DELETE",
-                data: [`${data.id}`],
-              }).then(({ data: res }) => {
-                if (res.code === 0) {
-                  this.$message.success({
-                    message: "删除成功!",
-                    duration: 1000,
-                    onClose: () => {
-                      this.getSubList(1, 20);
-                    },
-                  });
-                }
-              });
-            })
-            .catch((err) => { });
-        }
-        case "edit": {
-          this.handleAddParam(data); /** data is ==> id */
-          break;
-        }
-        // case 'view-detail-action':
-        // 	this.openDialog(data, true);
-        // 	break;
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.el-menu {
-  margin: 16px 0 !important;
-}
-
-.el-menu.el-menu--horizontal {
-  border: none !important;
-  /* background: #0f02 !important; */
-}
-
-/* .el-menu--horizontal > .el-menu-item.is-active { */
-/* border-bottom-color: #0b58ff; */
-/* } */
-
-.dialog-with-menu>>>.el-dialog__body {
-  /* padding-top: 16px !important;
-  padding-bottom: 16px !important; */
-  padding-top: 0 !important;
-  padding-bottom: 0 !important;
-}
-
-.el-select,
-.el-cascader {
-  width: 100% !important;
-}
-
-.dialog-with-menu>>>.el-dialog__header {
-  padding: 10px 20px 10px;
-  /* background: linear-gradient(to bottom, rgba(0, 0, 0, 0.25), white); */
-}
-
-.relative {
-  position: relative;
-}
-
-.at-right-top {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 10000;
-}
-
-ul.file-list,
-ul.file-list>li {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-
-.file-list {
-  max-height: 20vh;
-  overflow-y: auto;
-  margin-top: 12px;
-  /* width: 240px; */
-  display: flex;
-  flex-direction: column;
-}
-
-ul.file-list>li {
-  border-radius: 4px;
-  background-color: #edededd2;
-  padding: 8px;
-  margin-bottom: 2px;
-  display: flex;
-  justify-content: space-between;
-}
-
-ul.file-list>li:hover {
-  background-color: #ededed;
-}
-
-.file-operations {
-  display: flex;
-}
-
-.file-icon {
-  margin-right: 8px;
-  font-size: 16px;
-  line-height: 1;
-  display: flex;
-  place-content: center;
-  width: 16px;
-  height: 16px;
-}
-
-/* .image-preview-dialog {
-} */
-
-.force-disabled {
-  margin-top: 42px;
-}
-</style>

src/mixins/lb/basicPageMixin.js

@@ -78,7 +78,6 @@ export default {
 			return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
 		},
 		del(payload) {
-			debugger;
 			return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
 		},
 

src/styles/index.scss

@@ -163,7 +163,7 @@ input, textarea{
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: rgba(144,147,153,.5);
+  background-color: #EDEDED;
   background-clip: padding-box;
   min-height: 28px;
   -webkit-border-radius: 2em;
@@ -174,7 +174,7 @@ input, textarea{
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(144,147,153,.3);
+  background-color: #D9D9D9;
 }
 
 // 抽屉head区域---start
@@ -197,3 +197,7 @@ input, textarea{
   vertical-align: middle;
 }
 // 抽屉head区域---end
+// 弹出框，上下分布，去掉label的padding-bottom
+.el-form--label-top .el-form-item__label {
+  padding: 0;
+}

src/utils/ruoyi.js

@@ -187,19 +187,6 @@ export function getTenantEnable() {
   return process.env.VUE_APP_TENANT_ENABLE || true;
 }
 
-/**
- * 获得验证码功能是否开启
- */
-export function getCaptchaEnable() {
-  if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") {
-    return true;
-  }
-  if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") {
-    return false;
-  }
-  return process.env.VUE_APP_CAPTCHA_ENABLE || true;
-}
-
 /**
  * 获得文档是否开启
  */

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

@@ -2,10 +2,11 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:32:10
+ * @LastEditTime: 2023-11-25 18:09:05
  * @Description:
 -->
 <template>
+	<div class="dialog">
 		<el-form
 			:model="dataForm"
 			:rules="dataRule"
@@ -27,7 +28,7 @@
 			<el-row :gutter="20">
 				<el-col :span="12">
 					<el-form-item label="上级部门" prop="parentId">
-					<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门"/>
+						<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -39,6 +40,7 @@
 				</el-col>
 			</el-row>
 		</el-form>
+	</div>
 </template>
 
 <script>
@@ -68,6 +70,7 @@ export default {
 			},
 			departmentlList: [],
 			menuOptions: [],
+			isChoosed: false,
 			dataRule: {
         code: [{ required: true, message: "部门编码不能为空", trigger: "blur" }],
         name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
@@ -104,3 +107,9 @@ export default {
 	},
 };
 </script>
+
+<style scoped>
+.dialog {
+	min-height: 180px;
+}
+</style>

src/views/base/coreEquipment/components/AssetsUpload.vue

@@ -46,21 +46,13 @@
 					}}文件大小不超过2MB
 				</div>
 			</el-upload>
-			<!-- <div
-				class="file-list__item"
-				v-for="n in 9"
-				:key="n"
-				:style="{
-					display: n > 4 && !expand ? 'none' : 'block',
-				}"
-				:data-name="n"
-				:class="{ 'default-icon': !isPicMode }">
-				<i class="el-icon-delete"></i>
-			</div> -->
 			<div
-				class="file-list__item"
 				v-for="(file, index) in files"
 				:key="file.fileName"
+				style="width: 100%">
+				<div
+					class="file-list__item"
+					v-if="!isPicMode"
 					:style="{
 						background: isPicMode
 							? `url(${file.fileUrl}) no-repeat`
@@ -68,6 +60,7 @@
 						backgroundSize: isPicMode ? '100% 100%' : '64px',
 						backgroundPosition: isPicMode ? '0% 0%' : 'center',
 					}"
+					@click="handleDownload(file)"
 					:data-name="file.fileName">
 					<el-button
 						v-if="!disabled"
@@ -76,6 +69,14 @@
 						style="padding: 0"
 						@click="(e) => handleDelete(file)" />
 				</div>
+
+				<el-image
+					v-else
+					class="file-list__item"
+					style="width: 100%"
+					:src="file.fileUrl"
+					:preview-src-list="files.map((item) => item.fileUrl)"></el-image>
+			</div>
 		</section>
 	</div>
 </template>
@@ -189,6 +190,32 @@ export default {
 			}, 500);
 		},
 
+		async handleDownload(file) {
+			if (this.isPicMode) {
+				// this.$emit('preview', file);
+				const link = document.createElement('a');
+				link.href = file.fileUrl;
+				link.target = '_blank';
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+			} else {
+				// this.$emit('download', file);
+				const data = await this.$axios({
+					url: file.fileUrl,
+					method: 'get',
+					responseType: 'blob',
+				});
+				const link = document.createElement('a');
+				link.href = window.URL.createObjectURL(new Blob([data]));
+				link.download = file.fileName;
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+				window.URL.revokeObjectURL(link.href);
+			}
+		},
+
 		emitFilelist() {
 			this.$emit('update', this.files);
 		},

src/views/base/coreEquipment/components/EquipmentDrawer.vue

@@ -42,16 +42,26 @@
 							v-model="form" />
 					</div>
 
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+					<div
+						v-if="section.key == 'attrs'"
+						style="margin-top: 12px; position: relative">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加属性
+							</el-button>
+						</div>
 						<base-table
 							v-loading="attrListLoading"
 							:table-props="section.props"
 							:page="attrQuery?.params.pageNo || 1"
 							:limit="attrQuery?.params.pageSize || 10"
 							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
 							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
 							<method-btn
 								v-if="section.tableBtn"
 								slot="handleBtn"
@@ -76,7 +86,7 @@
 				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
 				</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">确定</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@@ -162,7 +172,9 @@ export default {
 						input: true,
 						label: '属性名称',
 						prop: 'name',
-						rules: [{ required: true, message: '属性名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[

src/views/base/coreEquipment/index.vue

@@ -1,29 +1,62 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-		<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
-		<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
 			@emitFun="handleEmitFun">
-			<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
 
 		<!-- 分页组件 -->
-		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
 		<!-- 对话框(添加) -->
-		<base-dialog :dialogTitle="title" :dialogVisible="open" @close="cancel" @cancel="cancel" width="60%"
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			width="60%"
 			@confirm="submitForm">
-			<DialogForm v-if="open" key="index-dialog-form" ref="form" label-position="top" size="small" v-model="form"
+			<DialogForm
+				v-if="open"
+				key="index-dialog-form"
+				ref="form"
+				label-position="top"
+				size="small"
+				v-model="form"
+				:has-files="['files', 'files2']"
 				:rows="computedRows" />
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<EquipmentDrawer v-if="editVisible" ref="drawer" :mode="editMode" @update-mode="editMode = $event"
-			:data-id="form.id" :sections="[
+		<EquipmentDrawer
+			v-if="editVisible"
+			ref="drawer"
+			:mode="editMode"
+			@update-mode="editMode = $event"
+			:data-id="form.id"
+			:sections="[
 				{
 					name: '基本信息',
 					key: 'base',
@@ -63,7 +96,10 @@
 					].filter((v) => v),
 					allowAdd: true,
 				},
-			]" @refreshDataList="getList" @cancel="cancelEdit" @destroy="cancelEdit" />
+			]"
+			@refreshDataList="getList"
+			@cancel="cancelEdit"
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
@@ -176,14 +212,18 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-equipment:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-equipment:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
@@ -196,7 +236,9 @@ export default {
 						input: true,
 						label: '设备名称',
 						prop: 'name',
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -225,7 +267,9 @@ export default {
 						label: '设备类型',
 						prop: 'equipmentTypeId',
 						url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
-						rules: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备类型不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -235,7 +279,11 @@ export default {
 						label: '预计生产时间(min/天)',
 						prop: 'workTime',
 						rules: [
-							{ required: true, message: '预计生产时间不能为空', trigger: 'blur' },
+							{
+								required: true,
+								message: '预计生产时间不能为空',
+								trigger: 'blur',
+							},
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -291,7 +339,11 @@ export default {
 						label: '单件产品加工时间(s)',
 						prop: 'processingTime',
 						rules: [
-							{ required: true, message: '单件产品加工时间不能为空', trigger: 'blur' },
+							{
+								required: true,
+								message: '单件产品加工时间不能为空',
+								trigger: 'blur',
+							},
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -322,13 +374,19 @@ export default {
 				[
 					{
 						upload: true,
-						label: '上传资料',
+						label: '设备资料',
 						prop: 'files',
 					},
 				],
 				[
-					{ input: true, label: '备注', prop: 'remark' }
+					{
+						upload: true,
+						label: '设备图片',
+						prop: 'files2',
+						fileType: 1,
+					},
 				],
+				[{ input: true, label: '备注', prop: 'remark' }],
 				// [
 				// 	{
 				// 		assetUpload: true,
@@ -429,7 +487,7 @@ export default {
 			// 表单参数
 			form: {
 				id: null,
-				files: []
+				files: [],
 			},
 			showUploadComponents: false, // 是否显示上传组件
 		};
@@ -512,7 +570,8 @@ export default {
 				spec: undefined,
 				description: undefined,
 				remark: undefined,
-				files: []
+				files: [],
+				files2: [],
 			};
 			this.resetForm('form');
 		},
@@ -540,9 +599,12 @@ export default {
 				if (!valid) {
 					return;
 				}
+				const payload = Object.assign({}, this.form);
+				payload.files = [...payload.files, ...payload.files2];
+				delete payload.files2;
 				// 修改的提交
 				if (this.form.id != null) {
-					updateEquipment(this.form).then((response) => {
+					updateEquipment(payload).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -550,7 +612,7 @@ export default {
 					return;
 				}
 				// 添加的提交
-				createEquipment(this.form).then((response) => {
+				createEquipment(payload).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();
@@ -569,7 +631,7 @@ export default {
 					this.getList();
 					this.$modal.msgSuccess('删除成功');
 				})
-				.catch(() => { });
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -587,7 +649,7 @@ export default {
 					this.$download.excel(response, '设备.xls');
 					this.exportLoading = false;
 				})
-				.catch(() => { });
+				.catch(() => {});
 		},
 		// 查看详情
 		viewDetail(id) {

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-15 16:23:49
+ * @LastEditTime: 2023-11-27 20:12:00
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px">
+		label-width="90px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="原料名称" prop="name">
@@ -46,6 +46,9 @@
 				</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>
 
@@ -70,7 +73,8 @@ export default {
         code: undefined,
         name: undefined,
         unit: undefined,
-        dailyCost: undefined
+        dailyCost: undefined,
+				remark: undefined
 			},
 			departmentlList: [],
 			menuOptions: [],

src/views/base/coreHotMaterial/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="45%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

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

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-15 15:41:44
+ * @LastEditTime: 2023-11-27 20:07:09
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -114,14 +114,6 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="drawer-body__footer">
-				<el-button v-if="!idAttrShow" @click="goback()">取消</el-button>
-				<el-button v-else :disabled="isdetail" @click="init(dataForm.id)">重置</el-button>
-				<el-button v-if="isdetail" type="primary" @click="goEdit()">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
-			</div>
 
 			<div class="attr-list" v-if="idAttrShow">
 				<small-title
@@ -158,14 +150,16 @@
 					:limit.sync="listQuery.pageSize"
 					:page-sizes="[5, 10, 15]"
 					@pagination="getList" />
-
-				<div class="drawer-body__footer">
-					<el-button type="primary" @click="goback()">关闭</el-button>
-				</div>
 			</div>
 
 		</div>
 
+		<div v-if="!isdetail" class="drawer-body__footer">
+			<el-button @click="goback()">取消</el-button>
+			<el-button :disabled="isdetail" @click="init(dataForm.id)">重置</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</div>
+
 		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
@@ -253,8 +247,8 @@ export default {
 			isdetail: false,
 			idAttrShow: false,
 			dataRule: {
-        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "产品编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
 				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
 				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }],
 				processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
@@ -270,11 +264,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
+					`是否确认删除属性名为"${raw.data.name}"的数据项?`,
 					'提示',
 					{
 						confirmButtonText: '确定',

src/views/base/coreProduct/index.vue

@@ -84,18 +84,18 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:core-product:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
 				this.$auth.hasPermi(`base:core-product:detail`)
 					? {
 							type: 'detail',
 							btnName: '查看详情',
 					  }
 					: undefined,
+				this.$auth.hasPermi(`base:core-product:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
           this.$auth.hasPermi(`base:core-product:delete`)
 					? {
 							type: 'delete',
@@ -141,6 +141,27 @@ export default {
 	},
 	created() {},
 	methods: {
+		// 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否确认删除产品名称为"${name}"的数据项`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
 		// 查看详情
 		otherMethods(val) {
 			if (val.type === 'detail') {

src/views/base/coreProductionLine/index.vue

@@ -144,8 +144,8 @@ export default {
     getDataList() {
       this.dataListLoading = true;
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-				// this.getStatus(response.data.list)
+        // this.tableData = response.data.list;
+				this.getStatus(response.data.list)
         this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });

src/views/base/coreSupplier/index.vue

@@ -105,7 +105,7 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '关键字',
+					label: '供应商',
 					placeholder: '供应商名称',
 					param: 'name',
 				},

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

@@ -2,23 +2,23 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-20 16:51:24
+ * @LastEditTime: 2023-11-28 14:09:09
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="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="height: 10vh">
 				<div style="font-size: 18px;">工单名：{{ dataForm.name }}</div>
-			</div>
+			</div> -->
 
 			<div class="attr-list">
 				<small-title
@@ -29,9 +29,8 @@
 
 				<div class="action_btn">
 					<template>
-						<span style="display: inline-block;" @click="addNew()">
-							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
-							<span class="add">添加</span>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
             </span>
           </template>
 				</div>
@@ -56,9 +55,9 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
+			<!-- <div class="drawer-body__footer">
 				<el-button type="primary" @click="goback()">关闭</el-button>
-			</div>
+			</div> -->
 		</div>
 
 		<attr-add
@@ -298,7 +297,7 @@ export default {
 }
 .action_btn {
   float: right;
-  margin: 5px 15px;
+  margin: -40px 15px;
   font-size: 14px;
 }
 .add {

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -1,21 +1,19 @@
 <template>
-  <el-form ref="dataForm" :rules="rules" label-width="130px" :model="dataForm">
-    <el-row>
-      <el-col :span='12'>
+  <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"></el-input>
+          <el-input v-model="dataForm.name" placeholder="请输入工单名称"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="工单编码" prop="code">
-          <el-input v-model="dataForm.code" disabled></el-input>
+          <el-input v-model="dataForm.code" disabled placeholder="请输入工单编码"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="dataForm.planProductId" placeholder="请选择" style="width: 100%;" @change="selectProduct">
+          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" filterable @change="selectProduct">
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -25,52 +23,50 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='8'>
         <el-form-item label="产品规格" prop="specifications">
-          <el-input v-model="dataForm.specifications" />
+          <el-input v-model="dataForm.specifications" placeholder="请输入产品规格" />
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="计划开始时间">
           <el-date-picker
             v-model="dataForm.planStartTime"
             type="datetime"
             value-format="timestamp"
             style="width: 100%;"
-            placeholder="选择日期">
+            placeholder="请选择计划开始时间">
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="计划完成时间">
           <el-date-picker
             v-model="dataForm.planFinishTime"
             type="datetime"
             value-format="timestamp"
             style="width: 100%;"
-            placeholder="选择日期">
+            placeholder="请选择计划完成时间">
           </el-date-picker>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
-      <el-col :span='12'>
+    <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%;"></el-input-number>
+          <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='12'>
+      <el-col :span='8'>
         <el-form-item label="计划生产数量" prop="planQuantity">
-          <el-input-number v-model="dataForm.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+          <el-input-number v-model="dataForm.planQuantity" :min="0" :max="9999999999999" style="width: 100%;" placeholder="请输入计划生产数量"></el-input-number>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span='12'>
+      <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-select v-model="dataForm.processFlowId" placeholder="请选择关联工艺" clearable filterable style="width: 100%;" @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
@@ -80,19 +76,23 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+    </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-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-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-row>
-    <el-row>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="优先级" prop="priority">
-          <el-select v-model="dataForm.priority" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="dataForm.priority" placeholder="请选择优先级" style="width: 100%;">
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
               :key="item.value"
@@ -102,9 +102,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="工单类型" prop="type">
-          <el-select v-model="dataForm.type" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="dataForm.type" placeholder="请选择工单类型" style="width: 100%;">
             <el-option
               v-for="item in workOrderTypeList"
               :key="item.id"
@@ -115,10 +115,10 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
-      <el-col :span='12'>
+    <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-select v-model="dataForm.productLineIds" placeholder="请选择关联产线" multiple style="width: 100%;">
             <el-option
               v-for="item in productLineList"
               :key="item.id"
@@ -128,9 +128,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="负责人" prop="workers">
-          <el-input v-model="dataForm.workers"></el-input>
+          <el-input v-model="dataForm.workers" placeholder="请输入负责人"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -175,6 +175,7 @@ export default {
         planQuantity: 0,
         processFlowId: '',
         materialMethod: 1,
+        triggerOrigin: 1,
         priority: '',
         productLineIds: [],
         type: '',
@@ -311,11 +312,11 @@ export default {
       if (val) {
         this.productList.map(item => {
           if (val === item.id) {
-            this.dataForm.productSpec = item.specifications
+            this.dataForm.specifications = item.specifications
           }
         })
       } else {
-        this.dataForm.productSpec = ''
+        this.dataForm.specifications = ''
       }
     }
   }

src/views/base/coreWorkOrder/allocation.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-16 09:14:35
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-03 14:19:01
  * @Description:
 -->
 <template>
@@ -105,7 +105,7 @@
 <script>
 import basicAdd from '../../core/mixins/basic-add';
 import { getConOrderList, createConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
-import SmallTitle from '../material/SmallTitle';
+import SmallTitle from '../coreWorkOrder/SmallTitle';
 // import { parseTime } from '../../core/mixins/code-filter';
 // import attrAdd from './attr-add';
 

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

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'35%'"
+		:width="'50%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -17,8 +17,10 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="100px"
+			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"
@@ -32,6 +34,8 @@
 								: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"
@@ -45,6 +49,10 @@
 								: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"
@@ -58,19 +66,28 @@
 								: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"
@@ -84,6 +101,8 @@
 								:value="dict.value" />
 						</el-select>
 					</el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>
 
 		<el-row style="text-align: right">

src/views/base/coreWorkOrder/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="300"
+				:width="350"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -57,7 +57,8 @@ import {
 	getCoreWOPage,
 	deleteCoreWO,
 	statusChange,
-	getConOrderList
+	getConOrderList,
+	getCoreWOList
 } from '@/api/base/coreWorkOrder';
 
 
@@ -65,19 +66,27 @@ const tableProps = [
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime
+		filter: parseTime,
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '工单名称'
+		label: '工单名称',
+		minWidth: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '工单编码'
+		label: '工单编码',
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'workers',
-		label: '负责人'
+		label: '负责人',
+		minWidth: 100,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'priority',
@@ -87,7 +96,7 @@ const tableProps = [
 	{
 		prop: 'triggerOrigin',
 		label: '来源',
-		filter: (val) => ['', 'MES', 'ERP'][val]
+		filter: (val) => ['', 'MES-手动', 'MES-订单下发', 'ERP'][val]
 	},
 	{
 		prop: 'status',
@@ -97,15 +106,19 @@ const tableProps = [
 	{
 		prop: 'planFinishTime',
 		label: '计划完成时间',
-		filter: parseTime
+		filter: parseTime,
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'planQuantity',
-		label: '计划生产数量'
+		label: '计划生产数量',
+		minWidth: 120,
 	},
 	{
 		prop: 'actualQuantity',
-		label: '实际生产数量'
+		label: '实际生产数量',
+		minWidth: 120,
 	}
 ];
 
@@ -127,48 +140,10 @@ export default {
 			allocationVisible: false,
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										name: 'status',
-										type: 'equal',
-										value: 1
-									}
-								]
-							}
-					  }
-					: undefined,
 				this.$auth.hasPermi(`base:core-work-order:material`)
 					? {
 							type: 'material',
-							btnName: '预使用原料信息',
-					  }
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:detail`)
-					? {
-							type: 'detail',
-							btnName: '查看详情',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:core-work-order:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-							showParam: {
-								type: '|',
-								data: [
-									{
-										name: 'status',
-										type: 'equal',
-										value: 1
-									}
-								]
-							}
+							btnName: '原料信息',
 					  }
 					: undefined,
 					{
@@ -246,10 +221,58 @@ export default {
 								}
 							]
 						}
+					},
+					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: '工单名称',
@@ -307,9 +330,20 @@ export default {
 			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) {

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:26:58
+ * @LastEditTime: 2023-11-24 18:13:02
  * @Description:
 -->
 <template>
@@ -196,7 +196,7 @@ export default {
 				workCost: undefined,
         remark: undefined,
 			},
-			majorIdList: undefined,
+			majorIdList: [],
 			departmentlList: [],
 			menuOptions: [],
 			bindIds: [],
@@ -267,7 +267,7 @@ export default {
 				workCost: undefined,
         remark: undefined
 			}
-			this.majorIdList = undefined
+			this.majorIdList = []
 		},
 		// 表单提交
     dataFormSubmit() {
@@ -288,24 +288,28 @@ export default {
             this.visible = false;
             this.$emit("refreshDataList");
           });
+					if (this.majorIdList.length > 0) {
 						this.majorIdList.forEach(majorId => {
 							createWoBindMa({
 								workerId: this.dataForm.id,
 								majorId: majorId
 							}).then(res => {})
 						});
+					}
           return;
         }
         // 添加的提交
         this.urlOptions.createURL(this.dataForm).then(response => {
 					// response.data = id
 					this.workerId = response.data
+					if (this.majorIdList.length > 0) {
 						this.majorIdList.forEach(majorId => {
 							createWoBindMa({
 								workerId: this.workerId,
 								majorId: majorId
 							}).then(res => {})
 						});
+					}
           this.$modal.msgSuccess("新增成功");
           this.visible = false;
           this.$emit("refreshDataList");
@@ -324,6 +328,7 @@ export default {
         if (this.dataForm.id) {
           this.urlOptions.infoURL(id).then(response => {
             this.dataForm = response.data;
+						this.dataForm.departmentName = undefined
           });
 					// 获取员工--专业
 					getWoBindMaPage({

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 08:55:37
+ * @LastEditTime: 2023-11-27 09:21:48
  * @Description:
 -->
 <template>
@@ -43,7 +43,9 @@
 				<el-form-item label="排序" prop="sort">
 					<el-input-number
 						v-model="dataForm.sort"
-						placeholder="排序" />
+						controls-position="right"
+						placeholder="排序"
+						style="width: 100%" />
 				</el-form-item>
 			</el-col>
 		</el-row>

src/views/base/coreWorkshopSection/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="40%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/base/equipmentPlcConnect/components/BasicDrawer.vue

@@ -166,13 +166,17 @@ export default {
 						input: true,
 						label: '参数列名',
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '参数名称',
 						prop: 'name',
-						rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -419,12 +423,11 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
 				const isEdit = this.attrForm.id != null;
 				this.attrFormSubmitting = true;
 				const res = await this.$axios({
@@ -432,7 +435,7 @@ export default {
 					method: isEdit ? 'put' : 'post',
 					data: {
 						...this.attrForm,
-					connectId: this.infoData.id
+						connectId: this.infoData.id,
 					},
 				});
 
@@ -448,6 +451,7 @@ export default {
 					});
 				}
 				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {

src/views/base/material/SmallTitle.vue

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

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

@@ -1,22 +1,11 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:22:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-08 16:52:34
  * @Description:
 -->
 <template>
-	<el-drawer
-		:visible.sync="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		size="60%">
-		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
-		</small-title>
-		<div class="content">
-			<div class="visual-part">
 	<el-form
 		:model="dataForm"
 		:rules="dataRule"
@@ -25,417 +14,210 @@
 		label-width="100px"
 		label-position="top">
 		<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="物料编码" prop="code">
+			<el-col :span="8">
+				<el-form-item label="物料产品名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入物料产品名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="物料产品编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
 						clearable
-									:disabled="isdetail"
-									placeholder="请输入物料编码" />
+						placeholder="请输入物料产品编码" />
 				</el-form-item>
 			</el-col>
-						<el-col :span="12">
-							<el-form-item label="物料名称" prop="name">
-								<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
+			<el-col :span="8">
+				<el-form-item label="物料产品类型" prop="typeId">
+					<treeselect
+						v-model="dataForm.typeId"
+						:options="deptOptions"
+						:normalizer="normalizer"
+						@select="setShowTime"
+						:show-count="true"
+						:appendToBody="true"
+						z-index="99999"
+						placeholder="选择物料产品类型" />
 				</el-form-item>
 			</el-col>
-					</el-row>
-					<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="英文名称" prop="engName">
-								<el-input
-									v-model="dataForm.engName"
-									clearable
-									:disabled="isdetail"
-									placeholder="请输入英文名称" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="物料类型" prop="type">
+			<el-col :span="8">
+				<el-form-item label="单位" prop="unit">
 					<el-select
-									v-model="dataForm.type"
+						v-model="dataForm.unit"
 						filterable
-									:disabled="isdetail"
 						style="width: 100%"
-									placeholder="请选择物料类型">
+						placeholder="请选择单位">
 						<el-option
-										v-for="dict in materialList"
+							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="spec">
+			<el-col :span="8">
+				<el-form-item label="规格" prop="specifications">
 					<el-input
-									v-model="dataForm.spec"
+						v-model="dataForm.specifications"
 						clearable
-									:disabled="isdetail"
 						placeholder="请输入规格" />
 				</el-form-item>
 			</el-col>
-						<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="供应商" prop="supplierId">
 					<el-select
 						v-model="dataForm.supplierId"
 						filterable
 						clearable
-									:disabled="isdetail"
-									style="width: 100%"
+						:style="{ width: '100%' }"
 						placeholder="请选择供应商">
 						<el-option
-										v-for="dict in supplierList"
-										:key="dict.id"
-										:label="dict.name"
-										:value="dict.id" />
+							v-for="item in supplierArr"
+							: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="12">
-							<el-form-item label="单位" prop="unit">
-								<el-select
-									v-model="dataForm.unit"
-									filterable
-									:disabled="isdetail"
-									style="width: 100%"
-									placeholder="请选择物料单位">
-									<el-option
-										v-for="dict in getDictDatas('unit_dict')"
-										:key="dict.value"
-										:label="dict.label"
-										:value="dict.value" />
-								</el-select>
+			<el-col :span="8" v-if="showTime">
+				<el-form-item label="生产单位用时" prop="processTime">
+					<el-input
+						v-model.number="dataForm.processTime"
+						type="number"
+						clearable
+						placeholder="请输入产线生产单位用时" />
 				</el-form-item>
 			</el-col>
-						<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="备注" prop="remark">
-								<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
 				</el-form-item>
 			</el-col>
 		</el-row>
 	</el-form>
-			</div>
-			<div class="attr-list" v-if="idAttrShow">
-				<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true">
-					物料属性
-				</small-title>
-
-				<div v-if="!isdetail" class="action_btn">
-          <template>
-            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
-            </span>
-          </template>
-        </div>
-				<base-table
-					:table-props="tableProps"
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-data="materialAttrList">
-					<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="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
-					编辑
-				</el-button> -->
-				<el-button v-if="!isdetail" 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 { createMaterial, updateMaterial, getMaterial, getCode, getSupplierList, getMaterialAttrList, deleteMaterialAttr } from "@/api/base/material";
-import { listData } from "@/api/system/dict/data";
-import SmallTitle from './SmallTitle';
-import { parseTime } from '../../core/mixins/code-filter';
-import attrAdd from './attr-add';
-import { getDictDatas } from "@/utils/dict";
-
-const tableBtn = [
-	{
-		type: 'edit',
-		btnName: '编辑',
-	},
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'attrName',
-		label: '属性名',
-	},
-	{
-		prop: 'attrValue',
-		label: '属性值',
-	},
-];
+import { getTreeArr } from '../mixins/code-filter';
+import {
+	createProductMaterial,
+	updateProductMaterial,
+	getProductMaterial,
+	getProductMaterialCode,
+	getSupplierList,
+	getMaterialTree,
+} from '@/api/base/material';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 
 export default {
 	mixins: [basicAdd],
-	components: { SmallTitle, attrAdd },
+	components: {
+		Treeselect,
+	},
 	data() {
 		return {
-			tableBtn,
-			tableProps,
-			addOrUpdateVisible: false,
 			urlOptions: {
 				isGetCode: true,
-        codeURL: getCode,
-				createURL: createMaterial,
-				updateURL: updateMaterial,
-				infoURL: getMaterial,
-			},
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
+				codeURL: getProductMaterialCode,
+				createURL: createProductMaterial,
+				updateURL: updateProductMaterial,
+				infoURL: getProductMaterial,
 			},
+			deptOptions: undefined,
+			showTime: false,
 			dataForm: {
 				id: undefined,
 				code: undefined,
 				name: '',
-				engName: '',
-				type: '',
-        spec: undefined,
+				typeId: undefined,
+				unit: undefined,
+				specifications: undefined,
 				supplierId: undefined,
+				processTime: 0,
 				remark: undefined,
-				unit: ''
 			},
-			materialList: [],
-			supplierList: [],
-			materialAttrList: [],
-			unitList: [],
-			visible: false,
-			isdetail: false,
-			idAttrShow: false,
+			supplierArr: [],
+			treeArr: [],
 			dataRule: {
-        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
-				type: [{ required: true, message: "物料类型不能为空", trigger: "blur" }]
-      }
+				code: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				typeId: [
+					{
+						required: true,
+						message: '物料产品类型不能为空',
+						trigger: 'blur',
+					},
+				],
+			},
 		};
 	},
-	mounted() {
-		this.getDict()
-	},
+	mounted() {},
 	methods: {
-		async getDict() {
-			// 物料类型列表
-			const res = await listData({
-				pageNo: 1,
-        pageSize: 99,
-        dictType: 'material_type',
-			});
-			this.materialList = res.data.list.map(item => {
-				return {
-					label: item.label,
-					value: Number(item.value)
-				}
-			});
-			// 供应商列表
-			const supplierRes = await getSupplierList();
-			this.supplierList = supplierRes.data;
-			// 物料单位列表
-			// const unitRes = await listData({
-			// 	pageNo: 1,
-      //   pageSize: 99,
-      //   dictType: 'goods_unit',
-			// });
-			// this.unitList = unitRes.data.list.map(item => {
-			// 	return {
-			// 		label: item.label,
-			// 		value: Number(item.value)
-			// 	}
-			// });
-		},
-		initData() {
-			this.materialAttrList.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(() => {
-						deleteMaterialAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-		getList() {
-			// 获取物料的属性列表
-			getMaterialAttrList({
-				...this.listQuery,
-				materialId: this.dataForm.id,
-			}).then((response) => {
-				this.materialAttrList = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		init(id, isdetail) {
-			this.initData();
-			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
+		init(id) {
+			this.dataForm.id = id || '';
 			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.urlOptions.infoURL(id).then((response) => {
 						this.dataForm = response.data;
-						if (this.dataForm.unit) {
-							this.dataForm.unit = String(this.dataForm.unit)
-						}
+						this.setDataForm();
 					});
-					// 获取物料的属性列表
-					this.getList();
 				} else {
 					if (this.urlOptions.isGetCode) {
-            this.getCode()
+						this.getCode();
+						this.setDataForm();
 					}
 				}
 			});
 		},
-		goback() {
-			this.$emit('refreshDataList');
-			this.visible = false;
-			// this.initData();
-		},
-		goEdit() {
-			this.isdetail = false;
-		},
-		// 新增 / 修改
-		addNew(id) {
-			this.addOrUpdateVisible = true;
+		typeId(typeId, product) {
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
+				this.dataForm.typeId = typeId || undefined;
+				this.showTime = product || false;
 			});
+		},
+		setDataForm() {
+			getSupplierList().then((res) => {
+				this.supplierArr = res.data;
+			});
+			// 下拉树结构
+			getMaterialTree().then((response) => {
+				this.deptOptions = [];
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+				this.$nextTick(() => {
+					if (this.dataForm.id) {
+						this.treeArr = [];
+						this.treeArr = getTreeArr(response.data);//解构，树结构变为普通数组
+						this.showTime = this.treeArr.find(
+							(item) => item.id == this.dataForm.typeId
+						).product;
 					}
+				});
+			});
+		},
+		/** 转换菜单数据结构 */
+		normalizer(node) {
+			if (node.children && !node.children.length) {
+				delete node.children;
 			}
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children,
+			};
+		},
+		setShowTime(node) {
+			this.showTime = node.product || false;
+		},
+	},
 };
 </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: -35px 15px;
-  font-size: 14px;
-}
-.add {
-	color: #0b58ff;
-}
-</style>

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

@@ -1,141 +0,0 @@
-<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="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>

src/views/base/material/index.vue

@@ -1,5 +1,71 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-01 14:54:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-08 15:12:18
+ * @Description:
+-->
 <template>
-	<div class="app-container">
+	<div style="display: flex; gap: 16px; flex: 1; background: #eff1f6">
+		<div
+			class="app-container"
+			style="background: white; width: 280px; border-radius: 8px">
+			<div class="head-container">
+				<el-input
+					v-model="treeName"
+					placeholder="请输入名称"
+					clearable
+					size="small"
+					prefix-icon="el-icon-search"
+					style="margin-bottom: 20px" />
+			</div>
+			<div class="head-container">
+				<el-tree
+					v-loading="treeLoading"
+					element-loading-text="拼命加载中"
+					element-loading-spinner="el-icon-loading"
+					element-loading-background="rgba(0, 0, 0, 0.8)"
+					:data="deptOptions1"
+					:props="defaultProps"
+					node-key="id"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					ref="tree"
+					default-expand-all
+					highlight-current
+					@node-click="handleNodeClick">
+					<span class="custom-tree-node" slot-scope="{ node, data }">
+						<span>{{ node.label }}</span>
+						<span style="float: right" v-if="data.parentId !== -1">
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-edit"
+								size="mini"
+								v-if="data.parentId !== 0"
+								@click="() => edit(node, data)" />
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-circle-plus-outline"
+								size="mini"
+								@click="() => append(data)" />
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-remove-outline"
+								size="mini"
+								v-if="data.parentId !== 0"
+								@click="() => remove(node, data)" />
+						</span>
+					</span>
+				</el-tree>
+			</div>
+		</div>
+
+		<div
+			class="app-container"
+			style="background: #fff; border-radius: 8px; width: 1px; flex: 1">
 			<search-bar
 				:formConfigs="formConfig"
 				ref="searchBarForm"
@@ -13,7 +79,7 @@
 				<method-btn
 					v-if="tableBtn.length"
 					slot="handleBtn"
-				:width="220"
+					:width="80"
 					label="操作"
 					:method-list="tableBtn"
 					@clickBtn="handleClick" />
@@ -23,10 +89,47 @@
 				: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
-			v-if="addOrUpdateVisible"
 					ref="addOrUpdate"
-			@refreshDataList="getDataList" />
+					@refreshDataList="successSubmit"></add-or-update>
+			</base-dialog>
+		</div>
+
+		<!-- 添加或修改菜单对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="700px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="父类型">
+							<treeselect
+								v-model="form.parentId"
+								:options="deptOptions"
+								:normalizer="normalizer"
+								:show-count="true"
+								:appendToBody="true"
+								z-index="99999"
+								placeholder="选择父类型" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="名称" prop="name">
+							<el-input v-model="form.name" placeholder="请输入名称" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</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>
 
@@ -34,97 +137,129 @@
 import AddOrUpdate from './add-or-updata';
 import basicPage from '../../core/mixins/basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
-import {
-	getMaterialPage,
-	deleteMaterial
-} from '@/api/base/material';
-import { listData } from "@/api/system/dict/data";
 import { publicFormatter } from '@/utils/dict';
+import {
+	getProductMaterialPage,
+	deleteProductMaterial,
+	getMaterialTree,
+	createMaterialTree,
+	updateMaterialTree,
+	deleteMaterialTree,
+} from '@/api/base/material';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
-	},
-	{
-		prop: 'code',
-		label: '物料编码'
+		filter: parseTime,
+		width: 150,
 	},
 	{
 		prop: 'name',
-		label: '物料名称'
+		label: '物料产品名称',
 	},
 	{
-		prop: 'engName',
-		label: '英文名称'
+		prop: 'code',
+		label: '物料产品编码',
 	},
 	{
-		prop: 'type',
-		label: '物料类型',
-		filter: publicFormatter('material_type')
+		prop: 'typeNameChain',
+		label: '物料产品类型',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+		width: 60,
+	},
+	{
+		prop: 'specifications',
+		label: '规格',
 	},
 	{
 		prop: 'supplierName',
-		label: '供应商'
+		label: '供应商',
 	},
 	{
 		prop: 'remark',
-		label: '备注'
-	}
+		label: '备注',
+	},
 ];
 
 export default {
 	mixins: [basicPage],
+	name: '',
+	components: {
+		AddOrUpdate,
+		Treeselect,
+	},
 	data() {
 		return {
+			// 部门树选项
+			treeName: undefined,
+			deptOptions: undefined,
+			deptOptions1: undefined,
+			treeLoading: false,
+			defaultProps: {
+				children: 'children',
+				label: 'name',
+			},
+			// 弹出层标题
+			title: '',
+			// 是否显示弹出层
+			open: false,
+			// 表单参数
+			form: {
+				id: undefined,
+				parentId: undefined,
+				name: undefined,
+				defaultType: false,
+			},
+			// 表单校验
+			rules: {
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+			},
 			urlOptions: {
-				getDataListURL: getMaterialPage,
-				deleteURL: deleteMaterial
-				// exportURL: exportFactoryExcel,
+				getDataListURL: getProductMaterialPage,
+				deleteURL: deleteProductMaterial,
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:material:update`)
+				this.$auth.hasPermi(`base:core-product:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-					this.$auth.hasPermi(`base:material:queryAttr`)
-					? {
-							type: 'search',
-							btnName: '查看属性',
-					  }
-					: undefined,
-					this.$auth.hasPermi(`base:material:editAttr`)
-					? {
-							type: 'editAttr',
-							btnName: '编辑属性',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:material:delete`)
+				this.$auth.hasPermi(`base:core-product:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
-			typeList: [],
 			formConfig: [
 				{
 					type: 'input',
-					label: '物料名称',
-					placeholder: '物料名称',
+					label: '物料产品名称',
+					placeholder: '物料产品名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '物料编码',
-					placeholder: '物料编码',
+					label: '物料产品编号',
+					placeholder: '物料产品编号',
 					param: 'code',
 				},
+				{
+					type: 'input',
+					label: '物料产品类型',
+					param: 'type',
+					disabled: true,
+				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -136,65 +271,45 @@ export default {
 				},
 				{
 					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
-					btnName: '新增物料',
+					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true
+					plain: true,
 				},
 			],
 		};
 	},
-	components: {
-		AddOrUpdate,
+	watch: {
+		// 根据名称筛选部门树
+		treeName(val) {
+			this.$refs.tree.filter(val);
+		},
 	},
 	created() {
-		this.getDict()
+		this.getDataList();
+		this.getTreeselect();
 	},
 	methods: {
-		async getDict() {
-			// 物料类型列表
-			const res = await listData({
-				pageNo: 1,
-        pageSize: 99,
-        dictType: 'material_type',
-			});
-			this.typeList = res.data.list.map(item => {
-				return {
-					label: item.label,
-					value: Number(item.value)
-				}
-			});
-		},
-		otherMethods(val) {
-			if (val.type === 'search') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '详情';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id, true);
-				});
-			} else {
-				this.addOrEditTitle = '编辑';
-				this.addOrUpdateVisible = true;
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id);
-				});
-			}
-		},
-		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.records.map(item => {
-					this.typeList.filter(t => {
-						if (item.type === t.value) {
-							item.materialType = t.label
-						}
+		// 删除
+		deleteHandle(id, name, index) {
+			this.$confirm(`是否确认删除物料产品名称为"${name}"的数据项`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
 			})
-					return item
+				.then(() => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
 						});
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
 					});
+				})
+				.catch(() => {});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -205,19 +320,13 @@ export default {
 					this.listQuery.code = val.code ? val.code : undefined;
 					this.getDataList();
 					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
 				case 'add':
 					this.addOrEditTitle = '新增';
 					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
+					this.$nextTick(() => {
+						this.$refs.addOrUpdate.init();
+						this.$refs.addOrUpdate.typeId(this.listQuery.typeId,this.listQuery.product);
+					});
 					break;
 				case 'export':
 					this.handleExport();
@@ -226,27 +335,126 @@ export default {
 					console.log(val);
 			}
 		},
-		// 删除
-    deleteHandle(id, name, index) {
-      this.$confirm(`是否删除物料名称为"${name}"的数据项?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+
+		/** 树操作 */
+
+		// 查询下拉树结构
+		getTreeselect() {
+			this.treeLoading = true;
+			getMaterialTree().then((response) => {
+				// treeArr[0].push(...this.handleTree(response.data, 'id'));
+				// 处理 deptOptions 参数
+				this.deptOptions = [];
+				this.treeLoading = false;
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+				const arr = [{ name: '全部', parentId: -1 }];
+				this.deptOptions1 = arr.concat(this.deptOptions);
+			});
+		},
+		// 筛选节点
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.listQuery.typeId = data.id || undefined;
+			this.listQuery.product = data.product;
+			this.$refs.searchBarForm.formInline.type = data.name || undefined;
+		},
+		// 新增节点
+		append(data) {
+			this.open = true;
+			this.title = '新增物料产品类型';
+			this.form.id = undefined;
+			this.form.parentId = data.id;
+		},
+		// 删除节点
+		remove(node, data) {
+			this.$confirm(`是否确认删除名称为"${data.name}"的数据项`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
 			})
 				.then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
+					deleteMaterialTree(data.id).then(({ data }) => {
 						this.$message({
-              message: "操作成功",
-              type: "success",
+							message: '操作成功',
+							type: 'success',
 							duration: 1500,
 							onClose: () => {
-                this.getDataList();
+								this.getTreeselect();
 							},
 						});
 					});
 				})
-        .catch(() => { });
+				.catch(() => {});
+		},
+		// 编辑节点
+		edit(node, data) {
+			this.open = true;
+			this.title = '编辑物料产品类型';
+			this.form.id = data.id;
+			this.form.name = data.name;
+			this.form.parentId = data.parentId;
+		},
+
+		/** 转换菜单数据结构 */
+		normalizer(node) {
+			if (node.children && !node.children.length) {
+				delete node.children;
 			}
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children,
+			};
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: undefined,
+				parentId: 0,
+				name: undefined,
+				defaultType: false,
+			};
+			this.resetForm('form');
+		},
+		// 表单提交
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.form.id) {
+					updateMaterialTree(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.cancel();
+						this.getTreeselect();
+					});
+					return;
+				}
+				// 添加的提交
+				createMaterialTree(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.cancel();
+					this.getTreeselect();
+				});
+			});
+		},
 	},
 };
 </script>
+
+<style scoped>
+.btnHover:hover {
+	color: #67c23a;
+	transform: scale(1.5);
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-06 19:55:59
+ * @LastEditTime: 2023-11-27 15:10:20
  * @Description:
 -->
 <template>
@@ -18,7 +18,8 @@
 					<el-select
 						v-model="dataForm.materialId"
 						placeholder="请选择物料"
-						@change="setMaterialCode">
+						@change="setMaterialCode"
+						style="width: 100%">
 						<el-option
 							v-for="dict in materialList"
 							:key="dict.id"

src/views/base/materialDate/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="40%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

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

@@ -1,15 +1,15 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-23 15:00:00
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-09 09:59:11
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="70%">
 		<small-title slot="title" :no-padding="true">
@@ -25,7 +25,7 @@
 					label-width="100px"
 					label-position="top">
 					<el-row :gutter="20">
-						<el-col :span="12">
+						<el-col :span="8">
 							<el-form-item label="产品名称" prop="productId">
 								<el-select
 									v-model="dataForm.productId"
@@ -42,15 +42,17 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="8">
 							<el-form-item label="产品BOM编码" prop="code">
 								<el-input v-model="dataForm.code" :disabled="isdetail" placeholder="请输入产品Bom编码" />
 							</el-form-item>
 						</el-col>
-					</el-row>
+						<el-col :span="8">
 							<el-form-item label="备注" prop="remark">
 								<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
 							</el-form-item>
+						</el-col>
+					</el-row>
 				</el-form>
 			</div>
 			<div class="attr-list" v-if="idAttrShow">
@@ -60,90 +62,26 @@
 					BOM明细
 				</small-title>
 
-				<!-- <base-table
+				<div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
+            </span>
+          </template>
+        </div>
+				<base-table
 					:table-props="tableProps"
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
-					:add-button-show="isdetail ? null : '添加属性'"
-					@emitButtonClick="addNew()"
-					:table-data="materialAttrList">
+					:table-data="tableData">
 					<method-btn
 						v-if="!isdetail"
 						slot="handleBtn"
-						:width="120"
+						:width="90"
 						label="操作"
 						:method-list="tableBtn"
 						@clickBtn="handleClick" />
-				</base-table> -->
-				<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="createTime" label="添加时间">
-						<template slot-scope="scope">
-							<span>{{ parseTime(scope.row.createTime) }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="materialId" label="物料名称">
-						<template slot-scope="scope">
-							<el-select
-									v-model="scope.row.materialId"
-									filterable
-									clearable
-									:disabled="!scope.row.isEdit"
-									placeholder="请选择物料"
-									@change="setCode(scope.row)">
-									<el-option
-										v-for="dict in materialList"
-										:key="dict.id"
-										:label="dict.name"
-										:value="dict.id" />
-								</el-select>
-						</template>
-					</el-table-column>
-					<el-table-column prop="materialCode" label="物料编码" />
-					<el-table-column prop="mUnit" label="单位" />
-					<el-table-column prop="num" label="数量">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.num" :disabled="!scope.row.isEdit"></el-input>
-						</template>
-					</el-table-column>
-					<el-table-column prop="remark" label="备注">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.remark" :disabled="!scope.row.isEdit"></el-input>
-						</template>
-					</el-table-column>
-					<el-table-column v-if="!isdetail" label="操作">
-						<template slot-scope="scope">
-							<el-tooltip v-if="!scope.row.isEdit" placement="top" content="编辑">
-								<el-button
-									type="text"
-									:style="{color:'#0B58FF'}"
-									size="mini"
-									@click="edit(scope.row)"
-								>
-									<!-- 此处的icon的名字命名为'table_'加上按钮的type -->
-									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="edit" />
-									<!-- <span>{{ item.btnName | i18nFilter }}</span> -->
-								</el-button>
-							</el-tooltip>
-							<el-button v-else type="text" size="small" @click="saveData(scope.row)">保存</el-button>
-							<el-tooltip placement="top" content="删除">
-								<el-button
-									type="text"
-									:style="{color:'#FF5454'}"
-									size="mini"
-									@click="deleteDetail(scope.row)"
-								>
-									<!-- 此处的icon的名字命名为'table_'加上按钮的type -->
-									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="table_delete" />
-									<!-- <span>{{ item.btnName | i18nFilter }}</span> -->
-								</el-button>
-							</el-tooltip>
-						</template>
-					</el-table-column>
-				</el-table>
+				</base-table>
 				<pagination
 					v-show="listQuery.total > 0"
 					:total="listQuery.total"
@@ -153,31 +91,28 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
-					编辑
-				</el-button> -->
-				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
+			<div v-if="!isdetail" class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
 		</div>
 
-		<!-- <attr-add
+		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			:material-id="dataForm.id"
-			@refreshDataList="getList" /> -->
+			:bom-id="dataForm.id"
+			@refreshDataList="getList" />
 	</el-drawer>
 </template>
 
 <script>
 import basicAdd from '../../core/mixins/basic-add';
-import { createMaterialPB, updateMaterialPB, getMaterialPB, getCode, getProList, getProBomList, createMaterialPBDet, updateMaterialPBDet, deleteMaterialPBDet } from "@/api/base/materialProductBom";
-import { getMaterialList } from "@/api/base/material";
-import { listData } from "@/api/system/dict/data";
-import SmallTitle from '../material/SmallTitle';
+import { createMaterialPB, updateMaterialPB, getMaterialPB, getCode, getProBomList, createMaterialPBDet, updateMaterialPBDet, deleteMaterialPBDet } from "@/api/base/materialProductBom";
+import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import SmallTitle from '../coreWorkOrder/SmallTitle';
 import { parseTime } from '../../core/mixins/code-filter';
-// import attrAdd from './attr-add';
+import attrAdd from './attr-add';
+import { publicFormatter } from '@/utils/dict';
 
 const tableBtn = [
 	{
@@ -196,18 +131,31 @@ const tableProps = [
 		filter: parseTime,
 	},
 	{
-		prop: 'attrName',
-		label: '属性名',
+		prop: 'materialName',
+		label: '物料名称',
 	},
 	{
-		prop: 'attrValue',
-		label: '属性值',
+		prop: 'materialCode',
+		label: '物料编码',
 	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	}
 ];
 
 export default {
 	mixins: [basicAdd],
-	components: { SmallTitle },
+	components: { SmallTitle, attrAdd },
 	data() {
 		return {
 			tableBtn,
@@ -233,9 +181,7 @@ export default {
 			},
 			productList: [],
 			materialAttrList: [],
-			materialList: [],
 			tableData: [],
-			unitList: [],
 			visible: false,
 			isdetail: false,
 			idAttrShow: false,
@@ -248,25 +194,47 @@ export default {
 		this.getDict()
 	},
 	methods: {
-		async getDict() {
-			// 产品列表
-			const proRes = await getProList();
-			this.productList = proRes.data;
-			// 物料列表
-			const res = await getMaterialList();
-			this.materialList = res.data;
-			// 物料单位列表
-			const unitRes = await listData({
-				pageNo: 1,
-        pageSize: 99,
-        dictType: 'unit_dict',
-			});
-			this.unitList = unitRes.data.list.map(item => {
-				return {
-					label: item.label,
-					value: Number(item.value)
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.deleteDetail(raw.data);
+			} else {
+				this.addNew(raw.data.id);
 			}
+		},
+		// 表单提交
+    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.idAttrShow = true;
+					this.dataForm.id = response.data
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+		async getDict() {
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[0].id:materRes.data[1].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.productList = [];
+			this.productList = materData.data;
 		},
 		initData() {
 			// this.materialAttrList.splice(0);
@@ -274,8 +242,7 @@ export default {
 		},
 		deleteDetail(raw) {
 			this.$confirm(
-				`确定删除关于物料编码为${
-					raw.materialCode}的数据?`,
+				`是否确认删除物料名称为"${raw.materialName}"的数据项?`,
 				'提示',
 				{
 					confirmButtonText: '确定',
@@ -297,70 +264,13 @@ export default {
 				})
 				.catch(() => {});
 		},
-		setCode(row) {
-			const tempM = this.materialList.filter(item => {
-				if (row.materialId === item.id) {
-					row.materialCode = item.code
-				}
-				return row.materialId === item.id
-			})
-			if (tempM[0].unit) {
-				this.unitList.filter(u => {
-					if (tempM[0].unit === u.value) {
-						row.unit = u.value
-						row.mUnit = u.label
-					}
-				})
-			} else {
-				row.unit = null
-				row.mUnit = ''
-			}
-			// row.materialCode = tempList[0].code
-			// row.unit = tempList[0].unit
-		},
-		edit(row) {
-			row.isEdit = true
-		},
-		saveData(row) {
-			// this.$refs['dataForm'].validate((valid) => {
-				// if (valid) {
-				// 	修改的提交
-				if (row.id) {
-					updateMaterialPBDet({
-						...row
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						// this.visible = false;
-						this.getList();
-					});
-					return;
-				}
-					// 添加的提交
-			createMaterialPBDet({
-				...row
-			}).then((response) => {
-				this.$modal.msgSuccess('新增成功');
-				// this.visible = false;
-				this.getList();
-			});
-				// }
-			// });
-		},
 		getList() {
 			// 获取产品Bom详细列表
 			getProBomList({
 				...this.listQuery,
 				bomId: this.dataForm.id
 			}).then((response) => {
-				this.tableData = response.data.records.map(item => {
-					this.unitList.filter(u => {
-						if (item.unit === u.value) {
-							item.mUnit = u.label
-						}
-					})
-					item.isEdit = false
-					return item
-				});
+				this.tableData = response.data.records
 				this.listQuery.total = response.data.total;
 			});
 		},
@@ -456,7 +366,7 @@ export default {
 
 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 30vh;
+	max-height: 20vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */
@@ -472,4 +382,12 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
+.action_btn {
+  float: right;
+  margin: -40px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
 </style>

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

@@ -0,0 +1,203 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'40%'"
+		: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="materialId">
+						<el-select
+							v-model="dataForm.materialId"
+							placeholder="请选择物料"
+							clearable
+							filterable
+							@change="setCode"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="dict in materialList"
+								: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="materialCode">
+						<el-input
+							v-model="dataForm.materialCode"
+							clearable
+							disabled
+							placeholder="请输入物料编码" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="单位" prop="unit">
+						<el-select
+							v-model="dataForm.unit"
+							style="width: 100%"
+							disabled
+							placeholder="请选择单位">
+							<el-option
+								v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+					<el-input-number v-model="dataForm.num" controls-position="right" clearable placeholder="请输入数量" style="width: 100%" />
+					</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>
+
+		<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 { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { createMaterialPBDet, updateMaterialPBDet, getMaterialPBDet } from "@/api/base/materialProductBom";
+
+export default {
+	props: {
+		bomId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				materialId: '',
+				num: 0,
+				materialCode: undefined,
+				unit: undefined,
+				remark: '',
+			},
+			materialList: [],
+			dataRule: {
+				materialId: [{ required: true, message: '物料名称不能为空', trigger: 'change' }],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 物料列表
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.materialList = [];
+			this.materialList = materData.data;
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getMaterialPBDet(this.dataForm.id).then((res) => {
+						this.dataForm = res.data
+						this.setCode()
+					});
+				}
+			});
+		},
+		setCode() {
+			const tempMaterial = this.materialList.filter(item =>{
+				return item.id === this.dataForm.materialId
+			})
+			this.dataForm.materialCode = tempMaterial[0]?.code
+			this.dataForm.unit = tempMaterial[0].unit === undefined ? undefined : String(tempMaterial[0]?.unit)
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateMaterialPBDet({
+							...this.dataForm,
+							bomId: this.bomId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createMaterialPBDet({
+						...this.dataForm,
+						bomId: this.bomId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/base/materialProductBom/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="220"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -68,24 +68,24 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`base:material-product-bom:queryMaterial`)
+					? {
+							type: 'detail',
+							btnName: '查看物料',
+					  }
+					: undefined,
 					this.$auth.hasPermi(`base:material-product-bom:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-					this.$auth.hasPermi(`base:material-product-bom:queryMaterial`)
-					? {
-							type: 'search',
-							btnName: '查看物料',
-					  }
-					: undefined,
-					this.$auth.hasPermi(`base:material-product-bom:editMaterial`)
-					? {
-							type: 'editMaterial',
-							btnName: '编辑物料',
-					  }
-					: undefined,
+					// this.$auth.hasPermi(`base:material-product-bom:editMaterial`)
+					// ? {
+					// 		type: 'editMaterial',
+					// 		btnName: '编辑物料',
+					//   }
+					// : undefined,
           this.$auth.hasPermi(`base:material-product-bom:delete`)
 					? {
 							type: 'delete',
@@ -123,7 +123,7 @@ export default {
 	created() {},
 	methods: {
 		otherMethods(val) {
-			if (val.type === 'search') {
+			if (val.type === 'detail') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:40:08
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-09 09:58:24
  * @Description:
 -->
 <template>
@@ -11,9 +11,10 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
+		label-width="80px"
+		label-position="top">
 		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="物料名称" prop="materialId">
 					<el-select
 						v-model="dataForm.materialId"
@@ -21,7 +22,7 @@
 						clearable
 						filterable
 						@change="setCode"
-					>
+						style="width: 100%">
 						<el-option
 							v-for="dict in materialList"
 							:key="dict.id"
@@ -30,7 +31,7 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="物料编码" prop="materialCode">
 					<el-input
 						v-model="dataForm.materialCode"
@@ -39,16 +40,14 @@
 						placeholder="请输入物料编码" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="批次号" prop="materialDateId">
+			<el-col :span="8">
+				<el-form-item label="物料批次" prop="materialDateId">
 					<el-select
 						v-model="dataForm.materialDateId"
 						clearable
 						filterable
 						placeholder="请选择物料批次"
-					>
+						style="width: 100%">
 						<el-option
 							v-for="dict in materialDateList"
 							:key="dict.id"
@@ -57,13 +56,16 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
 				<el-form-item label="使用设备" prop="equipmentId">
 					<el-select
 						v-model="dataForm.equipmentId"
 						clearable
 						filterable
-						placeholder="请选择使用设备">
+						placeholder="请选择使用设备"
+						style="width: 100%">
 						<el-option
 							v-for="dict in eqList"
 							:key="dict.id"
@@ -72,42 +74,46 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="使用时间" prop="useTime">
 					<el-date-picker
 						v-model="dataForm.useTime"
 						type="datetime"
-						format='yyyy-MM-dd HH:mm:ss'
-         		value-format='timestamp'
+						format="yyyy-MM-dd HH:mm:ss"
+						value-format="timestamp"
 						placeholder="选择日期时间" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="操作员" prop="userNames">
 					<el-select
 						v-model="dataForm.userNames"
 						clearable
 						filterable
 						multiple
-						placeholder="请选择操作员">
+						placeholder="请选择操作员"
+						style="width: 100%">
 						<el-option
 							v-for="dict in workersList"
 							:key="dict.id"
-							:label="dict.name"
-							:value="dict.name" />
+							:label="dict.nickname"
+							:value="dict.nickname" />
 					</el-select>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="使用数量" prop="num">
-					<el-input-number v-model="dataForm.num" clearable placeholder="请输入使用数量" />
+					<el-input-number
+						v-model="dataForm.num"
+						clearable
+						controls-position="right"
+						placeholder="请输入使用数量"
+						style="width: 100%" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="数据来源" prop="source">
 					<el-select
 						v-model="dataForm.source"
@@ -121,18 +127,29 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
+			<el-col :span="8">
 				<el-form-item label="备注" prop="remark">
-			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
 				</el-form-item>
+			</el-col>
+		</el-row>
 	</el-form>
 </template>
 
 <script>
 import basicAdd from '../../core/mixins/basic-add';
-import { createMaterialLog, updateMaterialLog, getMaterialLog, getEqListAll, getworkerAll } from "@/api/base/materialUseLog";
-import { getMaterialList } from "@/api/base/material"
-import { getMaterDateList } from "@/api/base/materialDate"
+import {
+	createMaterialLog,
+	updateMaterialLog,
+	getMaterialLog,
+	getEqListAll,
+} from '@/api/base/materialUseLog';
+import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { getMaterDateList } from '@/api/base/materialDate';
+import { listSimpleUsers } from '@/api/system/user';
 
 export default {
 	mixins: [basicAdd],
@@ -141,7 +158,7 @@ export default {
 			urlOptions: {
 				createURL: createMaterialLog,
 				updateURL: updateMaterialLog,
-				infoURL: getMaterialLog
+				infoURL: getMaterialLog,
 			},
 			dataForm: {
 				id: undefined,
@@ -155,66 +172,77 @@ export default {
 				address: undefined,
 				num: 0,
 				source: undefined,
-        remark: undefined
+				remark: undefined,
 			},
 			dataSourceList: [
 				{
 					id: 1,
-					name: '手动'
+					name: '手动',
 				},
 				{
 					id: 2,
-					name: 'PDA'
-				}
+					name: 'PDA',
+				},
 			],
 			materialList: [],
 			materialDateList: [],
 			eqList: [],
 			workersList: [],
 			dataRule: {
-        materialId: [{ required: true, message: "物料不能为空", trigger: "blur" }],
-        materialDateId: [{ required: true, message: "批次号不能为空", trigger: "blur" }],
-				useTime: [{ required: true, message: "使用时间不能为空", trigger: "blur" }],
-				userNames: [{ required: true, message: "操作员不能为空", trigger: "blur" }],
-				num: [{ required: true, message: "使用数量不能为空", trigger: "blur" }]
-      }
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'blur' },
+				],
+				useTime: [
+					{ required: true, message: '使用时间不能为空', trigger: 'blur' },
+				],
+				userNames: [
+					{ required: true, message: '操作员不能为空', trigger: 'blur' },
+				],
+				num: [{ required: true, message: '使用数量不能为空', trigger: 'blur' }],
+			},
 		};
 	},
 	mounted() {
-		this.getDictData()
+		this.getDictData();
 	},
 	methods: {
 		async getDictData() {
-			const materRes = await getMaterialList()
-			this.materialList = materRes.data
-			const dateRes = await getMaterDateList()
-			this.materialDateList = dateRes.data
-			const eqRes = await getEqListAll()
-			this.eqList = eqRes.data
-			const workerRes = await getworkerAll()
-			this.workersList = workerRes.data
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.materialList = [];
+			this.materialList = materData.data;
+			const dateRes = await getMaterDateList();
+			this.materialDateList = dateRes.data;
+			const eqRes = await getEqListAll();
+			this.eqList = eqRes.data;
+			const workerRes = await listSimpleUsers();
+			this.workersList = workerRes.data;
 		},
 		// 表单提交
 		dataFormSubmit() {
-			this.dataForm.userName = this.dataForm.userNames.join(',')
-      this.$refs["dataForm"].validate((valid) => {
+			this.dataForm.userName = this.dataForm.userNames.join(',');
+			this.$refs['dataForm'].validate((valid) => {
 				if (!valid) {
 					return false;
 				}
 				// 修改的提交
 				if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
+					this.urlOptions.updateURL(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
 						this.visible = false;
-            this.$emit("refreshDataList");
+						this.$emit('refreshDataList');
 					});
 					return;
 				}
 				// 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
 					this.visible = false;
-          this.$emit("refreshDataList");
+					this.$emit('refreshDataList');
 				});
 			});
 		},
@@ -223,38 +251,34 @@ export default {
 			this.visible = true;
 
 			this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
+				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
-          this.urlOptions.infoURL(id).then(response => {
-            this.dataForm.id = response.data.id
-						this.dataForm.materialCode = response.data.materialCode
-						this.dataForm.materialId = response.data.materialId
-						this.dataForm.materialDateId = response.data.materialDateId
-						this.dataForm.equipmentId = response.data.equipmentId
-						this.dataForm.useTime = response.data.useTime
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm.id = response.data.id;
+						this.dataForm.materialCode = response.data.materialCode;
+						this.dataForm.materialId = response.data.materialId;
+						this.dataForm.materialDateId = response.data.materialDateId;
+						this.dataForm.equipmentId = response.data.equipmentId;
+						this.dataForm.useTime = response.data.useTime;
 						// this.dataForm.userName = response.data.userName
-						this.dataForm.num = response.data.num
-						this.dataForm.source = response.data.source
-						this.dataForm.remark = response.data.remark
-						this.dataForm.userNames = response.data.userName.split(',')
-						console.log('打印', this.dataForm)
+						this.dataForm.num = response.data.num;
+						this.dataForm.source = response.data.source;
+						this.dataForm.remark = response.data.remark;
+						this.dataForm.userNames = response.data.userName.split(',');
 					});
 				} else {
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
 				}
 			});
 		},
 		setCode() {
-			const tempMaterial = this.materialList.filter(item =>{
-				return item.id === this.dataForm.materialId
-			})
-			this.dataForm.materialCode = tempMaterial[0].code
-			getMaterDateList({materialId: this.dataForm.materialId}).then(res =>{
-				this.materialDateList = res.data
-			})
-		}
+			const tempMaterial = this.materialList.filter((item) => {
+				return item.id === this.dataForm.materialId;
+			});
+			this.dataForm.materialCode = tempMaterial[0].code;
+			getMaterDateList({ materialId: this.dataForm.materialId }).then((res) => {
+				this.materialDateList = res.data;
+			});
+		},
 	},
 };
 </script>

src/views/base/materialUseLog/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

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

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: zhp
- * @LastEditTime: 2023-11-01 10:30:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-05 10:10:12
  * @Description:
  */
 export default {
@@ -53,11 +53,12 @@ export default {
       this.listQuery.pageNo = val;
       this.getDataList();
     },
-    // 新增 / 修改
-    addOrUpdateHandle(id) {
+    // 新增
+    addOrUpdateHandle() {
+      this.addOrEditTitle = '新增';
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id);
+        this.$refs.addOrUpdate.init();
       });
     },
     cancel(id) {
@@ -85,6 +86,7 @@ export default {
     },
     //tableBtn点击
     handleClick(val) {
+      console.log(val.data.packagingCode);
       if (val.type === "edit") {
         this.addOrUpdateVisible = true;
         this.addOrEditTitle = "编辑";
@@ -92,7 +94,7 @@ export default {
           this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data.packagingCode )
       } else if (val.type === "change") {
         this.changeStatus(val.data.id)
       } else {
@@ -101,7 +103,7 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`是否确认删除${name ? '[' + name + ']' : '[' + index + ']'}数据项?`, "提示", {
+      this.$confirm(`是否确认删除${name ? ' 名称为'+ name : '[' + index + ']'}数据项?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/base/mixins/code-filter.js

@@ -1,8 +1,8 @@
 
 /*
  * @Date: 2020-12-29 16:49:28
- * @LastEditors: DY
- * @LastEditTime: 2023-09-12 11:13:34
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-08 16:27:39
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -33,7 +33,7 @@ export function parseTime(time, pattern) {
     if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
       time = parseInt(time)
     } else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), '');
     }
     if ((typeof time === 'number') && (time.toString().length === 10)) {
       time = time * 1000
@@ -62,6 +62,22 @@ export function parseTime(time, pattern) {
   })
   return time_str
 }
+// 遍历树结构返回数组
+export function getTreeArr(arr) {
+  let result =[]
+  arr.forEach(item => {
+    if(item.children && item.children.length>0){
+      let {children,...obj} = item
+      result.push(obj)
+      result = result.concat(getTreeArr(children))
+    }else{
+      let {children,...obj} = item
+      result.push(obj)
+    }
+  });
+  return result
+}
+
 export default function (dictTable) {
   return function (val) {
     return table?.[dictTable]?.[val]

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:40:59
+ * @LastEditTime: 2023-11-24 09:13:50
  * @Description:
 -->
 <template>
@@ -122,7 +122,8 @@ export default {
           selectOptions: [],
           labelField: 'name',
           valueField: 'id',
-          param: 'workOrderId'
+          param: 'workOrderId',
+          filterable: true,
         },
         {
           // parent: 'dateFilterType',
@@ -214,6 +215,26 @@ export default {
         // this.listQuery.total = response.data.total;
       })
     },
+    deleteHandle(id, name, index, packagingCode) {
+      this.$confirm(`是否确认删除${'[' + packagingCode + ']'}数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
     handlePrint(id) {
       if (id) {
         getPackingModel(id).then(res => {

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

@@ -0,0 +1,228 @@
+<!-- 
+    filename: chart.vue
+    author: liubin
+    date: 2023-11-29 09:03:01
+    description: 
+-->
+
+<template>
+	<div class="analysis-chart">
+		<!-- tt ct 选择  -->
+		<el-button
+			v-for="(item, index) in ['设备CT', '设备TT', '产线CT', '产线TT']"
+			:key="index"
+			:class="[index == activeIndex ? 'activeButton' : '']"
+			@click="activeIndex = index">
+			{{ item }}
+		</el-button>
+		<!-- chart  -->
+		<div id="chart" ref="chartDiv" class="chart" style="margin-top: 12px" />
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+	name: 'AnalysisChart',
+	components: {},
+	props: ['daterange', 'tableData'],
+	data() {
+		return {
+			activeIndex: 0,
+			chart: null,
+			templateOption: {
+				tooltip: {
+					trigger: 'axis',
+				},
+				legend: {
+					icon: 'roundRect',
+					itemWidth: 12,
+					itemHeight: 12,
+				},
+				grid: {
+					top: '12%',
+					left: '6%',
+					right: '6%',
+					bottom: '12%',
+				},
+				xAxis: {
+					name: '时间',
+					axisLabel: {
+						margin: 12,
+						rotate: -8,
+					},
+					axisTicks: {
+						show: false,
+					},
+					data: this.daterange || [
+						'2020-01-02',
+						'2020-02-02',
+						'2020-03-02',
+						'2020-04-02',
+					],
+				},
+				yAxis: {
+					name: ['设备CT', '设备TT', '产线CT', '产线TT'][this.activeIndex],
+					nameLocation: 'end',
+					nameGap: 28,
+					nameTextStyle: {
+						fontSize: 14,
+						align: 'right',
+					},
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#333',
+							opacity: 0.6,
+						},
+					},
+				},
+				series: [
+					{
+						name: 'der Hund',
+						type: 'line',
+						data: [15, undefined, 36, 11],
+					},
+					{
+						name: 'die Katze',
+						type: 'line',
+						data: [5, 2, 6, 3],
+					},
+					{
+						name: 'die Maus',
+						type: 'line',
+						data: [11, 12, 13, 10],
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		this.initChart();
+	},
+	deactivated() {},
+	watch: {
+		activeIndex(val) {
+			this.initChart(val);
+		},
+	},
+	methods: {
+		/**
+		 *
+		 * @param {object} row 表格的每一列
+		 * @param {string} key 表格列prop的后缀
+		 */
+		getListFromTableRow(row, key = '_eq_ct') {
+			const list = [];
+			for (const prop of Object.keys(row).sort()) {
+				if (prop.endsWith(key)) {
+					list.push(row[prop]);
+				}
+			}
+			return list;
+		},
+		/** 初始化/设置 图表 */
+		initChart(val) {
+			console.log('tableData', this.tableData);
+			if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv);
+			switch (val) {
+				case 0:
+					const eqCt = this.tableData.map((row) => ({
+						name: row.equName,
+						type: 'line',
+						symbol: 'circle',
+						symbolSize: 8,
+						data: this.getListFromTableRow(row, '_eq_ct'),
+					}));
+					this.chart.setOption({
+						...this.templateOption,
+						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
+						series: eqCt,
+					});
+					break;
+				case 1:
+					const eqTt = this.tableData.map((row) => ({
+						name: row.equName,
+						type: 'line',
+						symbol: 'circle',
+						symbolSize: 8,
+						data: this.getListFromTableRow(row, '_eq_tt'),
+					}));
+					this.chart.setOption({
+						...this.templateOption,
+						yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
+						series: eqTt,
+					});
+					break;
+				case 2:
+					const plCt = this.tableData.map((row) => ({
+						name: row.equName,
+						type: 'line',
+						symbol: 'circle',
+						symbolSize: 8,
+						data: this.getListFromTableRow(row, '_pl_ct'),
+					}));
+					this.chart.setOption({
+						...this.templateOption,
+						yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
+						series: plCt,
+					});
+					break;
+				case 3:
+					const plTt = this.tableData.map((row) => ({
+						name: row.equName,
+						type: 'line',
+						symbol: 'circle',
+						symbolSize: 8,
+						data: this.getListFromTableRow(row, '_pl_tt'),
+					}));
+					this.chart.setOption({
+						...this.templateOption,
+						yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
+						series: plTt,
+					});
+					break;
+				default:
+					const eqCt2 = this.tableData.map((row) => ({
+						name: row.equName,
+						type: 'line',
+						symbol: 'circle',
+						symbolSize: 8,
+						data: this.getListFromTableRow(row, '_eq_ct'),
+					}));
+					this.chart.setOption({
+						...this.templateOption,
+						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
+						series: eqCt2,
+					});
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.analysis-chart {
+	width: 100%;
+	height: 100%;
+}
+
+.analysis-chart >>> .el-button {
+	background: #f1f1f1;
+	color: #333;
+	transition: all 0.3s;
+	border: none;
+
+	&.activeButton,
+	&:hover {
+		background: #0b58ff;
+		color: #fff;
+	}
+}
+
+#chart {
+	height: 100%;
+	/* background: #ccc; */
+}
+</style>

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

@@ -0,0 +1,270 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<div v-if="tableData.length">
+			<el-tabs
+				v-model="activeName"
+				@tab-click="handleTabClick"
+				style="height: 100%">
+				<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
+					<!-- @emitFun="handleEmitFun"> -->
+					<base-table
+						v-if="mode == 'table'"
+						:span-method="mergeColumnHandler"
+						:page="1"
+						:limit="999"
+						:table-props="tableProps"
+						:table-data="tableData" />
+				</el-tab-pane>
+				<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
+					<div class="graph" style="height: 100%">
+						<!-- graph  -->
+						<!-- <Graph
+										v-if="list.length"
+										:equipment-list="list"
+										:render="renderKey" /> -->
+						<BalanceChart ref="lineChart" />
+						<div v-if="list.length == 0" class="no-data-bg"></div>
+					</div>
+				</el-tab-pane>
+			</el-tabs>
+
+			<!-- <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" /> -->
+		</div>
+		<div v-else class="no-data-bg"></div>
+	</div>
+</template>
+
+<script>
+import { getCT } from '@/api/core/analysis/index';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import BalanceChart from '../balanceChart';
+
+export default {
+	components: {
+		BalanceChart,
+	},
+	// mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCT,
+			},
+			activeName: 'table',
+			tableProps: [],
+
+			tableData: [],
+			listQuery: {
+				// time: ''
+				endTime: undefined,
+				lineId: undefined,
+				startTime: undefined,
+			},
+			timeList: [],
+			spanArr: [],
+			xData: [],
+			yData: [],
+			optionArrUrl: [getCorePLList],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'lineIds',
+					defaultSelect: '',
+					multiple: false,
+					filterable: 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',
+				},
+			],
+		};
+	},
+	created() {
+		this.getArr();
+	},
+	methods: {
+		handleTabClick(tab, event) {
+			if (tab.name == 'graph') this.renderKey = Math.random();
+		},
+
+		getArr() {
+			const params = {
+				page: 1,
+				limit: 500,
+			};
+			this.optionArrUrl.forEach((item, index) => {
+				item(params).then((response) => {
+					this.formConfig[index].selectOptions = response.data;
+				});
+			});
+		},
+		setRowSpan(arr) {
+			let count = 0;
+			arr.forEach((item, index) => {
+				if (index === 0) {
+					this.spanArr.push(1);
+				} else {
+					if (item === arr[index - 1]) {
+						this.spanArr[count] += 1;
+						this.spanArr.push(0);
+					} else {
+						count = index;
+						this.spanArr.push(1);
+					}
+				}
+			});
+		},
+		/** 合并table列的规则 */
+		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
+			if (columnIndex == 0) {
+				if (this.spanArr[rowIndex]) {
+					return [
+						this.spanArr[rowIndex], // row span
+						1, // col span
+					];
+				} else {
+					return [0, 0];
+				}
+			}
+		},
+		getData() {
+			// this.listQuery.lineId = '1672847052717821953'
+			// this.listQuery.startTime = '1693497600000';
+			// this.listQuery.endTime = '1693843200000';
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+				console.log(res);
+				let arr = [
+					{
+						prop: 'sectionName',
+						label: '工段',
+						align: 'center',
+					},
+					{
+						prop: 'equName',
+						label: '设备',
+						align: 'center',
+					},
+				];
+				let sectionArr = [];
+				res.data.data.forEach((ele, index) => {
+					let tempData = [];
+					let eqData = [];
+					let plData = [];
+					ele.data.forEach((item, index) => {
+						item.children.forEach((params) => {
+							if (params.dynamicName === '设备CT') {
+								tempData[item.dynamicName + '_eq'] = params.dynamicValue;
+								eqData[index] = params.dynamicValue;
+							} else {
+								tempData[item.dynamicName + '_pl'] = params.dynamicValue;
+								plData[index] = params.dynamicValue;
+							}
+						});
+					});
+					const equipment = {
+						name: ele.equName,
+						eqData: eqData,
+						plData: plData,
+					};
+					tempData['equName'] = ele.equName;
+					tempData['sectionName'] = ele.sectionName;
+					this.tableData.push(tempData);
+					const { sectionName } = tempData;
+					sectionArr.push(sectionName);
+					this.yData.push(equipment);
+					console.log('看看equ', this.yData);
+				});
+				this.setRowSpan(sectionArr);
+				res.data.nameData.forEach((item) => {
+					this.timeList.push(item.name);
+				});
+				const timeArray = Array.from(new Set(this.timeList));
+				for (const times of timeArray) {
+					if (times !== '设备CT' && times !== '产线CT') {
+						const subprop = {
+							label: times,
+							align: 'center',
+							children: [
+								{ prop: times + '_eq', label: '设备CT', align: 'center' },
+								{ prop: times + '_pl', label: '产线CT', align: 'center' },
+							],
+						};
+						arr.push(subprop);
+						this.xData.push(times);
+					}
+				}
+				this.tableProps = arr;
+
+				console.log('表格横坐标', this.xData, this.yData);
+				this.$nextTick(() => {
+					this.$refs.lineChart.initChart(this.xData, this.yData);
+				});
+				// this.total = response.data.total;
+				// this.dataListLoading = false;
+			});
+		},
+		buttonClick(val) {
+			// console.log(val)
+			switch (val.btnName) {
+				case 'search':
+					// this.listQuery.pageNo = 1;
+					// this.listQuery.pageSize = 10;
+					this.listQuery.lineId = val.lineIds;
+					this.listQuery.startTime = val.time
+						? String(new Date(val.time[0]).getTime())
+						: undefined;
+					this.listQuery.endTime = val.time
+						? String(new Date(val.time[1]).getTime())
+						: undefined;
+					if (val.time && val.lineIds) {
+						this.tableData = [];
+						this.xData = [];
+						this.yData = [];
+						this.tableProps = [];
+						this.spanArr = [];
+						this.timeList = [];
+						this.getData();
+					} else {
+						this.$message({
+							message: '请选择产线和时间',
+							type: 'warning',
+						});
+					}
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

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

@@ -1,74 +1,74 @@
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <div v-if="tableData.length">
-      <base-table v-loading="dataListLoading" :span-method="mergeColumnHandler" :table-props="tableProps" :table-data="tableData" />
-      <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
-      <BalanceChart ref="lineChart" />
+	<div class="app-container" style="flex: 1; height: 1px">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- <div v-if="tableData.length"> -->
+		<div class="custom-tabs" style="">
+			<el-tabs
+				v-model="activeName"
+				@tab-click="handleTabClick"
+				style="height: 100%">
+				<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
+					<base-table
+						v-if="activeName == 'table' && ready"
+						:span-method="mergeRow"
+						:page="1"
+						:limit="999"
+						:table-props="tableProps"
+						:table-data="tableData" />
+					<div v-if="tableData.length == 0" class="no-data-bg"></div>
+				</el-tab-pane>
+				<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
+					<div class="graph" style="height: 800px">
+						<!-- graph  -->
+						<AnalysisChart
+							v-if="activeName == 'graph'"
+							:table-data="tableData"
+							:daterange="dateArr"></AnalysisChart>
+						<!-- <div v-else class="no-data-bg"></div> -->
+						<!-- <Graph
+										v-if="list.length"
+										:equipment-list="list"
+										:render="renderKey" /> -->
+						<!-- <BalanceChart ref="lineChart" /> -->
+						<!-- <div v-if="list.length == 0" class="no-data-bg"></div> -->
+					</div>
+				</el-tab-pane>
+			</el-tabs>
 		</div>
-    <div v-else class="no-data-bg"></div>
-    <!-- <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 { getCT } from '@/api/core/analysis/index';
-import { getCorePLList } from '@/api/base/coreProductionLine';
-import BalanceChart from '../balanceChart'
-import { time } from 'echarts';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-
-// const tableProps = [
-// 	// {
-//   //   prop: 'lineName',
-// 	// 	label: '产线',
-// 	// 	align: 'center',
-// 	// },
-//   // {
-//   //   prop: 'sum',
-//   //   label: '合计',
-//   //   align: 'center',
-//   // },
-//   // {
-//   //   prop: 'dynamicValue',
-//   //   label: 'dynamicName',
-//   //   align: 'center',
-//   //   children:[
-
-//   //   ]
-//   // }
-// ];
+import BalanceChart from '../balanceChart';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import AnalysisChart from './chart.vue';
 
 export default {
 	components: {
-    BalanceChart
+		BalanceChart,
+		AnalysisChart,
 	},
-  // mixins: [basicPage],
+	mixins: [basicPageMixin],
 	data() {
 		return {
-      urlOptions: {
-        getDataListURL: getCT,
+			activeName: 'table',
+			tableProps: [
+				{
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
 				},
-      tableProps: [],
-      dataListLoading: false,
+				{
+					prop: 'equName',
+					label: '设备',
+					align: 'center',
+				},
+			],
 			tableData: [],
-      listQuery: {
-        // time: ''
-        endTime: undefined,
-        lineId:undefined,
-        startTime:undefined
-      },
-      timeList: [],
-      spanArr: [], 
-      xData: [],
-      yData: [],
-      optionArrUrl: [getCorePLList],
 			formConfig: [
 				{
 					type: 'select',
@@ -82,74 +82,223 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					dateType: 'monthrange',
+					format: 'yyyy-MM',
+					valueFormat: 'yyyy-MM-ddTHH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-          width: 350,
-          param: 'time',
+					width: 240,
+					param: 'timeArr',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
-        }
+				},
 			],
+			queryParams: {
+				lineId: null,
+				startTime: null,
+				endTime: null,
+			},
+			sectionMap: {},
+			lastSection: null,
+			currRowIndex: 0,
+			spanArr: [],
+			// 保存时间列表
+			dateArr: [],
+			ready: false,
 		};
 	},
-  created() {
-    this.getArr();
+
+	mounted() {
+		this.getLine();
 	},
+
 	methods: {
-    getArr() {
-      const params = {
-        page: 1,
-        limit: 500
-      }
-      this.optionArrUrl.forEach((item, index) => {
-        item(params).then((response) => {
-          this.formConfig[index].selectOptions = response.data
-        });
-      });
+		handleTabClick(tab, event) {
+			if (tab.name == 'graph') this.renderKey = Math.random();
 		},
-    setRowSpan(arr) {
-      let count = 0
-      arr.forEach((item, index) => {
-        if(index === 0) {
-          this.spanArr.push(1)
-        } else {
-          if (item === arr[index - 1]) {
-            this.spanArr[count] += 1
-            this.spanArr.push(0)
-          } else {
-            count = index
-            this.spanArr.push(1)
-          }
-        }
-      })
+
+		/** 初始化 tableProps */
+		initTableProps() {
+			this.tableProps = [
+				{
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
+				},
+				{
+					prop: 'equName',
+					label: '设备',
+					align: 'center',
 				},
-    /** 合并table列的规则 */
-		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex == 0) {
-				if (this.spanArr[rowIndex]) {
-					return [
-						this.spanArr[rowIndex], // row span
-						1, // col span
 			];
-				} else {
+		},
+
+		/** 获取产线 */
+		async getLine() {
+			this.formConfig[0].selectOptions = [];
+			const { code, data } = await this.http(
+				'/base/core-production-line/listAll',
+				'get'
+			);
+			if (code == 0) {
+				this.formConfig[0].selectOptions = data;
+			}
+		},
+
+		/** 获取产线平衡数据 */
+		async getCT() {
+			const { code, data } = await this.http(
+				'/analysis/equipment-analysis/getCT',
+				'post',
+				this.queryParams
+			);
+			if (code == 0) {
+				return data;
+			}
+			return { data: [], nameData: [] };
+		},
+
+		/** 解析数据 */
+		async getList() {
+			const { data, nameData } = await this.getCT();
+			await this.buildProps(nameData);
+			await this.buildTableData(data);
+			this.tableData = this.tableData.sort((a, b) => {
+				if (a.sectionName < b.sectionName) return -1;
+				return 1;
+			});
+			// const p = this.tableProps
+			// const d = this.tableData
+			// debugger;
+			this.ready = true;
+		},
+
+		buildProps(nameData) {
+			this.initTableProps();
+			this.dateArr = [];
+			return new Promise((resolve, reject) => {
+				try {
+					const dateArr = Array.from(
+						new Set(
+							nameData
+								.map((item) => (item.tree == 1 ? item.name : undefined))
+								.filter((v) => v)
+						)
+					);
+					// 排个序
+					dateArr.sort().forEach((date) => {
+						this.tableProps.push({
+							label: date,
+							align: 'center',
+							children: [
+								{
+									prop: date + '_eq_ct',
+									label: '设备CT',
+									align: 'center',
+								},
+								{
+									prop: date + '_eq_tt',
+									label: '设备TT',
+									align: 'center',
+								},
+								{
+									prop: date + '_pl_ct',
+									label: '产线CT',
+									align: 'center',
+								},
+								{
+									prop: date + '_pl_tt',
+									label: '产线TT',
+									align: 'center',
+								},
+							],
+						});
+					});
+					this.dateArr = dateArr;
+					resolve();
+				} catch (err) {
+					reject(err);
+				}
+			});
+		},
+
+		async buildTableData(data) {
+			this.tableData = [];
+			const sectionArr = Array.from(
+				new Set(data.map((item) => item.sectionName))
+			).sort();
+
+			const sectionMap = sectionArr.reduce(
+				(sum, curr) => ({ ...sum, [curr]: 0 }),
+				{}
+			);
+
+			console.log('sectionArr', sectionArr);
+			console.log('sectionMap', sectionMap);
+			let spanArr = Array.from(sectionArr, () => 0);
+
+			return new Promise((resolve, reject) => {
+				/** 处理 工段 分组  */
+				data.map((item) => {
+					sectionMap[item.sectionName]++;
+					/** 处理 设备  */
+					const row = {
+						equName: item.equName,
+						sectionName: item.sectionName,
+					};
+					item.data.forEach((eq) => {
+						const date = eq.dynamicName;
+						eq.children.forEach((sub) => {
+							if (sub.dynamicName == '设备CT')
+								row[date + '_eq_ct'] = sub.dynamicValue;
+							if (sub.dynamicName == '设备TT')
+								row[date + '_eq_tt'] = sub.dynamicValue;
+							if (sub.dynamicName == '产线CT')
+								row[date + '_pl_ct'] = sub.dynamicValue;
+							if (sub.dynamicName == '产线TT')
+								row[date + '_pl_tt'] = sub.dynamicValue;
+						});
+					});
+					this.tableData.push(row);
+				});
+
+				/** 生成span数组 */
+				const tmp = [...spanArr];
+				for (const [index, key] of sectionArr.entries()) {
+					tmp[index + 1] = tmp[index] + sectionMap[key];
+				}
+
+				console.log('tep', tmp);
+				spanArr = tmp;
+
+				this.sectionMap = sectionMap;
+				this.spanArr = spanArr;
+				resolve();
+			});
+		},
+
+		mergeRow({ row, column, rowIndex, columnIndex }) {
+			if (columnIndex == 1) {
+				const span = this.sectionMap[row.sectionName];
+				if (this.spanArr.includes(rowIndex)) {
+					console.log('span...');
+					return [span, 1];
+				}
 				return [0, 0];
 			}
-			}
 		},
+
 		getData() {
 			// this.listQuery.lineId = '1672847052717821953'
 			// this.listQuery.startTime = '1693497600000';
 			// this.listQuery.endTime = '1693843200000';
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
-        console.log(res)
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+				console.log(res);
 				let arr = [
 					{
 						prop: 'sectionName',
@@ -160,42 +309,42 @@ export default {
 						prop: 'equName',
 						label: '设备',
 						align: 'center',
-          }
-        ]
-        let sectionArr= []
+					},
+				];
+				let sectionArr = [];
 				res.data.data.forEach((ele, index) => {
-          let tempData = []
-          let eqData = []
-            let plData = []
+					let tempData = [];
+					let eqData = [];
+					let plData = [];
 					ele.data.forEach((item, index) => {
-            item.children.forEach(params => {
+						item.children.forEach((params) => {
 							if (params.dynamicName === '设备CT') {
-                tempData[item.dynamicName + '_eq'] = params.dynamicValue
-                eqData[index] = params.dynamicValue
+								tempData[item.dynamicName + '_eq'] = params.dynamicValue;
+								eqData[index] = params.dynamicValue;
 							} else {
-                tempData[item.dynamicName + '_pl'] = params.dynamicValue
-                plData[index] = params.dynamicValue
+								tempData[item.dynamicName + '_pl'] = params.dynamicValue;
+								plData[index] = params.dynamicValue;
 							}
-            })
-          })
+						});
+					});
 					const equipment = {
 						name: ele.equName,
 						eqData: eqData,
-            plData: plData
-          }
-          tempData['equName'] = ele.equName
-          tempData['sectionName'] = ele.sectionName
-          this.tableData.push(tempData)
-          const { sectionName } = tempData
-          sectionArr.push(sectionName)
-          this.yData.push(equipment)
-          console.log('看看equ', this.yData)
-        })
-        this.setRowSpan(sectionArr)
-        res.data.nameData.forEach(item => {
-          this.timeList.push(item.name)
-        })
-        const timeArray = Array.from(new Set(this.timeList))
+						plData: plData,
+					};
+					tempData['equName'] = ele.equName;
+					tempData['sectionName'] = ele.sectionName;
+					this.tableData.push(tempData);
+					const { sectionName } = tempData;
+					sectionArr.push(sectionName);
+					this.yData.push(equipment);
+					console.log('看看equ', this.yData);
+				});
+				this.setRowSpan(sectionArr);
+				res.data.nameData.forEach((item) => {
+					this.timeList.push(item.name);
+				});
+				const timeArray = Array.from(new Set(this.timeList));
 				for (const times of timeArray) {
 					if (times !== '设备CT' && times !== '产线CT') {
 						const subprop = {
@@ -203,44 +352,67 @@ export default {
 							align: 'center',
 							children: [
 								{ prop: times + '_eq', label: '设备CT', align: 'center' },
-                { prop: times + '_pl', label: '产线CT', align: 'center' }
-              ]
-            }
-            arr.push(subprop)
-            this.xData.push(times)
+								{ prop: times + '_pl', label: '产线CT', align: 'center' },
+							],
+						};
+						arr.push(subprop);
+						this.xData.push(times);
 					}
 				}
-        this.tableProps = arr
+				this.tableProps = arr;
 
-        console.log('表格横坐标', this.xData, this.yData)
+				console.log('表格横坐标', this.xData, this.yData);
 				this.$nextTick(() => {
-          this.$refs.lineChart.initChart(this.xData, this.yData)
-        })
+					this.$refs.lineChart.initChart(this.xData, this.yData);
+				});
 				// this.total = response.data.total;
 				// this.dataListLoading = false;
 			});
 		},
+
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.queryParams.lineId = btn.lineIds || null;
+					this.queryParams.startTime = btn.timeArr ? btn.timeArr[0] : null;
+					this.queryParams.endTime = btn.timeArr ? btn.timeArr[1] : null;
+
+					if (!btn.lineIds || !btn.timeArr.length) {
+						this.$message({
+							message: '请选择产线和时间',
+							type: 'warning',
+						});
+					}
+					this.getList();
+					break;
+			}
+		},
+
 		buttonClick(val) {
 			// console.log(val)
 			switch (val.btnName) {
 				case 'search':
 					// this.listQuery.pageNo = 1;
 					// this.listQuery.pageSize = 10;
-          this.listQuery.lineId = val.lineIds
-          this.listQuery.startTime = val.time ? String(new Date(val.time[0]).getTime()) : undefined;
-          this.listQuery.endTime = val.time ? String(new Date(val.time[1]).getTime()) : undefined;
+					this.listQuery.lineId = val.lineIds;
+					this.listQuery.startTime = val.time
+						? String(new Date(val.time[0]).getTime())
+						: undefined;
+					this.listQuery.endTime = val.time
+						? String(new Date(val.time[1]).getTime())
+						: undefined;
 					if (val.time && val.lineIds) {
-            this.tableData = []
-            this.xData = []
-            this.yData = []
-            this.tableProps = []
-            this.spanArr = []
-            this.timeList = []
-            this.getData()
+						this.tableData = [];
+						this.xData = [];
+						this.yData = [];
+						this.tableProps = [];
+						this.spanArr = [];
+						this.timeList = [];
+						this.getData();
 					} else {
 						this.$message({
 							message: '请选择产线和时间',
-              type: 'warning'
+							type: 'warning',
 						});
 					}
 					break;
@@ -260,3 +432,23 @@ export default {
 	},
 };
 </script>
+<style scoped>
+.custom-tabs >>> .el-tabs__header {
+	margin-bottom: 8px;
+	display: inline-block;
+	transform: translateY(-12px);
+}
+.custom-tabs >>> .el-tabs__item {
+	padding-left: 0px !important;
+	padding-right: 0px !important;
+	line-height: 36px !important;
+	height: 36px;
+}
+
+.custom-tabs >>> .el-tabs__content {
+	height: calc(100% - 42px);
+}
+.custom-tabs >>> .el-tab-pane {
+	height: 100%;
+}
+</style>

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

@@ -110,7 +110,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '搜索',
+					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
@@ -149,6 +149,27 @@ export default {
 	},
 	created() {},
 	methods: {
+		// 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`确定确认删除工厂名称为"${name}"的数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':

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

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="订单名" prop="orderId">
-          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in orderList"
               :key="item.id"
@@ -39,7 +39,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="发货负责人" prop="deliveryPersonId">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in personList"
               :key="item.id"
@@ -75,9 +75,8 @@
   </el-form>
 </template>
 <script>
-import { orderList } from '@/api/base/orderManage'
 import { getWorkerList } from '@/api/base/worker'
-import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog } from '@/api/base/delivery'
+import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
 export default {
   name: 'AddOrUpdate',
   data() {
@@ -116,7 +115,7 @@ export default {
       }
     },
     getSelectList() {
-      orderList().then(res => {
+      listOrderList().then(res => {
         this.orderList = res.data || []
       })
       getWorkerList().then(res => {

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

@@ -2,7 +2,7 @@
   <el-drawer
     title="发货进度"
     :visible.sync="centervisible"
-    size="80%"
+    size="50%"
     class="deliveryLogDetail"
     @close='closeA'
     :show-close='false'>
@@ -47,7 +47,7 @@
               <method-btn
                 v-if="tableBtn.length"
                 slot="handleBtn"
-                :width="150"
+                :width="80"
                 label="操作"
                 :method-list="tableBtn"
                 @clickBtn="viewDetDetail"
@@ -65,7 +65,7 @@
           <div v-if="activeName === 'barChart'">
             <div 
               id="logDetPieBar"
-              style="width: 100%"
+              style="width: 60%"
               :style="{ height: chartHeight + 'px' }"
             ></div>
           </div>
@@ -75,7 +75,7 @@
     <!-- 详情抽屉 -->
     <el-drawer
       title="发货详情"
-      size="60%"
+      size="50%"
       :append-to-body="true"
       :visible.sync="innerDrawer"
       @close='closeB'
@@ -141,7 +141,8 @@ const tableProps = [
   },
   {
     prop: 'rate',
-    label: '发货比列(%)'
+    label: '发货比列(%)',
+    width: 110
   },
   {
     prop: 'principalCost',
@@ -173,7 +174,8 @@ const tableProps2 = [
   },
   {
     prop: 'packagingSize',
-    label: '装箱规格（片/箱）'
+    label: '装箱规格（片/箱）',
+    minWidth: 140
   },
   {
     prop: 'packagingNum',
@@ -210,8 +212,8 @@ export default {
       tableBtn: [
         this.$auth.hasPermi('base:group-team:update')
           ? {
-              type: 'detDetail',
-              btnName: '查看发货详情'
+              type: 'detail',
+              btnName: '详情'
             }
           : undefined
       ].filter((v) => v),
@@ -230,7 +232,7 @@ export default {
       // 图
       chartDom: '',
       chart: '',
-      chartHeight: this.tableHeight(300)
+      chartHeight: this.tableHeight(300)*0.6
     }
   },
   // watch: {
@@ -270,6 +272,8 @@ export default {
       }
     },
     getBar() {
+      let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
+      let colorList = []
       if (
         this.chart !== null &&
         this.chart !== '' &&
@@ -280,64 +284,90 @@ export default {
       this.chartDom = document.getElementById('logDetPieBar')
       this.chart = echarts.init(this.chartDom)
       let seriesData = []
-      let sumData = 0
-      this.tableData && this.tableData.map(item =>{
+      if (this.tableData.length > 0) {
+        for (let i = 0; i < this.tableData.length; i++) {
           let obj = {}
-        obj.value = item.rate
-        obj.name = item.name
+          obj.value = this.tableData[i].num
+          obj.name = this.tableData[i].name
           seriesData.push(obj)
-        sumData+=item.rate
-      })
-      if (sumData < 100) {
+          if (i < 5) {
+            colorList.push(color[i])
+          } else {
+            colorList.push(color[i%5])
+          }
+        }
+      }
+      if (this.orderMsg.num < this.orderMsg.orderNum) {
         let obj = {}
-        obj.value = 100 - sumData
+        obj.value = this.orderMsg.orderNum - this.orderMsg.num
         obj.name = "未发货"
         seriesData.push(obj)
+        colorList.push('#F5F5F5')
+      }else {
+        let obj = {}
+        obj.value = 0
+        obj.name = "未发货"
+        seriesData.push(obj)
+        colorList.push('#F5F5F5')
       }
       var option = {
-        color: ['#B0EB42', '#FF9747', '#FF6860', '#7164FF', '#288AFF', '#63BDFF', '#73DE93', '#FFCE6A'],
-        tooltip: {
-          trigger: 'item',
-          formatter: function(params) {
-            let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${params.color};"></span>`
-            return `<span>
-                <span style="color:rgba(0,0,0,0.85);">${str}${params.name}</span>
-                <span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${params.percent}</span>
-              </span>`
-          }
-        },
+        color: colorList,
         legend: {
-          type: 'scroll',
-          orient: 'vertical',
-          right: '10%',
-          top: 20,
-          bottom: 20,
-          icon: 'rect',
-          itemHeight: 8,
-          itemWidth: 8
+          bottom: '5%',
+          left: 'center',
+          itemWidth: 8,
+          itemHeight: 8
         },
         series: [
           {
             type: 'pie',
-            radius: ['60%', '80%'],
-            avoidLabelOverlap: false,
-            label: {
-              show: false,
-              position: 'center'
-            },
+            radius: ['40%', '55%'],
             emphasis: {
+              scale: false
+            },
             label: {
-                show: true,
-                fontSize: 40,
-                fontWeight: 'bold'
+              alignTo: 'edge',
+              formatter: '{name|{b}}\n{value|{c}}',
+              minMargin: 5,
+              edgeDistance: 10,
+              lineHeight: 15,
+              rich: {
+                name: {
+                  fontSize: 14,
+                  color: 'rgba(0,0,0,0.65)'
                 },
-              scale: true ,
-              scaleSize: 20 ,
-            },
-            labelLine: {
-              show: false
+                value: {
+                  fontSize: 14,
+                  color: 'rgba(0,0,0,0.65)'
+                }
+              }
             },
             data: seriesData
+          },
+          {
+            type: 'pie',
+            radius: ['40%', '40%'],
+            label: {
+              show: true,
+              position: 'center',
+              color: '#000',
+              formatter: [
+                  '{a|'+this.orderMsg.orderNum+'}',
+                  '{b|总数}'
+              ].join('\n\n'),
+              rich: {
+                a: {
+                    fontSize: 26 +'px'
+                },
+                b: {
+                    fontSize: 16 +'px'
+                }
+              }
+            },
+            emphasis: {
+              scale: false
+            },
+            data: [100]
           }
         ]
       };
@@ -377,11 +407,13 @@ export default {
 </script>
 <style scoped lang='scss'>
 .box1 {
-  height: 56px;
+  height: 76px;
+  border-bottom: 1px solid #E9E9E9;
+  margin: 0px 8px 20px 30px;
   .box_col {
     display: inline-block;
     width: 20%;
-    padding: 8px 8px 8px 40px;
+    padding: 8px 8px 8px 8px;
     .blodTip {
       height: 16px;
       font-size: 14px;
@@ -398,7 +430,7 @@ export default {
   }
 }
 .box2 {
-    padding:32px 32px 30px 30px;
+    padding:0px 32px 30px 30px;
     height: calc(100vh - 150px);
 }
 .boxTitle {

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

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-form-item label="关联表名" prop="plcId">
-      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;">
+      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
         <el-option
           v-for="item in plcList"
           :key="item.id"

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

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in energyListType"
               :key="item.id"

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

@@ -63,7 +63,7 @@ const tableProps = [
   }
 ]
 export default {
-  name: "EnergyPlc",
+  name: "EnergyQuantityRealtime",
   data() {
     return {
       formConfig: [
@@ -125,10 +125,34 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
+    if (location.href.indexOf('?') > 0) {
+      let arr = location.href.split('?')[1].split('&')
+      this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
+    } else {
+      this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
+    }
+    this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
+    this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
     this.getList();
     this.getTypeList()
   },
+  watch: {
+    $route: 'initData'
+  },
   methods: {
+    initData(to) {
+      if (to.name === 'EnergyQuantityRealtime') {
+        if (location.href.indexOf('?') > 0) {
+          let arr = location.href.split('?')[1].split('&')
+          this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
+        } else {
+          this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
+        }
+        this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
+        this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
+        this.getList()
+      }
+    },
     buttonClick(val) {
       this.queryParams.pageNo = 1;
       this.queryParams.energyTypeId = val.energyTypeId

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

@@ -15,7 +15,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
             <el-option
               v-for="item in this.energyTypeList"
               :key="item.id"

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

@@ -80,8 +80,7 @@ export default {
           param: 'timeVal',
           defaultSelect: [],
           width: 350,
-          clearable: false,
-          required:true
+          clearable: false
         },
         {
           type: 'button',
@@ -122,35 +121,11 @@ export default {
       this.tableH = this.tableHeight(260)
       this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
     })
-    if (location.href.indexOf('?') > 0) {
-      let arr = location.href.split('?')[1].split('&')
-      this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-    } else {
-      this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
-    }
-    this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
-    this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
     this.getList()
     this.getTypeList()
     this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
   },
-  watch: {
-    $route: 'initData'
-  },
   methods: {
-    initData(to) {
-      if (to.name === 'EnergyReportSearch') {
-        if (location.href.indexOf('?') > 0) {
-          let arr = location.href.split('?')[1].split('&')
-          this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-        } else {
-          this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
-        }
-        this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
-        this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
-        this.getList()
-      }
-    },
     getTypeList() {
       getEnergyTypeListAll().then((res) => {
         this.formConfig[1].selectOptions = res.data || []

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

@@ -27,7 +27,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in energyListType"
               :key="item.id"

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

@@ -8,11 +8,11 @@
 <template>
 	<div class="app-container allow-overflow">
 		<!-- 搜索工作栏 -->
-		<small-title
+		<!-- <small-title
 			style="margin: 16px 0; padding-left: 8px"
 			:no-padding="true">
 			设备运行状态
-		</small-title>
+		</small-title> -->
 
 		<div
 			class="graph"
@@ -22,7 +22,8 @@
 				flex-direction: column;
 				position: relative;
 			">
-			<div class="blue-title">各设备加工数量</div>
+			<!-- <div class="blue-title">各设备加工数量</div> -->
+			<div class="blue-title">设备运行状态</div>
 			<div class="legend">
 				<div class="legend-item">
 					<span class="icon blue"></span>
@@ -41,22 +42,17 @@
 					<span class="text">速度开动率</span>
 				</div>
 			</div>
-			<div class="graph-grid">
+			<div v-if="list.length" class="graph-grid">
 				<div class="bg-grid grid-line">
-					<div
-						class="grid-item"
-						v-for="item in list.length"
-						:key="item"></div>
+					<div class="grid-item" v-for="item in list.length" :key="item"></div>
 				</div>
 
 				<div class="bg-grid grid-charts">
-					<pie-chart
-						v-for="item in list"
-						:key="item.id"
-						:value="item" />
+					<pie-chart v-for="item in list" :key="item.id" :value="item" />
 					<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
 				</div>
 			</div>
+			<div class="no-data-bg" v-else></div>
 		</div>
 	</div>
 </template>

src/views/equipment/analysis/efficiency/components/pieChart.vue

@@ -202,7 +202,9 @@ export default {
 			];
 			this.config.series[1].data = [
 				{ name: '速度开动率', value: peEfficiency },
-				{ name: '', value: Math.ceil(peEfficiency) - peEfficiency },
+				{ name: '', value: 100 },
+				// { name: '速度开动率', value: peEfficiency },
+				// { name: '', value: Math.ceil(peEfficiency) - peEfficiency },
 			];
 			//
 			this.textData = {

src/views/equipment/analysis/quality/components/lineChart.vue

@@ -21,18 +21,15 @@ export default {
 			chart: null,
 		};
 	},
-	// watch: {
-	// 	list: {
-	// 		handler(listdata) {
-	// 			if (listdata && listdata.length) {
-	// 				console.log('[linechart] list changed', listdata);
-	// 				const option = this.handleList(listdata);
-	// 				this.setOption(option);
-	// 			}
-	// 		},
-	// 		immediate: true,
-	// 	},
-	// },
+	watch: {
+		list: {
+			handler(listdata) {
+				this.setOption();
+			},
+			immediate: true,
+			deep: true,
+		},
+	},
 	computed: {
 		option() {
 			const opt = [];
@@ -55,7 +52,7 @@ export default {
 					},
 					formatter: (params) => {
 						const name = params[0].name;
-						const goodRate = opt.find((item) => item[0] == name)[4];
+						const goodRate = opt.find((item) => item[0] == name)[4] || '0';
 						return `
 							<h1 style="font-size: 18px; letter-spacing: 1px;">${
 								params[0].axisValue
@@ -109,6 +106,9 @@ export default {
 				xAxis: {
 					type: 'category',
 					axisTick: { show: false },
+					axisLabel: {
+						rotate: 45,
+					},
 					data: opt.map((item) => item[0]),
 				},
 				yAxis: {

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

@@ -6,15 +6,15 @@
 -->
 
 <template>
-	<div class="app-container">
+	<div class="app-container" style="flex: 1; height: 1px; display: flex; flex-direction: column;">
 		<!-- 搜索工作栏 -->
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<el-row>
-			<el-col class="custom-tabs">
+		<el-row type="flex" style="flex: 1;">
+			<el-col class="custom-tabs" style="flex: 1;">
 				<el-tabs
 					v-model="activeName"
 					:stretch="true"
@@ -32,7 +32,7 @@
 						<div
 							v-if="activeName == 'graph'"
 							class="graph"
-							style="height: 40vh; display: flex; flex-direction: column">
+							style="height: 100%; display: flex; flex-direction: column">
 							<div class="blue-title">各设备加工数量</div>
 							<LineChart v-if="list && list.length" :list="list" />
 							<div v-else class="no-data-bg"></div>
@@ -63,13 +63,13 @@ export default {
 			activeName: 'table', // defaults to 'table'
 			searchBarFormConfig: [
 				// 产品
-				{
-					__index: 'product',
-					type: 'select',
-					label: '产品',
-					placeholder: '请选择产品',
-					param: 'productId',
-				},
+				// {
+				// 	__index: 'product',
+				// 	type: 'select',
+				// 	label: '产品',
+				// 	placeholder: '请选择产品',
+				// 	param: 'productId',
+				// },
 				// 产线
 				{
 					__index: 'line',
@@ -156,17 +156,17 @@ export default {
 				{
 					// width: 160,
 					prop: 'inQuantity',
-					label: '进片数量',
+					label: '加工数量',
 				},
 				{
 					// width: 160,
 					prop: 'outQuantity',
-					label: '出片数量',
+					label: '合格数量',
 				},
 				{
 					// width: 160,
 					prop: 'nokQuantity',
-					label: '破损/不合格数',
+					label: '不合格数量',
 				},
 				{
 					// width: 160,
@@ -280,7 +280,7 @@ export default {
 
 		async fillProductOptions() {
 			const { data } = await this.$axios({
-				url: '/base/core-product/listAll',
+				url: '/base/core-product-material/listAll',
 				method: 'get',
 			});
 			const cfg = this.searchBarFormConfig.find(
@@ -377,6 +377,9 @@ export default {
 }
 
 :deep(.custom-tabs) {
+	.el-tabs {
+		height: 100%;
+	}
 	.el-tabs__header {
 		margin-bottom: 8px;
 		display: inline-block;
@@ -389,6 +392,14 @@ export default {
 		line-height: 36px !important;
 		height: 36px;
 	}
+
+	.el-tabs__content {
+		height: calc(100% - 48px);
+	}
+
+	#pane-graph {
+		height: 100%;
+	}
 }
 
 .blue-title {

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

@@ -0,0 +1,303 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-11 20:33:12
+ * @Description:
+-->
+<template>
+	<div class="alarm-handle">
+		<el-skeleton v-if="loading" />
+		<div v-else>
+			<DialogForm
+				ref="orderForm"
+				key="orderForm"
+				v-model="orderForm"
+				:disabled="readOnly"
+				:has-files="false"
+				label-position="top"
+				:rows="orderFormRows" />
+
+			<small-title style="margin: 16px 0" :no-padding="true" size="sm">
+				处理方式
+			</small-title>
+
+			<DialogForm
+				key="handleMethodForm"
+				ref="handleMethodForm"
+				v-model="handleMethodForm"
+				:disabled="readOnly"
+				:has-files="true"
+				label-position="top"
+				:rows="handleMethodFormRows" />
+		</div>
+	</div>
+</template>
+
+<script>
+import SmallTitle from './SmallTitle';
+import { getworkerAll } from '@/api/base/materialUseLog';
+import Editor from '@/components/Editor';
+import DialogForm from '@/components/DialogForm';
+
+export default {
+	name: 'AlarmHandle',
+	props: ['readOnly', 'logId'],
+	components: { SmallTitle, DialogForm, Editor },
+	data() {
+		return {
+			loading: false,
+			orderForm: {
+				id: null,
+				equipment: null,
+				createTime: null,
+				alarmContent: null,
+				alarmValue: null,
+				// 缺少报警编号字段, 用 alarmValue 代替
+				alarmCode: null,
+				equipmentCode: null
+			},
+			orderFormRows: [
+				[
+					{
+						input: true,
+						label: '设备编码',
+						prop: 'equipmentCode',
+					},
+					{
+						datetime: true,
+						label: '报警时间',
+						prop: 'createTime',
+					},
+					{
+						input: true,
+						label: '报警编号',
+						prop: 'alarmCode',
+					},
+					{
+						input: true,
+						label: '报警内容',
+						prop: 'alarmContent',
+					},
+				],
+			],
+			handleMethodFormRows: [
+				[
+					{
+						select: true,
+						label: '处理人',
+						prop: 'hander',
+						url: '/base/core-worker/listAll',
+						bind: {
+							multiple: true,
+						},
+						rules: [
+							{ required: true, message: '类型名称不能为空', trigger: 'blur' },
+						],
+					},
+					{
+						upload: true,
+						label: '上传资料',
+						prop: 'files',
+					},
+				],
+				[
+					{
+						key: 'handerMode',
+						subcomponent: Editor,
+						label: '处理方式',
+						prop: 'handerMode',
+						bind: {
+							'min-height': 200,
+						},
+					},
+				],
+			],
+			handleMethodForm: {
+				id: null,
+				logId: null,
+				hander: null,
+				handerMode: null,
+				remark: null,
+				files: [
+					// {
+					// 	fileName: '',
+					// 	fileType: '',
+					// 	fileUrl: ''
+					// }
+				],
+			},
+			workersList: [],
+		};
+	},
+	mounted() {
+		this.loading = true;
+		this.getDict()
+			.then(() => {
+				this.init();
+			})
+			.catch((err) => {
+				this.loading = false;
+			});
+	},
+	methods: {
+		/**
+		 * 获取员工数据
+		 */
+		async getDict() {
+			const workerRes = await getworkerAll();
+			this.workersList = workerRes.data;
+		},
+
+		/**
+		 * 初始化
+		 */
+		async init() {
+			await this.initTop();
+			await this.initDown();
+			this.loading = false;
+		},
+
+		/**
+		 * 初始化上部表单
+		 */
+		async initTop() {
+			if (!this.logId) {
+				this.$msgError('缺少报警日志id');
+				this.$emit('close');
+			}
+			const url = '/base/equipment-alarm-log/get';
+			const { data, code } = await this.$axios({
+				url: url,
+				method: 'get',
+				params: {
+					id: this.logId,
+				},
+			});
+			if (code == 0) {
+				this.orderForm = data;
+			}
+		},
+
+		/**
+		 * 初始化下部表单
+		 */
+		async initDown() {
+			if (!this.logId) {
+				this.$msgError('缺少报警日志id');
+				this.$emit('close');
+			}
+			const url = '/base/equipment-alarm-hand/page'; // 经沟通，此处采用page接口的第一个返回值
+			const { data, code } = await this.$axios({
+				url: url,
+				method: 'get',
+				params: {
+					logId: this.logId,
+				},
+			});
+			if (code == 0) {
+				this.handleMethodForm = {
+					...data.list[0],
+					hander: data.list[0]?.hander?.split(',') || '',
+				};
+			}
+		},
+
+		/**
+		 * 更新表单
+		 */
+		async submit() {
+			const result = await Promise.all([
+				await this.updateTop(),
+				await this.updateHandleMethod(),
+			]);
+			if (result[0] == true && result[1] == true) {
+				this.$modal.msgSuccess('更新成功');
+				this.$emit('refreshDataList');
+			} else {
+				this.$modal.msgError('更新失败');
+			}
+		},
+
+		/**
+		 * 更新下部表单
+		 */
+		async updateHandleMethod() {
+			const url = '/base/equipment-alarm-hand';
+			const valid = await this.$refs.orderForm.validate();
+			if (!valid) {
+				return false;
+			}
+			const { code, data } = await this.$axios({
+				url: url + (this.handleMethodForm.id ? '/update' : '/create'),
+				method: this.handleMethodForm.id ? 'put' : 'post',
+				data: {
+					...this.handleMethodForm,
+					hander: this.handleMethodForm.hander?.join(',') || '',
+					logId: this.logId,
+				},
+			});
+			if (code == 0) {
+				return true;
+			}
+			return false;
+		},
+
+		/**
+		 * 更新上部分表单
+		 */
+		async updateTop() {
+			const url = '/base/equipment-alarm-log';
+			const valid = await this.$refs.handleMethodForm.validate();
+			if (!valid) {
+				return false;
+			}
+			const { code, data } = await this.$axios({
+				url: url + '/update',
+				method: 'put',
+				data: this.orderForm,
+			});
+			if (code == 0) {
+				return true;
+			}
+			return false;
+		},
+
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+
+				if (this.file) {
+					const temp = this.file.split(','); // 获取文件个数
+					let arry = [];
+					temp.forEach((item) => {
+						arry.push({
+							fileType: 2,
+							fileUrl: item,
+						});
+					});
+					this.dataForm.files = arry;
+				}
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.alarm-handle {
+	padding: 0;
+}
+
+.alarm-handle__method >>> .el-select {
+	width: 100% !important;
+}
+</style>

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

@@ -40,7 +40,7 @@ $pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
 $mgr: 8px;
 @each $size, $height in $pxls {
 	.#{$size}-title {
-		font-size: 18px;
+		font-size: $height;
 		line-height: $height;
 		color: #000;
 		font-weight: 500;
@@ -53,7 +53,7 @@ $mgr: 8px;
 			width: 4px;
 			height: $height + 2px;
 			border-radius: 1px;
-			margin-right: $mgr;
+			margin-right: 4px;
 			background-color: #0b58ff;
 		}
 	}

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

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

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

@@ -45,20 +45,23 @@
 				:disabled="mode == 'detail'"
 				:has-files="false"
 				:rows="rows" /> -->
-			<add-or-update
+			<AddOrUpdate
+				v-if="open"
 				ref="addOrUpdate"
+				:read-only="readOnly"
+				:log-id="chosedLogId"
+				@close="cancel"
 				@refreshDataList="successSubmit" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import AddOrUpdate from './add-or-updata.vue'
 import { publicFormatter } from '@/utils/dict';
-// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
-
+import AddOrUpdate from './AddOrUpdate.vue';
+import moment from 'moment';
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 const btn = {
 	name: 'tableBtn',
@@ -68,7 +71,10 @@ const btn = {
 	},
 	methods: {
 		handleClick() {
-			this.$emit('emitData', { action: this.injectData.name, value: this.injectData });
+			this.$emit('emitData', {
+				action: this.injectData.name,
+				value: this.injectData,
+			});
 		},
 	},
 	render: function (h) {
@@ -80,15 +86,15 @@ const btn = {
 	},
 };
 
-
-
 export default {
 	name: 'Record',
 	components: { AddOrUpdate },
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['equipmentName', 'recordTime'],
+			readOnly: false,
+			chosedLogId: false,
+			searchBarKeys: ['equipmentName', 'createTime'],
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -113,12 +119,16 @@ export default {
 				{ prop: 'productionLine', label: '产线' },
 				{ prop: 'workshopSection', label: '工段' },
 				{ prop: 'equipment', label: '设备名称' },
-				{ prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
-				{ prop: 'responsible', label: '报警时间' }, // 接口缺
-				{ prop: 'responsible1', label: '设备报警码' }, // 接口缺
+				{
+					prop: 'alarmGrade',
+					label: '报警级别',
+					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
+				},
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter },
+				{ prop: 'alarmCode', label: '设备报警码' },
 				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
-				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },  // TODO: 是否换成按钮， 群里问
+				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -141,7 +151,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'recordTime',
+					param: 'createTime',
 					// defaultSelect: [
 					// 	new Date(y, m, d)
 					// 		.toLocaleString()
@@ -196,9 +206,10 @@ export default {
 				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
+				recordTime: [],
 			},
 			basePath: '/base/equipment-alarm-log',
-			list: []
+			list: [],
 		};
 	},
 	created() {
@@ -206,21 +217,20 @@ export default {
 	},
 	methods: {
 		handleEmitFun(val) {
-			console.log('你好', val)
 			if (val.action === '报警处理') {
+				// this.chosedLogId = val.value.alarmId;
+				this.chosedLogId = val.value.id;
 				// 报警处理
-				this.open = true
-				this.title = '报警处理'
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.value.id);
-				});
+				this.open = true;
+				this.title = '报警处理';
+				this.readOnly = false;
 			} else {
+				// this.chosedLogId = val.value.alarmId;
+				this.chosedLogId = val.value.id;
 				// 查看
-				this.open = true
-				this.title = '查看'
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.value.id, true);
-				});
+				this.open = true;
+				this.title = '查看';
+				this.readOnly = true;
 			}
 		},
 		/** 查询列表 */
@@ -234,8 +244,8 @@ export default {
 			});
 		},
 		successSubmit() {
-      this.cancel()
-      this.getList()
+			this.cancel();
+			this.getList();
 		},
 		/** 取消按钮 */
 		cancel() {
@@ -282,7 +292,7 @@ export default {
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs.addOrUpdate.dataFormSubmit()
+			this.$refs.addOrUpdate.submit();
 			// this.$refs['form'].validate((valid) => {
 			// 	if (!valid) {
 			// 		return;

src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue

@@ -9,10 +9,11 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="mode.includes('detail') ? true : false"
+		:before-close="handleCancel"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -42,7 +43,8 @@
 							:dataForm="form"
 							:rows="formRows" /> -->
 
-						<el-row style="margin-bottom: 24px">
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
 									class="title"
@@ -62,13 +64,39 @@
 								</div>
 							</el-col>
 						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组名称"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.name"
+											placeholder="请输入设备分组名称"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组编码"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.code"
+											placeholder="请输入设备分组编码"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
 					</div>
 
 					<div
 						v-if="section.key == 'attrs'"
 						style="position: relative; margin-top: 12px">
-						<!-- v-if="!mode.includes('detail')" -->
-						<div style="position: absolute; top: -40px; right: 0">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
 								添加报警
@@ -84,7 +112,7 @@
 							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -102,12 +130,13 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button> -->
-				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
+				<el-button
+					type="primary"
+					@click="handleSave">
+					确定
+				</el-button>
 			</div>
 		</div>
 
@@ -163,7 +192,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			mode: '',
@@ -191,7 +220,9 @@ export default {
 						label: '报警编码', // 自动生成
 						prop: 'code',
 						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '报警编码不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警编码不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						select: true,
@@ -205,13 +236,17 @@ export default {
 						input: true,
 						label: '参数列名', // 在实时数据库的列名
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '报警内容',
 						prop: 'alarmContent',
-						rules: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警内容不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -223,7 +258,9 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警类型不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
@@ -322,7 +359,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -346,7 +383,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,
@@ -403,12 +440,11 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
 				const isEdit = this.attrForm.id != null;
 				this.attrFormSubmitting = true;
 				const res = await this.$axios({
@@ -429,6 +465,7 @@ export default {
 					});
 				}
 				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {

src/views/equipment/base/config/AlarmGroup/index.vue

@@ -45,6 +45,7 @@
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:data-id="alarmForm.id"
 			:sections="[
@@ -403,12 +404,25 @@ export default {
 				});
 			});
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			// debugger;
 			const { id, code, name, createTime } = row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = id;
 			this.alarmForm.equipmentGroupCode = code;
 			this.alarmForm.equipmentGroupName = name;

src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue

@@ -9,10 +9,11 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="mode.includes('detail') ? true : false"
+		:before-close="handleCancel"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -42,6 +43,7 @@
 							:dataForm="form"
 							:rows="formRows" /> -->
 
+						<!-- <el-row v-if="mode.includes('detail')" style="margin-bottom: 24px"> -->
 						<el-row style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
@@ -62,13 +64,38 @@
 								</div>
 							</el-col>
 						</el-row>
+						<!-- <el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组名称"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.name"
+											placeholder="请输入设备分组名称"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组编码"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.code"
+											placeholder="请输入设备分组编码"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row> -->
 					</div>
 
 					<div
 						v-if="section.key == 'attrs'"
 						style="position: relative; margin-top: 12px">
-						<!-- v-if="!mode.includes('detail')" -->
-						<div style="position: absolute; top: -40px; right: 0">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
 								添加属性
@@ -84,7 +111,7 @@
 							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -102,12 +129,13 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button> -->
-				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
+				<el-button
+					type="primary"
+					@click="handleCancel">
+					确定
+				</el-button>
 			</div>
 		</div>
 
@@ -163,7 +191,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			mode: '',
@@ -191,7 +219,9 @@ export default {
 						label: '报警编码', // 自动生成
 						prop: 'code',
 						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '报警编码不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警编码不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						select: true,
@@ -201,7 +231,9 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警类型不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -222,13 +254,17 @@ export default {
 						input: true,
 						label: '参数列名', // 在实时数据库的列名
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '报警内容',
 						prop: 'alarmContent',
-						rules: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警内容不能为空', trigger: 'blur' },
+						],
 					},
 				],
 			],
@@ -322,7 +358,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -346,7 +382,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,
@@ -403,13 +439,11 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
-			console.log('this.attrform', this.attrForm);
 				const isEdit = this.attrForm.id != null;
 				this.attrFormSubmitting = true;
 				const res = await this.$axios({
@@ -430,6 +464,7 @@ export default {
 					});
 				}
 				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {

src/views/equipment/base/config/BindGroup/index.vue

@@ -34,7 +34,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="700px"
+			width="30%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@@ -45,6 +45,7 @@
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:data-id="alarmForm.id"
 			:sections="[
@@ -224,7 +225,9 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -238,7 +241,9 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '报警分组不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警分组不能为空', trigger: 'blur' },
+						],
 					},
 				],
 			],
@@ -269,7 +274,13 @@ export default {
 						input: true,
 						label: '设备分组名称',
 						prop: 'name',
-						rules: [{ required: true, message: '设备分组名称不能为空', trigger: 'blur' }],
+						rules: [
+							{
+								required: true,
+								message: '设备分组名称不能为空',
+								trigger: 'blur',
+							},
+						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -287,26 +298,23 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ width: 240, prop: 'code', label: '报警编码' },
+				{ prop: 'code', label: '报警编码' },
 				{
-					width: 100,
 					prop: 'type',
 					label: '报警类型',
 					filter: (val) =>
 						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
 				},
 				{
-					width: 90,
 					prop: 'grade',
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ width: 180, prop: 'alarmCode', label: '设备报警编码' },
-				{ width: 128, prop: 'plcParamName', label: '参数列名' },
-				{ width: 128, prop: 'alarmContent', label: '报警内容' },
+				{ prop: 'alarmCode', label: '设备报警编码' },
+				{ prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'alarmContent', label: '报警内容' },
 			],
 		};
 	},
@@ -361,6 +369,19 @@ export default {
 			};
 			this.resetForm('form');
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -411,11 +432,11 @@ export default {
 			});
 		},
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			const { equipmentId, equipmentName, groupCode, groupId, groupName, id } =
 				row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = groupId;
 			this.alarmForm.equipmentGroupCode = groupCode;
 			this.alarmForm.equipmentGroupName = groupName;

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -52,6 +52,7 @@
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:info-data="alarmForm"
 			:sections="[
@@ -59,6 +60,10 @@
 					name: '基本信息',
 					key: 'base',
 					rows: drawerBaseInfoRows,
+					url: '/base/equipment-plc-connect/get',
+					urlUpdate: '/base/equipment-plc-connect/update',
+					urlCreate: '/base/equipment-plc-connect/create',
+					queryParams: { id: alarmForm.id },
 				},
 				{
 					name: '采集参数',
@@ -189,7 +194,7 @@ export default {
 					placeholder: '请选择设备',
 					param: 'equipmentId',
 					selectOptions: [],
-					filterable: true
+					filterable: true,
 				},
 				{
 					type: 'select',
@@ -197,7 +202,7 @@ export default {
 					placeholder: '请选择关联表编码',
 					param: 'plcId',
 					selectOptions: [],
-					filterable: true
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -299,7 +304,7 @@ export default {
 					filter: publicFormatter('unit_dict'),
 				},
 				{
-					prop: 'equipment_param_type',
+					prop: 'equipmentParamType',
 					label: '设备参数类型',
 					filter: (val) =>
 						val != null
@@ -307,12 +312,12 @@ export default {
 							: '-',
 				},
 				{
-					prop: 'production_param_type',
+					prop: 'productionParamType',
 					label: '生产参数类型',
 					filter: (val) =>
 						val != null
-							// ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
-							? ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
+							? // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							  ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
 							: '-',
 				},
 				{
@@ -423,6 +428,19 @@ export default {
 			};
 			this.resetForm('form');
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -474,7 +492,7 @@ export default {
 		},
 
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			// debugger;
 			const {
 				id,
@@ -490,7 +508,7 @@ export default {
 				workshopSection,
 			} = row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = id;
 			this.alarmForm.plcTableName = plcTableName; // 关联表名
 			this.alarmForm.equipmentName = equipmentName;

src/views/equipment/base/config/DataCollection/TableConfig.vue

@@ -25,6 +25,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
+				:width="90"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -41,7 +42,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="700px"
+			width="45%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@@ -127,7 +128,7 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ prop: 'code', label: '编码' },
+				{ prop: 'code', label: '编码', showOverflowtooltip: true },
 				{ prop: 'plcTableName', label: '关联表名' },
 				{ prop: 'name', label: '标识名称' },
 				{ prop: 'enName', label: '英文名称' },
@@ -136,7 +137,7 @@ export default {
 					label: '是否采集',
 					subcomponent: switchBtn,
 				},
-				{ prop: 'description', label: '描述' },
+				{ prop: 'description', label: '描述', showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
@@ -213,16 +214,28 @@ export default {
 					},
 				],
 				[
+					// {
+					// 	switch: true,
+					// 	label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
+					// 	prop: 'collection',
+					// 	bind: {
+          //     'active-value': 1,
+					// 		'inactive-value': 0,
+          //     value: 1,
+					// 	},
+					// },
 					{
-						switch: true,
-						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
+						select: true,
+						options: [
+							{ label: '否', value: 0 },
+							{ label: '是', value: 1 }
+						],
+						label: '是否采集',
 						prop: 'collection',
 						bind: {
-                            'active-value': 1,
-							'inactive-value': 0,
-                            value: 1,
-						},
-					},
+							clearable: true, filterable: true
+						}
+					}
 				],
 				[
 					{

src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue

@@ -9,10 +9,11 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="mode.includes('detail') ? true : false"
+		:before-close="handleCancel"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -42,7 +43,8 @@
 							v-model="form"
 							:rows="formRows" /> -->
 
-						<el-row style="margin-bottom: 24px">
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
 									class="title"
@@ -60,17 +62,59 @@
 									关联表名
 								</div>
 								<div class="value" style="font-size: 14px">
-									{{ form.plcTableName }}
+									{{ form.plcName }}
 								</div>
 							</el-col>
 						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-select
+											v-model="form.equipmentId"
+											filterable
+											clearable
+											placeholder="请选择设备">
+											<el-option
+												v-for="eq in eqList"
+												:key="eq.id"
+												:label="eq.name"
+												:value="eq.id"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备关联表名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-select
+											v-model="form.plcId"
+											filterable
+											clearable
+											placeholder="请选择关联表">
+											<el-option
+												v-for="plc in plcList"
+												:key="plc.id"
+												:label="plc.name"
+												:value="plc.id"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
 					</div>
 
 					<div
 						v-if="section.key == 'attrs'"
 						style="position: relative; margin-top: 12px">
-						<!-- v-if="!mode.includes('detail')" -->
-						<div style="position: absolute; top: -40px; right: 0">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
 								添加属性
@@ -86,7 +130,7 @@
 							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -104,12 +148,13 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
-					编辑
-				</el-button> -->
-				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
+				<el-button
+					type="primary"
+					@click="handleSave">
+					确定
+				</el-button>
 			</div>
 		</div>
 
@@ -164,7 +209,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'infoData'],
+	props: ['sections', 'defaultMode', 'infoData', 'size'],
 	data() {
 		return {
 			mode: '',
@@ -173,6 +218,8 @@ export default {
 			total: 0,
 			form: {},
 			list: [],
+			eqList: [],
+			plcList: [],
 			attrTitle: '',
 			attrForm: {
 				id: null,
@@ -228,7 +275,7 @@ export default {
 					{
 						select: true,
 						label: '设备参数类型',
-						prop: 'equipment_param_type',
+						prop: 'equipmentParamType',
 						options: [
 							{ label: '一般参数', value: 1 },
 							{ label: '工艺参数', value: 2 },
@@ -245,7 +292,7 @@ export default {
 					{
 						select: true,
 						label: '生产参数类型',
-						prop: 'production_param_type',
+						prop: 'productionParamType',
 						options: [
 							// { label: '进片数量', value: 1 },
 							// { label: '出片数量', value: 2 },
@@ -351,6 +398,17 @@ export default {
 	mounted() {
 		this.shouldRefreshPageView = false;
 		this.mode = this.defaultMode || 'detail';
+
+		if (this.mode != 'detail') {
+			this.$axios('/base/core-equipment/listAll').then(({ code, data }) => {
+				this.eqList = data;
+			});
+			this.$axios({
+				url: '/base/equipment-plc/page',
+			}).then(({ code, data }) => {
+				this.plcList = data.list;
+			});
+		}
 		for (const section of this.sections) {
 			// 请求具体信息
 			if ('url' in section) {
@@ -412,7 +470,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -450,6 +508,8 @@ export default {
 				defaultValue: '',
 				description: '',
 				remark: '',
+				equipmentParamType: '',
+				productionParamType: '',
 				alarmContent: '',
 			};
 			this.attrTitle = '添加参数绑定信息';

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

@@ -7,13 +7,15 @@
 
 <template>
 	<el-drawer
+		ref="drawer"
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
-		size="60%">
+		size="60%"
+		@closed="$emit('destroy')">
 		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '查看详情' : '新增' }}
+			{{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title>
 		<el-form
 			ref="dataForm"
@@ -77,13 +79,26 @@
 					<el-form-item label="巡检时间" prop="actualTime">
 						<el-date-picker
 							v-model="dataForm.actualTime"
-							type="date"
+							type="datetime"
 							:disabled="isdetail"
-							format='yyyy-MM-dd'
+							format='yyyy-MM-dd HH:mm:ss'
 							value-format="timestamp"
 							placeholder="选择巡检时间" />
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item label="数据来源" prop="origin">
+						<el-select
+							v-model="dataForm.origin"
+							filterable
+							:disabled="isdetail"
+							style="width: 100%"
+							placeholder="请选择数据来源">
+							<el-option key="1" label="手动" :value="1" />
+							<el-option key="2" label="自动" :value="2" />
+						</el-select>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-form-item label="巡检内容">
 				<base-table
@@ -93,20 +108,17 @@
 					:table-data="list" />
 			</el-form-item>
 			<el-form-item label="巡检详情" prop="description">
-				<editor v-model="dataForm.description" :read-only="isdetail" :min-height="380"/>
+				<editor v-model="dataForm.description" :read-only="isdetail" :min-height="150"/>
 			</el-form-item>
 			<el-form-item label="附件">
-				<FileUpload v-model="file" :disabled="isdetail" />
+				<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="isdetail" @name="setFileName" />
 			</el-form-item>
 			
 		</el-form>
 
-		<div class="drawer-body__footer">
+		<div v-if="!isdetail" class="drawer-body__footer">
 			<el-button type="primary" @click="goback()">取消</el-button>
-			<el-button v-if="isdetail" type="primary" @click="goEdit()">
-				编辑
-			</el-button>
-			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 	</el-drawer>
 </template>
@@ -173,6 +185,7 @@ export default {
 				actualTime: undefined,
 				responsible: undefined,
 				description: undefined,
+				origin: undefined,
 				files: []
 			},
 			list: [],
@@ -184,6 +197,7 @@ export default {
 				total: 0,
 			},
 			file: '',
+			fileName: '',
 			dataRule: {
         responsible: [{ required: true, message: "巡检人不能为空", trigger: "blur" }],
         actualTime: [{ required: true, message: "巡检时间不能为空", trigger: "blur" }]
@@ -194,6 +208,9 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		setFileName(val) {
+			this.fileName = val
+		},
 		async getDict() {
 			const res = await getEquipmentAll()
 			this.eqList = res.data
@@ -222,16 +239,9 @@ export default {
 			return this.$refs.dataForm.resetFields(args);
 		},
 		initData() {
-			this.dataForm = {
-				id: undefined,
-				configId: undefined,
-				equipmentId: undefined,
-				actualTime: undefined,
-				responsible: undefined,
-				description: undefined,
-				files: []
-			}
 			this.list = []
+			this.file = ''
+			this.fileName = ''
 		},
 		init(id, isdetail) {
 			this.initData();
@@ -239,6 +249,10 @@ export default {
 			this.dataForm.id = id || undefined;
 			this.visible = true;
 
+			// const scrollContainer = this.$refs.dataForm;
+			// const scrollPosition = scrollContainer.scrollTop;
+			// console.log('12', scrollPosition);
+
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 
@@ -247,6 +261,12 @@ export default {
 					getEqCheckLog(this.dataForm.id).then(response => {
 						this.formLoading = false
             this.dataForm = response.data;
+						if (this.dataForm.files.length > 0) {
+							this.file = this.dataForm.files[0].fileUrl
+							this.fileName = this.dataForm.files[0].fileName
+						}
+						this.setConfig()
+						this.setInspectionContet()
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
@@ -283,8 +303,9 @@ export default {
 				if (this.file) {
 					const temp = this.file.split(',') // 获取文件个数
 					let arry = []
-					temp.forEach(item => {
+					temp.forEach((item, index) => {
 						arry.push({
+							fileName: this.fileName,
 							fileType: 2,
 							fileUrl: item
 						})

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

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

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

@@ -49,7 +49,8 @@
 		<addRecord
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList" />
+			@refreshDataList="getList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -69,7 +70,7 @@ export default {
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['equipmentId', 'createTime'],
+			searchBarKeys: ['equipmentId', 'actualTime'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
@@ -93,7 +94,7 @@ export default {
 			tableProps: [
 				{ prop: 'configName', label: '配置名称' },
 				{ prop: 'equipmentName', label: '设备名称' },
-				// { prop: 'lineName', label: '数据来源' },
+				{ prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] },
 				// { prop: 'sectionName', label: '计划巡检时间' },
 				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
 				// { prop: 'maintenanceDetail', label: '完成状态' },
@@ -113,12 +114,12 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'startTime',
+					param: 'actualTime',
 					// width: 350,
 				},
 				{

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-09 11:09:26
+ * @LastEditTime: 2023-11-27 10:48:55
  * @Description:
 -->
 <template>
@@ -52,9 +52,8 @@
 
 				<div v-if="!isdetail" class="action_btn">
 					<template>
-						<span style="display: inline-block;" @click="addNew()">
-							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
-							<span class="add">添加</span>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
             </span>
           </template>
 				</div>
@@ -177,11 +176,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
+					`是否确认删除巡检项目名称为"${raw.data.program}"的数据项?`,
 					'提示',
 					{
 						confirmButtonText: '确定',
@@ -290,7 +285,7 @@ export default {
 
 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 76vh;
+	max-height: 16vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */
@@ -308,7 +303,7 @@ export default {
 }
 .action_btn {
   float: right;
-  margin: 5px 15px;
+  margin: -40px 15px;
   font-size: 14px;
 }
 .add {

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

@@ -0,0 +1,105 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-25 16:23:13
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="配置名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						placeholder="请输入配置名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="配置编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						placeholder="请输入配置编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="设备名称" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						filterable
+						style="width: 100%"
+						placeholder="请选择设备名称"
+						@change="setCode">
+						<el-option
+							v-for="dict in eqList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="设备编码" prop="equipmentCode">
+						<el-input v-model="dataForm.equipmentCode" disabled placeholder="请输入设备编码" />
+					</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+import { getEqCheck, getCode, createCheckConfig, updateCheckConfig } from "@/api/equipment/base/inspection/settings";
+import { getEquipmentAll } from '@/api/base/equipment'
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCheckConfig,
+				updateURL: updateCheckConfig,
+				infoURL: getEqCheck,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        equipmentId: undefined,
+				equipmentCode: undefined
+			},
+			eqList: [],
+			dataRule: {
+				equipmentId: [{ required: true, message: "设备不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "配置编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "配置名称不能为空", trigger: "blur" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 设备列表
+			const res = await getEquipmentAll()
+			this.eqList = res.data
+		},
+		setCode() {
+			const chooseM = this.eqList.filter(item => {
+				return item.id === this.dataForm.equipmentId
+			})
+			this.dataForm.equipmentCode = chooseM[0].code
+		}
+	},
+};
+</script>

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

@@ -36,14 +36,10 @@
 			:dialogVisible="open"
 			@close="cancel"
 			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="false"
-				:rows="rows" />
+			@confirm="handleConfirm">
+			<add
+				ref="add"
+				@refreshDataList="successSubmit" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata
@@ -56,12 +52,13 @@
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
+import add from './add.vue'
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentCheckSetting',
-	components: { addOrUpdata },
+	components: { addOrUpdata, add },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -101,7 +98,7 @@ export default {
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备' },
 				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'responsible', label: '负责人' },
+				// { prop: 'responsible', label: '负责人' },
 				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
@@ -116,6 +113,7 @@ export default {
 					label: '设备名称',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -170,8 +168,12 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
 						rules: [
-							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+							{ required: true, message: '设备名称不能为空', trigger: 'change' },
 						],
 					},
 					{
@@ -201,6 +203,13 @@ export default {
 		this.getList();
 	},
 	methods: {
+		handleConfirm() {
+      this.$refs.add.dataFormSubmit()
+    },
+		successSubmit() {
+      this.cancel()
+      this.getList()
+    },
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(
@@ -225,9 +234,10 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
+			this.$refs.add.formClear()
 			this.open = false;
-			this.mode = null;
-			this.reset();
+			this.title = ''
+			// this.reset();
 		},
 		/** 表单重置 */
 		reset() {
@@ -252,18 +262,26 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			this.reset();
+			// this.reset();
 			this.open = true;
 			this.title = '添加巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init();
+			});
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
+			// this.reset();
+			// const id = row.id;
+			// this.info({ id }).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改巡检设置';
+			// });
 			this.open = true;
 			this.title = '修改巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init(row.id);
 			});
 		},
 		/** 提交按钮 */
@@ -293,7 +311,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该巡检记录?')
+				.confirm('是否确认删除配置名为"' + row.name + '"的数据项?')
 				.then(() => {
 					return this.del({ id });
 				})

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

@@ -49,7 +49,7 @@
 
 <script>
 import { publicFormatter } from '@/utils/dict';
-import moment from 'moment';
+// import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 import { parseTime } from '@/utils/ruoyi'
@@ -67,7 +67,7 @@ const remainBox = {
 		color() {
 			if (this.value) {
 				const v = +this.value;
-				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+				return v < 0 ? '#FF5454' : v >= 0 && v < 2 ? '#FFD767' : '#37D97F';
 			}
 			return 'unset';
 		},
@@ -78,9 +78,10 @@ const remainBox = {
 				style={`background: ${
 					this.color
 				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
-					this.color == 'red' ? '#fff' : 'unset'
+					// this.color == 'red' ? '#fff' : 'unset'
+					'#fff'
 				}`}>
-				{this.injectData[this.injectData.prop] || ''}
+				{ this.injectData[this.injectData.prop]?.toFixed(0) || '' }
 			</div>
 		);
 	},
@@ -121,30 +122,35 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'name', label: '保养计划' },
-				{ prop: 'lineName', label: '产线名' },
-				{ prop: 'sectionName', label: '工段名' },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'equipmentCode', 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: 100, showOverflowtooltip: true },
+				{ prop: 'equipmentCode', label: '设备编码', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'maintenancePeriod', label: '保养频率' },
 				{
 					prop: 'maintainType',
 					label: '保养类型',
+					showOverflowtooltip: true,
 					filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
 				},
 				{
 					prop: 'lastMaintainTime',
 					label: '上次保养时间',
 					filter: parseTime,
+					minWidth: 150,
+					showOverflowtooltip: true
 				},
-				{ prop: 'nextMaintainTime', label: '计划下次保养时间', filter: parseTime },
+				{ prop: 'nextMaintainTime', label: '计划下次保养时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
 				{
 					prop: 'remainDays',
 					label: '距离保养时间(天)',
 					subcomponent: remainBox,
+					minWidth: 150,
+					// showOverflowtooltip: true
 				},
-				{ prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '保养记录', name: '查看详情', subcomponent: btn },
+				{ prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn, width: 100 },
+				{ prop: 'opt2', label: '保养记录', name: '查看详情', subcomponent: btn, width: 100 },
 			],
 			searchBarFormConfig: [
 				{
@@ -176,6 +182,7 @@ export default {
 						: '',
 					btnName: '导出',
 					name: 'export',
+					plain: true,
 					color: 'warning',
 				},
 			],

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

@@ -45,6 +45,11 @@
 				:disabled="mode == 'detail'"
 				:has-files="true"
 				:rows="rows" />
+			<el-row v-if="mode === 'detail'" slot="footer" type="flex" justify="end">
+				<el-col :span="12">
+					<el-button size="small" class="btnTextStyle" @click="cancel">关闭</el-button>
+				</el-col>
+			</el-row>
 		</base-dialog>
 	</div>
 </template>
@@ -94,23 +99,24 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 150,
 					filter: timeFilter,
 				},
-				{ prop: 'maintainOrderNumber', label: '设备保养单号' },
-				{ prop: 'startTime', label: '开始时间', filter: timeFilter },
-				{ prop: 'endTime', label: '结束时间', filter: timeFilter },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'maintainWorker', label: '保养人员' },
+				{ prop: 'maintainOrderNumber', label: '设备保养单号', width: 110, showOverflowtooltip: true },
+				{ prop: 'startTime', label: '开始时间', filter: timeFilter, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'endTime', label: '结束时间', filter: timeFilter, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'maintainWorker', label: '保养人员', minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'relatePlan',
 					label: '是否计划保养',
+					width: 120,
 					filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
 				},
-				{ prop: 'planName', label: '保养计划名称' },
-				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
-				{ prop: 'timeUsed', label: '实际保养用时(h)' },
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'planName', label: '保养计划名称', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'maintainDuration', label: '计划保养用时(h)', minWidth: 130, showOverflowtooltip: true },
+				{ prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
+				{ prop: 'remark', label: '备注', minWidth: 100, showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
@@ -157,6 +163,15 @@ export default {
 				{
 					type: 'separate',
 				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'warning',
+				},
 				{
 					type: this.$auth.hasPermi('equipment:maintain-record:create')
 						? 'button'
@@ -166,14 +181,6 @@ export default {
 					plain: true,
 					color: 'success',
 				},
-				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
-						? 'button'
-						: '',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
 			],
 			rows: [
 				[
@@ -208,17 +215,29 @@ export default {
 					},
 				],
 				[
+					// {
+					// 	switch: true,
+					// 	label: '是否计划保养',
+					// 	prop: 'relatePlan',
+					// 	bind: {
+					// 		'active-value': 1,
+					// 		'inactive-value': 2,
+					// 	},
+					// 	rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
+					// },
 					{
-						switch: true,
+						select: true,
+						options: [
+							{ label: '是', value: 1 },
+							{ label: '否', value: 2 }
+						],
 						label: '是否计划保养',
 						prop: 'relatePlan',
 						bind: {
-							'active-value': 1,
-							'inactive-value': 2,
+							clearable: true, filterable: true
 						},
 						rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
 					},
-					{},
 					{
 						select: true,
 						label: '所属计划',
@@ -229,6 +248,11 @@ export default {
 							clearable: true,
 						},
 					},
+					{
+						input: true,
+						label: '保养用时',
+						prop: 'timeUsed',
+					},
 				],
 				[
 					{
@@ -255,11 +279,7 @@ export default {
 							clearable: true,
 						},
 					},
-					{
-						input: true,
-						label: '保养用时',
-						prop: 'timeUsed',
-					},
+					{}
 				],
 
 				[

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

@@ -9,12 +9,16 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="disabled"
 		class="drawer"
-		size="60%">
+		custom-class="mes-drawer"
+		size="65%"
+		@closed="$emit('destroy')">
 		<small-title slot="title" :no-padding="true">
 			{{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
 		</small-title>
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
 				<el-form
 					ref="form"
 					:model="dataForm"
@@ -55,11 +59,14 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+
+					<el-divider style="margin-top: -10px" />
+					
 					<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-				{{ '可编辑信息' }}
+						{{ '设备维修信息' }}
 					</small-title>
 					<el-row :gutter="20">
-				<el-col :span="8">
+						<el-col :span="6">
 							<el-form-item
 								label="维修开始时间"
 								prop="maintenanceStartTime"
@@ -72,8 +79,7 @@
 									value-format="timestamp" />
 							</el-form-item>
 						</el-col>
-
-				<el-col :span="8">
+						<el-col :span="6">
 							<el-form-item
 								label="维修结束时间"
 								prop="maintenanceFinishTime"
@@ -86,8 +92,7 @@
 									value-format="timestamp" />
 							</el-form-item>
 						</el-col>
-
-				<el-col :span="8">
+						<el-col :span="6">
 							<el-form-item
 								label="维修方式"
 								prop="repairMode"
@@ -104,9 +109,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">
+						<el-col :span="6">
 							<el-form-item label="故障类型" prop="faultType">
 								<el-select
 									:disabled="disabled"
@@ -129,7 +132,7 @@
 								prop="faultDetail"
 								:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
 								<!-- // 富文本 -->
-						<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="380"/>
+								<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150"/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -138,7 +141,7 @@
 						<el-col>
 							<el-form-item label="维修记录" prop="maintenanceDetail">
 								<!-- // 富文本 -->
-						<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="380"/>
+								<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="150"/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -146,7 +149,7 @@
 					<el-row :gutter="20">
 						<el-col>
 							<el-form-item label="维修附件" prop="file">
-						<FileUpload v-model="file" :disabled="disabled" />
+								<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -163,12 +166,11 @@
 					</el-row>
 				</el-form>
 
-		<div class="drawer-body__footer">
-			<el-button style="" @click="goback()">{{ disabled ? '返回' : '取消' }}</el-button>
-			<!-- <el-button v-if="disabled" type="primary" @click="goEdit()">
-				编辑
-			</el-button> -->
-			<el-button v-if="!disabled" type="primary" @click="dataFormSubmit()">确定</el-button>
+				<div v-if="!disabled" class="drawer-body__footer">
+					<el-button style="" @click="goback()">取消</el-button>
+					<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+				</div>
+			</div>
 		</div>
 	</el-drawer>
 </template>
@@ -206,11 +208,15 @@ export default {
 			visible: false,
 			disabled: false,
 			dataForm: {},
-			file: ''
+			file: '',
+			fileName: ''
 		};
 	},
 	mounted() {},
 	methods: {
+		setFileName(val) {
+			this.fileName = val
+		},
 		goback() {
 			this.$emit('refreshDataList');
 			this.visible = false;
@@ -225,12 +231,15 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
+		initData() {
+			this.file = ''
+			this.fileName = ''
+		},
 		init(row, isdetail) {
-			// this.initData();
+			this.initData();
 			this.disabled = isdetail || false;
 			this.dataForm.id = row.id || undefined;
 			this.visible = true;
-			console.log('111', this.dataForm, row)
 
 			this.$nextTick(() => {
 				this.$refs['form'].resetFields();
@@ -241,6 +250,10 @@ export default {
 						this.formLoading = false
             this.dataForm = response.data;
 						this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+						if (this.dataForm.files.length > 0) {
+							this.file = this.dataForm.files[0].fileUrl
+							this.fileName = this.dataForm.files[0].fileName
+						}
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
@@ -261,6 +274,7 @@ export default {
 					let arry = []
 					temp.forEach(item => {
 						arry.push({
+							fileName: this.fileName,
 							fileType: 2,
 							fileUrl: item
 						})
@@ -288,56 +302,39 @@ export default {
 </script>
 
 <style scoped>
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
 .drawer >>> .el-drawer {
 	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
 }
 
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
 }
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
 	display: flex;
 	flex-direction: column;
+	height: 100%;
 }
 
-.drawer >>> .content {
-	padding: 30px 24px;
+.drawer-body__content {
 	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;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
 }
 
 .drawer-body__footer {

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

@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="180"
+				:width="120"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -48,7 +48,8 @@
 		<CustomDialogForm
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList" />
+			@refreshDataList="getList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -69,12 +70,6 @@ export default {
 			addOrUpdateVisible: false,
 			searchBarKeys: ['maintenanceStatus', 'createTime', 'equipmentId'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:repair:update')
-					? {
-							type: 'detail',
-							btnName: '详情',
-					  }
-					: undefined,
 				this.$auth.hasPermi('equipment:repair:finish')
 					? {
 							type: 'finish',
@@ -83,10 +78,16 @@ export default {
 					: undefined,
 				this.$auth.hasPermi('equipment:repair:update')
 					? {
-							type: 'edit',
-							btnName: '修改',
+							type: 'detail',
+							btnName: '详情',
 					  }
 					: undefined,
+				// this.$auth.hasPermi('equipment:repair:update')
+				// 	? {
+				// 			type: 'edit',
+				// 			btnName: '修改',
+				// 	  }
+				// 	: undefined,
 				this.$auth.hasPermi('equipment:repair:delete')
 					? {
 							type: 'delete',
@@ -99,29 +100,31 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 150,
 					filter: parseTime,
 				},
-				{ prop: 'repairOrderNumber', label: '设备维修单号' },
-				{ prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime },
+				{ prop: 'repairOrderNumber', label: '设备维修单号', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
 				{
 					prop: 'maintenanceFinishTime',
 					label: '结束时间',
 					filter: parseTime,
+					minWidth: 150,
+					showOverflowtooltip: true
 				},
 				{
 					prop: 'maintenanceStatus',
 					label: '维修状态',
 					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
 				},
-				{ prop: 'maintenanceDuration', label: '维修时长(h)' },
+				{ prop: 'maintenanceDuration', label: '维修时长(h)', width: 110 },
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'maintenanceDetail', label: '维修明细' },
-				{ prop: 'repairman', label: '维修工' },
-				{ prop: 'repairmanPhone', label: '联系方式' },
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
@@ -176,6 +179,7 @@ export default {
 					type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
+					plain: true,
 					color: 'warning',
 				},
 			],

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

@@ -75,9 +75,6 @@
 
 		<div class="drawer-body__footer">
 			<el-button type="primary" @click="goback()">关闭</el-button>
-			<el-button v-if="disabled" type="primary" @click="goEdit()">
-				编辑
-			</el-button>
 		</div>
 
 		<attr-add

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

@@ -35,7 +35,7 @@
 		</el-form>
 
 		<el-row style="text-align: right">
-			<el-button @click="visible = false">取消</el-button>
+			<el-button @click="cancel">取消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</el-row>
 	</el-dialog>
@@ -79,21 +79,13 @@ export default {
 				this.partList = res.data.list;
 			})
 		},
+		cancel() {
+			this.$refs['dataForm'].resetFields()
+			this.visible = false
+		},
 		init(id) {
-			this.dataForm.id = id || '';
+			// this.dataForm.id = id || '';
 			this.visible = true;
-			// this.$nextTick(() => {
-			// 	this.$refs['dataForm'].resetFields();
-			// 	if (this.dataForm.id) {
-			// 		getCoreProductAttr({
-			// 			id: this.dataForm.id
-			// 		}).then((res) => {
-			// 			const { name, value } = res.data;
-			// 			this.dataForm.name = name;
-			// 			this.dataForm.value = value;
-			// 		});
-			// 	}
-			// });
 		},
 		// 表单提交
 		dataFormSubmit() {
@@ -117,6 +109,7 @@ export default {
 						configId: this.configId,
 					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
+						this.$refs['dataForm'].resetFields()
 						this.visible = false;
 						this.$emit('refreshDataList');
 					});

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

@@ -301,6 +301,12 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
+				if (this.form.unit !== undefined) {
+					this.form.unit = String(this.form.unit)
+				}
+				if (this.form.type !== undefined) {
+					this.form.type = String(this.form.type)
+				}
 				this.open = true;
 				this.title = '修改备品备件';
 			});

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

@@ -310,7 +310,8 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'change') {
 				// 更换
-				this.addNew();
+				console.log(raw)
+				this.addNew(raw.data.sparePartId);
 			} else {}
 		},
 		getList() {
@@ -320,7 +321,7 @@ export default {
 				configId: this.dataForm.id,
 			}).then((response) => {
 				this.list = response.data;
-				this.listQuery.total = response.data.total;
+				this.listQuery.total = response.data.length;
 			});
 		},
 		getList1() {
@@ -334,10 +335,10 @@ export default {
 			});
 		},
 		// 新增 / 修改
-		addNew(id) {
+		addNew(sparePartId) {
 			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
+				this.$refs.addOrUpdate.init(sparePartId);
 			});
 		},
 		/** 导出按钮操作 */