Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test

Reviewed-on: #129

.env.dev

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

.env.front

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

.env.prod

@@ -15,22 +15,18 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
 
 
 # 根据服务器或域名修改
-# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
-PUBLIC_PATH = 'http://192.168.0.33:8889/'
+PUBLIC_PATH = 'http://10.70.2.32'
 
 # 二级部署路径
-VUE_APP_APP_NAME ='yudao-admin'
+# VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.stage

@@ -1,26 +1,27 @@
-NODE_ENV = production
+# 生产环境配置
+ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = MES系统
 
-# 测试环境配置
-ENV = 'staging'
+# 芋道管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
 
-# 芋道管理系统/测试环境
-VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
+# 积木报表指向地址
+VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
-# 静态资源地址
-PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
+
+# 根据服务器或域名修改
+PUBLIC_PATH = 'http://192.168.0.33:8889/'
+
+# 二级部署路径
+# VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
-

.env.static

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

src/api/base/delivery.js

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

src/api/base/materialProductBom.js

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

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

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

src/api/quality/processTraceability.js

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

src/assets/icons/svg/table_edit.svg

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

src/components/DialogForm/index.vue

@@ -142,6 +142,9 @@ function findMaxLabelWidth(rows) {
 			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
+				if (opt.label.includes('(')) {
+					max = max - 3
+				}
 			}
 		});
 	});
@@ -239,7 +242,7 @@ export default {
 		size: {
 			type: String,
 			default: '',
-		},
+		}
 	},
 	data() {
 		return {

src/components/Editor/index.vue

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

src/components/FileUpload/index.vue

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

src/components/Verifition/Verify/VerifySlide.vue

@@ -360,6 +360,7 @@ export default {
         ts: Date.now(), // 现在的时间戳
       }
       reqGet(data).then(res => {
+        console.log(1)
         if (res.repCode === '0000') {
           this.backImgBase = res.repData.originalImageBase64
           this.blockBackImgBase = res.repData.jigsawImageBase64

src/router/index.js

@@ -104,7 +104,7 @@ export const constantRoutes = [
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
     component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue')
-  },
+  }, 
      {
     path: '/processingBoard',
     name: 'processingBoard',

src/styles/index.scss

@@ -196,4 +196,8 @@ input, textarea{
   margin-right: 8px;
   vertical-align: middle;
 }
-// 抽屉head区域---end
+// 抽屉head区域---end
+// 弹出框，上下分布，去掉label的padding-bottom
+.el-form--label-top .el-form-item__label {
+  padding: 0;
+}

src/utils/ruoyi.js

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

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

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

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

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

src/views/base/coreHotMaterial/index.vue

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

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

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

src/views/base/coreProduct/index.vue

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

src/views/base/coreSupplier/index.vue

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

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

@@ -2,23 +2,23 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-24 18:20:26
+ * @LastEditTime: 2023-11-28 14:09:09
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
 		size="50%">
 		<small-title slot="title" :no-padding="true">
-			{{ '预使用主原料信息' }}
+			{{ '工单名称：' + dataForm.name }}
 		</small-title>
 		<div class="content">
-			<div style="height: 10vh">
+			<!-- <div style="height: 10vh">
 				<div style="font-size: 18px;">工单名：{{ dataForm.name }}</div>
-			</div>
+			</div> -->
 
 			<div class="attr-list">
 				<small-title
@@ -30,7 +30,7 @@
 				<div class="action_btn">
 					<template>
             <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
             </span>
           </template>
 				</div>
@@ -55,9 +55,9 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
+			<!-- <div class="drawer-body__footer">
 				<el-button type="primary" @click="goback()">关闭</el-button>
-			</div>
+			</div> -->
 		</div>
 
 		<attr-add

src/views/base/coreWorkOrder/addWorkOrder.vue

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

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

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'35%'"
+		:width="'50%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -17,73 +17,92 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="100px"
+			label-width="80px"
 			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="原料" prop="material">
-				<el-select
-					v-model="dataForm.material"
-					filterable
-					style="width: 100%"
-					placeholder="请选择原料">
-					<el-option
-						v-for="dict in getDictDatas('material')"
-						:key="dict.value"
-						:label="dict.label"
-						:value="dict.value" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="来源" prop="origin">
-				<el-select
-					v-model="dataForm.origin"
-					filterable
-					style="width: 100%"
-					placeholder="请选择来源">
-					<el-option
-						v-for="dict in originList"
-						:key="dict.value"
-						:label="dict.label"
-						:value="dict.value" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="供应商" prop="supplierId">
-				<el-select
-					v-model="dataForm.supplierId"
-					filterable
-					style="width: 100%"
-					placeholder="请选择供应商">
-					<el-option
-						v-for="dict in supplierList"
-						:key="dict.id"
-						:label="dict.name"
-						:value="dict.id" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="批次号" prop="batch">
-				<el-input
-					v-model="dataForm.batch"
-					clearable
-					placeholder="请输入批次号" />
-			</el-form-item>
-			<el-form-item label="数量" prop="num">
-				<el-input-number
-					v-model="dataForm.num"
-					clearable
-					style="width: 100%"
-					placeholder="请输入数量" />
-			</el-form-item>
-			<el-form-item label="单位" prop="unit">
-				<el-select
-					v-model="dataForm.unit"
-					filterable
-					style="width: 100%"
-					placeholder="请选择单位">
-					<el-option
-						v-for="dict in getDictDatas('unit_dict')"
-						:key="dict.value"
-						:label="dict.label"
-						:value="dict.value" />
-				</el-select>
-			</el-form-item>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="原料" prop="material">
+						<el-select
+							v-model="dataForm.material"
+							filterable
+							style="width: 100%"
+							placeholder="请选择原料">
+							<el-option
+								v-for="dict in getDictDatas('material')"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="来源" prop="origin">
+						<el-select
+							v-model="dataForm.origin"
+							filterable
+							style="width: 100%"
+							placeholder="请选择来源">
+							<el-option
+								v-for="dict in originList"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="供应商" prop="supplierId">
+						<el-select
+							v-model="dataForm.supplierId"
+							filterable
+							style="width: 100%"
+							placeholder="请选择供应商">
+							<el-option
+								v-for="dict in supplierList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="批次号" prop="batch">
+						<el-input
+							v-model="dataForm.batch"
+							clearable
+							placeholder="请输入批次号" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+						<el-input-number
+							v-model="dataForm.num"
+							clearable
+							controls-position="right"
+							style="width: 100%"
+							placeholder="请输入数量" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="单位" prop="unit">
+						<el-select
+							v-model="dataForm.unit"
+							filterable
+							style="width: 100%"
+							placeholder="请选择单位">
+							<el-option
+								v-for="dict in getDictDatas('unit_dict')"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>
 
 		<el-row style="text-align: right">

src/views/base/coreWorkOrder/index.vue

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

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

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

src/views/base/coreWorkshopSection/index.vue

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

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

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:22:38
+ * @LastEditTime: 2023-11-27 15:26:12
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -120,6 +120,7 @@
 					</el-row>
 				</el-form>
 			</div>
+			
 			<div class="attr-list" v-if="idAttrShow">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
@@ -156,13 +157,11 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
-					编辑
-				</el-button> -->
-				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
+			<div v-if="!isdetail" class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
+
 		</div>
 
 		<attr-add
@@ -293,11 +292,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
+					`是否确认删除属性名为"${raw.data.attrName}"的数据项?`,
 					'提示',
 					{
 						confirmButtonText: '确定',
@@ -363,6 +358,29 @@ export default {
 				}
 			});
 		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+						this.visible = false
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+					this.idAttrShow = true
+          this.$emit("refreshDataList");
+        });
+      });
+    },
 		goback() {
 			this.$emit('refreshDataList');
 			this.visible = false;
@@ -432,7 +450,7 @@ export default {
 }
 .action_btn {
   float: right;
-  margin: -35px 15px;
+  margin: -40px 15px;
   font-size: 14px;
 }
 .add {

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

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'35%'"
+		:width="'30%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -17,7 +17,7 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="100px"
+			label-width="70px"
 			@keyup.enter.native="dataFormSubmit()">
 			<el-form-item label="属性名" prop="attrName">
 				<el-input

src/views/base/material/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="220"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -85,25 +85,25 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`base:material:queryAttr`)
+					? {
+							type: 'detail',
+							btnName: '查看属性',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`base:material:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-					this.$auth.hasPermi(`base:material:queryAttr`)
-					? {
-							type: 'search',
-							btnName: '查看属性',
-					  }
-					: undefined,
-					this.$auth.hasPermi(`base:material:editAttr`)
-					? {
-							type: 'editAttr',
-							btnName: '编辑属性',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:material:delete`)
+					// this.$auth.hasPermi(`base:material:editAttr`)
+					// ? {
+					// 		type: 'editAttr',
+					// 		btnName: '编辑属性',
+					//   }
+					// : undefined,
+        this.$auth.hasPermi(`base:material:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -136,7 +136,7 @@ export default {
 				},
 				{
 					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
-					btnName: '新增物料',
+					btnName: '新增',
 					name: 'add',
 					color: 'success',
 					plain: true
@@ -166,7 +166,7 @@ export default {
 			});
 		},
 		otherMethods(val) {
-			if (val.type === 'search') {
+			if (val.type === 'detail') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {

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

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

src/views/base/materialDate/index.vue

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

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

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

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

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

src/views/base/materialProductBom/index.vue

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

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:40:08
+ * @LastEditTime: 2023-11-27 19:57:23
  * @Description:
 -->
 <template>
@@ -11,9 +11,10 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
+		label-width="80px"
+		label-position="top">
 		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="物料名称" prop="materialId">
 					<el-select
 						v-model="dataForm.materialId"
@@ -21,6 +22,7 @@
 						clearable
 						filterable
 						@change="setCode"
+						style="width: 100%"
 					>
 						<el-option
 							v-for="dict in materialList"
@@ -30,7 +32,7 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="物料编码" prop="materialCode">
 					<el-input
 						v-model="dataForm.materialCode"
@@ -39,15 +41,14 @@
 						placeholder="请输入物料编码" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="批次号" prop="materialDateId">
 					<el-select
 						v-model="dataForm.materialDateId"
 						clearable
 						filterable
 						placeholder="请选择物料批次"
+						style="width: 100%"
 					>
 						<el-option
 							v-for="dict in materialDateList"
@@ -57,13 +58,16 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
 				<el-form-item label="使用设备" prop="equipmentId">
 					<el-select
 						v-model="dataForm.equipmentId"
 						clearable
 						filterable
-						placeholder="请选择使用设备">
+						placeholder="请选择使用设备"
+						style="width: 100%">
 						<el-option
 							v-for="dict in eqList"
 							:key="dict.id"
@@ -72,9 +76,7 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="使用时间" prop="useTime">
 					<el-date-picker
 						v-model="dataForm.useTime"
@@ -84,14 +86,15 @@
 						placeholder="选择日期时间" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="操作员" prop="userNames">
 					<el-select
 						v-model="dataForm.userNames"
 						clearable
 						filterable
 						multiple
-						placeholder="请选择操作员">
+						placeholder="请选择操作员"
+						style="width: 100%">
 						<el-option
 							v-for="dict in workersList"
 							:key="dict.id"
@@ -102,12 +105,12 @@
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="使用数量" prop="num">
-					<el-input-number v-model="dataForm.num" clearable placeholder="请输入使用数量" />
+					<el-input-number v-model="dataForm.num" clearable controls-position="right" placeholder="请输入使用数量" style="width: 100%" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="数据来源" prop="source">
 					<el-select
 						v-model="dataForm.source"
@@ -121,10 +124,12 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
+			<el-col :span="8">
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
 		</el-row>
-		<el-form-item label="备注" prop="remark">
-			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
-		</el-form-item>
 	</el-form>
 </template>
 
@@ -237,13 +242,8 @@ export default {
 						this.dataForm.source = response.data.source
 						this.dataForm.remark = response.data.remark
 						this.dataForm.userNames = response.data.userName.split(',')
-						console.log('打印', this.dataForm)
           });
-        } else {
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
-				}
+        } else {}
       });
     },
 		setCode() {

src/views/base/materialUseLog/index.vue

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

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-01 10:30:12
+ * @LastEditTime: 2023-11-24 09:29:36
  * @Description:
  */
 export default {
@@ -85,6 +85,7 @@ export default {
     },
     //tableBtn点击
     handleClick(val) {
+      console.log(val.data.packagingCode);
       if (val.type === "edit") {
         this.addOrUpdateVisible = true;
         this.addOrEditTitle = "编辑";
@@ -92,7 +93,7 @@ export default {
           this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data.packagingCode )
       } else if (val.type === "change") {
         this.changeStatus(val.data.id)
       } else {
@@ -101,7 +102,7 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`是否确认删除${name ? '[' + name + ']' : '[' + index + ']'}数据项?`, "提示", {
+      this.$confirm(`是否确认删除${name ? ' 名称为'+ name : '[' + index + ']'}数据项?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/base/packagingPrintLog/index.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -54,13 +54,15 @@ export default {
 				alarmContent: null,
 				alarmValue: null,
 				// 缺少报警编号字段, 用 alarmValue 代替
+				alarmCode: null,
+				equipmentCode: null
 			},
 			orderFormRows: [
 				[
 					{
 						input: true,
 						label: '设备编码',
-						prop: 'equipment',
+						prop: 'equipmentCode',
 					},
 					{
 						datetime: true,
@@ -70,7 +72,7 @@ export default {
 					{
 						input: true,
 						label: '报警编号',
-						prop: 'alarmValue',
+						prop: 'alarmCode',
 					},
 					{
 						input: true,

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

@@ -151,7 +151,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'recordTime',
+					param: 'createTime',
 					// defaultSelect: [
 					// 	new Date(y, m, d)
 					// 		.toLocaleString()
@@ -206,7 +206,7 @@ export default {
 				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
-				recordTime: []
+				recordTime: [],
 			},
 			basePath: '/base/equipment-alarm-log',
 			list: [],

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

@@ -9,7 +9,8 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="mode.includes('detail') ? true : false"
+		:before-close="handleCancel"
 		class="drawer"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
@@ -129,13 +130,12 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">返回</el-button>
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
-					v-if="!mode.includes('detail')"
 					@click="handleSave">
-					保存
+					确定
 				</el-button>
 			</div>
 		</div>

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

@@ -9,7 +9,8 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="mode.includes('detail') ? true : false"
+		:before-close="handleCancel"
 		class="drawer"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
@@ -128,11 +129,10 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
-					v-if="!mode.includes('detail')"
 					@click="handleCancel">
 					确定
 				</el-button>

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

@@ -34,7 +34,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="700px"
+			width="30%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">

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

@@ -304,7 +304,7 @@ export default {
 					filter: publicFormatter('unit_dict'),
 				},
 				{
-					prop: 'equipment_param_type',
+					prop: 'equipmentParamType',
 					label: '设备参数类型',
 					filter: (val) =>
 						val != null
@@ -312,7 +312,7 @@ export default {
 							: '-',
 				},
 				{
-					prop: 'production_param_type',
+					prop: 'productionParamType',
 					label: '生产参数类型',
 					filter: (val) =>
 						val != null

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

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

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

@@ -9,7 +9,8 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="mode.includes('detail') ? true : false"
+		:before-close="handleCancel"
 		class="drawer"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
@@ -61,7 +62,7 @@
 									关联表名
 								</div>
 								<div class="value" style="font-size: 14px">
-									{{ form.plcTableName }}
+									{{ form.plcName }}
 								</div>
 							</el-col>
 						</el-row>
@@ -73,9 +74,17 @@
 										class="title"
 										label="设备名"
 										style="font-size: 16px; margin: 8px 0">
-										<el-input
-											v-model="form.equipmentName"
-											placeholder="请输入设备名"></el-input>
+										<el-select
+											v-model="form.equipmentId"
+											filterable
+											clearable
+											placeholder="请选择设备">
+											<el-option
+												v-for="eq in eqList"
+												:key="eq.id"
+												:label="eq.name"
+												:value="eq.id"></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
 								<el-col :span="8">
@@ -83,9 +92,17 @@
 										class="title"
 										label="设备关联表名"
 										style="font-size: 16px; margin: 8px 0">
-										<el-input
-											v-model="form.plcTableName"
-											placeholder="请输入关联表名"></el-input>
+										<el-select
+											v-model="form.plcId"
+											filterable
+											clearable
+											placeholder="请选择关联表">
+											<el-option
+												v-for="plc in plcList"
+												:key="plc.id"
+												:label="plc.name"
+												:value="plc.id"></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
 							</el-form>
@@ -131,13 +148,12 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
-					v-if="!mode.includes('detail')"
 					@click="handleSave">
-					保存
+					确定
 				</el-button>
 			</div>
 		</div>
@@ -202,6 +218,8 @@ export default {
 			total: 0,
 			form: {},
 			list: [],
+			eqList: [],
+			plcList: [],
 			attrTitle: '',
 			attrForm: {
 				id: null,
@@ -257,7 +275,7 @@ export default {
 					{
 						select: true,
 						label: '设备参数类型',
-						prop: 'equipment_param_type',
+						prop: 'equipmentParamType',
 						options: [
 							{ label: '一般参数', value: 1 },
 							{ label: '工艺参数', value: 2 },
@@ -274,7 +292,7 @@ export default {
 					{
 						select: true,
 						label: '生产参数类型',
-						prop: 'production_param_type',
+						prop: 'productionParamType',
 						options: [
 							// { label: '进片数量', value: 1 },
 							// { label: '出片数量', value: 2 },
@@ -380,6 +398,17 @@ export default {
 	mounted() {
 		this.shouldRefreshPageView = false;
 		this.mode = this.defaultMode || 'detail';
+
+		if (this.mode != 'detail') {
+			this.$axios('/base/core-equipment/listAll').then(({ code, data }) => {
+				this.eqList = data;
+			});
+			this.$axios({
+				url: '/base/equipment-plc/page',
+			}).then(({ code, data }) => {
+				this.plcList = data.list;
+			});
+		}
 		for (const section of this.sections) {
 			// 请求具体信息
 			if ('url' in section) {
@@ -479,6 +508,8 @@ export default {
 				defaultValue: '',
 				description: '',
 				remark: '',
+				equipmentParamType: '',
+				productionParamType: '',
 				alarmContent: '',
 			};
 			this.attrTitle = '添加参数绑定信息';

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

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

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

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

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

@@ -49,7 +49,8 @@
 		<addRecord
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList" />
+			@refreshDataList="getList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -93,7 +94,7 @@ export default {
 			tableProps: [
 				{ prop: 'configName', label: '配置名称' },
 				{ prop: 'equipmentName', label: '设备名称' },
-				// { prop: 'lineName', label: '数据来源' },
+				{ prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] },
 				// { prop: 'sectionName', label: '计划巡检时间' },
 				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
 				// { prop: 'maintenanceDetail', label: '完成状态' },

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-24 18:38:22
+ * @LastEditTime: 2023-11-27 10:48:55
  * @Description:
 -->
 <template>
@@ -176,11 +176,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
+					`是否确认删除巡检项目名称为"${raw.data.program}"的数据项?`,
 					'提示',
 					{
 						confirmButtonText: '确定',

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

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

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

@@ -36,14 +36,10 @@
 			:dialogVisible="open"
 			@close="cancel"
 			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="false"
-				:rows="rows" />
+			@confirm="handleConfirm">
+			<add
+				ref="add"
+				@refreshDataList="successSubmit" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata
@@ -56,12 +52,13 @@
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
+import add from './add.vue'
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentCheckSetting',
-	components: { addOrUpdata },
+	components: { addOrUpdata, add },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -206,6 +203,13 @@ export default {
 		this.getList();
 	},
 	methods: {
+		handleConfirm() {
+      this.$refs.add.dataFormSubmit()
+    },
+		successSubmit() {
+      this.cancel()
+      this.getList()
+    },
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(
@@ -230,9 +234,10 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
+			this.$refs.add.formClear()
 			this.open = false;
-			this.mode = null;
-			this.reset();
+			this.title = ''
+			// this.reset();
 		},
 		/** 表单重置 */
 		reset() {
@@ -257,18 +262,26 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			this.reset();
+			// this.reset();
 			this.open = true;
 			this.title = '添加巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init();
+			});
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改巡检设置';
+			// this.reset();
+			// const id = row.id;
+			// this.info({ id }).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改巡检设置';
+			// });
+			this.open = true;
+			this.title = '修改巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init(row.id);
 			});
 		},
 		/** 提交按钮 */
@@ -298,7 +311,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该巡检记录?')
+				.confirm('是否确认删除配置名为"' + row.name + '"的数据项?')
 				.then(() => {
 					return this.del({ id });
 				})

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

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

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

@@ -99,23 +99,24 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 150,
 					filter: timeFilter,
 				},
-				{ prop: 'maintainOrderNumber', label: '设备保养单号' },
-				{ prop: 'startTime', label: '开始时间', filter: timeFilter },
-				{ prop: 'endTime', label: '结束时间', filter: timeFilter },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'maintainWorker', label: '保养人员' },
+				{ prop: 'maintainOrderNumber', label: '设备保养单号', width: 110, showOverflowtooltip: true },
+				{ prop: 'startTime', label: '开始时间', filter: timeFilter, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'endTime', label: '结束时间', filter: timeFilter, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'maintainWorker', label: '保养人员', minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'relatePlan',
 					label: '是否计划保养',
+					width: 120,
 					filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
 				},
-				{ prop: 'planName', label: '保养计划名称' },
-				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
-				{ prop: 'timeUsed', label: '实际保养用时(h)' },
-				{ prop: 'remark', label: '备注' },
+				{ prop: 'planName', label: '保养计划名称', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'maintainDuration', label: '计划保养用时(h)', minWidth: 130, showOverflowtooltip: true },
+				{ prop: 'timeUsed', label: '实际保养用时(h)', minWidth: 130 },
+				{ prop: 'remark', label: '备注', minWidth: 100, showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
@@ -162,6 +163,15 @@ export default {
 				{
 					type: 'separate',
 				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'warning',
+				},
 				{
 					type: this.$auth.hasPermi('equipment:maintain-record:create')
 						? 'button'
@@ -171,14 +181,6 @@ export default {
 					plain: true,
 					color: 'success',
 				},
-				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
-						? 'button'
-						: '',
-					btnName: '导出',
-					name: 'export',
-					color: 'warning',
-				},
 			],
 			rows: [
 				[
@@ -213,17 +215,29 @@ export default {
 					},
 				],
 				[
+					// {
+					// 	switch: true,
+					// 	label: '是否计划保养',
+					// 	prop: 'relatePlan',
+					// 	bind: {
+					// 		'active-value': 1,
+					// 		'inactive-value': 2,
+					// 	},
+					// 	rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
+					// },
 					{
-						switch: true,
+						select: true,
+						options: [
+							{ label: '是', value: 1 },
+							{ label: '否', value: 2 }
+						],
 						label: '是否计划保养',
 						prop: 'relatePlan',
 						bind: {
-							'active-value': 1,
-							'inactive-value': 2,
+							clearable: true, filterable: true
 						},
 						rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
 					},
-					{},
 					{
 						select: true,
 						label: '所属计划',
@@ -234,6 +248,11 @@ export default {
 							clearable: true,
 						},
 					},
+					{
+						input: true,
+						label: '保养用时',
+						prop: 'timeUsed',
+					},
 				],
 				[
 					{
@@ -260,11 +279,7 @@ export default {
 							clearable: true,
 						},
 					},
-					{
-						input: true,
-						label: '保养用时',
-						prop: 'timeUsed',
-					},
+					{}
 				],
 
 				[

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

@@ -9,166 +9,168 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="disabled"
 		class="drawer"
-		size="60%">
+		custom-class="mes-drawer"
+		size="65%"
+		@closed="$emit('destroy')">
 		<small-title slot="title" :no-padding="true">
 			{{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
 		</small-title>
-		<el-form
-			ref="form"
-			:model="dataForm"
-			label-width="100px"
-			label-position="top"
-			v-loading="formLoading">
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item label="维修单号" prop="repairOrderNumber">
-						<span>{{ dataForm.repairOrderNumber }}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="设备名称" prop="equipmentName">
-						<span>{{ dataForm.equipmentName }}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="维修工" prop="repairman">
-						<span>{{ dataForm.repairman }}</span>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item label="故障发生时间" prop="faultTime">
-						<span>{{ parseTime(dataForm.faultTime) }}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="故障级别" prop="faultLevel">
-						<span>{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="联系方式" prop="repairmanPhone">
-						<span>{{ dataForm.repairmanPhone }}</span>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-				{{ '可编辑信息' }}
-			</small-title>
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item
-						label="维修开始时间"
-						prop="maintenanceStartTime"
-						:rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
-						<el-date-picker
-							v-model="dataForm.maintenanceStartTime"
-							type="datetime"
-							:disabled="disabled"
-							placeholder="请选择维修开始时间"
-							value-format="timestamp" />
-					</el-form-item>
-				</el-col>
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<el-form
+					ref="form"
+					:model="dataForm"
+					label-width="100px"
+					label-position="top"
+					v-loading="formLoading">
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="维修单号" prop="repairOrderNumber">
+								<span>{{ dataForm.repairOrderNumber }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="设备名称" prop="equipmentName">
+								<span>{{ dataForm.equipmentName }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="维修工" prop="repairman">
+								<span>{{ dataForm.repairman }}</span>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="故障发生时间" prop="faultTime">
+								<span>{{ parseTime(dataForm.faultTime) }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="故障级别" prop="faultLevel">
+								<span>{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="联系方式" prop="repairmanPhone">
+								<span>{{ dataForm.repairmanPhone }}</span>
+							</el-form-item>
+						</el-col>
+					</el-row>
 
-				<el-col :span="8">
-					<el-form-item
-						label="维修结束时间"
-						prop="maintenanceFinishTime"
-						:rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
-						<el-date-picker
-							v-model="dataForm.maintenanceFinishTime"
-							type="datetime"
-							:disabled="disabled"
-							placeholder="请选择维修开始时间"
-							value-format="timestamp" />
-					</el-form-item>
-				</el-col>
+					<el-divider style="margin-top: -10px" />
+					
+					<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+						{{ '设备维修信息' }}
+					</small-title>
+					<el-row :gutter="20">
+						<el-col :span="6">
+							<el-form-item
+								label="维修开始时间"
+								prop="maintenanceStartTime"
+								:rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
+								<el-date-picker
+									v-model="dataForm.maintenanceStartTime"
+									type="datetime"
+									:disabled="disabled"
+									placeholder="请选择维修开始时间"
+									value-format="timestamp" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item
+								label="维修结束时间"
+								prop="maintenanceFinishTime"
+								:rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
+								<el-date-picker
+									v-model="dataForm.maintenanceFinishTime"
+									type="datetime"
+									:disabled="disabled"
+									placeholder="请选择维修开始时间"
+									value-format="timestamp" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item
+								label="维修方式"
+								prop="repairMode"
+								:rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
+								<el-select
+									:disabled="disabled"
+									v-model="dataForm.repairMode"
+									placeholder="请选择维修方式">
+									<el-option
+										v-for="opt in getDictDatas('repair-mode')"
+										:key="opt.value"
+										:label="opt.label"
+										:value="opt.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="故障类型" prop="faultType">
+								<el-select
+									:disabled="disabled"
+									v-model="dataForm.faultType"
+									placeholder="请选择故障类型">
+									<el-option
+										v-for="opt in getDictDatas('fault-type')"
+										:key="opt.value"
+										:label="opt.label"
+										:value="opt.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
 
-				<el-col :span="8">
-					<el-form-item
-						label="维修方式"
-						prop="repairMode"
-						:rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
-						<el-select
-							:disabled="disabled"
-							v-model="dataForm.repairMode"
-							placeholder="请选择维修方式">
-							<el-option
-								v-for="opt in getDictDatas('repair-mode')"
-								:key="opt.value"
-								:label="opt.label"
-								:value="opt.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item label="故障类型" prop="faultType">
-						<el-select
-							:disabled="disabled"
-							v-model="dataForm.faultType"
-							placeholder="请选择故障类型">
-							<el-option
-								v-for="opt in getDictDatas('fault-type')"
-								:key="opt.value"
-								:label="opt.label"
-								:value="opt.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
+					<el-row :gutter="20">
+						<el-col>
+							<el-form-item
+								label="故障明细"
+								prop="faultDetail"
+								:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
+								<!-- // 富文本 -->
+								<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150"/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 
-			<el-row :gutter="20">
-				<el-col>
-					<el-form-item
-						label="故障明细"
-						prop="faultDetail"
-						:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
-						<!-- // 富文本 -->
-						<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="380"/>
-					</el-form-item>
-				</el-col>
-			</el-row>
+					<el-row :gutter="20">
+						<el-col>
+							<el-form-item label="维修记录" prop="maintenanceDetail">
+								<!-- // 富文本 -->
+								<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="150"/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 
-			<el-row :gutter="20">
-				<el-col>
-					<el-form-item label="维修记录" prop="maintenanceDetail">
-						<!-- // 富文本 -->
-						<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="380"/>
-					</el-form-item>
-				</el-col>
-			</el-row>
+					<el-row :gutter="20">
+						<el-col>
+							<el-form-item label="维修附件" prop="file">
+								<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
+							</el-form-item>
+						</el-col>
+					</el-row>
 
-			<el-row :gutter="20">
-				<el-col>
-					<el-form-item label="维修附件" prop="file">
-						<FileUpload v-model="file" :disabled="disabled" />
-					</el-form-item>
-				</el-col>
-			</el-row>
+					<el-row :gutter="20">
+						<el-col>
+							<el-form-item label="备注" prop="remark">
+								<el-input
+									v-model="dataForm.remark"
+									:placeholder="`请输入备注`"
+									:disabled="disabled" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
 
-			<el-row :gutter="20">
-				<el-col>
-					<el-form-item label="备注" prop="remark">
-						<el-input
-							v-model="dataForm.remark"
-							:placeholder="`请输入备注`"
-							:disabled="disabled" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-
-		<div class="drawer-body__footer">
-			<el-button style="" @click="goback()">{{ disabled ? '返回' : '取消' }}</el-button>
-			<!-- <el-button v-if="disabled" type="primary" @click="goEdit()">
-				编辑
-			</el-button> -->
-			<el-button v-if="!disabled" type="primary" @click="dataFormSubmit()">确定</el-button>
+				<div v-if="!disabled" class="drawer-body__footer">
+					<el-button style="" @click="goback()">取消</el-button>
+					<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+				</div>
+			</div>
 		</div>
 	</el-drawer>
 </template>
@@ -206,11 +208,15 @@ export default {
 			visible: false,
 			disabled: false,
 			dataForm: {},
-			file: ''
+			file: '',
+			fileName: ''
 		};
 	},
 	mounted() {},
 	methods: {
+		setFileName(val) {
+			this.fileName = val
+		},
 		goback() {
 			this.$emit('refreshDataList');
 			this.visible = false;
@@ -225,12 +231,15 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
+		initData() {
+			this.file = ''
+			this.fileName = ''
+		},
 		init(row, isdetail) {
-			// this.initData();
+			this.initData();
 			this.disabled = isdetail || false;
 			this.dataForm.id = row.id || undefined;
 			this.visible = true;
-			console.log('111', this.dataForm, row)
 
 			this.$nextTick(() => {
 				this.$refs['form'].resetFields();
@@ -241,6 +250,10 @@ export default {
 						this.formLoading = false
             this.dataForm = response.data;
 						this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+						if (this.dataForm.files.length > 0) {
+							this.file = this.dataForm.files[0].fileUrl
+							this.fileName = this.dataForm.files[0].fileName
+						}
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
@@ -261,6 +274,7 @@ export default {
 					let arry = []
 					temp.forEach(item => {
 						arry.push({
+							fileName: this.fileName,
 							fileType: 2,
 							fileUrl: item
 						})
@@ -288,56 +302,39 @@ export default {
 </script>
 
 <style scoped>
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
 .drawer >>> .el-drawer {
 	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
 }
 
 .drawer >>> .el-drawer__header {
 	margin: 0;
 	padding: 32px 32px 24px;
 	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
 }
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
 	display: flex;
 	flex-direction: column;
+	height: 100%;
 }
 
-.drawer >>> .content {
-	padding: 30px 24px;
+.drawer-body__content {
 	flex: 1;
-	display: flex;
-	flex-direction: column;
-	/* height: 100%; */
-}
-
-.drawer >>> .visual-part {
-	flex: 1 auto;
-	max-height: 76vh;
-	overflow: hidden;
-	overflow-y: scroll;
-	padding-right: 10px; /* 调整滚动条样式 */
-}
-
-.drawer >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
 }
 
 .drawer-body__footer {

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

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

src/views/equipment/monitor/SearchBar.vue

@@ -17,6 +17,8 @@
 				<el-select
 					size="small"
 					placeholder="请选择产线"
+					clearable 
+					filterable
 					@change="getEquipmentByLineId"
 					v-model="form.productionLineId">
 					<el-option
@@ -30,6 +32,8 @@
 				<el-select
 					size="small"
 					placeholder="请选择设备"
+					clearable 
+					filterable
 					v-model="form.equipmentId">
 					<el-option
 						v-for="item in listEq"

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

@@ -80,6 +80,8 @@
 			<el-select
 				v-if="open"
 				style="width: 100%"
+				filterable
+				clearable
 				v-model="queryParams.equipmentId"
 				placeholder="请选择一个设备">
 				<el-option

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 16:50:55
+ * @LastEditTime: 2023-11-28 10:03:20
  * @Description:
 -->
 <template>
@@ -53,7 +53,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="drawer-body__footer">
+      <div v-if="!isdetail" class="drawer-body__footer">
         <el-button style="" @click="goback()">取消</el-button>
         <el-button v-if="isdetail" type="primary" @click="goEdit()">
           编辑

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

@@ -1,8 +1,13 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
+<<<<<<< HEAD
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-23 09:20:12
+ * @LastEditTime: 2023-11-28 10:09:20
+=======
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-27 16:37:17
+>>>>>>> projects/mes-test
  * @Description:
 -->
 <template>
@@ -53,7 +58,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="isdetail" class="drawer-body__footer">
+      <div v-if="!isdetail" class="drawer-body__footer">
         <el-button style="" @click="goback()">取消</el-button>
         <el-button v-if="isdetail" type="primary" @click="goEdit()">
           编辑
@@ -140,7 +145,7 @@ const tableProps = [
     label: '最小值（工艺）',
   },
   {
-    prop: 'manValue',
+    prop: 'maxValue',
     label: '最大值（工艺）',
   },
   {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-11-23 14:26:54
+ * @LastEditTime: 2023-11-28 10:11:40
  * @LastEditors: zhp
  * @Description:
 -->
@@ -84,7 +84,7 @@ export default {
       },
       equipmentId:null,
 			dataRule: {
-				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        paramId: [{ required: true, message: '参数名称不能为空', trigger: 'change' }],
 			},
 		};
   },

src/views/extend/processFlow/index.vue

@@ -279,7 +279,7 @@ export default {
 				.then(async () => {
 					const { code } = await this.http(
 						'/extend/process-flow/copy',
-						'post',
+						'get',
 						{
 							id,
 						}
@@ -333,10 +333,11 @@ export default {
 
 		async getList() {
 			this.loading = true;
-			const { code, data } = await this.recv(this.queryParams);
+			// const { code, data } = await this.recv(this.queryParams);
+			const { code, data } = await this.http('/extend/process-flow/listAll', 'get');
 			if (code == 0) {
-				this.list = data.list;
-				this.total = data.total;
+				this.list = data;
+				// this.total = data.total;
 				this.loading = false;
 				return;
 			}

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

@@ -28,7 +28,7 @@ export default {
 	// },
 	props: {
 		currentSelect: {
-			type: String,
+			type: String | Number,
 			default: null,
 		},
 		list: {
@@ -59,8 +59,16 @@ export default {
 		},
 		currentSelect: {
 			handler(val) {
+				// val: string
 				this.selected = val;
 				this.randomKey = Math.random();
+				// 更新选中状态
+				if (val) {
+					this.list__inner.forEach((item) => {
+						if (item.id == val) item.disabled = false;
+						else item.disabled = true;
+					});
+				}
 			},
 			immediate: true,
 		},

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

@@ -19,7 +19,7 @@
 			</el-col>
 		</el-row>
 
-		<el-row style="border: 1px solid #ccc; display: flex">
+		<el-row v-if="filteredBomList.length" style="border: 1px solid #ccc; display: flex">
 			<el-col :span="8">
 				<div class="select-list">
 					<div class="sl__header" style="background: #f3f4fb; padding: 12px">
@@ -78,6 +78,7 @@
 				</div>
 			</el-col>
 		</el-row>
+		<div class="no-data-bg" v-else></div>
 	</div>
 </template>
 ;

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

@@ -77,6 +77,17 @@
 				:bom-list="bomList"
 				:value="selectedBoms"
 				@update="selectedBoms = $event" />
+
+			<el-row slot="footer">
+				<el-button size="small" @click="cancel">取消</el-button>
+				<el-button
+					type="primary"
+					size="small"
+					@click="submitForm"
+					:loading="btnLoading">
+					确定
+				</el-button>
+			</el-row>
 		</base-dialog>
 	</section>
 </template>
@@ -95,6 +106,7 @@ export default {
 	},
 	data() {
 		return {
+			btnLoading: false,
 			open: false,
 			eqList: [],
 			bomList: [],
@@ -170,6 +182,7 @@ export default {
 			});
 		},
 		submitForm() {
+			this.btnLoading = true;
 			// 现将子组件的修改提交更新至本组件
 			this.$refs.bomSelector.commit();
 			// 再提交至后端
@@ -187,11 +200,14 @@ export default {
 					if (code == 0) {
 						this.$message.success('操作成功');
 						this.getList(this.currentDet);
+						this.btnLoading = false;
 						this.cancel();
 					} else {
+						this.btnLoading = false;
 						this.$message.error('操作失败');
 					}
 				} else {
+					this.btnLoading = false;
 					this.$message.info('请选择设备');
 				}
 			});
@@ -218,34 +234,45 @@ export default {
 				this.total = 0;
 			}
 
+			this.selectedBoms = [];
 			// 获取设备及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 {
+			})
+				.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);
+						this.selectedBoms = [];
+					}
+				})
+				.catch((err) => {
 					this.bomList.splice(0);
-				}
-			});
+					this.selectedBoms = [];
+				});
 		},
 		async handleAddEquipment() {
 			this.open = true;

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

@@ -34,7 +34,7 @@
 				class="btn-refresh"
 				@click="handleUpdateLayout"
 				icon="el-icon-refresh">
-				刷新布局
+				保存布局
 			</el-button>
 			<el-button
 				type="primary"
@@ -62,6 +62,16 @@
 			@cancel="cancel"
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<el-row slot="footer">
+				<el-button size="small" @click="cancel">取消</el-button>
+				<el-button
+					type="primary"
+					size="small"
+					@click="submitForm"
+					:loading="btnLoading">
+					确定
+				</el-button>
+			</el-row>
 		</base-dialog>
 	</section>
 </template>
@@ -102,7 +112,9 @@ export default {
 						input: true,
 						label: '工序名称',
 						prop: 'name',
-						rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '工序名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -111,7 +123,9 @@ 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,
 						},
@@ -139,6 +153,7 @@ export default {
 			},
 			currentDet: null,
 			currentNode: null,
+			btnLoading: false
 		};
 	},
 	watch: {
@@ -221,7 +236,7 @@ export default {
 				node.attr('container/stroke', '#0b58ff');
 				const { detId, detName, detDesc, processId, sectionId, sectionName } =
 					node.attrs;
-				console.log('node clicked!', node)
+				console.log('node clicked!', node);
 				this.currentDet = {};
 				this.$set(this.currentDet, 'detId', detId?.text);
 				this.$set(this.currentDet, 'sectionId', sectionId?.text);
@@ -354,6 +369,7 @@ export default {
 		},
 
 		handleEdit() {
+			console.log('edit: ', this.currentDet);
 			this.form.name = this.currentDet.detName;
 			this.form.sectionId = this.currentDet.sectionId;
 			this.form.remark = this.currentDet.detDesc;
@@ -379,6 +395,7 @@ export default {
 				if (!valid) {
 					return;
 				}
+				this.btnLoading = true;
 				// 修改的提交
 				if (this.form.id != null) {
 					this.updateProcess()
@@ -392,9 +409,20 @@ export default {
 									sectionName: { text: sectionName },
 									detDesc: { text: remark },
 								});
+								// 修改currentDet
+								this.currentDet = {
+									...this.currentDet,
+									detName: name,
+									sectionId: sectionId,
+									sectionName: sectionName,
+									detDesc: remark,
+								};
+								this.btnLoading = false;
 							});
 						})
-						.catch((err) => {});
+						.catch((err) => {
+							this.btnLoading = false;
+						});
 					return;
 				}
 
@@ -412,11 +440,14 @@ export default {
 					.then((node) => {
 						if (!node) {
 							this.$modal.msgError('创建节点失败');
+							this.btnLoading = false;
 							return;
 						}
+						this.btnLoading = false;
 						this.graph.addNode(node);
 					})
 					.catch((err) => {
+						this.btnLoading = false;
 						return;
 					});
 			});

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

@@ -21,12 +21,12 @@
 			</el-col>
 		</el-row>
 
-		<el-row :gutter="20" style="margin-top: 12px;">
+		<el-row :gutter="20" style="margin-top: 12px">
 			<el-col :span="6">
 				<!-- <InfoItem label="创建人" value="xxse" /> -->
 			</el-col>
 			<el-col :span="6">
-				<InfoItem label="创建时间" :value="form.createTime" />
+				<InfoItem label="创建时间" :value="form.createTime" :time-format="true" />
 			</el-col>
 			<el-col :span="6">
 				<!-- <InfoItem label="更新人" value="xxse" /> -->
@@ -39,11 +39,12 @@
 </template>
 
 <script>
+import moment from 'moment';
 
 const InfoItem = {
 	name: 'InfoItem',
 	components: {},
-	props: ['label', 'value'],
+	props: ['label', 'value', 'timeFormat'],
 	data() {
 		return {};
 	},
@@ -52,9 +53,13 @@ const InfoItem = {
 	render: function (h) {
 		return (
 			<div style="display: flex; align-items: center; font-size: 14px; line-height: 1.5">
-				<span style="width: 100px; text-align: left; font-weight: 700">{this.label}:</span>
+				<span style="width: 100px; text-align: left; font-weight: 700">
+					{this.label}:
+				</span>
 				<span style="width: 200px; text-align: left; text-overflow: ellipse; white-space: nowrap">
-					{this.value}
+					{this.timeFormat
+						? moment(this.value).format('YYYY-MM-DD HH:mm:ss')
+						: this.value}
 				</span>
 			</div>
 		);
@@ -77,12 +82,12 @@ export default {
 				createTime: null,
 				remark: null,
 				enable: null,
-				code: null
+				code: null,
 			},
 		};
 	},
 	activated() {
-		this.getInfo()
+		this.getInfo();
 	},
 	computed: {},
 	methods: {
@@ -93,7 +98,7 @@ export default {
 				method,
 				params: method === 'get' ? payload : null,
 				data: method !== 'get' ? payload : null,
-			})
+			});
 		},
 		put(payload) {
 			return this.http(this.updateUrl, 'put', payload);
@@ -114,12 +119,12 @@ export default {
 			// debugger;
 			if (code == 0) {
 				this.form = {
-					...data
+					...data,
 				};
 			} else {
-				this.$modal.msgError('工艺信息获取失败')
+				this.$modal.msgError('工艺信息获取失败');
 			}
-		}
+		},
 	},
 };
 </script>

src/views/extend/processTraceability/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:23:40
+ * @LastEditTime: 2023-11-28 10:34:24
  * @Description:
 -->
 <template>
@@ -26,9 +26,10 @@ import { parseTime } from '../../core/mixins/code-filter';
 import {
   getProcessTraceabilityPage,
   getWorkOrderList,
+  getCoreProduct
   // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
-
+import { publicFormatter } from '@/utils/dict';
 const tableProps = [
   {
     prop: 'name',
@@ -44,7 +45,8 @@ const tableProps = [
   },
   {
     prop: 'status',
-    label: '状态'
+    label: '状态',
+    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
   },
   {
     prop: 'startProduceTime',
@@ -61,8 +63,9 @@ const tableProps = [
     label: '生产数量'
   },
   {
-    prop: 'unit',
-    label: '单位'
+    prop: 'planProductUnit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
   },
   {
     prop: 'processFlowName',
@@ -113,7 +116,8 @@ export default {
           selectOptions: [],
           labelField: 'name',
           valueField: 'id',
-          param: 'orderName'
+          param: 'orderName',
+          filterable: true,
         },
         {
           type: 'datePicker',
@@ -182,17 +186,25 @@ export default {
     handleClick(val) {
       if (val.type === "processDetail") {
         console.log(val);
-        this.$router.push({
-          name: 'process-traceability-detail',
-          params: {
-            id: '1715180991838887938',
-            orderId: val.data.id,
-            name: val.data.name,
-            productName: val.data.planProductName,
-            processFlowName: val.data.processFlowName
-            // equipmentName,
-          },
-        });
+        let specificationsData =''
+        getCoreProduct(val.data.planProductId).then((res) => {
+          console.log(res)
+
+          this.$router.push({
+            path: 'process-traceability-detail',
+            query: {
+              id: val.data.processFlowId,
+              orderId: val.data.id,
+              name: val.data.name,
+              specifications: res.data.specifications,
+              productName: val.data.planProductName,
+              processFlowName: val.data.processFlowName,
+              // planProductId: val.data.planProductId
+              // equipmentName,
+            },
+          });
+        })
+
         // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
       }
     },

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

@@ -117,11 +117,11 @@ export default {
         // },
         { prop: 'name', label: '参数名' },
         {
-          prop: 'name', label: '设定范围最小- 最大 / 标准',
+          prop: 'status', label: '设定范围最小- 最大 / 标准',
           subcomponent: StatusBtn
         },
         {
-          prop: 'code', label: '最小值',
+          prop: '', label: '最小值',
           children: [
             {
               prop: 'minValueSet',
@@ -134,7 +134,7 @@ export default {
           ]
         },
         {
-          prop: 'code', label: '最大值',
+          prop: '', label: '最大值',
           children: [
             {
               prop: 'maxValueSet',
@@ -184,9 +184,9 @@ export default {
       getDetMaterial({
         pageNo: 1,
         pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
         flowDetId: [this.detId],
-        // orderId: this.$route.params.orderId,
+        // orderId: this.$route.query.orderId,
 
       },).then((res) => {
         console.log(res);
@@ -231,25 +231,29 @@ export default {
         getDetMaterial({
           pageNo: 1,
           pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
           flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,
 
         },).then((res) => {
-          this.materialList = res.data[0].data
-          this.name = res.data[0].name
+          if (res.data.length != []) {
+            this.materialList = res.data[0].data
+            this.name = res.data[0].name
+          }
         })
       } else {
         getDetValue({
           pageNo: 1,
           pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
           flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,
 
         }).then((res) => {
-          this.valueList = res.data[0].data
-          this.name = res.data[0].name
+          if (res.data.length != []) {
+            this.valueList = res.data[0].data
+            this.name = res.data[0].name
+          }
         })
       }
     },
@@ -258,12 +262,14 @@ export default {
       getDetMaterial({
         pageNo: 1,
         pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
         flowDetId: [this.detId],
       }).then((res) => {
         console.log(res);
-        this.materialList = res.data[0].data
-        this.name = res.data[0].name
+        if (res.data.length != []) {
+          this.materialList = res.data[0].data
+          this.name = res.data[0].name
+        }
       })
 		},
 		clearList() {

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

@@ -123,7 +123,7 @@ export default {
 		}
 	},
   mounted() {
-    console.log(this.$route.params.id)
+    console.log(this.$route.query.id)
 		this.loadLayout().then(json => {
 			this.initGraph(json)
 		})
@@ -260,7 +260,7 @@ export default {
 		},
 
 		async loadLayout() {
-      const flowId = this.$route.params.id;
+      const flowId = this.$route.query.id;
       console.log(flowId)
 			if (!flowId) return { cells: [] }
 			const { code, data } = await this.info({ id: flowId });
@@ -288,12 +288,12 @@ export default {
 		async handleUpdateLayout() {
 			this.layout.content = JSON.stringify(this.graph.toJSON());
 			let code, data;
-			console.table([this.layout, this.$route.params.id])
+			console.table([this.layout, this.$route.query.id])
 			// 手动刷新布局
 			if (this.layout.id) {
 				({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
 			} else {
-				this.layout.flowId = this.$route.params.id;
+				this.layout.flowId = this.$route.query.id;
 				({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
 			}
 
@@ -410,7 +410,7 @@ export default {
 		},
 
 		createProcess() {
-			// const flowId = this.$route.params.id;
+			// const flowId = this.$route.query.id;
 			const flowId = this.getFlowId(); // it also works
 			if (!flowId) {
 				this.$modal.msgError('工艺ID不能为空');

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

@@ -20,14 +20,13 @@
         <InfoItem label="产品名称" :value="form.productName" />
       </el-col>
       <el-col :span="6">
-        <InfoItem label="产品规格"  />
+        <InfoItem label="产品规格" :value="form.specifications" />
       </el-col>
     </el-row>
   </section>
 </template>
 
 <script>
-
 const InfoItem = {
 	name: 'InfoItem',
 	components: {},
@@ -62,6 +61,7 @@ export default {
 				id: null,
 				name: null,
         productName: null,
+        specifications:null,
         processFlowName: null,
 				// remark: null,
 				// enable: null,
@@ -70,7 +70,8 @@ export default {
 		};
 	},
 	mounted() {
-		this.getInfo()
+    this.getInfo()
+    console.log(this.$route.query)
 	},
 	computed: {},
 	methods: {
@@ -95,12 +96,14 @@ export default {
 		// info(payload) {
 		// 	return this.http(this.infoUrl, 'get', payload);
 		// },
-    async getInfo() {
-      this.form.name = this.$route.params.name
-      this.form.productName = this.$route.params.productName
-      this.form.processFlowName = this.$route.params.processFlowName
-      // this.form.name = this.$route.params.name
-      // const flowId = this.$route.params.id;
+    getInfo() {
+      // console.log(this.$route.query.planProductId);
+      this.form.name = this.$route.query.name
+      this.form.specifications = this.$route.query.specifications
+      this.form.productName = this.$route.query.productName
+      this.form.processFlowName = this.$route.query.processFlowName
+      // this.form.name = this.$route.query.name
+      // const flowId = this.$route.query.id;
       // console.log(flowId);
 			// if (!flowId) this.$router.go(-1);
 			// const { code, data } = await this.info({ id: flowId });

src/views/group/base/groupTeam/components/groupTeamAdd.vue

@@ -15,7 +15,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="班组组长" prop="leaderId">
-          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" @change="selectLeader">
+          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
             <el-option
               v-for="item in workerList"
               :key="item.id"

src/views/group/base/groupTeamScheduling/index.vue

@@ -290,7 +290,8 @@ export default {
           break;
         case '2': // 能源
           this.$router.push({
-            path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
+            // path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
+            path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
           })
           break;
         default:

src/views/login.vue

@@ -80,13 +80,6 @@
 
 				<!-- 表单 -->
 				<div class="form-cont">
-					<el-tabs
-						class="form"
-						v-model="loginForm.loginType"
-						style="float: none">
-						<el-tab-pane label="账号密码登录" name="uname"></el-tab-pane>
-						<el-tab-pane label="短信验证码登录" name="sms"></el-tab-pane>
-					</el-tabs>
 					<div style="">
 						<el-form
 							ref="loginForm"
@@ -106,7 +99,7 @@
 								</el-input>
 							</el-form-item>
 							<!-- 账号密码登录 -->
-							<div v-if="loginForm.loginType === 'uname'">
+							<div>
 								<el-form-item prop="username">
 									<el-input
 										v-model="loginForm.username"
@@ -139,56 +132,6 @@
 								</el-checkbox>
 							</div>
 
-							<!-- 短信验证码登录 -->
-							<div v-if="loginForm.loginType === 'sms'">
-								<el-form-item prop="mobile">
-									<el-input
-										v-model="loginForm.mobile"
-										type="text"
-										auto-complete="off"
-										placeholder="请输入手机号">
-										<!-- <svg-icon
-											slot="prefix"
-											icon-class="phone"
-											class="el-input__icon input-icon" /> -->
-									</el-input>
-								</el-form-item>
-								<el-form-item prop="mobileCode">
-									<el-input
-										v-model="loginForm.mobileCode"
-										type="text"
-										auto-complete="off"
-										placeholder="短信验证码"
-										class="sms-login-mobile-code-prefix"
-										@keyup.enter.native="handleLogin">
-										<!-- <template>
-											<svg-icon
-												slot="prefix"
-												icon-class="password"
-												class="el-input__icon input-icon" />
-										</template> -->
-										<template slot="suffix">
-											<span
-												v-if="mobileCodeTimer <= 0"
-												class="getMobileCode"
-												@click="getSmsCode"
-												style="
-													cursor: pointer;
-													color: #0b58ff;
-													font-size: calc(12 * 0.12vh);
-													line-height: calc(54 * 0.12vh);
-													padding-right: calc(10 * 0.12vh);
-												">
-												获取验证码
-											</span>
-											<span v-if="mobileCodeTimer > 0" class="getMobileCode">
-												{{ mobileCodeTimer }}秒后可重新获取
-											</span>
-										</template>
-									</el-input>
-								</el-form-item>
-							</div>
-
 							<!-- 下方的登录按钮 -->
 							<el-form-item
 								id="button-form-item"
@@ -227,13 +170,6 @@
 				</div>
 			</div>
 		</div>
-
-		<!-- 图形验证码 -->
-		<Verify
-			ref="verify"
-			:captcha-type="'blockPuzzle'"
-			:img-size="{ width: '400px', height: '200px' }"
-			@success="handleLogin" />
 	</div>
 </template>
 
@@ -241,7 +177,7 @@
 import { sendSmsCode, socialAuthRedirect } from '@/api/login';
 import { getTenantIdByName } from '@/api/system/tenant';
 import { SystemUserSocialTypeEnum } from '@/utils/constants';
-import { getCaptchaEnable, getTenantEnable } from '@/utils/ruoyi';
+import { getTenantEnable } from '@/utils/ruoyi';
 import {
 	getPassword,
 	getRememberMe,
@@ -269,7 +205,7 @@ export default {
 	data() {
 		return {
 			codeUrl: '',
-			captchaEnable: true,
+			captchaEnable: false,
 			tenantEnable: true,
 			mobileCodeTimer: 0,
 			loginForm: {
@@ -347,8 +283,6 @@ export default {
 				}
 			});
 		}
-		// 验证码开关
-		this.captchaEnable = getCaptchaEnable();
 		// 重定向地址
 		this.redirect = this.$route.query.redirect
 			? decodeURIComponent(this.$route.query.redirect)
@@ -360,15 +294,7 @@ export default {
 	},
 	methods: {
 		getCode() {
-			// 情况一，未开启：则直接登录
-			if (!this.captchaEnable) {
-				this.handleLogin({});
-				return;
-			}
-
-			// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
-			// 弹出验证码
-			this.$refs.verify.show();
+			this.handleLogin({});
 		},
 		getCookie() {
 			const username = getUsername();
@@ -522,4 +448,7 @@ export default {
 		top: 22%;
 	}
 }
+.form-cont {
+	padding-top: 40px;
+}
 </style>

src/views/monitoring/equipmentFullParams/index.vue

@@ -115,12 +115,12 @@ export default {
 				vm.$set(
 					vm.searchBarFormConfig[0],
 					'defaultSelect',
-					to.params.equipmentCode
+					to.params.equipmentName
 				);
 				vm.$set(
 					vm.searchBarFormConfig[1],
 					'defaultSelect',
-					to.params.equipmentName
+					to.params.equipmentCode
 				);
 				vm.handleQuery();
 			});

src/views/monitoring/equipmentProcessAmount/index.vue

@@ -33,7 +33,7 @@
 							:data-value="fc.id"
 							class="factory-list__item"
 							:class="{ 'is-current': fc.id == currentFactory?.id }">
-							<span>
+							<span :data-value="fc.id">
 								{{ fc.label }}
 							</span>
 							<svg-icon
@@ -98,9 +98,7 @@
 								</base-table>
 							</el-tab-pane>
 							<el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
-								<div
-									class="graph"
-									style="height: 100%;">
+								<div class="graph" style="height: 100%">
 									<!-- graph  -->
 									<Graph
 										v-if="list.length"

src/views/order/base/orderManage/components/addWorkOrder.vue

@@ -6,7 +6,7 @@
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" @change="getWorkOrderMsg">
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
             <el-option
               v-for="item in workOrderList"
               :key="item.id"

src/views/order/base/orderManage/components/orderAdd.vue

@@ -18,7 +18,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -39,7 +39,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
             <el-option
               v-for="item in customerList"
               :key="item.id"
@@ -82,7 +82,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"

src/views/order/base/orderManage/index.vue

@@ -17,7 +17,7 @@
       <method-btn
         v-if="tableBtn.length"
         slot="handleBtn"
-        :width="320"
+        :width="240"
         label="操作"
         :method-list="tableBtn"
         @clickBtn="handleClick"

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -73,7 +73,7 @@ const tableProps = [
   {
     prop: 'status',
     label: '订单状态',
-    filter: publicFormatter('order_priority')
+    filter: publicFormatter('order_status')
   },
   {
     prop: 'startProduceTime',
@@ -88,7 +88,7 @@ const tableProps = [
     minWidth: 160
   },
   {
-    prop: 'productLines',
+    prop: 'lineNames',
     label: '加工线',
     filter: (val) => val ? val.join(',') : '',
     minWidth: 180
@@ -154,7 +154,7 @@ export default {
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(315),
+      tableH: this.tableHeight(305),
       total: 0,
       tableBtn: [
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@@ -215,7 +215,7 @@ export default {
   components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(315)
+      this.tableH = this.tableHeight(305)
     })
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
@@ -347,6 +347,9 @@ export default {
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
+  .searchBarBox {
+    margin-bottom: 0;
+  }
   .boxTitle {
     display: inline-block;
     font-size: 16px;

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

@@ -1,81 +1,53 @@
 <template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
+  <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"
-				fixed="right"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
+    <!-- 列表 -->
+    <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" fixed="right" :method-list="tableBtn"
+        @clickBtn="handleTableBtnClick" />
+    </base-table>
 
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="40%"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
-					[
-						{
-							select: true,
-							label: '检测类型',
-							prop: 'typeId',
-							url: '/base/quality-inspection-type/listAll',
-							rules: [{ required: true, message: '检测类型不能为空', trigger: 'blur' }],
-							bind: {
-								filterable: true,
-							},
-						},
-					],
-					[
-						{
-							input: true,
-							label: '检测内容',
-							prop: 'content',
-							rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
-						},
-					],
-					[
-						{
-							input: true,
-							label: '内容编码',
-							prop: 'code',
-							url: '/base/quality-inspection-det/getCode',
-						},
-					],
-					[{ input: true, label: '备注', prop: 'remark' }],
-				]" />
-		</base-dialog>
-	</div>
+    <!-- 对话框(添加 / 修改) -->
+    <base-dialog :dialogTitle="title" :dialogVisible="open" width="40%" @close="cancel" @cancel="cancel"
+      @confirm="submitForm">
+      <DialogForm v-if="open" ref="form" v-model="form" :rows="[
+      	[
+      		{
+      			select: true,
+      			label: '检测类型',
+      			prop: 'typeId',
+      			url: '/base/quality-inspection-type/listAll',
+      			rules: [{ required: true, message: '检测类型不能为空', trigger: 'blur' }],
+      			bind: {
+      				filterable: true,
+      			},
+          },
+              {
+      			input: true,
+      			label: '检测内容',
+      			prop: 'content',
+      			rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
+      		},
+      	],
+
+        [
+          {
+            input: true,
+            label: '内容编码',
+            prop: 'code',
+            url: '/base/quality-inspection-det/getCode',
+          },
+          { input: true, label: '备注', prop: 'remark' }],
+      ]" />
+    </base-dialog>
+  </div>
 </template>
 
 <script>

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

@@ -1,76 +1,52 @@
 <template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
+  <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>
+    <!-- 列表 -->
+    <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" />
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
-					[
-						{
-							input: true,
-							label: '检测类型名称',
-							prop: 'name',
-							rules: [
-								{
-									required: true,
-									message: '检测类型名称不能为空',
-									trigger: 'blur',
-								},
-							],
-							// bind: {
-							// 	disabled: true, // some condition, like detail mode...
-							// }
-						},
-					],
-					[
-						{
-							input: true,
-							label: '检测类型编码',
-							prop: 'code',
-							url: '/base/quality-inspection-type/getCode',
-						},
-					],
-					[{ input: true, label: '备注', prop: 'remark' }],
-				]" />
-		</base-dialog>
-	</div>
+    <!-- 对话框(添加 / 修改) -->
+    <base-dialog :dialogTitle="title" :dialogVisible="open" @close="cancel" width="30%" @cancel="cancel"
+      @confirm="submitForm">
+      <DialogForm v-if="open" ref="form" v-model="form" :rows="[
+      	[
+      		{
+      			input: true,
+      			label: '检测类型名称',
+      			prop: 'name',
+      			rules: [
+      				{
+      					required: true,
+      					message: '检测类型名称不能为空',
+      					trigger: 'blur',
+      				},
+      			],
+      			// bind: {
+      			// 	disabled: true, // some condition, like detail mode...
+      			// }
+      		},
+      	],
+        [
+      		{
+      			input: true,
+      			label: '检测类型编码',
+      			prop: 'code',
+      			url: '/base/quality-inspection-type/getCode',
+      		},
+      	],
+      	[{ input: true, label: '备注', prop: 'remark' }],
+      ]" />
+    </base-dialog>
+  </div>
 </template>
 
 <script>

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

@@ -1,13 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-06 15:36:31
+ * @LastEditTime: 2023-11-24 08:42:18
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
-    <el-row :gutter="20">
+  <el-form :model="dataForm"  :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()">
+    <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="报废类型编码" prop="code">
           <el-input v-model="dataForm.code" placeholder="请输入报废类型编码" />
@@ -19,7 +19,7 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row :gutter="20">
+    <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="描述类型" prop="description">
           <el-input v-model="dataForm.description" clearable placeholder="描述类型" />

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

@@ -11,7 +11,7 @@
             <base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list">
             </base-table>
             <div v-for="(item,index) in downProps" :key="index">
-              <div class="blue-title">工单:{{ list[index].workOrderName }}</div>
+              <div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
               <base-table class="base-table__margin" :table-props="item" :page="1" :limit="10"
                 :table-data="downList[index]">
               </base-table>
@@ -214,7 +214,7 @@ export default {
         {
           // width: 160,
           prop: 'workOrderName',
-          label: '工单名',
+          label: '工单名称',
         },
         ...this.dynamicProps,
         {
@@ -315,7 +315,11 @@ export default {
               data: arrYAxis,
               type: 'bar',
               showBackground: true,
-              barWidth:'20',
+              barWidth: '20',
+              label: {
+                show: true,
+                position: 'top'
+              },
               backgroundStyle: {
                 color: 'rgba(180, 180, 180, 0.2)'
               }

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-10 16:25:02
+ * @LastEditTime: 2023-11-24 10:55:54
  * @Description:
 -->
 <template>
@@ -132,6 +132,9 @@ export default {
           name: 'search',
           color: 'primary',
         },
+        {
+          type: 'separate',
+        },
         // {
         // 	type: 'separate',
         // },

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-10 16:32:28
+ * @LastEditTime: 2023-11-28 10:51:44
  * @Description:
 -->
 <template>
@@ -26,10 +26,10 @@ import { parseTime } from '../mixins/code-filter';
 import {
   getProcessTraceabilityPage,
   getWorkOrderList,
+  getCoreProduct
   // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
 import { publicFormatter } from '@/utils/dict';
-
 const tableProps = [
   {
     prop: 'name',
@@ -46,7 +46,7 @@ const tableProps = [
   {
     prop: 'status',
     label: '状态',
-    filter:publicFormatter('work_order_status')
+    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
   },
   {
     prop: 'startProduceTime',
@@ -63,7 +63,7 @@ const tableProps = [
     label: '生产数量'
   },
   {
-    prop: 'unit',
+    prop: 'planProductUnit',
     label: '单位',
     filter: publicFormatter('unit_dict')
   },
@@ -73,7 +73,7 @@ const tableProps = [
   },
   {
     prop: 'yield',
-    label: '成品率'
+    label: '合格率'
   }
 ];
 
@@ -116,21 +116,22 @@ export default {
           selectOptions: [],
           labelField: 'name',
           valueField: 'id',
-          param: 'orderName'
+          param: 'orderName',
+          filterable: true,
+        },
+        {
+          type: 'datePicker',
+          label: '工单开始时间',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
         },
-        // {
-        //   type: 'datePicker',
-        //   label: '时间段',
-        //   dateType: 'daterange',
-        //   format: 'yyyy-MM-dd',
-        //   valueFormat: "yyyy-MM-dd",
-        //   rangeSeparator: '-',
-        //   startPlaceholder: '开始时间',
-        //   endPlaceholder: '结束时间',
-        //   param: 'timeVal',
-        //   defaultSelect: [],
-        //   width: 250
-        // },
         {
           type: 'button',
           btnName: '搜索',
@@ -185,17 +186,25 @@ export default {
     handleClick(val) {
       if (val.type === "processDetail") {
         console.log(val);
-        this.$router.push({
-          name: 'process-traceability-detail',
-          params: {
-            id: '1715180991838887938',
-            orderId: val.data.id,
-            name: val.data.name,
-            productName: val.data.planProductName,
-            processFlowName: val.data.processFlowName
-            // equipmentName,
-          },
-        });
+        let specificationsData =''
+        getCoreProduct(val.data.planProductId).then((res) => {
+          console.log(res)
+
+          this.$router.push({
+            path: 'process-traceability-detail',
+            query: {
+              id: val.data.processFlowId,
+              orderId: val.data.id,
+              name: val.data.name,
+              specifications: res.data.specifications,
+              productName: val.data.planProductName,
+              processFlowName: val.data.processFlowName,
+              // planProductId: val.data.planProductId
+              // equipmentName,
+            },
+          });
+        })
+
         // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
       }
     },
@@ -241,13 +250,13 @@ export default {
       if (val.btnName === 'search') {
         this.listQuery.orderName = val.orderName ? val.orderName :undefined
         // this.queryParams.status = val.status
-        // if (val.timeVal && val.timeVal.length != 0 ) {
-        // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        // this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
-        // } else {
-        //   this.listQuery.startTime = undefined
-        //   this.listQuery.endTime = undefined
-        // }
+        if (val.timeVal && val.timeVal.length != 0 ) {
+        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
+        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
+        } else {
+          this.listQuery.startTime = undefined
+          this.listQuery.endTime = undefined
+        }
         this.getList()
       } else {
         // this.handleExport()