merge

Reviewed-on: #101

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-16 14:07:34
+ # @LastEditTime: 2023-11-21 10:36:47
  # @LastEditors: DY
  # @Description:
 ###
@@ -12,14 +12,14 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
+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.8:48080'
+# 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:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 
 # 积木报表指向地址

src/api/base/qualityInspectionDet.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-10-17 09:26:38
+ * @LastEditTime: 2023-11-20 15:50:08
+ * @LastEditors: zhp
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 创建质量检测信息基础
@@ -52,3 +59,11 @@ export function exportQualityInspectionDetExcel(query) {
     responseType: 'blob'
   })
 }
+
+export function getQualityInspectionDetList(query) {
+  return request({
+    url: '/base/quality-inspection-det/listAll',
+    method: 'get',
+    params: query
+  })
+}

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-13 08:52:12
+ * @LastEditTime: 2023-11-20 16:38:18
  * @LastEditors: DY
  * @Description: 
  */
@@ -65,4 +65,12 @@ export function getcheckList(query) {
     method: 'get',
     params: query
   })
+}
+
+// 删除巡检内容
+export function deleteCheck(id) {
+  return request({
+    url: '/base/equipment-check/delete?id=' + id,
+    method: 'delete'
+  })
 }

src/api/equipment/base/maintain/record.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-16 20:22:12
+ * @LastEditTime: 2023-11-21 10:50:55
  * @LastEditors: DY
  * @Description: 
  */
@@ -14,3 +14,21 @@ export function deleteEqMaintainLog(id) {
     method: 'delete'
   })
 }
+
+// 删除设备保养计划配置
+export function deleteEqMaintainPlan(id) {
+  return request({
+    url: '/base/equipment-maintain-plan/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 导出设备保养监控
+export function exportMaintainMonitorExcel(query) {
+  return request({
+    url: '/base/equipment-maintain-plan/monitor-export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/equipment/base/spare-parts/list.js

@@ -0,0 +1,16 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-11-22 13:59:17
+ * @LastEditTime: 2023-11-22 13:59:45
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 删除设备备品备件
+export function deleteSparePart(id) {
+  return request({
+    url: '/base/equipment-spare-part/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/assets/icons/svg/home.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/banner/home" fill="#000" fill-rule="nonzero">
+            <g id="编组">
+                <rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" stroke="#000" stroke-width="0.1"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/components/DialogForm/index.vue

@@ -65,6 +65,7 @@
 						v-if="col.subcomponent"
 						:key="col.key"
 						:disabled="disabled"
+						:read-only="disabled"
 						:is="col.subcomponent"
 						v-model="form[col.prop]"
 						:inlineStyle="col.style"

src/components/Editor/index.vue

@@ -1,279 +1,293 @@
 <template>
-  <div>
-    <el-upload
-      :action="uploadFileUrl"
-      :before-upload="handleBeforeUpload"
-      :on-success="handleUploadSuccess"
-      :on-error="handleUploadError"
-      name="file"
-      :show-file-list="false"
-      :headers="headers"
-      style="display: none"
-      ref="upload"
-      v-if="this.type === 'url'"
-    >
-    </el-upload>
-    <div class="editor" ref="editor" :style="styles"></div>
-  </div>
+	<div :class="[readOnly ? 'editor-wrapper' : '']">
+		<el-upload
+			:action="uploadFileUrl"
+			:before-upload="handleBeforeUpload"
+			:on-success="handleUploadSuccess"
+			:on-error="handleUploadError"
+			name="file"
+			:show-file-list="false"
+			:headers="headers"
+			style="display: none"
+			ref="upload"
+			v-if="this.type === 'url'"></el-upload>
+		<div class="editor" ref="editor" :style="styles"></div>
+	</div>
 </template>
 
 <script>
-import Quill from "quill";
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-import { getAccessToken } from "@/utils/auth";
+import Quill from 'quill';
+import 'quill/dist/quill.core.css';
+import 'quill/dist/quill.snow.css';
+import 'quill/dist/quill.bubble.css';
+import { getAccessToken } from '@/utils/auth';
 
 export default {
-  name: "Editor",
-  props: {
-    /* 编辑器的内容 */
-    value: {
-      type: String,
-      default: "",
-    },
-    /* 高度 */
-    height: {
-      type: Number,
-      default: null,
-    },
-    /* 最小高度 */
-    minHeight: {
-      type: Number,
-      default: null,
-    },
-    /* 只读 */
-    readOnly: {
-      type: Boolean,
-      default: false,
-    },
-    // 上传文件大小限制(MB)
-    fileSize: {
-      type: Number,
-      default: 5,
-    },
-    /* 类型（base64格式、url格式） */
-    type: {
-      type: String,
-      default: "url",
-    }
-  },
-  data() {
-    return {
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
-      headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
-      Quill: null,
-      currentValue: "",
-      options: {
-        theme: "snow",
-        bounds: document.body,
-        debug: "warn",
-        modules: {
-          // 工具栏配置
-          toolbar: [
-            ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-            ["blockquote", "code-block"],                    // 引用  代码块
-            [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-            [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-            [{ size: ["small", false, "large", "huge"] }],   // 字体大小
-            [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-            [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
-          ],
-        },
-        placeholder: "请输入内容",
-        readOnly: true,
-      },
-    };
-  },
-  computed: {
-    styles() {
-      let style = {};
-      if (this.minHeight) {
-        style.minHeight = `${this.minHeight}px`;
-      }
-      if (this.height) {
-        style.height = `${this.height}px`;
-      }
-      return style;
-    },
-  },
-  watch: {
-    value: {
-      handler(val) {
-        if (val !== this.currentValue) {
-          this.currentValue = val === null ? "" : val;
-          if (this.Quill) {
-            this.Quill.pasteHTML(this.currentValue);
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  mounted() {
-    this.init();
-  },
-  beforeDestroy() {
-    this.Quill = null;
-  },
-  methods: {
-    init() {
-      const editor = this.$refs.editor;
-      this.Quill = new Quill(editor, this.options);
-      // 取消自动聚焦 start
-      this.$nextTick(()=>{
-        this.Quill.blur();
-        if(!this.readOnly){
-          this.Quill.enable();
-        }
-      });
-      // 如果设置了上传地址则自定义图片上传事件
-      if (this.type === 'url') {
-        let toolbar = this.Quill.getModule("toolbar");
-        toolbar.addHandler("image", (value) => {
-          this.uploadType = "image";
-          if (value) {
-            this.$refs.upload.$children[0].$refs.input.click();
-          } else {
-            this.quill.format("image", false);
-          }
-        });
-      }
-      this.Quill.pasteHTML(this.currentValue);
-      this.Quill.on("text-change", (delta, oldDelta, source) => {
-        const html = this.$refs.editor.children[0].innerHTML;
-        const text = this.Quill.getText();
-        const quill = this.Quill;
-        this.currentValue = html;
-        this.$emit("input", html);
-        this.$emit("on-change", { html, text, quill });
-      });
-      this.Quill.on("text-change", (delta, oldDelta, source) => {
-        this.$emit("on-text-change", delta, oldDelta, source);
-      });
-      this.Quill.on("selection-change", (range, oldRange, source) => {
-        this.$emit("on-selection-change", range, oldRange, source);
-      });
-      this.Quill.on("editor-change", (eventName, ...args) => {
-        this.$emit("on-editor-change", eventName, ...args);
-      });
-    },
-    // 上传前校检格式和大小
-    handleBeforeUpload(file) {
-      // 校检文件大小
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      return true;
-    },
-    handleUploadSuccess(res, file) {
-      // 获取富文本组件实例
-      let quill = this.Quill;
-      // 如果上传成功
-      // edit by 芋道源码
-      if (res.code === 200 || res.code === 0) {
-        // 获取光标所在位置
-        let length = quill.getSelection().index;
-        // 插入图片  res.url为服务器返回的图片地址
-        // edit by 芋道源码
-        quill.insertEmbed(length, "image", res.data);
-        // 调整光标到最后
-        quill.setSelection(length + 1);
-      } else {
-        this.$message.error("图片插入失败");
-      }
-    },
-    handleUploadError() {
-      this.$message.error("图片插入失败");
-    },
-  },
+	name: 'Editor',
+	props: {
+		/* 编辑器的内容 */
+		value: {
+			type: String,
+			default: '',
+		},
+		/* 高度 */
+		height: {
+			type: Number,
+			default: null,
+		},
+		/* 最小高度 */
+		minHeight: {
+			type: Number,
+			default: null,
+		},
+		/* 只读 */
+		readOnly: {
+			type: Boolean,
+			default: false,
+		},
+		// 上传文件大小限制(MB)
+		fileSize: {
+			type: Number,
+			default: 5,
+		},
+		/* 类型（base64格式、url格式） */
+		type: {
+			type: String,
+			default: 'url',
+		},
+	},
+	data() {
+		return {
+			uploadFileUrl:
+				process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 请求地址
+			headers: { Authorization: 'Bearer ' + getAccessToken() }, // 设置上传的请求头部
+			Quill: null,
+			currentValue: '',
+			options: {
+				theme: 'snow',
+				bounds: document.body,
+				debug: 'warn',
+				modules: {
+					// 工具栏配置
+					toolbar: [
+						['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+						['blockquote', 'code-block'], // 引用  代码块
+						[{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+						[{ indent: '-1' }, { indent: '+1' }], // 缩进
+						[{ size: ['small', false, 'large', 'huge'] }], // 字体大小
+						[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+						[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+						[{ align: [] }], // 对齐方式
+						['clean'], // 清除文本格式
+						['link', 'image', 'video'], // 链接、图片、视频
+					],
+				},
+				placeholder: '请输入内容',
+				readOnly: true,
+			},
+		};
+	},
+	computed: {
+		styles() {
+			let style = {};
+			if (this.minHeight) {
+				style.minHeight = `${this.minHeight}px`;
+			}
+			if (this.height) {
+				style.height = `${this.height}px`;
+			}
+			return style;
+		},
+	},
+	watch: {
+		value: {
+			handler(val) {
+				if (val !== this.currentValue) {
+					this.currentValue = val === null ? '' : val;
+					if (this.Quill) {
+						this.Quill.pasteHTML(this.currentValue);
+					}
+				}
+			},
+			immediate: true,
+		},
+	},
+	mounted() {
+		this.init();
+	},
+	beforeDestroy() {
+		this.Quill = null;
+	},
+	methods: {
+		init() {
+			const editor = this.$refs.editor;
+			this.Quill = new Quill(editor, this.options);
+			// 取消自动聚焦 start
+			this.$nextTick(() => {
+				this.Quill.blur();
+				if (!this.readOnly) {
+					this.Quill.enable();
+				}
+			});
+			// 如果设置了上传地址则自定义图片上传事件
+			if (this.type === 'url') {
+				let toolbar = this.Quill.getModule('toolbar');
+				toolbar.addHandler('image', (value) => {
+					this.uploadType = 'image';
+					if (value) {
+						this.$refs.upload.$children[0].$refs.input.click();
+					} else {
+						this.quill.format('image', false);
+					}
+				});
+			}
+			this.Quill.pasteHTML(this.currentValue);
+			this.Quill.on('text-change', (delta, oldDelta, source) => {
+				const html = this.$refs.editor.children[0].innerHTML;
+				const text = this.Quill.getText();
+				const quill = this.Quill;
+				this.currentValue = html;
+				this.$emit('input', html);
+				this.$emit('on-change', { html, text, quill });
+			});
+			this.Quill.on('text-change', (delta, oldDelta, source) => {
+				this.$emit('on-text-change', delta, oldDelta, source);
+			});
+			this.Quill.on('selection-change', (range, oldRange, source) => {
+				this.$emit('on-selection-change', range, oldRange, source);
+			});
+			this.Quill.on('editor-change', (eventName, ...args) => {
+				this.$emit('on-editor-change', eventName, ...args);
+			});
+		},
+		// 上传前校检格式和大小
+		handleBeforeUpload(file) {
+			// 校检文件大小
+			if (this.fileSize) {
+				const isLt = file.size / 1024 / 1024 < this.fileSize;
+				if (!isLt) {
+					this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+					return false;
+				}
+			}
+			return true;
+		},
+		handleUploadSuccess(res, file) {
+			// 获取富文本组件实例
+			let quill = this.Quill;
+			// 如果上传成功
+			// edit by 芋道源码
+			if (res.code === 200 || res.code === 0) {
+				// 获取光标所在位置
+				let length = quill.getSelection().index;
+				// 插入图片  res.url为服务器返回的图片地址
+				// edit by 芋道源码
+				quill.insertEmbed(length, 'image', res.data);
+				// 调整光标到最后
+				quill.setSelection(length + 1);
+			} else {
+				this.$message.error('图片插入失败');
+			}
+		},
+		handleUploadError() {
+			this.$message.error('图片插入失败');
+		},
+	},
 };
 </script>
 
 <style>
-.editor, .ql-toolbar {
-  white-space: pre-wrap !important;
-  line-height: normal !important;
+.editor-wrapper {
+	position: relative;
+  cursor: not-allowed;
+
+	&::after {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: #f5f7fa77;
+	}
+}
+.editor,
+.ql-toolbar {
+	white-space: pre-wrap !important;
+	line-height: normal !important;
 }
 .quill-img {
-  display: none;
+	display: none;
 }
-.ql-snow .ql-tooltip[data-mode="link"]::before {
-  content: "请输入链接地址:";
+.ql-snow .ql-tooltip[data-mode='link']::before {
+	content: '请输入链接地址:';
 }
 .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-  border-right: 0px;
-  content: "保存";
-  padding-right: 0px;
+	border-right: 0px;
+	content: '保存';
+	padding-right: 0px;
 }
 
-.ql-snow .ql-tooltip[data-mode="video"]::before {
-  content: "请输入视频地址:";
+.ql-snow .ql-tooltip[data-mode='video']::before {
+	content: '请输入视频地址:';
 }
 
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
-  content: "14px";
+	content: '14px';
 }
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
-  content: "10px";
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
+	content: '10px';
 }
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
-  content: "18px";
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
+	content: '18px';
 }
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
-  content: "32px";
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
+	content: '32px';
 }
 
 .ql-snow .ql-picker.ql-header .ql-picker-label::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
-  content: "文本";
+	content: '文本';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: "标题1";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
+	content: '标题1';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: "标题2";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
+	content: '标题2';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: "标题3";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
+	content: '标题3';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: "标题4";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
+	content: '标题4';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: "标题5";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
+	content: '标题5';
 }
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: "标题6";
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
+	content: '标题6';
 }
 
 .ql-snow .ql-picker.ql-font .ql-picker-label::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
-  content: "标准字体";
+	content: '标准字体';
 }
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
-  content: "衬线字体";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
+	content: '衬线字体';
 }
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
-  content: "等宽字体";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
+	content: '等宽字体';
 }
 </style>

src/layout/components/NavbarRight.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="right-msg" :style="blackTitle ? 'color: #000' : 'color: #fff'">
+      <div class="home-icon" v-if='blackTitle'>
+        <svg-icon icon-class="home" style="font-size: 24px; cursor: pointer;" @click="toHome"/>
+      </div>
       <div class="time-msg">
         <div class="line1">{{timeZone}}&nbsp;&nbsp;&nbsp;&nbsp;{{topTime}}</div>
         <div class="line2">{{topDate}}</div>
@@ -45,7 +48,7 @@ export default {
       }
     }
   },
-  mounted() {
+  created() {
     this.getUserMsg()
     this.getTime()
   },
@@ -73,7 +76,10 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = getPath('/');
         })
-      }).catch(() => {});
+      }).catch(() => {})
+    },
+    toHome() {
+      this.$router.push({ path: "/" })
     }
   }
 }
@@ -83,13 +89,16 @@ export default {
   float: right;
   height: 100%;
   font-size: 14px;
-  // color: #fff;
-  // padding-top: 15px;
-  // padding-right: 38px;
   .time-msg {
     display: inline-block;
     margin-right: 30px;
   }
+  .home-icon {
+    display: inline-block;
+    margin-right: 30px;
+    vertical-align: top;
+    padding-top: 7px;
+  }
   .base-msg {
     display: inline-block;
     .avatar {

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-15 16:04:06
+ * @LastEditTime: 2023-11-22 13:58:30
  * @Description:
 -->
 <template>
@@ -14,6 +14,8 @@
     }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
       许昌安彩AGV原片周转看板
+      <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
+      <h3 class="time">{{ times }}</h3>
       <!-- <el-button
         type="text"
         class="title-button"
@@ -87,11 +89,11 @@
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
-            <el-row :gutter="9 * beilv">
-              <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
+            <!-- <el-row :gutter="9 * beilv"> -->
+              <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> -->
                 <base-table :page="1" :limit="9" :show-index="false" :beilv="1" :table-config="inventoryTableProps"
                   :table-data="inventoryList" />
-              </el-col>
+              <!-- </el-col> -->
               <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
                 <base-table3
                   :page="2"
@@ -101,7 +103,7 @@
                   :table-data="qualityList2"
                 />
               </el-col> -->
-            </el-row>
+            <!-- </el-row> -->
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
@@ -666,7 +668,8 @@ export default {
     return {
       beilv: 1,
       beilv2: 1,
-      clientWidth:0,
+      clientWidth: 0,
+      times:undefined,
       value: 100,
       qualityYearTableProps,
       cxNameList,
@@ -748,6 +751,7 @@ export default {
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
+    this.getTimes()
     this.windowWidth(document.documentElement.clientWidth)
   },
   mounted() {
@@ -776,6 +780,30 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getTimes() {
+      setInterval(this.getTimesInterval, 1000);
+    },
+    getTimesInterval: function () {
+      let _this = this;
+      let year = new Date().getFullYear(); //获取当前时间的年份
+      let month = new Date().getMonth() + 1; //获取当前时间的月份
+      let day = new Date().getDate(); //获取当前时间的天数
+      let hours = new Date().getHours(); //获取当前时间的小时
+      let minutes = new Date().getMinutes(); //获取当前时间的分数
+      let seconds = new Date().getSeconds(); //获取当前时间的秒数
+      //当小于 10 的是时候，在前面加 0
+      if (hours < 10) {
+        hours = "0" + hours;
+      }
+      if (minutes < 10) {
+        minutes = "0" + minutes;
+      }
+      if (seconds < 10) {
+        seconds = "0" + seconds;
+      }
+      //拼接格式化当前时间
+      this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+    },
     windowWidth(value) {
       this.clientWidth = value
     },
@@ -846,7 +874,19 @@ export default {
     background-size: 100% 100%;
     color: #00fff0;
     text-align: center;
-
+    position: relative;
+    .unit{
+      position: absolute;
+      left: 260px;
+      top:25px;
+      font-size: 20px;
+    }
+    .time{
+      position: absolute;
+      left: 1360px;
+      top:25px;
+      font-size: 20px;
+    }
     .title-button {
       color: #00fff0;
       font-size: 20px;

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-03 10:53:43
+ * @LastEditTime: 2023-11-22 10:27:50
  * @Description:
 -->
 <template>
@@ -77,8 +77,8 @@ export default {
         remark: undefined
 			},
 			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" }],
 				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
@@ -87,10 +87,12 @@ export default {
               if (value) {
 								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
 									callback(new Error("手机号格式错误"));
+								} else {
+									callback();
 								}
 							} else {
-                callback();
-              }
+								callback();
+							}
             }, trigger: "blur"
           }
         ]

src/views/base/coreCustomer/index.vue

@@ -105,8 +105,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '名称',
-					placeholder: '专业',
+					label: '客户名称',
+					placeholder: '客户名称',
 					param: 'name',
 				},
 				{

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-02 14:16:30
+ * @LastEditTime: 2023-11-22 10:32:10
  * @Description:
 -->
 <template>
@@ -89,7 +89,6 @@ export default {
 			const menu = { id: 0, name: '总部门', children: [] };
 			menu.children = this.handleTree(this.departmentlList, "id")
 			this.menuOptions.push(menu)
-			console.log('你好', this.menuOptions)
 		},
 		/** 转换菜单数据结构 */
     normalizer(node) {

src/views/base/coreDepartment/index.vue

@@ -134,6 +134,11 @@ export default {
     //     this.dataListLoading = false;
     //   });
     // },
+		successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+			this.$refs.addOrUpdate.getDict()
+    },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':

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

@@ -162,7 +162,7 @@ export default {
 						input: true,
 						label: '属性名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '属性名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[

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

@@ -10,7 +10,7 @@
 		v-loading="formLoading">
 		<el-row :gutter="20">
 			<el-col :span="8">
-				<el-form-item label="设备名称" prop="name" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+				<el-form-item label="设备名称" prop="name" :rules="[{ required: true, message: '设备名称不能为空', trigger: 'blur' }]">
 					<el-input v-model="form.name" :disabled="disabled" placeholder="请输入设备名称"></el-input>
 				</el-form-item>
 			</el-col>
@@ -33,7 +33,7 @@
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="设备类型" prop="equipmentTypeId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '设备类型不能为空', trigger: 'blur' }]">
 					<el-select v-model="form.equipmentTypeId" :disabled="disabled" filterable placeholder="请选择设备类型">
 						<el-option v-for="eqType in eqTypeList" :key="eqType.id" :label="eqType.name"
 							:value="eqType.id"></el-option>
@@ -43,7 +43,7 @@
 
 			<el-col :span="8">
 				<el-form-item label="预计生产时间(min/天)" prop="workTime" :rules="[
-					{ required: true, message: '不能为空', trigger: 'blur' },
+					{ required: true, message: '预计生产时间不能为空', trigger: 'blur' },
 					{
 						type: 'number',
 						message: '请输入正确的数字值',
@@ -71,7 +71,7 @@
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="设备TT值" prop="tvalue" :rules="[
-					{ required: true, message: '不能为空', trigger: 'blur' },
+					{ required: true, message: '设备TT值不能为空', trigger: 'blur' },
 					{
 						type: 'number',
 						message: '请输入正确的数字值',
@@ -86,7 +86,7 @@
 		<el-row :gutter="20">
 			<el-col :span="8">
 				<el-form-item label="产品加工时间(s)" prop="processingTime" :rules="[
-					{ required: true, message: '不能为空', trigger: 'blur' },
+					{ required: true, message: '产品加工时间不能为空', trigger: 'blur' },
 					{
 						type: 'number',
 						message: '请输入正确的数字值',

src/views/base/coreEquipment/index.vue

@@ -123,7 +123,7 @@ export default {
 				},
 				{ prop: 'name', label: '设备名称' },
 				{ width: 256, prop: 'code', label: '设备编码' },
-				{ prop: 'equipmentType', label: '设备类型' },
+				{ prop: 'equipmentTypeName', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
 				// {
@@ -196,7 +196,7 @@ 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...
 						// }
@@ -211,10 +211,6 @@ export default {
 						input: true,
 						label: '英文名称',
 						prop: 'enName',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
 					},
 				],
 				[
@@ -222,10 +218,6 @@ export default {
 						input: true,
 						label: '缩写',
 						prop: 'abbr',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
 					},
 
 					{
@@ -233,7 +225,7 @@ 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,
 						},
@@ -243,7 +235,7 @@ export default {
 						label: '预计生产时间(min/天)',
 						prop: 'workTime',
 						rules: [
-							{ required: true, message: '不能为空', trigger: 'blur' },
+							{ required: true, message: '预计生产时间不能为空', trigger: 'blur' },
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -264,18 +256,26 @@ export default {
 						datetime: true,
 						label: '生产日期',
 						prop: 'productionTime',
+						bind: {
+							format: 'yyyy-MM-dd',
+							clearable: true,
+						},
 					},
 					{
 						datetime: true,
 						label: '进厂日期',
 						prop: 'enterTime',
+						bind: {
+							format: 'yyyy-MM-dd',
+							clearable: true,
+						},
 					},
 					{
 						input: true,
 						prop: 'tvalue',
 						label: '设备TT值',
 						rules: [
-							{ required: true, message: '不能为空', trigger: 'blur' },
+							{ required: true, message: '设备TT值不能为空', trigger: 'blur' },
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -291,7 +291,7 @@ export default {
 						label: '产品加工时间(s)',
 						prop: 'processingTime',
 						rules: [
-							{ required: true, message: '不能为空', trigger: 'blur' },
+							{ required: true, message: '产品加工时间不能为空', trigger: 'blur' },
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -304,7 +304,6 @@ export default {
 					{
 						input: true,
 						label: '制造商',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						prop: 'manufacturer',
 					},
 					{
@@ -317,7 +316,6 @@ export default {
 					{
 						textarea: true,
 						label: '功能描述',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						prop: 'description',
 					},
 				],

src/views/base/coreEquipmentLineBind/index.vue

@@ -149,7 +149,7 @@ export default {
 						select: true,
 						label: '产线',
 						prop: 'productionLineId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '产线名不能为空', trigger: 'blur' }],
 						url: '/base/core-production-line/listAll',
 						bind: { clearable: true, filterable: true },
 						// watch: 'workshopSectionId'
@@ -159,7 +159,7 @@ export default {
 						label: '工段',
 						prop: 'workshopSectionId',
 						depends: 'productionLineId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 						bind: { clearable: true, filterable: true },
 						url: '/base/core-workshop-section/listByParentId',
 					},
@@ -169,7 +169,7 @@ export default {
 						select: true,
 						label: '设备',
 						prop: 'equipmentId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
 						bind: { clearable: true, filterable: true },
 						url: '/base/core-equipment/listAll',
 					},

src/views/base/coreEquipmentType/index.vue

@@ -91,15 +91,15 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '设备类型名称' },
-				{ prop: 'code', label: '检测类型编码' },
+				{ prop: 'name', label: '类型名称' },
+				{ prop: 'code', label: '类型编号' },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
 					label: '设备类型',
-					placeholder: '请输入设备类型名称',
+					placeholder: '设备类型',
 					param: 'name',
 				},
 				{
@@ -133,18 +133,19 @@ export default {
 				[
 					{
 						input: true,
-						label: '设备类型名称',
+						label: '类型名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }
 					},
 					{
 						input: true,
-						label: '设备类型编码',
+						label: '类型编号',
 						prop: 'code',
 						url: '/base/core-equipment-type/getCode',
+						rules: [{ required: true, message: '类型编号不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -174,7 +175,13 @@ export default {
 				name: '',
 			},
 			// 表单参数
-			form: {},
+			form: {
+				code: undefined,
+				name: undefined,
+				id: undefined,
+				parentId: undefined,
+				remark: undefined
+			},
 		};
 	},
 	watch: {
@@ -268,7 +275,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除设备类型"' + row.name + '"?')
+				.confirm('是否确认删除设备类型"' + row.name + '"的数据项?')
 				.then(function () {
 					return deleteEquipmentType(id);
 				})

src/views/base/coreMajor/index.vue

@@ -97,8 +97,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '名称',
-					placeholder: '专业',
+					label: '专业名称',
+					placeholder: '专业名称',
 					param: 'name',
 				},
 				{

src/views/base/coreProduct/index.vue

@@ -107,8 +107,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '工单名称',
-					placeholder: '工单名称',
+					label: '产品名称',
+					placeholder: '产品名称',
 					param: 'name'
 				},
 				{

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-03 19:28:06
+ * @LastEditTime: 2023-11-21 18:59:54
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
+		label-width="100px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="产线名称" prop="name">
@@ -30,7 +30,8 @@
 					<el-select
 						v-model="dataForm.factoryId"
 						filterable
-						placeholder="请选择工厂">
+						placeholder="请选择工厂"
+						style="width: 100%">
 						<el-option
 							v-for="dict in factoryList"
 							:key="dict.id"
@@ -94,8 +95,8 @@ export default {
 			},
 			factoryList: [],
 			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" }],
 				factoryId: [{ required: true, message: "工厂不能为空", trigger: "blur" }]
       }
 		};

src/views/base/coreProductionLine/index.vue

@@ -71,6 +71,10 @@ const tableProps = [
 		label: '当前状态',
 		filter: codeFilter('lineStatus')
 	},
+	{
+		prop: 'tvalue',
+		label: '产线TT值(h)'
+	},
 	{
 		prop: 'description',
 		label: '描述'

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-03 11:00:47
+ * @LastEditTime: 2023-11-22 10:27:43
  * @Description:
 -->
 <template>
@@ -77,8 +77,8 @@ export default {
         remark: undefined
 			},
 			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" }],
 				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
@@ -87,10 +87,12 @@ export default {
 							if (value) {
 								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
 									callback(new Error("手机号格式错误"));
+								} else {
+									callback();
 								}
 							} else {
-                callback();
-              }
+								callback();
+							}
             }, trigger: "blur"
           }
         ]
@@ -98,6 +100,31 @@ export default {
 		};
 	},
 	mounted() {},
-	methods: {}
+	methods: {
+		// 表单提交
+    dataFormSubmit() {
+			console.log('你好', this.dataForm)
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false; 
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+	}
 };
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-06 14:38:20
+ * @LastEditTime: 2023-11-20 16:51:24
  * @Description:
 -->
 <template>
@@ -95,7 +95,8 @@ const tableProps = [
 	},
 	{
 		prop: 'material',
-		label: '原料名称'
+		label: '原料名称',
+		filter: publicFormatter('material')
 	},
 	{
 		prop: 'origin',
@@ -103,7 +104,7 @@ const tableProps = [
 		filter: (val) => ['', '内部', '采购'][val]
 	},
 	{
-		prop: 'supplierId',
+		prop: 'supplierName',
 		label: '供应商',
 	},
 	{
@@ -195,7 +196,7 @@ export default {
 				...this.listQuery,
 				workOrderId: this.dataForm.id,
 			}).then((response) => {
-				this.materialList = response.data.list;
+				this.materialList = response.data.records;
 				this.listQuery.total = response.data.total;
 			});
 		},

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -26,8 +26,8 @@
         </el-form-item>
       </el-col>
       <el-col :span='12'>
-        <el-form-item label="产品规格" prop="productSpec">
-          <el-input v-model="dataForm.productSpec" disabled></el-input>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="dataForm.specifications" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -35,9 +35,9 @@
       <el-col :span='12'>
         <el-form-item label="计划开始时间">
           <el-date-picker
-            v-model="planStartTime"
+            v-model="dataForm.planStartTime"
             type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="timestamp"
             style="width: 100%;"
             placeholder="选择日期">
           </el-date-picker>
@@ -46,9 +46,9 @@
       <el-col :span='12'>
         <el-form-item label="计划完成时间">
           <el-date-picker
-            v-model="planFinishTime"
+            v-model="dataForm.planFinishTime"
             type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="timestamp"
             style="width: 100%;"
             placeholder="选择日期">
           </el-date-picker>
@@ -83,8 +83,8 @@
       <el-col :span='12'>
         <el-form-item label="物料计算方式" prop="materialMethod">
           <el-radio-group v-model="dataForm.materialMethod" @change="materialMethodChange">
-            <el-radio :label="1">产品基础</el-radio>
-            <el-radio :label="2">工艺扩展</el-radio>
+            <el-radio :label="1">产品基础BOM</el-radio>
+            <el-radio :label="2">工艺扩展BOM</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -168,7 +168,7 @@ export default {
         name: '',
         code: '',
         planProductId: '',
-        productSpec: '',
+        specifications: '',
         planStartTime: '',
         planFinishTime: '',
         planAssignQuantity: 0,
@@ -186,7 +186,7 @@ export default {
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
         planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
-        productLineIds: [{ required: true, message: "产品不能为空", trigger: "change" }]
+        productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }]
       },
       productList: [],
       processFlowList: [],
@@ -232,6 +232,10 @@ export default {
         if (this.dataForm.id) {
           getCoreWO(id).then(response => {
             this.dataForm = response.data;
+            if (this.dataForm.priority !== undefined) {
+              this.dataForm.priority = String(this.dataForm.priority)
+            }
+            this.dataForm.priority 
           });
         } else {
           if (this.urlOptions.isGetCode) {
@@ -264,7 +268,11 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            this.$emit("refreshDataList", true);
+            console.log('121', this.dataForm.name)
+            this.$emit("refreshDataList", {
+              id: response.data,
+              name: this.dataForm.name
+            });
           }).catch(() => {
             this.$emit("refreshDataList");        
           });

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

@@ -62,7 +62,7 @@
 				<el-input
 					v-model="dataForm.batch"
 					clearable
-					placeholder="请输入规格" />
+					placeholder="请输入批次号" />
 			</el-form-item>
 			<el-form-item label="数量" prop="num">
 				<el-input-number
@@ -143,13 +143,19 @@ export default {
 		},
 		init(id) {
 			this.dataForm.id = id || '';
-			console.log('1', this.dataForm.id)
 			this.visible = true;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
 					getCoreWOMa(this.dataForm.id).then((res) => {
 						this.dataForm = res.data
+						if (this.dataForm.unit !== undefined) {
+							this.dataForm.unit = String(this.dataForm.unit)
+						}
+						if (this.dataForm.material !== undefined) {
+							this.dataForm.material = String(this.dataForm.material)
+						}
+						console.log('111', this.dataForm)
 					});
 				}
 			});

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-16 13:45:13
+ * @LastEditTime: 2023-11-22 09:47:53
  * @Description:
 -->
 <template>
@@ -16,6 +16,7 @@
 		<!-- <small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title> -->
+		<el-button style="float: right" type="primary" @click="goback()">返回</el-button>
 		<div v-show="workOrderButton.length">
 			<el-button  v-for="(work, index) in workOrderButton" :key="index" type="primary" @click="init(work.id, true)">{{ work.name }}</el-button>
 		</div>
@@ -33,7 +34,7 @@
 					<el-col :span="8">工单名称:{{ dataForm.name }}</el-col>
 					<el-col :span="8">工单来源:{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}</el-col>
 					<el-col :span="8">所属订单:
-						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px">{{ item.name }}</span>
+						<span v-for="(item, index) in orderList" :key="index" style="margin-right: 10px">{{ item.orderName }}</span>
 					</el-col>
 				</el-row>
 				<el-row :gutter="20">
@@ -42,7 +43,7 @@
 					<el-col :span="8">计划生产数量:{{ dataForm.planQuantity }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="8">预计用时(小时):{{ dataForm.expectedTime }}</el-col>
+					<el-col :span="8">预计用时(小时):{{ dataForm.remainingTime }}</el-col>
 					<el-col :span="8">计划投入数量:{{ dataForm.planAssignQuantity }}</el-col>
 					<el-col :span="8">优先级:{{ fitlerP(dataForm.priority) }}</el-col>
 				</el-row>
@@ -63,9 +64,7 @@
 			</small-title>
 			<div class="formContent">
 				<el-row :gutter="20">
-					<el-col :span="8">订单创建时间:
-						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: pre-wrap">{{ parseTime(item.createTime) }}</span>
-					</el-col>
+					<el-col :span="8">工单创建时间:{{ parseTime(dataForm.createTime) }}</el-col>
 					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
 					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
 				</el-row>
@@ -143,7 +142,7 @@
 <script>
 // import basicAdd from '../../core/mixins/basic-add';
 import { getCoreWO, getMaterialBomPage, getConOrderList, getCoreWOListById } from "@/api/base/coreWorkOrder";
-import { orderList } from "@/api/base/orderManage";
+// import { orderList } from "@/api/base/orderManage";
 import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
@@ -186,7 +185,7 @@ const tableProps = [
 const tableProps1 = [
 	{
 		prop: 'materialName',
-		label: '原料名称'
+		label: '物料名称'
 	},
 	{
 		prop: 'unit',
@@ -223,7 +222,7 @@ export default {
 			dataForm: {},
 			orderList: [],
 			materialList: [],
-			orderArray: [],
+			// orderArray: [],
 			visible: false,
 			isdetail: false,
 			workOrderButton: [],
@@ -336,12 +335,11 @@ export default {
 				});
 			}
 			// 获取订单相关信息
-			orderList({
-				workOrderId: this.dataForm.id
-			}).then((response) => {
-				this.orderArray = response.data;
-				// this.listQuery.total = response.data.total;
-			});
+			// orderList({
+			// 	workOrderId: this.dataForm.id
+			// }).then((response) => {
+			// 	this.orderArray = response.data;
+			// });
 		},
 		init(id, isdetail) {
 			this.initData();
@@ -374,8 +372,7 @@ export default {
 			});
 		},
 		goback() {
-			this.visible = false;
-			this.$emit('refreshDataList');
+			this.$router.go(-1);
 			// this.initData();
 		},
 		goEdit() {

src/views/base/coreWorkOrder/index.vue

@@ -213,7 +213,7 @@ export default {
 								{
 									name: 'status',
 									type: 'equal',
-									value: 3
+									value: 2
 								},
 								{
 									name: 'status',
@@ -313,7 +313,15 @@ export default {
 		refreshWorkOrder(val) {
 			console.log(val)
 			if (val) {
-				console.log('打印')
+				// 预使用原料信息
+				console.log('预使用原料信息')
+				this.handleCancel()
+      	this.getDataList()
+				this.materialVisible = true;
+        this.addOrEditTitle = "预使用主原料信息";
+        this.$nextTick(() => {
+          this.$refs.material.init(val, true);
+        });
 			} else {
 				this.successSubmit()
 			}

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-03 11:01:24
+ * @LastEditTime: 2023-11-22 10:26:58
  * @Description:
 -->
 <template>
@@ -211,10 +211,12 @@ export default {
               if (value) {
 								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
 									callback(new Error("手机号格式错误"));
+								} else {
+									callback();
 								}
 							} else {
-                callback();
-              }
+								callback();
+							}
             }, trigger: "blur"
           }
         ],
@@ -243,13 +245,32 @@ export default {
 		setOut(val) {
 			if (val === 1) {
 				this.isOut = true
+				this.dataForm.outTime = ''
 			} else {
 				this.isOut = false
 			}
 		},
+		reset() {
+			this.dataForm = {
+				id: undefined,
+        code: undefined,
+        name: undefined,
+				fileUrl: undefined,
+				sex: 0,
+				telephone: undefined,
+				departmentId: undefined,
+				position: undefined,
+				entryTime: new Date().getTime(),
+				status: 1,
+				outTime: undefined,
+				education: undefined,
+				workCost: undefined,
+        remark: undefined
+			}
+			this.majorIdList = undefined
+		},
 		// 表单提交
     dataFormSubmit() {
-			console.log('111', this.dataForm)
       this.$refs["dataForm"].validate((valid) => {
         if (!valid) {
           return false;
@@ -292,7 +313,8 @@ export default {
       });
     },
 		init(id) {
-      this.dataForm.id = id || "";
+			this.reset()
+      this.dataForm.id = id || undefined;
       this.visible = true;
       if (this.urlOptions.getOption) {
         this.getArr()

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-03 19:31:25
+ * @LastEditTime: 2023-11-22 08:55:37
  * @Description:
 -->
 <template>
@@ -82,8 +82,8 @@ export default {
 			},
 			proLineList: [],
 			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" }],
 				productionLineId: [{ required: true, message: "产线不能为空", trigger: "blur" }],
         sort: [{ required: true, message: "排序不能为空", trigger: "blur" }]
       }

src/views/base/equipmentBindSection/dialogForm.vue

@@ -16,7 +16,7 @@
 				<el-form-item
 					label="产线"
 					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '产线不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.productionLineId"
 						placeholder="请选择产线"
@@ -35,7 +35,7 @@
 				<el-form-item
 					label="工段"
 					prop="workshopSectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '工段不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.workshopSectionId"
 						filterable
@@ -55,7 +55,7 @@
 				<el-form-item
 					label="设备"
 					prop="equipmentId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '设备不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.equipmentId"
 						filterable

src/views/base/equipmentBindSection/index.vue

@@ -176,7 +176,7 @@ export default {
 						url: '/base/production-line/listAll',
 						// prop: '__product_line', // __开头代表不传递给服务器
 						prop: 'productionLineId', // 编辑接口返回的产线id，所以不能使用上面那种形式
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
 					},
 					{
 						select: true,
@@ -185,7 +185,7 @@ export default {
 						// depends: '__product_line', // 依赖产线获取数据
 						depends: 'productionLineId',
 						prop: 'workshopSectionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -194,7 +194,7 @@ export default {
 						label: '设备',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=100',
 						prop: 'equipmentId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,

src/views/base/equipmentGroupAlarm/dialogForm.vue

@@ -16,36 +16,20 @@
 				<el-form-item
 					label="报警编码"
 					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
 					<el-input
 						:disabled="disabled"
 						v-model="dataForm.code"
 						@change="$emit('update', dataForm)"
 						placeholder="请输入工段排序" />
 				</el-form-item>
-				<!-- 				
-						<el-form-item
-						label="报警编码"
-						prop="code"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-						<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-						v-for="opt in productionLineList"
-						:key="opt.value"
-						:label="opt.label"
-						:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
 			</el-col>
 
 			<el-col :span="12">
 				<el-form-item
 					label="报警类型"
 					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.type"
 						:disabled="disabled"
@@ -68,7 +52,7 @@
 				<el-form-item
 					label="报警级别"
 					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
 						v-model="dataForm.grade"
@@ -101,7 +85,7 @@
 				<el-form-item
 					label="参数列名"
 					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
 					<el-input
 						:disabled="disabled"
 						v-model="dataForm.plcParamName"
@@ -113,7 +97,7 @@
 				<el-form-item
 					label="报警内容"
 					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
 					<el-input
 						:disabled="disabled"
 						v-model="dataForm.alarmContent"

src/views/base/equipmentGroupAlarm/index.vue

@@ -137,7 +137,7 @@ 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,
@@ -147,7 +147,7 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -168,13 +168,13 @@ 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' }],
 					},
 				],
 			],

src/views/base/equipmentPlc/index.vue

@@ -177,7 +177,7 @@ export default {
 						input: true,
 						label: '关联表名',
 						prop: 'plcTableName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }
@@ -187,7 +187,7 @@ export default {
 						label: '编码',
 						prop: 'code',
 						url: '/base/equipment-group/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -195,7 +195,7 @@ export default {
 						input: true,
 						label: '标识',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '标识不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }

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

@@ -166,13 +166,13 @@ 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' }],
 					},
 				],
 				[
@@ -181,7 +181,6 @@ export default {
 						label: '单位',
 						prop: 'unit',
 						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						switch: true,
@@ -222,7 +221,6 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -230,13 +228,11 @@ export default {
 						input: true,
 						label: '标准值',
 						prop: 'defaultValue',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '描述',
 						prop: 'description',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -244,7 +240,6 @@ export default {
 						input: true,
 						label: '备注',
 						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 			],

src/views/base/equipmentPlcConnect/index.vue

@@ -236,7 +236,7 @@ export default {
 						prop: 'plcId',
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -248,7 +248,7 @@ export default {
 						label: '设备',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -274,7 +274,7 @@ export default {
 						input: true,
 						label: '设备名',
 						prop: 'equipmentName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }

src/views/base/equipmentPlcParam/index.vue

@@ -120,13 +120,13 @@ 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' }],
 					},
 				],
 				[
@@ -135,7 +135,6 @@ export default {
 						label: '单位',
 						prop: 'unit',
 						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						switch: true,
@@ -176,7 +175,6 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -184,13 +182,11 @@ export default {
 						input: true,
 						label: '标准值',
 						prop: 'defaultValue',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '描述',
 						prop: 'description',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -198,7 +194,6 @@ export default {
 						input: true,
 						label: '备注',
 						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 			],

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-06 19:44:24
+ * @LastEditTime: 2023-11-22 11:22:38
  * @Description:
 -->
 <template>
@@ -127,12 +127,17 @@
 					物料属性
 				</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"
-					:add-button-show="isdetail ? null : '添加属性'"
-					@emitButtonClick="addNew()"
 					:table-data="materialAttrList">
 					<method-btn
 						v-if="!isdetail"
@@ -152,11 +157,11 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="goback()">取消</el-button>
-				<el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</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> -->
+				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
 		</div>
 
@@ -425,4 +430,12 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
+.action_btn {
+  float: right;
+  margin: -35px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-06 20:04:03
+ * @LastEditTime: 2023-11-22 11:09:44
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="产品BOM编码" prop="code">
-								<el-input v-model="dataForm.code" disabled placeholder="请输入产品Bom编码" />
+								<el-input v-model="dataForm.code" :disabled="isdetail" placeholder="请输入产品Bom编码" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -154,11 +154,11 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="goback()">取消</el-button>
-				<el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</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> -->
+				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
 		</div>
 
@@ -304,15 +304,16 @@ export default {
 				}
 				return row.materialId === item.id
 			})
-			this.unitList.filter(u => {
-				if (tempM[0].unit === u.value) {
-					row.unit = u.value
-					row.mUnit = u.label
-				}
-			})
+			if (tempM[0].unit) {
+				this.unitList.filter(u => {
+					if (tempM[0].unit === u.value) {
+						row.unit = u.value
+						row.mUnit = u.label
+					}
+				})
+			}
 			// row.materialCode = tempList[0].code
 			// row.unit = tempList[0].unit
-			console.log('row', row)
 		},
 		edit(row) {
 			row.isEdit = true

src/views/base/materialProductBom/index.vue

@@ -151,7 +151,7 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name ? val.name : undefined;
+					this.listQuery.productName = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
 				case 'reset':

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-06 19:27:57
+ * @LastEditTime: 2023-11-22 10:40:08
  * @Description:
 -->
 <template>
@@ -151,7 +151,7 @@ export default {
 				equipmentId: undefined,
         userName: undefined,
 				userNames: [],
-				useTime: undefined,
+				useTime: new Date().getTime(),
         address: undefined,
 				num: 0,
 				source: undefined,

src/views/base/materialUseLog/index.vue

@@ -130,7 +130,7 @@ export default {
           type: 'datePicker',
           label: '使用时间段',
           dateType: 'datetimerange',
-          format: 'yyyy-MM-dd',
+          format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           rangeSeparator: '-',
           startPlaceholder: '开始时间',

src/views/choicePart/index.vue

@@ -2,7 +2,7 @@
   <div class="choicepart-container">
     <navbar />
     <div class="choicepart-wrapper">
-      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'">
+      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'" v-show="showItem">
       <div class="choicepart-line1">
         <div
           v-for="(item, index) in menuArr1"
@@ -37,7 +37,7 @@
   </div>
 </template>
 <script>
-import Navbar from './components/Navbar.vue'
+import Navbar from './components/Navbar'
 import { debounce } from '@/utils/debounce'
 export default {
   components: { Navbar },
@@ -154,6 +154,7 @@ export default {
           }
         }
       ],
+      showItem: false
     }
   },
   // computed:{
@@ -217,6 +218,9 @@ export default {
       }
     },
     resetSize() {
+      let _this = this
+      _this.showItem = false
+      _this.loading = true
       let choicepartBox = document.querySelector('#choicepartBox')
       let rw = parseFloat(window.innerWidth)
       let rh = parseFloat(window.innerHeight)
@@ -224,8 +228,16 @@ export default {
       let bh = parseFloat(choicepartBox.style.height)
       let wx = 0.82/(bw / rw)
       let hx = 0.56/(bh / rh)
-      this.scale = wx > hx ? hx : wx
+      _this.scale = wx > hx ? hx : wx
+      setTimeout(_this.showItemFun, 700)
+    },
+    showItemFun() {
+      this.loading = false
+      this.showItem = true
     }
+  },
+  beforeDestroy() {
+    this.showItem = false
   }
 }
 </script>
@@ -244,7 +256,7 @@ export default {
     align-items: center;
   }
   .choicepart-box {
-    // border: 1px solid red;
+    // transition: all 0.3s linear;
     .choicepart-line1 {
       width: 100%;
       margin-bottom: 80px;

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

@@ -29,27 +29,60 @@
 				<section v-for="(section, index) in sections" :key="section.key">
 					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
 
-					<div class="form-part" v-if="section.key == 'base'">
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
 						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
+						<!-- <BaseInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
 							:dataForm="form"
-							:rows="formRows" />
+							:rows="formRows" /> -->
+
+						<el-row style="margin-bottom: 24px">
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备分组名称
+								</div>
+								<div class="value" style="font-size: 14px">{{ form.name }}</div>
+							</el-col>
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备分组编码
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.code }}
+								</div>
+							</el-col>
+						</el-row>
 					</div>
 
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+					<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">
+							<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"
@@ -71,17 +104,10 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
+				</el-button> -->
+				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
 			</div>
 		</div>
 
@@ -99,9 +125,9 @@
 			<DialogForm
 				v-if="attrFormVisible"
 				ref="attrForm"
-				:disabled="mode.includes('detail')"
 				v-model="attrForm"
 				:rows="attrRows" />
+			<!-- :disabled="mode.includes('detail')" -->
 		</base-dialog>
 	</el-drawer>
 </template>
@@ -165,8 +191,30 @@ 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,
+						label: '报警级别', // 字典
+						prop: 'grade',
+						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
+					},
+				],
+				[
+					{
+						input: true,
+						label: '参数列名', // 在实时数据库的列名
+						prop: 'plcParamName',
+						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '报警内容',
+						prop: 'alarmContent',
+						rules: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
+					},
+				],
+				[
 					{
 						select: true,
 						label: '报警类型', // 固定选项
@@ -175,15 +223,7 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '报警级别', // 字典
-						prop: 'grade',
-						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
+						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -191,20 +231,6 @@ export default {
 						prop: 'alarmCode',
 					},
 				],
-				[
-					{
-						input: true,
-						label: '参数列名', // 在实时数据库的列名
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '报警内容',
-						prop: 'alarmContent',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
 			],
 			attrQuery: {
 				params: {
@@ -226,7 +252,7 @@ export default {
 						bind: {
 							// 详情 模式下，禁用各种输入
 							// disabled: this.mode == 'detail',
-							disabled: true
+							disabled: true,
 						},
 					};
 				});

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

@@ -16,46 +16,26 @@
 				<el-form-item
 					label="报警编码"
 					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
 					<el-input
 						:disabled="disabled"
 						v-model="dataForm.code"
 						@change="$emit('update', dataForm)"
 						placeholder="请输入报警编码" />
 				</el-form-item>
-				<!-- 				
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
 			</el-col>
-
 			<el-col :span="12">
 				<el-form-item
-					label="报警类型"
-					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					label="报警级别"
+					prop="grade"
+					:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
-						v-model="dataForm.type"
-						placeholder="请选择报警类型"
-						@change="handleTypeChange">
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
 						<el-option
-							v-for="opt in [
-								{ label: '布尔型', value: 2 },
-								{ label: '字符型', value: 1 },
-							]"
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -66,16 +46,45 @@
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
-					label="报警级别"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					label="参数列名"
+					prop="plcParamName"
+					:rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.plcParamName"
+						placeholder="请输入参数列名"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警内容"
+					prop="alarmContent"
+					:rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmContent"
+						placeholder="请输入报警内容"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警类型"
+					prop="type"
+					:rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
+						v-model="dataForm.type"
+						placeholder="请选择报警类型"
+						@change="handleTypeChange">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							v-for="opt in [
+								{ label: '布尔型', value: 2 },
+								{ label: '字符型', value: 1 },
+							]"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -96,32 +105,6 @@
 				</el-form-item>
 			</el-col>
 		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="参数列名"
-					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.plcParamName"
-						placeholder="请输入参数列名"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="报警内容"
-					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmContent"
-						placeholder="请输入报警内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
 	</el-form>
 </template>
 

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

@@ -183,10 +183,7 @@ export default {
 						input: true,
 						label: '设备分组名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
-						// }
+						rules: [{ required: true, message: '设备分组名称不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -271,7 +268,7 @@ export default {
 						input: true,
 						label: '分组名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }
@@ -283,7 +280,7 @@ export default {
 						label: '分组编码',
 						prop: 'code',
 						url: '/base/equipment-group/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '分组编码不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -291,7 +288,6 @@ export default {
 						input: true,
 						label: '备注',
 						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						bind: {
 							placeholder: '请输入备注',
 						},

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

@@ -29,27 +29,60 @@
 				<section v-for="(section, index) in sections" :key="section.key">
 					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
 
-					<div class="form-part" v-if="section.key == 'base'">
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
 						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
+						<!-- <BaseInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
 							ref="form"
 							:disabled="true"
 							:dataForm="form"
-							:rows="formRows" />
+							:rows="formRows" /> -->
+
+						<el-row style="margin-bottom: 24px">
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备分组名称
+								</div>
+								<div class="value" style="font-size: 14px">{{ form.name }}</div>
+							</el-col>
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备分组编码
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.code }}
+								</div>
+							</el-col>
+						</el-row>
 					</div>
 
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+					<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">
+							<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"
@@ -71,17 +104,10 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
+				</el-button> -->
+				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
 			</div>
 		</div>
 
@@ -96,10 +122,10 @@
 			@close="closeAttrForm"
 			@cancel="closeAttrForm"
 			@confirm="submitAttrForm">
+			<!-- :disabled="mode.includes('detail')" -->
 			<DialogForm
 				v-if="attrFormVisible"
 				ref="attrForm"
-				:disabled="mode.includes('detail')"
 				v-model="attrForm"
 				:rows="attrRows" />
 		</base-dialog>
@@ -165,7 +191,7 @@ 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,
@@ -175,7 +201,7 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -196,13 +222,13 @@ 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' }],
 					},
 				],
 			],

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

@@ -16,46 +16,27 @@
 				<el-form-item
 					label="报警编码"
 					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
 					<el-input
 						:disabled="disabled"
 						v-model="dataForm.code"
 						@change="$emit('update', dataForm)"
 						placeholder="请输入工段排序" />
 				</el-form-item>
-				<!-- 				
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
 			</el-col>
 
 			<el-col :span="12">
 				<el-form-item
-					label="报警类型"
-					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					label="报警级别"
+					prop="grade"
+					:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
-						v-model="dataForm.type"
-						placeholder="请选择报警类型"
-						@change="handleTypeChange">
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
 						<el-option
-							v-for="opt in [
-								{ label: '布尔型', value: 2 },
-								{ label: '字符型', value: 1 },
-							]"
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -66,16 +47,45 @@
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
-					label="报警级别"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					label="参数列名"
+					prop="plcParamName"
+					:rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.plcParamName"
+						placeholder="请输入参数列名"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警内容"
+					prop="alarmContent"
+					:rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmContent"
+						placeholder="请输入报警内容"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警类型"
+					prop="type"
+					:rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
+						v-model="dataForm.type"
+						placeholder="请选择报警类型"
+						@change="handleTypeChange">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							v-for="opt in [
+								{ label: '布尔型', value: 2 },
+								{ label: '字符型', value: 1 },
+							]"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -96,32 +106,6 @@
 				</el-form-item>
 			</el-col>
 		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="参数列名"
-					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.plcParamName"
-						placeholder="请输入参数列名"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="报警内容"
-					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmContent"
-						placeholder="请输入报警内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
 	</el-form>
 </template>
 

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

@@ -224,7 +224,7 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -238,7 +238,7 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '报警分组不能为空', trigger: 'blur' }],
 					},
 				],
 			],
@@ -269,7 +269,7 @@ 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...
 						// }

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

@@ -224,7 +224,7 @@ export default {
 						prop: 'plcId',
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -236,7 +236,7 @@ export default {
 						label: '设备',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -262,7 +262,7 @@ export default {
 						input: true,
 						label: '设备名',
 						prop: 'equipmentName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }

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

@@ -184,7 +184,7 @@ export default {
 						input: true,
 						label: '关联表名',
 						prop: 'plcTableName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }
@@ -194,7 +194,7 @@ export default {
 						label: '编码',
 						prop: 'code',
 						url: '/base/equipment-group/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -202,7 +202,7 @@ export default {
 						input: true,
 						label: '标识',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '标识不能为空', trigger: 'blur' }],
 						// bind: {
 						// 	disabled: true, // some condition, like detail mode...
 						// }

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

@@ -29,27 +29,62 @@
 				<section v-for="(section, index) in sections" :key="section.key">
 					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
 
-					<div class="form-part" v-if="section.key == 'base'">
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="border-bottom: 1px solid #dfdfdf; margin-bottom: 24px">
 						<el-skeleton v-if="!showForm" animated />
-						<BaseInfoForm
+						<!-- <BaseInfoForm
 							key="drawer-dialog-form"
 							v-if="showForm"
 							ref="form"
 							:disabled="mode.includes('detail')"
 							v-model="form"
-							:rows="formRows" />
+							:rows="formRows" /> -->
+
+						<el-row style="margin-bottom: 24px">
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									设备名
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.equipmentName }}
+								</div>
+							</el-col>
+							<el-col :span="8">
+								<div
+									class="title"
+									style="font-weight: 700; font-size: 16px; margin: 8px 0">
+									关联表名
+								</div>
+								<div class="value" style="font-size: 14px">
+									{{ form.plcTableName }}
+								</div>
+							</el-col>
+						</el-row>
 					</div>
 
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+					<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">
+							<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"
@@ -71,17 +106,10 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
-						v-if="sections[1].allowAdd"
-						type="primary"
-						@click="handleAddAttr">
-						添加属性
-					</el-button> -->
+				</el-button> -->
+				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
 			</div>
 		</div>
 
@@ -96,10 +124,10 @@
 			@close="closeAttrForm"
 			@cancel="closeAttrForm"
 			@confirm="submitAttrForm">
+			<!-- :disabled="mode.includes('detail')" -->
 			<DialogForm
 				v-if="attrFormVisible"
 				ref="attrForm"
-				:disabled="mode.includes('detail')"
 				v-model="attrForm"
 				:rows="attrRows" />
 		</base-dialog>
@@ -166,13 +194,13 @@ 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' }],
 					},
 				],
 				[
@@ -181,7 +209,6 @@ export default {
 						label: '单位',
 						prop: 'unit',
 						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						switch: true,
@@ -199,24 +226,23 @@ export default {
 						label: '设备参数类型',
 						prop: 'equipment_param_type',
 						options: [
-                            { label: '一般参数', value: 1 },
-                            { label: '工艺参数', value: 2 },
-                            { label: '报警参数', value: 3 },
-                        ],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+							{ label: '一般参数', value: 1 },
+							{ label: '工艺参数', value: 2 },
+							{ label: '报警参数', value: 3 },
+						],
+						rules: [{ required: true, message: '设备参数类型不能为空', trigger: 'blur' }],
 					},
 					{
-                        select: true,
+						select: true,
 						label: '生产参数类型',
-                        prop: 'production_param_type',
+						prop: 'production_param_type',
 						options: [
-                            { label: '进片数量', value: 1 },
-                            { label: '出片数量', value: 2 },
-                            { label: '破损数量', value: 3 },
-                            { label: '无类型', value: 4 },
-
-                        ],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+							{ label: '进片数量', value: 1 },
+							{ label: '出片数量', value: 2 },
+							{ label: '破损数量', value: 3 },
+							{ label: '无类型', value: 4 },
+						],
+						rules: [{ required: true, message: '生产参数类型不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -248,7 +274,6 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -256,13 +281,11 @@ export default {
 						input: true,
 						label: '标准值',
 						prop: 'defaultValue',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '描述',
 						prop: 'description',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -270,7 +293,6 @@ export default {
 						input: true,
 						label: '备注',
 						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 			],

src/views/equipment/base/config/deprecated/dialogForm.vue

@@ -1,187 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for equipmentBindSection only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="dataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.code"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
-				</el-form-item>
-				<!-- 				
-						<el-form-item
-						label="报警编码"
-						prop="code"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-						<el-select
-						v-model="dataForm.code"
-						placeholder="请选择产线"
-						@change="handleProductlineChange">
-						<el-option
-						v-for="opt in productionLineList"
-						:key="opt.value"
-						:label="opt.label"
-						:value="opt.value" />
-					</el-select>
-				</el-form-item> -->
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="报警类型"
-					prop="type"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.type"
-						:disabled="disabled"
-						placeholder="请选择报警类型"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '布尔型', value: 2 },
-								{ label: '字符型', value: 1 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="报警级别"
-					prop="grade"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						:disabled="disabled"
-						v-model="dataForm.grade"
-						placeholder="请选择报警级别"
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					v-if="+dataForm.type == 1"
-					label="设备报警编码"
-					prop="alarmCode">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmCode"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入设备报警编码" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="参数列名"
-					prop="plcParamName"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.plcParamName"
-						placeholder="请输入参数列名"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="报警内容"
-					prop="alarmContent"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						:disabled="disabled"
-						v-model="dataForm.alarmContent"
-						placeholder="请输入报警内容"
-						@change="$emit('update', dataForm)"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-		};
-	},
-	mounted() {
-		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
-			this.formLoading = false;
-			this.$emit('update', {
-				...this.dataForm,
-				code,
-			});
-		});
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-		async handleProductlineChange(id) {
-			await this.getWorksectionList(id);
-			this.dataForm.workshopSectionId = null;
-			this.$emit('update', this.dataForm);
-		},
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>

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

@@ -1,361 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="736px"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	createEquipmentGroupAlarm,
-	updateEquipmentGroupAlarm,
-	deleteEquipmentGroupAlarm,
-	getEquipmentGroupAlarm,
-	getEquipmentGroupAlarmPage,
-	exportEquipmentGroupAlarmExcel,
-} from '@/api/base/equipmentGroupAlarm';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import moment from 'moment';
-import { publicFormatter } from '@/utils/dict';
-import DialogForm from './dialogForm.vue';
-
-export default {
-	name: 'EquipmentGroupAlarm',
-	components: { DialogForm },
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			searchBarKeys: [''],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-group-alarm:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-group-alarm:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{  width: 240, prop: 'code', label: '报警编码' },
-				{
-					prop: 'type',
-					label: '报警类型',
-					filter: (val) =>
-						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
-				},
-				{
-					prop: 'grade',
-					label: '报警级别',
-					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
-				},
-				{ prop: 'alarmCode', label: '设备报警编码' },
-				{ prop: 'plcParamName', label: '参数列名' },
-				{ prop: 'alarmContent', label: '报警内容' },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备分组编码',
-					width: '220',
-					placeholder: '/',
-					param: 'equipmentGroupCode',
-					defaultSelect: null,
-					disabled: true,
-				},
-				{
-					type: 'input',
-					label: '设备分组名称',
-					placeholder: '/',
-					param: 'equipmentGroupName',
-					defaultSelect: null,
-					disabled: true,
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-group-alarm:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '报警编码', // 自动生成
-						prop: 'code',
-						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '报警类型', // 固定选项
-						prop: 'type',
-						options: [
-							{ label: '布尔型', value: 2 },
-							{ label: '字符型', value: 1 },
-						],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '报警级别', // 字典
-						prop: 'grade',
-						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
-					},
-					{
-						input: true,
-						label: '设备报警编码', // 对应到设备实际的报警编码
-						prop: 'alarmCode',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '参数列名', // 在实时数据库的列名
-						prop: 'plcParamName',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '报警内容',
-						prop: 'alarmContent',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				equipmentGroupId: null,
-			},
-			// 表单参数
-			form: {
-				id: null,
-				equipmentGroupId: null,
-				code: null,
-				type: null,
-				grade: null,
-				alarmCode: null,
-				alarmContent: null,
-				plcParamName: null,
-			},
-			// // 表单校验
-			// rules: {
-			//   equipmentGroupId: [{ required: true, message: "设备分组ID，关联base_equipment_group不能为空", trigger: "blur" }],
-			//   type: [{ required: true, message: "报警类型:1.字符型，2.布尔型不能为空", trigger: "change" }],
-			//   alarmContent: [{ required: true, message: "报警内容 该条报警具体的解释不能为空", trigger: "blur" }],
-			//   plcParamName: [{ required: true, message: "关联编码，对应到plc_param_name的编码，用于链接数采不能为空", trigger: "blur" }],
-			// }
-		};
-	},
-	// watch: {
-	//   $route(value) {
-	//     console.log('new route info', value)
-	//   }
-	// },
-	// created() {
-	// 	this.getList();
-	// },
-	activated() {
-		// 设置顶部搜索栏信息
-		const { equipmentGroupName, equipmentGroupCode, equipmentGroupId } =
-			this.$route.params;
-		this.setSearchBarFormValue('equipmentGroupName', equipmentGroupName);
-		this.setSearchBarFormValue('equipmentGroupCode', equipmentGroupCode);
-		this.queryParams.equipmentGroupId = equipmentGroupId;
-		// if (!equipmentGroupId) this.getList(); // 拦截
-		this.getList();
-	},
-	deactivated() {
-		this.setSearchBarFormValue('equipmentGroupName', null);
-		this.setSearchBarFormValue('equipmentGroupCode', null);
-		this.queryParams.equipmentGroupId = null;
-	},
-	methods: {
-		/** 设置 searchBarForm 的默认值 - 用得比较少 */
-		setSearchBarFormValue(param, value) {
-			this.searchBarFormConfig.forEach((config) => {
-				if (config.param == param) {
-					config.defaultSelect = value;
-				}
-			});
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentGroupAlarmPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: null,
-				equipmentGroupId: null,
-				code: null,
-				type: null,
-				grade: null,
-				alarmCode: null,
-				alarmContent: null,
-				plcParamName: null,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			if (this.queryParams.equipmentGroupId == null)
-				return this.$message.error('没有检测到设备分组信息');
-			this.reset();
-			this.open = true;
-			this.title = '添加设备分组报警明细';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentGroupAlarm(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备分组报警明细';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentGroupAlarm({
-						...this.form,
-						equipmentGroupId: this.queryParams.equipmentGroupId,
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentGroupAlarm({
-					...this.form,
-					equipmentGroupId: this.queryParams.equipmentGroupId,
-				}).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除该报警?')
-				.then(function () {
-					return deleteEquipmentGroupAlarm(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备分组报警明细数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentGroupAlarmExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备分组报警明细.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>

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

@@ -52,6 +52,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
+import { deleteCheck } from "@/api/equipment/base/inspection/settings";
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -127,7 +128,7 @@ export default {
 						label: '巡检内容编号',
 						prop: 'code',
 						url: '/base/equipment-check/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '巡检内容编号不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -135,7 +136,7 @@ export default {
 						input: true,
 						label: '巡检项目',
 						prop: 'program',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '巡检项目不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -143,7 +144,7 @@ export default {
 						input: true,
 						label: '巡检内容',
 						prop: 'content',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '巡检内容不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -163,7 +164,12 @@ export default {
 				content: null,
 			},
 			// 表单参数
-			form: {},
+			form: {
+				code: '',
+				program: '',
+				id: undefined,
+				content: ''
+			},
 			basePath: '/base/equipment-check',
 			mode: null,
 		};
@@ -224,7 +230,7 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			this.reset();
+			// this.reset();
 			this.open = true;
 			this.title = '添加巡检内容';
 		},
@@ -265,9 +271,10 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否确认删除巡检项目名称为"' + row.program + '"的数据项?')
 				.then(function () {
-					return this.delete({ id });
+					// return this.delete({ id });
+					return deleteCheck(id)
 				})
 				.then(() => {
 					this.getList();

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

@@ -166,7 +166,7 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -181,8 +181,7 @@ export default {
 							clearable: true,
 							multiple: true,
 						},
-						options: [{ label: 'test', value: 'test' }],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '维修工不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -195,7 +194,7 @@ export default {
 						datetime: true,
 						label: '故障发生时间',
 						prop: 'faultTime',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '故障发生时间不能为空', trigger: 'blur' }],
 						bind: {
 							format: 'yyyy-MM-dd HH:mm:ss',
 							'value-format': 'timestamp',

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

@@ -103,8 +103,7 @@ export default {
 				{ prop: 'equipmentName', label: '设备' },
 				{ prop: 'responsible', label: '负责人' },
 				{ prop: 'equipmentCode', label: '描述' },
-				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'checkNumber', label: '巡检条数' } // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
 				{
@@ -152,14 +151,14 @@ export default {
 						input: true,
 						label: '配置名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '配置编码',
 						prop: 'code',
 						url: '/base/equipment-check-config/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '配置编码不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -168,7 +167,7 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,

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

@@ -51,6 +51,7 @@
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 
 const remainBox = {
 	name: 'RemainBox',
@@ -124,7 +125,7 @@ export default {
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'maintainDuration', label: '保养频率' },
+				{ prop: 'maintenancePeriod', label: '保养频率' },
 				{
 					prop: 'maintainType',
 					label: '保养类型',
@@ -195,6 +196,24 @@ export default {
 		this.getList();
 	},
 	methods: {
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有设备保养监控数据项?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportMaintainMonitorExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备保养监控.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => { });
+		},
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(

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

@@ -50,6 +50,7 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'
 
 export default {
 	name: 'PlanConfig',
@@ -88,7 +89,7 @@ export default {
 				},
 				{ prop: 'name', label: '计划名称' },
 				{ prop: 'code', label: '计划编号' },
-				{ prop: 'enabled', label: '启用状态' },
+				{ prop: 'enabled', label: '启用状态', filter: (val) => ['停用', '启用'][val] },
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备名称' },
@@ -169,14 +170,14 @@ export default {
 						input: true,
 						label: '计划名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
 						label: '计划编号',
 						prop: 'code',
 						url: '/base/equipment-maintain-plan/getCode',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -185,7 +186,7 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
 					},
 					{
 						select: true,
@@ -220,6 +221,7 @@ export default {
 								transform: (val) => Number(val),
 							},
 						],
+						rules: [{ required: true, message: '保养频率不能为空', trigger: 'blur' }],
 					},
 				],
 				[{ input: true, label: '备注', prop: 'remark' }],
@@ -344,9 +346,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除设备类型"' + row.name + '"?')
+				.confirm('是否确认删除计划名称为"' + row.name + '"的数据项?')
 				.then(function () {
-					return this.del(id);
+					return deleteEqMaintainPlan(id);
 				})
 				.then(() => {
 					this.getList();

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

@@ -42,7 +42,7 @@
 				v-if="open"
 				ref="form"
 				v-model="form"
-        :disabled="mode == 'detail'"
+				:disabled="mode == 'detail'"
 				:has-files="true"
 				:rows="rows" />
 		</base-dialog>
@@ -53,7 +53,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import Editor from '@/components/Editor';
-import { deleteEqMaintainLog } from '@/api/equipment/base/maintain/record'
+import { deleteEqMaintainLog } from '@/api/equipment/base/maintain/record';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -64,7 +64,6 @@ export default {
 	data() {
 		return {
 			searchBarKeys: [
-				'maintainPlanId',
 				'maintainPlanId',
 				'startTime',
 				'relatePlan',
@@ -187,10 +186,9 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '保养设备不能为空', trigger: 'blur' }],
 					},
 					{
-						// TODO: 和班组联动
 						select: true,
 						label: '保养人员',
 						prop: 'maintainWorker',
@@ -201,7 +199,7 @@ export default {
 							clearable: true,
 							multiple: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '保养人员不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -218,15 +216,14 @@ export default {
 							'active-value': 1,
 							'inactive-value': 2,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
 					},
 					{},
 					{
-						// TODO: 和计划联动
 						select: true,
 						label: '所属计划',
 						prop: 'maintainPlanId',
-						url: '',
+						url: '/base/equipment-maintain-plan/page',
 						bind: {
 							filterable: true,
 							clearable: true,
@@ -238,7 +235,7 @@ export default {
 						datetime: true,
 						label: '开始时间',
 						prop: 'startTime',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
 						bind: {
 							format: 'yyyy-MM-dd HH:mm:ss',
 							'value-format': 'timestamp',
@@ -250,7 +247,7 @@ export default {
 						datetime: true,
 						label: '结束时间',
 						prop: 'endTime',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
 						bind: {
 							format: 'yyyy-MM-dd HH:mm:ss',
 							'value-format': 'timestamp',
@@ -272,10 +269,16 @@ export default {
 						prop: 'files',
 					},
 				],
-				// TODO: 富文本
-				[{ label: '保养描述', prop: 'maintenanceDes', subcomponent: Editor, bind: {
-					'min-height': 192
-				} }],
+				[
+					{
+						label: '保养描述',
+						prop: 'maintenanceDes',
+						subcomponent: Editor,
+						bind: {
+							'min-height': 192,
+						},
+					},
+				],
 				[{ input: true, label: '备注', prop: 'remark' }],
 			],
 			// 是否显示弹出层
@@ -293,20 +296,26 @@ export default {
 			// 表单参数
 			form: {},
 			basePath: '/base/equipment-maintain-log',
-            mode: null
+			mode: null,
 		};
 	},
 	created() {
 		this.initSearchBar();
 		if (this.$route.query) {
-			this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined
-			this.queryParams.maintainPlanId = this.$route.query?.maintainPlanId ?? undefined
-			this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined
-			this.queryParams.startTime = this.$route.query?.createTime ?? undefined
-			this.searchBarFormConfig[0].defaultSelect = this.$route.query.equipmentId ?? undefined
-			this.searchBarFormConfig[1].defaultSelect = Number(this.$route.query.maintainPlanId) ?? undefined
-			this.searchBarFormConfig[2].defaultSelect = this.$route.query?.createTime ?? undefined
-			this.searchBarFormConfig[3].defaultSelect = Number(this.$route.query.relatePlan) ?? undefined
+			this.queryParams.equipmentId =
+				this.$route.query?.equipmentId ?? undefined;
+			this.queryParams.maintainPlanId =
+				this.$route.query?.maintainPlanId ?? undefined;
+			this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
+			this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+			this.searchBarFormConfig[0].defaultSelect =
+				this.$route.query.equipmentId ?? undefined;
+			this.searchBarFormConfig[1].defaultSelect =
+				Number(this.$route.query.maintainPlanId) ?? undefined;
+			this.searchBarFormConfig[2].defaultSelect =
+				this.$route.query?.createTime ?? undefined;
+			this.searchBarFormConfig[3].defaultSelect =
+				Number(this.$route.query.relatePlan) ?? undefined;
 		}
 		this.getList();
 	},
@@ -349,7 +358,7 @@ export default {
 		/** 取消按钮 */
 		cancel() {
 			this.open = false;
-            this.mode = null;
+			this.mode = null;
 			this.reset();
 		},
 		/** 表单重置 */
@@ -399,7 +408,7 @@ export default {
 			this.info({ id }).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.form.maintainWorker = this.form.maintainWorker.split(',')
+				this.form.maintainWorker = this.form.maintainWorker.split(',');
 				this.title = '修改保养记录';
 			});
 		},
@@ -409,7 +418,7 @@ export default {
 				if (!valid) {
 					return;
 				}
-				this.form.maintainWorker = this.form.maintainWorker.join(',')
+				this.form.maintainWorker = this.form.maintainWorker.join(',');
 				// 修改的提交
 				if (this.form.id != null) {
 					this.put(this.form).then((response) => {
@@ -431,7 +440,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否删除设备保养单号为"' + row.maintainOrderNumber + '"的数据项?')
+				.confirm('是否删除设备名称为"' + row.equipmentName + '"的数据项?')
 				.then(function () {
 					return deleteEqMaintainLog(id);
 				})
@@ -443,7 +452,7 @@ export default {
 		},
 		handleDetail({ id }) {
 			this.reset();
-            this.mode = 'detail'
+			this.mode = 'detail';
 			this.info({ id }).then((response) => {
 				this.form = response.data;
 				this.open = true;

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

@@ -19,6 +19,7 @@
 			ref="form"
 			:model="dataForm"
 			label-width="100px"
+			label-position="top"
 			v-loading="formLoading">
 			<el-row :gutter="20">
 				<el-col :span="8">
@@ -62,7 +63,7 @@
 					<el-form-item
 						label="维修开始时间"
 						prop="maintenanceStartTime"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						:rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
 						<el-date-picker
 							v-model="dataForm.maintenanceStartTime"
 							type="datetime"
@@ -76,7 +77,7 @@
 					<el-form-item
 						label="维修结束时间"
 						prop="maintenanceFinishTime"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						:rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
 						<el-date-picker
 							v-model="dataForm.maintenanceFinishTime"
 							type="datetime"
@@ -90,7 +91,7 @@
 					<el-form-item
 						label="维修方式"
 						prop="repairMode"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						:rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
 						<el-select
 							:disabled="disabled"
 							v-model="dataForm.repairMode"
@@ -126,7 +127,7 @@
 					<el-form-item
 						label="故障明细"
 						prop="faultDetail"
-						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
 						<!-- // 富文本 -->
 						<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="380"/>
 					</el-form-item>
@@ -213,7 +214,7 @@ export default {
 			this.visible = false;
 		},
 		goEdit() {
-			this.isdetail = false;
+			this.disabled = false;
 		},
 		/** 模拟透传 ref  */
 		validate(cb) {

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

@@ -112,7 +112,7 @@ export default {
 				{
 					prop: 'maintenanceStatus',
 					label: '维修状态',
-					filter: (v) => (v != null ? ['未完成', '完成'][v] : ''),
+					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
 				},
 				{ prop: 'maintenanceDuration', label: '维修时长(h)' },
 				{ prop: 'lineName', label: '产线' },
@@ -138,8 +138,23 @@ export default {
 					selectOptions: [
 						{ name: '未完成', id: '0' },
 						{ name: '完成', id: '1' },
+						{ name: '进行中', id: '2' },
 					],
 				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'createTime'
+				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -169,7 +184,7 @@ export default {
 						input: true,
 						label: '维修单号',
 						prop: 'repairOrderNumber',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '维修单号不能为空', trigger: 'blur' }],
 					},
 					{
 						select: true,
@@ -180,7 +195,7 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -198,7 +213,7 @@ export default {
 							// multiple: true,
 						},
 						// options: [{ label: 'test', value: 'test' }],
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '维修工不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -211,7 +226,7 @@ export default {
 						datetime: true,
 						label: '故障发生时间',
 						prop: 'faultTime',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '故障发生时间不能为空', trigger: 'blur' }],
 						bind: {
 							format: 'yyyy-MM-dd HH:mm:ss',
 							'value-format': 'timestamp',

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

@@ -161,7 +161,7 @@ export default {
 						input: true,
 						label: '配置名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -174,7 +174,7 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[

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

@@ -52,6 +52,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
+import { deleteSparePart } from '@/api/equipment/base/spare-parts/list'
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -131,6 +132,7 @@ export default {
 						input: true,
 						label: '备件名称',
 						prop: 'name',
+						rules: [{ required: true, message: '备件名称不能为空', trigger: 'blur' }],
 					},
 					{
 						input: true,
@@ -153,7 +155,7 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -196,21 +198,6 @@ export default {
 						prop: 'remark',
 					},
 				],
-				// [
-				// {
-				// 	datetime: true,
-				// 	label: '故障发生时间',
-				// 	prop: 'faultTime',
-				// 	rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-				// 	bind: {
-				// 		format: 'yyyy-MM-dd HH:mm:ss',
-				// 		'value-format': 'timestamp',
-				// 		// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-				// 		clearable: true,
-				// 	},
-				// },
-
-				// ],
 			],
 			// 是否显示弹出层
 			open: false,
@@ -328,9 +315,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否确认删除备件名称为"' + row.name + '"的数据项?')
 				.then(function () {
-					return this.delete({ id });
+					return deleteSparePart(id);
 				})
 				.then(() => {
 					this.getList();

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

@@ -211,7 +211,7 @@ export default {
 						input: true,
 						label: '配置名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -224,7 +224,7 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[

src/views/extend/processFlow/index.vue

@@ -180,7 +180,7 @@ 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...
 						// }
@@ -197,6 +197,7 @@ export default {
 						select: true,
 						label: '产线',
 						prop: 'lineId',
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
 						// cache: 'processFlow::lineList',
 						url: '/base/core-production-line/listAll',
 						bind: {
@@ -217,8 +218,9 @@ export default {
 				[
 					{
 						textarea: true,
-						label: '功能描述',
+						label: '工艺描述',
 						prop: 'remark',
+						rules: [{ required: true, message: '工艺描述不能为空', trigger: 'blur' }],
 					},
 				],
 			],

src/views/extend/processFlowView/components/BomSelection.vue

@@ -0,0 +1,114 @@
+<!-- 
+    filename: BomSelection.vue
+    author: liubin
+    date: 2023-11-20 13:23:36
+    description: 
+-->
+
+<template>
+	<div class="bom-selection">
+		<el-checkbox
+			v-for="item in list__inner"
+			:key="item.id + randomKey"
+			:label="item.name"
+			:disabled="item.disabled"
+			:checked="item.id === selected"
+			@change="(e) => handleChange(item, e)"
+			class="sl__body-item"></el-checkbox>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'BomSelection',
+	components: {},
+	// model: {
+	// 	prop: 'selected',
+	// 	event: 'update',
+	// },
+	props: {
+		currentSelect: {
+			type: String,
+			default: null,
+		},
+		list: {
+			type: Array,
+			default: () => [],
+		},
+		equipmentId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			list__inner: [],
+			selected: null,
+			randomKey: Math.random(),
+		};
+	},
+	watch: {
+		list: {
+			handler(val) {
+				if (val) {
+					this.list__inner = val.map((item) => ({ ...item, disabled: false }));
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+		currentSelect: {
+			handler(val) {
+				this.selected = val;
+				this.randomKey = Math.random();
+			},
+			immediate: true,
+		},
+	},
+	methods: {
+		handleChange(bomItem, selected) {
+			this.list__inner = this.list__inner.map((item) => ({
+				...item,
+				disabled: selected ? item.id !== bomItem.id : false,
+			}));
+
+			if (selected) this.selected = null;
+			else this.clearSelected();
+
+			this.$emit('change', this.equipmentId, bomItem.id, selected);
+			this.$nextTick(() => {
+				this.$forceUpdate();
+			});
+		},
+		clearSelected() {
+			console.log('clearSelected');
+			this.selected = null;
+			this.randomKey = Math.random();
+			// this.$emit('update', null);
+			// this.$nextTick(() => {
+			// 	this.$forceUpdate();
+			// });
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.bom-selection {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+	padding: 6px;
+}
+
+.sl__body-item {
+	margin: 0;
+	padding: 3px 6px;
+	border-radius: 4px;
+	transition: background 0.3s ease-in-out;
+
+	&:hover {
+		background: #0001;
+	}
+}
+</style>

src/views/extend/processFlowView/components/BomSelector.vue

@@ -0,0 +1,264 @@
+<!-- 
+    filename: BomSelector.vue
+    author: liubin
+    date: 2023-11-17 16:23:28
+    description: 
+-->
+
+<template>
+	<div class="bom-selector">
+		<el-row>
+			<el-col :span="8">
+				<el-input
+					v-model="searchText"
+					placeholder="搜索"
+					clearable
+					style="margin-bottom: 12px; user-select: none">
+					<i slot="prefix" class="el-input__icon el-icon-search"></i>
+				</el-input>
+			</el-col>
+		</el-row>
+
+		<el-row style="border: 1px solid #ccc; display: flex">
+			<el-col :span="8">
+				<div class="select-list">
+					<div class="sl__header" style="background: #f3f4fb; padding: 12px">
+						<span style="">可分配设备</span>
+						<span>
+							{{ selectedEquipments.length }}/{{ filteredBomList.length }}
+						</span>
+					</div>
+					<div class="sl__body">
+						<div
+							class="sl__body-item"
+							v-for="eq in filteredBomList"
+							:key="eq.id + refreshKey">
+							<el-checkbox
+								:key="refreshKey"
+								:checked="selectedEquipments.includes(eq.id)"
+								@change="(e) => handleEquipmentChange(eq, e)"
+								class=""></el-checkbox>
+							<span
+								:key="'label' + refreshKey"
+								@click.stop="() => handleLoadDom(eq)">
+								{{ eq.name }}
+							</span>
+						</div>
+					</div>
+				</div>
+			</el-col>
+			<el-col :span="8" style="border-left: 1px solid #ccc">
+				<div class="select-list">
+					<div class="sl__header" style="background: #f3f4fb; padding: 12px">
+						<span style="">物料BOM</span>
+					</div>
+
+					<BomSelection
+						ref="materialsBomList"
+						:key="materialsBomList.equipmentId + 'materialsBomList'"
+						:list="materialsBomList"
+						:equipment-id="materialsBomList.equipmentId"
+						:current-select="currentSelectedMaterialBomId"
+						@change="handleMaterialBomChange" />
+				</div>
+			</el-col>
+			<el-col :span="8" style="border-left: 1px solid #ccc">
+				<div class="select-list">
+					<div class="sl__header" style="background: #f3f4fb; padding: 12px">
+						<span style="">参数BOM</span>
+					</div>
+
+					<BomSelection
+						ref="valuesBomList"
+						:key="valuesBomList.equipmentId + 'valuesBomList'"
+						:list="valuesBomList"
+						:equipment-id="valuesBomList.equipmentId"
+						:current-select="currentSelectedValueBomId"
+						@change="handleValueBomChange" />
+				</div>
+			</el-col>
+		</el-row>
+	</div>
+</template>
+;
+<script>
+import BomSelection from './BomSelection.vue';
+export default {
+	name: 'BomSelector',
+	components: { BomSelection },
+	model: {
+		prop: 'value',
+		event: 'update',
+	},
+	props: {
+		bomList: {
+			type: Array,
+			default: () => [],
+		},
+		value: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	data() {
+		return {
+			searchText: '',
+			selectedEquipments: [],
+			selected: [],
+			materialsBomList: [],
+			valuesBomList: [],
+			refreshKey: Math.random(),
+			currentSelectedMaterialBomId: null,
+			currentSelectedValueBomId: null,
+		};
+	},
+	watch: {
+		value: {
+			handler(val) {
+				console.log('value', val);
+				if (val) {
+					this.selectedEquipments = val.map((item) => item.equipmentId);
+					this.selected = val;
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	computed: {
+		filteredBomList() {
+			return this.bomList.filter((item) => {
+				return item.name.includes(this.searchText);
+			});
+		},
+	},
+	methods: {
+		commit() {
+			this.$emit('update', this.selected);
+		},
+
+		handleLoadDom(eq) {
+			// 只显示 dom 列表
+			this.currentEquipment = eq.id;
+			this.materialsBomList = eq.materialsBom;
+			this.valuesBomList = eq.valuesBom;
+			// 回复选中的bom信息
+			if (this.selectedEquipments.includes(eq.id)) {
+				const selectedItem = this.selected.find(
+					(item) => item.equipmentId == eq.id
+				);
+				this.currentSelectedMaterialBomId =
+					selectedItem.equMaterialBomId ?? null;
+				this.currentSelectedValueBomId = selectedItem.equValueBomId ?? null;
+			}
+		},
+
+		handleEquipmentChange(eq, selected) {
+			this.currentEquipment = eq.id;
+			this.materialsBomList = eq.materialsBom;
+			this.valuesBomList = eq.valuesBom;
+
+			if (selected) {
+				this.selectedEquipments.push(eq.id);
+				this.selected.push({
+					equipmentId: eq.id,
+					equValueBomId: null,
+					equMaterialBomId: null,
+				});
+				// this.$emit('update', this.selected);
+			} else {
+				// 清空选择状态
+				this.selectedEquipments = this.selectedEquipments.filter(
+					(id) => id !== eq.id
+				);
+				// this.$refs.materialsBomList.clearSelected();
+				// this.$refs.valuesBomList.clearSelected();
+				this.currentSelectedMaterialBomId = null;
+				this.currentSelectedValueBomId = null;
+				this.selected = this.selected.filter(
+					(item) => item.equipmentId !== eq.id
+				);
+				// this.$emit('update', this.selected);
+			}
+		},
+
+		handleMaterialBomChange(equipmentId, bomId, selected) {
+			const selectedItem = this.selected.find(
+				(item) => item.equipmentId == equipmentId
+			);
+			if (selected && !selectedItem) {
+				// 如果没找到这个
+				this.selectedEquipments.push(equipmentId);
+				this.selected.push({
+					equipmentId,
+					equValueBomId: null,
+					equMaterialBomId: bomId,
+				});
+				// 强制更新'设备'一栏
+				this.refreshKey = Math.random();
+				// this.$emit('update', this.selected);
+				return;
+			}
+			selectedItem && (selectedItem.equMaterialBomId = selected ? bomId : null);
+			this.currentSelectedMaterialBomId = selected ? bomId : null;
+			// this.$emit('update', this.selected);
+		},
+
+		handleValueBomChange(equipmentId, bomId, selected) {
+			const selectedItem = this.selected.find(
+				(item) => item.equipmentId == equipmentId
+			);
+			if (selected && !selectedItem) {
+				// 如果没找到这个
+				this.selectedEquipments.push(equipmentId);
+				this.selected.push({
+					equipmentId,
+					equValueBomId: bomId,
+					equMaterialBomId: null,
+				});
+				this.refreshKey = Math.random();
+				// this.$emit('update', this.selected);
+				return;
+			}
+			selectedItem && (selectedItem.equValueBomId = selected ? bomId : null);
+			this.currentSelectedValueBomId = selected ? bomId : null;
+			// this.$emit('update', this.selected);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.bom-selector {
+	min-height: 200px;
+}
+
+.sl__body {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+	padding: 6px;
+}
+
+.sl__body-item {
+	margin: 0;
+	padding: 3px 6px;
+	border-radius: 4px;
+	cursor: pointer;
+	transition: background 0.3s ease-in-out;
+	display: flex;
+	align-items: center;
+	gap: 8px;
+
+	> span {
+		flex: 1;
+	}
+
+	&:hover {
+		background: #0001;
+	}
+}
+.sl__header {
+	border-bottom: 1px solid #ccc;
+}
+</style>

src/views/extend/processFlowView/components/ProcessBomList.vue

@@ -31,6 +31,9 @@
 				icon="el-icon-search"
 				placeholder="搜索"
 				v-model="searchText"
+				:disabled="currentDet == null"
+				@change="handleSearchTextChange"
+				clearable
 				style="margin-left: 20px">
 				<i slot="prefix" class="el-input__icon el-icon-search"></i>
 			</el-input>
@@ -63,22 +66,27 @@
 		<base-dialog
 			dialogTitle="选择设备"
 			:dialogVisible="open"
+			width="45%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<el-transfer v-model="choosedEquipments" :data="eqList">
-				<!-- <span slot-scope="{ option }">
-					{{ option.key }} - {{ option.label }}
-				</span> -->
-			</el-transfer>
+			<!-- <CustomTransfer /> -->
+			<BomSelector
+				ref="bomSelector"
+				v-if="open"
+				:bom-list="bomList"
+				:value="selectedBoms"
+				@update="selectedBoms = $event" />
 		</base-dialog>
 	</section>
 </template>
 
 <script>
+import BomSelector from './BomSelector.vue';
+
 export default {
 	name: 'ProcessBom',
-	components: {},
+	components: { BomSelector },
 	props: {
 		currentDet: {
 			type: Object,
@@ -89,11 +97,12 @@ export default {
 		return {
 			open: false,
 			eqList: [],
+			bomList: [],
 			finalList: [],
 			choosedEquipments: [],
 			searchBarFormConfig: [{ label: '工序下设备' }],
 			tableProps: [
-				{ prop: 'equipmentId', label: '设备名称' },
+				{ prop: 'equName', label: '设备名称' },
 				{ prop: 'materialName', label: '物料BOM' },
 				{ prop: 'valueName', label: '参数BOM' },
 			],
@@ -103,13 +112,17 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
+				equipmentName: '',
 			},
-			searchText: ''
+			searchText: '',
+			selectedBoms: [],
+			timer: null,
 		};
 	},
 	watch: {
 		currentDet: {
 			handler(val) {
+				console.log('currentDet', val);
 				if (val != null) {
 					this.getList(val);
 				} else {
@@ -121,51 +134,21 @@ export default {
 		},
 	},
 	methods: {
-		renderFn(h, option) {
-			console.log(option);
-			return <span>1</span>;
-		},
-		async getEqList() {
-			console.log('currentDet', this.currentDet);
-			const { sectionId } = this.currentDet;
-			const { code, data } = await this.http(
-				'base/core-equipment-bind-section/page',
-				'get',
-				{ workshopSectionId: sectionId, pageNo: 1, pageSize: 100 }
-			);
-			if (code == 0) {
-				console.log('workshopSectionId', data);
-
-				// 模拟数据
-				this.eqList = [
-					{ equipmentId: 1, equipmentName: '设备1' },
-					{ equipmentId: 2, equipmentName: '设备2' },
-					{ equipmentId: 3, equipmentName: '设备3' },
-					{ equipmentId: 4, equipmentName: '设备4' },
-					{ equipmentId: 5, equipmentName: '设备5' },
-					{ equipmentId: 6, equipmentName: '设备6' },
-				]; // ].map((item) => ({ label: item.equipmentName, key: item.equipmentId }));
-
-				// 获取参数bom和物料bom
-				// 需调用参数bom接口和 物料bom接口
-				this.finalList = this.eqList.map((item) => {
-					item.sub = [];
-					// key: equipmentId-参数bomId
-					item.sub.push({
-						key: item.equipmentId + '-' + '101',
-						label: '参数bom1',
-					});
-					item.sub.push({
-						key: item.equipmentId + '-' + '201',
-						label: '物料bom1',
-					});
-
-					return item;
-				});
-			}
-		},
 		handleEmitFun() {},
+
 		handleTableBtnClick() {},
+
+		handleSearchTextChange(val) {
+			if (this.timer) clearTimeout(this.timer);
+			this.timer = setTimeout(() => {
+				console.log('geting list.......');
+				this.queryParams.equipmentName = val;
+				this.$nextTick(() => {
+					this.getList(this.currentDet);
+				});
+			}, 300);
+		},
+
 		put(payload) {
 			return this.http(this.updateUrl, 'put', payload);
 		},
@@ -186,8 +169,41 @@ export default {
 				data: method !== 'get' ? payload : null,
 			});
 		},
-		submitForm() {},
-		async getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
+		submitForm() {
+			// 现将子组件的修改提交更新至本组件
+			this.$refs.bomSelector.commit();
+			// 再提交至后端
+			this.$nextTick(async () => {
+				console.log('selectedBoms', this.selectedBoms);
+				if (this.selectedBoms.length) {
+					const { code, data } = await this.http(
+						'/extend/process-flow-det-equipment/createList',
+						'post',
+						this.selectedBoms.map((item) => ({
+							...item,
+							flowDetId: this.currentDet.detId,
+						}))
+					);
+					if (code == 0) {
+						this.$message.success('操作成功');
+						this.getList(this.currentDet);
+						this.cancel();
+					} else {
+						this.$message.error('操作失败');
+					}
+				} else {
+					this.$message.info('请选择设备');
+				}
+			});
+		},
+		async getList({
+			detId,
+			detName,
+			detDesc,
+			flowId,
+			sectionName,
+			sectionId,
+		} = {}) {
 			console.log('get list', detId, detName, flowId);
 			const { data, code } = await this.http(
 				'/extend/process-flow-det-equipment/page',
@@ -201,10 +217,38 @@ export default {
 				this.list.splice(0);
 				this.total = 0;
 			}
+
+			// 获取设备及bom列表
+			this.http('/extend/process-flow-det/getEquipmentDetBySectionId', 'post', {
+				sectionId,
+				flowDetId: detId,
+			}).then(({ code, data }) => {
+				if (code == 0) {
+					this.bomList = data.map((eq) => {
+						eq.materialsBom = eq.materialsBom || [];
+						eq.valuesBom = eq.valuesBom || [];
+						// 设置选中状态
+						eq.materialsBom.chosen = eq.materialsBomChoseId ?? null;
+						eq.valuesBom.chosen = eq.valuesBomChoseId ?? null;
+						if (eq.equChose || eq.materialsBom.chosen || eq.valuesBom.chosen) {
+							this.selectedBoms.push({
+								equipmentId: eq.id,
+								equMaterialBomId: eq.materialsBom.chosen,
+								equValueBomId: eq.valuesBom.chosen,
+							});
+						}
+						// 设置设备id
+						eq.materialsBom.equipmentId = eq.id;
+						eq.valuesBom.equipmentId = eq.id;
+						return eq;
+					});
+				} else {
+					this.bomList.splice(0);
+				}
+			});
 		},
 		async handleAddEquipment() {
 			this.open = true;
-			await this.getEqList();
 		},
 		cancel() {
 			this.open = false;

src/views/extend/processFlowView/components/ProcessDetail.vue

@@ -102,7 +102,7 @@ export default {
 						input: true,
 						label: '工序名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -111,7 +111,7 @@ export default {
 						label: '工段',
 						prop: 'sectionId',
 						url: '/base/core-workshop-section/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},

src/views/extend/processFlowView/components/candidate.js

@@ -0,0 +1,51 @@
+export class Candidate {
+	constructor(id, name, paramBomList, materialBomList) {
+		this.equipmentId = id;
+		this.equipmentName = name;
+		this.children = [];
+		this.totalBom = paramBomList.length + materialBomList.length;
+		this.selected = false;
+		paramBomList.forEach((pb) => {
+			this.children.push({
+				id: pb.id,
+				name: pb.name,
+				type: 'param',
+				selected: false,
+			});
+		});
+		materialBomList.forEach((mb) => {
+			this.children.push({
+				id: mb.id,
+				name: mb.name,
+				type: 'material',
+				selected: false,
+			});
+		});
+	}
+
+	get selected() {
+		return this.children.filter((child) => child.selected).length;
+	}
+
+	get paramBom() {
+		return this.children.filter((child) => child.type === 'param');
+	}
+
+	get materialBom() {
+		return this.children.filter((child) => child.type === 'material');
+	}
+}
+
+export class CandidateList {
+	constructor() {
+		this.value = [];
+	}
+
+	addCandidate(candidate) {
+		this.value.push(candidate);
+	}
+
+	get selected() {
+		return this.list.filter((candidate) => candidate.selected).length;
+	}
+}

src/views/extend/processFlowView/index.vue

@@ -25,7 +25,7 @@ export default {
 	data() {
 		return {
 			flowId: null,
-			currentDet: null
+			currentDet: null,
 		};
 	},
 	provide() {
@@ -36,6 +36,14 @@ export default {
 			},
 		};
 	},
+	beforeRouteEnter(to, from, next) {
+		console.log('tot', to, from);
+		if (to.params.id) {
+			next();
+		} else {
+			next({ path: '/extend/process-flow' });
+		}
+	},
 	activated() {
 		console.log('activated...', this.$route.params);
 		this.flowId = this.$route.params.id;
@@ -44,10 +52,9 @@ export default {
 	methods: {
 		handleDetSelected(det) {
 			if (det != null) {
-				this.currentDet = { ...det }
-			}
-			else this.currentDet = null;
-		}
+				this.currentDet = { ...det };
+			} else this.currentDet = null;
+		},
 	},
 };
 </script>

src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue

@@ -68,7 +68,7 @@ export default {
 						input: true,
 						label: '工序名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -77,7 +77,7 @@ export default {
 						label: '工段',
 						prop: 'sectionId',
 						url: '/base/core-workshop-section/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},

src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue

@@ -27,24 +27,26 @@
 
       <el-col :span="12">
         <el-form-item label="按钮盒识别码" prop="buttonId" :rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入整数',
-							trigger: 'blur',
-							transform: (val) => Number.isInteger(Number(val)) && Number(val),
-						},
-					]">
+        	{ required: true, message: '不能为空', trigger: 'blur' },
+        	{
+        		type: 'number',
+        		message: '请输入整数',
+        		trigger: 'blur',
+        		transform: (val) => Number.isInteger(Number(val)) && Number(val),
+        	},
+        ]">
           <el-input v-model="dataForm.buttonId" @change="$emit('update', dataForm)" placeholder="请输入整数" />
         </el-form-item>
-        <!--
 				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					label="产线"
+					prop="productionLineId"
+					:rules="[
+						{ required: true, message: '产线不能为空', trigger: 'blur' },
+					]">
 					<el-select
-						v-model="dataForm.code"
+						v-model="dataForm.productionLineId"
 						placeholder="请选择产线"
+						filterable
 						@change="handleProductlineChange">
 						<el-option
 							v-for="opt in productionLineList"
@@ -52,38 +54,78 @@
 							:label="opt.label"
 							:value="opt.value" />
 					</el-select>
-				</el-form-item> -->
-      </el-col>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="工段"
+					prop="sectionId"
+					:rules="[
+						{ required: true, message: '工段不能为空', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="dataForm.sectionId"
+						placeholder="请选择工段"
+						filterable
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in workshopSectionList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
 
-      <el-col :span="12">
-        <el-form-item label="按钮盒模式" prop="model">
-          <el-input v-model="dataForm.model" @change="$emit('update', dataForm)" placeholder="请输入按钮盒模式" />
-        </el-form-item>
-      </el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="按钮盒识别码"
+					prop="buttonId"
+					:rules="[
+						{
+							required: true,
+							message: '按钮盒识别码不能为空',
+							trigger: 'blur',
+						},
+						{
+							type: 'number',
+							message: '请输入整数',
+							trigger: 'blur',
+							transform: (val) => Number.isInteger(Number(val)) && Number(val),
+						},
+					]">
+					<el-input
+						v-model="dataForm.buttonId"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入整数" />
+				</el-form-item>
+			</el-col>
 
       <el-col :span="12">
         <el-form-item label="按钮值" prop="keyValue" :rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入100以内的整数',
-							trigger: 'blur',
-							transform: (val) =>
-								Number.isInteger(+val) &&
-								Number(val) >= 0 &&
-								Number(val) <= 100 &&
-								Number(val),
-						},
-					]">
+        	{ required: true, message: '不能为空', trigger: 'blur' },
+        	{
+        		type: 'number',
+        		message: '请输入100以内的整数',
+        		trigger: 'blur',
+        		transform: (val) =>
+        			Number.isInteger(+val) &&
+        			Number(val) >= 0 &&
+        			Number(val) <= 100 &&
+        			Number(val),
+        	},
+        ]">
           <el-input v-model="dataForm.keyValue" type="number" min="0" max="100" @change="$emit('update', dataForm)"
             placeholder="请输入按钮盒模式" />
         </el-form-item>
       </el-col>
 
       <el-col :span="12">
-        <el-form-item label="检测内容" prop="inspectionDetContent">
-          <el-input type="textarea" v-model="dataForm.inspectionDetContent" placeholder="请输入检测内容"
-            @change="$emit('update', dataForm)"></el-input>
+        <el-form-item label="检测内容" prop="inspectionDetId">
+          <el-select v-model="dataForm.inspectionDetId" placeholder="请选择检测内容" filterable
+            @change="$emit('update', dataForm)">
+            <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
         </el-form-item>
       </el-col>
     </el-row>
@@ -108,12 +150,14 @@ export default {
 	data() {
 		return {
 			formLoading: true,
-			productionLineList: [],
+      productionLineList: [],
+      inspectionDetList:[],
 			workshopSectionList: [],
 		};
 	},
 	mounted() {
-		this.getProductionLineList();
+    this.getProductionLineList()
+    this.getQualityInspectionDetList()
 		// this.getWorksectionList();
 		// this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
 		// 	this.formLoading = false;
@@ -153,7 +197,20 @@ export default {
 			}
 			this.formLoading = false;
 		},
-
+    async getQualityInspectionDetList() {
+      this.formLoading = true;
+      const res = await this.$axios({
+        url: '/base/quality-inspection-det/listAll',
+        method: 'get',
+      });
+      if (res.code == 0) {
+        this.inspectionDetList = res.data.map((item) => ({
+          label: item.content,
+          value: item.id,
+        }));
+      }
+      this.formLoading = false;
+    },
 		async getWorksectionList(id) {
 			this.formLoading = true;
 			const res = await this.$axios({

src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue

@@ -70,7 +70,7 @@ export default {
 						label: '产线',
 						url: '/base/production-line/listAll',
 						prop: 'productionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -80,7 +80,7 @@ export default {
 						label: '工段',
 						url: '/base/workshop-section/listAll',
 						prop: 'sectionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -118,13 +118,17 @@ export default {
 							},
 						],
 						bind: { type: 'number', min: 0, max: 100 },
-					},
-					{
-						textarea: true,
-						label: '检测内容',
-						prop: 'inspectionDetContent',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-					},
+          },
+          {
+            select: true,
+            label: '检测内容',
+            url: '/base/quality-inspection-det/listAll',
+            prop: 'inspectionDetId',
+            rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+            bind: {
+              filterable: true,
+            },
+          },
 				],
 			],
 			searchBarFormConfig: [
@@ -218,7 +222,7 @@ export default {
 			form: {
 				id: null,
 				buttonId: null,
-				inspectionDetContent: null,
+        inspectionDetId: null,
         productionLineId: null,
 				sectionId: null,
 				model: null,

src/views/quality/base/qualityInspectionDet/index.vue

@@ -50,7 +50,7 @@
 							label: '检测类型',
 							prop: 'typeId',
 							url: '/base/quality-inspection-type/listAll',
-							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+							rules: [{ required: true, message: '检测类型不能为空', trigger: 'blur' }],
 							bind: {
 								filterable: true,
 							},
@@ -61,7 +61,7 @@
 							input: true,
 							label: '检测内容',
 							prop: 'content',
-							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+							rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
 						},
 					],
 					[

src/views/quality/base/qualityInspectionType/index.vue

@@ -47,7 +47,13 @@
 							input: true,
 							label: '检测类型名称',
 							prop: 'name',
-							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+							rules: [
+								{
+									required: true,
+									message: '检测类型名称不能为空',
+									trigger: 'blur',
+								},
+							],
 							// bind: {
 							// 	disabled: true, // some condition, like detail mode...
 							// }
@@ -174,31 +180,7 @@ export default {
 					plain: true,
 					color: 'success',
 				},
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
 			],
-			// 表单配置
-			// formRows: [
-			// 	[
-			// 		{
-			// 			input: true,
-			// 			label: '检测类型名称',
-			// 			prop: 'name',
-			// 			rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-			// 			// bind: {
-			// 			// 	disabled: true, // some condition, like detail mode...
-			// 			// }
-			// 		},
-			// 	],
-			// 	[{ input: true, label: '检测类型编码', prop: 'code' }],
-			// 	[{ input: true, label: '备注', prop: 'remark' }],
-			// ],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -208,11 +190,11 @@ export default {
 				name: null,
 			},
 			// 表单参数
-      form: {
-        name: null,
-        code: undefined,
-        remark:undefined
-      },
+			form: {
+				name: null,
+				code: undefined,
+				remark: undefined,
+			},
 		};
 	},
 	// watch: {

src/views/quality/base/qualityScrapDet/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-06 16:00:24
+ * @LastEditTime: 2023-11-20 15:23:59
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,18 +10,18 @@
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="报废原因编码" prop="code">
-          <el-input v-model="dataForm.code" placeholder="请输入报废类型编码" />
+          <el-input v-model="dataForm.code" placeholder="请输入报废原因编码" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="报废原因" prop="content">
-          <el-input v-model="dataForm.content" placeholder="请输入报废类型" />
+          <el-input v-model="dataForm.content" placeholder="请输入报废原因" />
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="报废类型" prop="description">
+        <el-form-item label="报废类型" prop="typeId">
           <el-select v-model="dataForm.typeId" placeholder="请选择报废类型">
             <el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
@@ -68,6 +68,7 @@ export default {
 				// materialId: [{ required: true, message: "", trigger: "blur" }],
         code: [{ required: true, message: "报废原因编码不能为空", trigger: "blur" }],
         content: [{ required: true, message: "报废原因不能为空", trigger: "blur" }],
+        typeId: [{ required: true, message: "报废类型不能为空", trigger: "change" }],
       }
 		};
 	},

src/views/quality/base/qualityScrapLog/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-07 18:56:20
+ * @LastEditTime: 2023-11-21 14:11:18
  * @LastEditors: zhp
  * @Description:
 -->
@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="数量" prop="sum">
-          <el-input v-model="dataForm.sum" placeholder="请输入数量" />
+        <el-form-item label="数量" prop="num">
+          <el-input v-model="dataForm.num" placeholder="请输入数量" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -176,9 +176,9 @@ export default {
       getDetList().then((res) => {
         console.log(res);
         // console.log(response);
-        this.workOrderList = res.data.map((item) => {
+        this.detList = res.data.map((item) => {
           return {
-            name: item.name,
+            name: item.content,
             id: item.id
           }
         })

src/views/quality/monitoring/currentData/dialogForm.vue

@@ -16,7 +16,7 @@
 				<el-form-item
 					label="检测内容"
 					prop="inspectionDetId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '检测内容不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.inspectionDetId"
 						placeholder="请选择检测内容"
@@ -36,7 +36,7 @@
 				<el-form-item
 					label="来源"
 					prop="source"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '来源不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.source"
 						placeholder="请选择来源"
@@ -60,7 +60,7 @@
 				<el-form-item
 					label="产线"
 					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '产线不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.productionLineId"
 						placeholder="请选择产线"
@@ -79,7 +79,7 @@
 				<el-form-item
 					label="工段"
 					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '工段不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.sectionId"
 						placeholder="请选择工段"
@@ -110,7 +110,7 @@
 				<el-form-item
 					label="检测时间"
 					prop="checkTime"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '检测时间不能为空', trigger: 'blur' }]">
 					<el-date-picker
 						v-model="innerDataForm.checkTime"
 						type="datetime"

src/views/quality/monitoring/currentData/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
-
     <!-- 列表 -->
     <el-row>
       <el-col class="custom-tabs">
@@ -20,6 +18,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane :label="'\u3000图形数据\u3000'" name="chart" style="overflow: inherit">
+            <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
             <div id="main" style="height: 500px;width: 1000px;"></div>
           </el-tab-pane>
         </el-tabs>
@@ -75,13 +74,13 @@ export default {
       },
       activeName: 'table',
       searchBarFormConfig: [
-        // {
-        //   type: 'select',
-        //   label: '工单号',
-        //   placeholder: '请选择工单号',
-        //   param: 'workOrderId',
-        //   selectOptions: [],
-        // },
+        {
+          type: 'label',
+          label: '当前检测数据柱状图',
+          // placeholder: '请选择工单号',
+          // param: 'workOrderId',
+          // selectOptions: [],
+        },
 				// {
 				// 	type: 'select',
 				// 	label: '产品',
@@ -95,40 +94,40 @@ export default {
 				// 	placeholder: '请输入检测内容',
 				// 	param: 'inspectionDetContent',
 				// },
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-          valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'checkTime',
-					// width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
 				// {
-				// 	type: this.$auth.hasPermi(
-				// 		'base:quality-inspection-record:create'
-				// 	)
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '新增',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'success',
+				// 	type: 'datePicker',
+				// 	label: '时间段',
+				// 	dateType: 'daterange', // datetimerange
+				// 	// format: 'yyyy-MM-dd HH:mm:ss',
+				// 	format: 'yyyy-MM-dd',
+        //   valueFormat: 'timestamp',
+				// 	rangeSeparator: '-',
+				// 	startPlaceholder: '开始日期',
+				// 	endPlaceholder: '结束日期',
+				// 	defaultTime: ['00:00:00', '23:59:59'],
+				// 	param: 'checkTime',
+				// 	// width: 350,
 				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '查询',
+				// 	name: 'search',
+				// 	color: 'primary',
+				// },
+				// {
+				// 	type: 'separate',
+				// },
+				// // {
+				// // 	type: this.$auth.hasPermi(
+				// // 		'base:quality-inspection-record:create'
+				// // 	)
+				// // 		? 'button'
+				// // 		: '',
+				// // 	btnName: '新增',
+				// // 	name: 'add',
+				// // 	plain: true,
+				// // 	color: 'success',
+				// // },
 			],
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:quality-inspection-record:update')
@@ -316,6 +315,7 @@ export default {
               data: arrYAxis,
               type: 'bar',
               showBackground: true,
+              barWidth:'20',
               backgroundStyle: {
                 color: 'rgba(180, 180, 180, 0.2)'
               }

src/views/quality/monitoring/processTraceabilityDetail/components/ProcessDetail.vue

@@ -68,7 +68,7 @@ export default {
 						input: true,
 						label: '工序名称',
 						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -77,7 +77,7 @@ export default {
 						label: '工段',
 						prop: 'sectionId',
 						url: '/base/core-workshop-section/listAll',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},

src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue

@@ -6,141 +6,81 @@
 -->
 
 <template>
-	<el-form
-		ref="form"
-		:model="innerDataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="检测内容"
-					prop="inspectionDetId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.inspectionDetId"
-						placeholder="请选择检测内容"
-						filterable
-						clearable
-						@change="handleInspectionDetChange">
-						<el-option
-							v-for="opt in inspectionDetList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
+  <el-form ref="form" :model="innerDataForm" label-width="100px" v-loading="formLoading">
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="工单号" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单号" filterable clearable>
+            <el-option v-for="opt in workOrderList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="检测内容" prop="inspectionDetId"
+          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.inspectionDetId" placeholder="请选择检测内容" filterable clearable
+            @change="handleInspectionDetChange">
+            <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="产线" prop="productionLineId"
+          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.productionLineId" placeholder="请选择产线" filterable clearable
+            @change="handleProductlineChange">
+            <el-option v-for="opt in productionLineList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="工段" prop="sectionId" :rules="[{ required: false, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.sectionId" placeholder="请选择工段" clearable filterable
+            @change="$emit('update', innerDataForm)">
+            <el-option v-for="opt in sectionList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="检测人员" prop="checkPerson">
+          <el-input v-model="innerDataForm.checkPerson" clearable @change="$emit('update', innerDataForm)"
+            placeholder="请输入检测人员" />
+        </el-form-item>
+      </el-col>
 
-			<el-col :span="12">
-				<el-form-item
-					label="来源"
-					prop="source"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.source"
-						placeholder="请选择来源"
-						filterable
-						clearable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '手动', value: 1 },
-								{ label: '自动', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						clearable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.sectionId"
-						placeholder="请选择工段"
-						clearable
-						filterable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in sectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="检测人员" prop="checkPerson">
-					<el-input
-						v-model="innerDataForm.checkPerson"
-						clearable
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入检测人员" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="检测时间"
-					prop="checkTime"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="innerDataForm.checkTime"
-						type="datetime"
-						placeholder="请选择检测时间"
-						value-format="timestamp"
-						@change="$emit('update', innerDataForm)"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="描述" prop="explainText">
-					<el-input
-						v-model="innerDataForm.explainText"
-						placeholder="请输入描述信息"
-						@change="$emit('update', innerDataForm)"
-						type="textarea"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col>
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="innerDataForm.remark"
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入备注"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
+      <el-col :span="12">
+        <el-form-item label="检测时间" prop="checkTime" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-date-picker v-model="innerDataForm.checkTime" type="datetime" placeholder="请选择检测时间"
+            value-format="timestamp" @change="$emit('update', innerDataForm)"></el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="来源" prop="source" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.source" placeholder="请选择来源" filterable clearable
+            @change="$emit('update', innerDataForm)">
+            <el-option v-for="opt in [
+            	{ label: '手动', value: 1 },
+            	{ label: '自动', value: 2 },
+            ]" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="innerDataForm.remark" @change="$emit('update', innerDataForm)" placeholder="请输入备注">
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
 </template>
 
 <script>
@@ -163,13 +103,14 @@ export default {
 			formLoading: true,
 			inspectionDetList: [],
 			productionLineList: [],
-			sectionList: [],
+      sectionList: [],
+      workOrderList:[],
 			innerDataForm: {},
 			cacheInspectionDetList: null,
 		};
 	},
 	mounted() {
-		Promise.all([this.getProductLineList(), this.getInspectionDetList()]).then(
+    Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList()]).then(
 			() => {
 				this.formLoading = false;
 			}
@@ -231,6 +172,14 @@ export default {
 			}));
 		},
 
+    async getWorkOrderList() {
+      const response = await this.$axios('base/core-work-order/listbyfilter');
+      this.workOrderList = response.data.map((item) => ({
+        label: item.name,
+        value: item.id,
+      }));
+    },
+
 		// 获取检测内容列表
 		async getInspectionDetList() {
 			const response = await this.$axios(

src/views/quality/monitoring/qualityInspectionRecord/index.vue

@@ -74,7 +74,7 @@ export default {
 						url: '/base/quality-inspection-det/listAll',
 						prop: 'inspectionDetId',
 						labelKey: 'content',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -102,7 +102,7 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
 					},
 					{
 						select: true,
@@ -113,7 +113,7 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: false, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -126,7 +126,7 @@ export default {
 						datetime: true,
 						label: '检测时间',
 						prop: 'checkTime',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '检测时间不能为空', trigger: 'blur' }],
 						bind: {
 							format: 'yyyy-MM-dd HH:mm:ss',
 							'value-format': 'timestamp',
@@ -135,31 +135,25 @@ export default {
 						},
 					},
 				],
-				// [
-				// 	{
-				// 		textarea: true,
-				// 		label: '检测内容',
-				// 		prop: 'inspectionDetContent',
-				// 		value: '',
-				// 		rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-				// 	},
-				// ],
 				[{ textarea: true, label: '描述', prop: 'explainText' }],
 				[{ input: true, label: '备注', prop: 'remark' }],
 			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					param: 'productionLineId',
-					selectOptions: [],
+					label: '工单号',
+          placeholder: '请选择工单号',
+					param: 'workOrderId',
+          selectOptions: [],
+          filterable:true
 				},
 				{
-					type: 'input',
+          type: 'select',
 					label: '检测内容',
-					placeholder: '请输入检测内容',
-					param: 'inspectionDetContent',
+          placeholder: '请输入检测内容',
+          selectOptions: [],
+          param: 'inspectionDetContent',
+          filterable: true
 				},
 				{
 					type: 'datePicker',
@@ -217,7 +211,12 @@ export default {
 					fixed: true,
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
+        },
+        {
+          // width: 128,
+          prop: 'workOrderName',
+          label: '工单Id',
+        },
 				{
 					// width: 128,
 					prop: 'inspectionDetContent',
@@ -255,7 +254,8 @@ export default {
 				inspectionDetContent: undefined,
 				productionLineId: undefined,
 				sectionId: undefined,
-				checkPerson: undefined,
+        checkPerson: undefined,
+        workOrderId:undefined,
 				checkTime: undefined,
 				source: undefined,
 				explainText: undefined,
@@ -264,16 +264,17 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+        pageSize: 10,
+        workOrderId:null,
 				inspectionDetContent: null,
 				checkTime: [],
-				productionLineId: null,
+				// productionLineId: null,
 			},
 		};
 	},
 	created() {
 		this.getList();
-		// this.getProductLineList();
+		this.getProductLineList()
 	},
 	watch: {
 		form: {
@@ -309,7 +310,7 @@ export default {
 	methods: {
 		/** 获取搜索栏的产线列表 */
 		getProductLineList() {
-			this.$axios('/base/production-line/listAll').then((response) => {
+      this.$axios('/base/core-work-order/listbyfilter').then((response) => {
 				this.searchBarFormConfig[0].selectOptions = response.data.map(
 					(item) => {
 						return {
@@ -318,7 +319,17 @@ export default {
 						};
 					}
 				);
-			});
+      })
+      this.$axios('/base/quality-inspection-det/listAll').then((response) => {
+        this.searchBarFormConfig[1].selectOptions = response.data.map(
+          (item) => {
+            return {
+              name: item.content,
+              id: item.content,
+            };
+          }
+        );
+      });
 		},
 		/** 查询列表 */
 		getList() {

src/views/quality/monitoring/statisticalData/dialogForm.vue

@@ -16,7 +16,7 @@
 				<el-form-item
 					label="检测内容"
 					prop="inspectionDetId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '检测内容不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.inspectionDetId"
 						placeholder="请选择检测内容"
@@ -36,7 +36,7 @@
 				<el-form-item
 					label="来源"
 					prop="source"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '来源不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.source"
 						placeholder="请选择来源"
@@ -60,7 +60,7 @@
 				<el-form-item
 					label="产线"
 					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '产线不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.productionLineId"
 						placeholder="请选择产线"
@@ -79,7 +79,7 @@
 				<el-form-item
 					label="工段"
 					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '工段不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.sectionId"
 						placeholder="请选择工段"
@@ -110,7 +110,7 @@
 				<el-form-item
 					label="检测时间"
 					prop="checkTime"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					:rules="[{ required: true, message: '检测时间不能为空', trigger: 'blur' }]">
 					<el-date-picker
 						v-model="innerDataForm.checkTime"
 						type="datetime"

src/views/quality/monitoring/statisticalData/index.vue

@@ -206,6 +206,16 @@ export default {
   computed: {
     tableProps() {
       return [
+        {
+          // width: 128,
+          prop: 'workOrderId',
+          label: '工单号',
+        },
+        {
+          // width: 128,
+          prop: 'productionName',
+          label: '产品',
+        },
         {
           // width: 160,
           prop: 'inspectionContent',
@@ -214,8 +224,8 @@ export default {
         ...this.dynamicProps,
         {
           // width: 128,
-          prop: 'sumInput',
-          label: '检测类型总数',
+          prop: 'sumScrap',
+          label: '未检测总数',
         },
         {
           // width: 128,
@@ -342,6 +352,8 @@ export default {
           inspectionContent: item.inspectionContent,
           ...keyValuePairs,
           sumInput: item.sumInput,
+          productionName: item.productionName,
+          workOrderId: item.workOrderId,
           scrapRatio: item.scrapRatio,
         };
       });

src/views/warehouse/end-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-17 09:52:17
+ * @LastEditTime: 2023-11-20 15:54:28
  * @Description:
 -->
 <template>
@@ -15,31 +15,31 @@
 		label-width="100px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="名称" prop="name">
+				<el-form-item label="物品名称" prop="name">
 					<el-input
 						v-model="dataForm.name"
 						clearable
-						placeholder="请输入名称" />
+						placeholder="请输入物品名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="编码" prop="code">
+				<el-form-item label="物品编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
 						clearable
-						placeholder="请输入编码" />
+						placeholder="请输入物品编码" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="规格" prop="spec">
+				<el-form-item label="物品规格" prop="spec">
 					<el-input
 						v-model="dataForm.spec"
 						clearable
-						placeholder="请输入规格" />
+						placeholder="请输入物品规格" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="单位" prop="unit">
+				<el-form-item label="物品单位" prop="unit">
 					<el-select
 						v-model="dataForm.unit"
 						filterable
@@ -57,6 +57,7 @@
 			<el-col :span="12">
 				<el-form-item label="单日消耗量" prop="dailyUse">
 					<el-input-number
+            :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
 						placeholder="请输入单日消耗量" />
@@ -65,9 +66,10 @@
 			<el-col :span="12">
 				<el-form-item label="允许留存时间" prop="allowTime">
 					<el-input-number
+            :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-						placeholder="请输入允许留存时间" />
+						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -134,10 +136,10 @@ export default {
 			},
 			dataRule: {
 				code: [
-					{ required: true, message: '库位编码不能为空', trigger: 'blur' },
+					{ required: true, message: '物品编码不能为空', trigger: 'blur' },
 				],
 				name: [
-					{ required: true, message: '库位名称不能为空', trigger: 'blur' },
+					{ required: true, message: '物品名称不能为空', trigger: 'blur' },
 				],
 			},
 			isorno: [

src/views/warehouse/end-material/warehouseGoods/index.vue

@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict';
 const tableProps = [
 	{
 		prop: 'name',
-		label: '名称',
+		label: '物品名称',
 	},
 	{
 		prop: 'code',
-		label: '编码',
+		label: '物品编码',
 	},
 	{
 		prop: 'spec',
-		label: '规格',
+		label: '物品规格',
 	},
 	{
 		prop: 'unit',
-		label: '单位',
+		label: '物品单位',
     filter: publicFormatter('unit_dict')
 	},
 	{
@@ -121,8 +121,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '名称',
-					placeholder: '名称',
+					label: '物品名称',
+					placeholder: '物品名称',
 					param: 'name',
 				},
 				{

src/views/warehouse/end-material/warehouseLocationHis/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
@@ -114,7 +113,7 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`end-material:warehouse-realtime-location-his:query`)
+				this.$auth.hasPermi(`end-material:warehouse-location-his:query`)
 					? {
 							type: 'info',
 							btnName: '详情',

src/views/warehouse/end-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-04 16:32:54
+ * @LastEditTime: 2023-11-20 15:14:18
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-						@change="setBatchInfo"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -79,13 +78,12 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="入库数量" prop="numDet">
+				<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet">
 					<el-input-number
 						v-model="dataForm.numDet"
 						clearable
             :min="0"
-            :max="max?max:9999999"
-						placeholder="请输入入库数量" />
+						placeholder="请输入数量" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -130,7 +128,6 @@ export default {
 			},
 			goodsArr: [],
 			Batch: [],
-      max: 0,
 			dataRule: {
 				goodsId: [
 					{ required: true, message: '物品名称不能为空', trigger: 'change' },
@@ -143,7 +140,7 @@ export default {
 					},
 				],
 				numDet: [
-					{ required: true, message: '入库数量不能为空', trigger: 'blur' },
+					{ required: true, message: '数量不能为空', trigger: 'blur' },
 				],
 			},
 		};
@@ -172,13 +169,6 @@ export default {
 				}
 			});
 		},
-    setBatchInfo(){
-			this.Batch.forEach((item) => {
-				if (item.goodsBatch === this.dataForm.goodsBatch) {
-					this.max = item.numDet
-				}
-			});
-    },
 		outWare(data) {
 			this.getArr();
 			this.visible = true;

src/views/warehouse/end-material/warehouseRealtimeLocation/attr-add.vue

@@ -29,6 +29,7 @@
 					<el-option
 						v-for="item in productArr"
 						:key="item.id"
+            :disabled="!item.enabled"
 						:label="item.name"
 						:value="item" />
 				</el-select>

src/views/warehouse/out-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-17 09:51:59
+ * @LastEditTime: 2023-11-20 15:54:39
  * @Description:
 -->
 <template>
@@ -15,31 +15,31 @@
 		label-width="100px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="名称" prop="name">
+				<el-form-item label="物品名称" prop="name">
 					<el-input
 						v-model="dataForm.name"
 						clearable
-						placeholder="请输入名称" />
+						placeholder="请输入物品名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="编码" prop="code">
+				<el-form-item label="物品编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
 						clearable
-						placeholder="请输入编码" />
+						placeholder="请输入物品编码" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="规格" prop="spec">
+				<el-form-item label="物品规格" prop="spec">
 					<el-input
 						v-model="dataForm.spec"
 						clearable
-						placeholder="请输入规格" />
+						placeholder="请输入物品规格" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="单位" prop="unit">
+				<el-form-item label="物品单位" prop="unit">
 					<el-select
 						v-model="dataForm.unit"
 						filterable
@@ -57,6 +57,7 @@
 			<el-col :span="12">
 				<el-form-item label="单日消耗量" prop="dailyUse">
 					<el-input-number
+            :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
 						placeholder="请输入单日消耗量" />
@@ -65,9 +66,10 @@
 			<el-col :span="12">
 				<el-form-item label="允许留存时间" prop="allowTime">
 					<el-input-number
+            :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-						placeholder="请输入允许留存时间" />
+						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -134,10 +136,10 @@ export default {
 			},
 			dataRule: {
 				code: [
-					{ required: true, message: '库位编码不能为空', trigger: 'blur' },
+					{ required: true, message: '物品编码不能为空', trigger: 'blur' },
 				],
 				name: [
-					{ required: true, message: '库位名称不能为空', trigger: 'blur' },
+					{ required: true, message: '物品名称不能为空', trigger: 'blur' },
 				],
 			},
 			isorno: [

src/views/warehouse/out-material/warehouseGoods/index.vue

@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict';
 const tableProps = [
 	{
 		prop: 'name',
-		label: '名称',
+		label: '物品名称',
 	},
 	{
 		prop: 'code',
-		label: '编码',
+		label: '物品编码',
 	},
 	{
 		prop: 'spec',
-		label: '规格',
+		label: '物品规格',
 	},
 	{
 		prop: 'unit',
-		label: '单位',
+		label: '物品单位',
     filter: publicFormatter('unit_dict')
 	},
 	{
@@ -121,8 +121,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '名称',
-					placeholder: '名称',
+					label: '物品名称',
+					placeholder: '物品名称',
 					param: 'name',
 				},
 				{

src/views/warehouse/out-material/warehouseLocationHis/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
@@ -114,7 +113,7 @@ export default {
 			tableData: [],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`out-material:warehouse-realtime-location-his:query`)
+				this.$auth.hasPermi(`out-material:warehouse-location-his:query`)
 					? {
 							type: 'info',
 							btnName: '详情',

src/views/warehouse/out-material/warehouseRealtime/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-04 16:24:41
+ * @LastEditTime: 2023-11-20 15:14:00
  * @Description:
 -->
 <template>
@@ -68,7 +68,6 @@
 						v-model="dataForm.goodsBatch"
 						filterable
 						clearable
-						@change="setBatchInfo"
 						placeholder="请选择物品名称">
 						<el-option
 							v-for="(item, index) in Batch"
@@ -79,13 +78,12 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="入库数量" prop="numDet">
+				<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet">
 					<el-input-number
 						v-model="dataForm.numDet"
 						clearable
             :min="0"
-            :max="max?max:9999999"
-						placeholder="请输入入库数量" />
+						placeholder="请输入数量" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -130,7 +128,6 @@ export default {
 			},
 			goodsArr: [],
 			Batch: [],
-      max: 0,
 			dataRule: {
 				goodsId: [
 					{ required: true, message: '物品名称不能为空', trigger: 'change' },
@@ -143,7 +140,7 @@ export default {
 					},
 				],
 				numDet: [
-					{ required: true, message: '入库数量不能为空', trigger: 'blur' },
+					{ required: true, message: '数量不能为空', trigger: 'blur' },
 				],
 			},
 		};
@@ -172,13 +169,6 @@ export default {
 				}
 			});
 		},
-    setBatchInfo(){
-			this.Batch.forEach((item) => {
-				if (item.goodsBatch === this.dataForm.goodsBatch) {
-					this.max = item.numDet
-				}
-			});
-    },
 		outWare(data) {
 			this.getArr();
 			this.visible = true;

src/views/warehouse/out-material/warehouseRealtimeLocation/attr-add.vue

@@ -29,6 +29,7 @@
 					<el-option
 						v-for="item in productArr"
 						:key="item.id"
+            :disabled="!item.enabled"
 						:label="item.name"
 						:value="item" />
 				</el-select>

src/views/warehouse/package-material/warehouseGoods/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-17 09:51:44
+ * @LastEditTime: 2023-11-20 15:54:49
  * @Description:
 -->
 <template>
@@ -15,31 +15,31 @@
 		label-width="100px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="名称" prop="name">
+				<el-form-item label="物品名称" prop="name">
 					<el-input
 						v-model="dataForm.name"
 						clearable
-						placeholder="请输入名称" />
+						placeholder="请输入物品名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="编码" prop="code">
+				<el-form-item label="物品编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
 						clearable
-						placeholder="请输入编码" />
+						placeholder="请输入物品编码" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="规格" prop="spec">
+				<el-form-item label="物品规格" prop="spec">
 					<el-input
 						v-model="dataForm.spec"
 						clearable
-						placeholder="请输入规格" />
+						placeholder="请输入物品规格" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="单位" prop="unit">
+				<el-form-item label="物品单位" prop="unit">
 					<el-select
 						v-model="dataForm.unit"
 						filterable
@@ -57,6 +57,7 @@
 			<el-col :span="12">
 				<el-form-item label="单日消耗量" prop="dailyUse">
 					<el-input-number
+            :min="0"
 						v-model="dataForm.dailyUse"
 						clearable
 						placeholder="请输入单日消耗量" />
@@ -65,9 +66,10 @@
 			<el-col :span="12">
 				<el-form-item label="允许留存时间" prop="allowTime">
 					<el-input-number
+            :min="0"
 						v-model="dataForm.allowTime"
 						clearable
-						placeholder="请输入允许留存时间" />
+						placeholder="请输入允许留存时间" /> (天)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -134,10 +136,10 @@ export default {
 			},
 			dataRule: {
 				code: [
-					{ required: true, message: '库位编码不能为空', trigger: 'blur' },
+					{ required: true, message: '物品编码不能为空', trigger: 'blur' },
 				],
 				name: [
-					{ required: true, message: '库位名称不能为空', trigger: 'blur' },
+					{ required: true, message: '物品名称不能为空', trigger: 'blur' },
 				],
 			},
 			isorno: [

src/views/warehouse/package-material/warehouseGoods/index.vue

@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict';
 const tableProps = [
 	{
 		prop: 'name',
-		label: '名称',
+		label: '物品名称',
 	},
 	{
 		prop: 'code',
-		label: '编码',
+		label: '物品编码',
 	},
 	{
 		prop: 'spec',
-		label: '规格',
+		label: '物品规格',
 	},
 	{
 		prop: 'unit',
-		label: '单位',
+		label: '物品单位',
     filter: publicFormatter('unit_dict')
 	},
 	{
@@ -121,8 +121,8 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '名称',
-					placeholder: '名称',
+					label: '物品名称',
+					placeholder: '物品名称',
 					param: 'name',
 				},
 				{