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

.env.prod

@@ -15,15 +15,14 @@ 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://10.70.2.32'
-PUBLIC_PATH = 'http://192.168.0.33:8889/'
 
 # 二级部署路径
-VUE_APP_APP_NAME ='yudao-admin'
+# VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true

.env.stage

@@ -1,16 +1,21 @@
-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
@@ -20,4 +25,3 @@ VUE_APP_DOC_ENABLE = false
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
-

src/api/base/coreProduct.js

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

src/api/base/groupClasses.js

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

src/api/base/groupSchedulingPlan.js

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

src/api/base/groupSchedulingRule.js

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

src/api/base/groupTeamScheduling.js

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

src/api/base/material.js

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

src/api/base/materialProductBom.js

@@ -70,7 +70,7 @@ export function getMaterialPBList(query) {
 // 获得产品列表
 export function getProList(query) {
   return request({
-    url: '/base/core-product-material/listAll',
+    url: '/base/core-product/listAll',
     method: 'get',
     params: query
   })

src/api/base/product.js

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

src/api/extend/processEquMaterialBom.js

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

src/api/monitoring/statisticalData.js

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

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/mixins/lb/basicPageMixin.js

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

src/mixins/tableHeightMixin.js

@@ -1,20 +0,0 @@
-export default {
-	data() {
-		return {
-			tableH: this.tableHeight(260),
-		};
-	},
-	created() {
-		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
-		window.addEventListener('resize', this._setTableHeight);
-	},
-	destroyed() {
-		window.removeEventListener('resize', this._setTableHeight);
-	},
-	methods: {
-		_setTableHeight() {
-			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
-			// this.tableH = this.tableHeight(260);
-		},
-	},
-};

src/plugins/modal.js

@@ -59,33 +59,6 @@ export default {
       type: "warning",
     })
   },
-  // 删除确认窗体（UI规范）
-  delConfirm(title) {
-    return MessageBox.confirm("确定删除后不可恢复该数据",  `是否确认删除 【${title}】 数据项？`, {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: "warning",
-      showClose:false
-    })
-  },
-  // 关闭页面确认窗体（UI规范）
-  closeConfirm() {
-    return MessageBox.confirm("确定关闭将不保留编辑内容", "是否确认要关闭页面？", {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: "warning",
-      showClose:false
-    })
-  },
-  // 确认窗体（UI规范）
-  newConfirm(content,title) {
-    return MessageBox.confirm(content, title, {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: "warning",
-      showClose:false
-    })
-  },
   // 提交内容
   prompt(content) {
     return MessageBox.prompt(content, "系统提示", {

src/styles/index.scss

@@ -201,34 +201,3 @@ input, textarea{
 .el-form--label-top .el-form-item__label {
   padding: 0;
 }
-
-// 确认弹窗(UI样式修改和原样式有区别--start)
-.el-message-box__status+.el-message-box__message {
-  padding-left: 58px;
-}
-.el-message-box {
-  width: auto;
-  min-width: 424px;
-  .el-message-box__header {
-    padding:32px 32px 0px 72px;
-    .el-message-box__title {
-      font-size: 16px;
-      font-weight: 600;
-      color: rgba(0,0,0,0.85);
-    }
-  }
-  .el-message-box__content {
-    padding-bottom: 24px;
-    .el-message-box__status {
-      top:-72%;
-      left:20px;
-      font-size:21px !important
-    }
-  }
-  .el-message-box__btns {
-    padding-right: 32px;
-    padding-bottom:14px;
-  }
-}
-
-// 确认弹窗(UI样式修改和原样式有区别--end)

src/views/base/coreWorkOrder/allocation.vue

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

src/views/base/material/SmallTitle.vue

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

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

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

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

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

src/views/base/material/index.vue

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

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
+ * @LastEditors: DY
- * @LastEditTime: 2024-07-09 09:59:11
+ * @LastEditTime: 2023-11-27 19:50:36
  * @Description:
 -->
 <template>
@@ -107,9 +107,10 @@
 
 <script>
 import basicAdd from '../../core/mixins/basic-add';
-import { createMaterialPB, updateMaterialPB, getMaterialPB, getCode, getProBomList, createMaterialPBDet, updateMaterialPBDet, deleteMaterialPBDet } from "@/api/base/materialProductBom";
+import { createMaterialPB, updateMaterialPB, getMaterialPB, getCode, getProList, getProBomList, createMaterialPBDet, updateMaterialPBDet, deleteMaterialPBDet } from "@/api/base/materialProductBom";
-import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { getMaterialList } from "@/api/base/material";
-import SmallTitle from '../coreWorkOrder/SmallTitle';
+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 { publicFormatter } from '@/utils/dict';
@@ -182,6 +183,7 @@ export default {
 			productList: [],
 			materialAttrList: [],
 			tableData: [],
+			unitList: [],
 			visible: false,
 			isdetail: false,
 			idAttrShow: false,
@@ -227,14 +229,21 @@ export default {
       });
     },
 		async getDict() {
-			const materRes = await getMaterialTree();
+			// 产品列表
-      let typeId = materRes.data[0].product?materRes.data[0].id:materRes.data[1].id
+			const proRes = await getProList();
-      const listQuery= {
+			this.productList = proRes.data;
-        typeId:typeId
+			// 物料单位列表
+			const unitRes = await listData({
+				pageNo: 1,
+        pageSize: 99,
+        dictType: 'unit_dict',
+			});
+			this.unitList = unitRes.data.list.map(item => {
+				return {
+					label: item.label,
+					value: Number(item.value)
 				}
-			const materData = await getMaterialList(listQuery);
+			});
-			this.productList = [];
-			this.productList = materData.data;
 		},
 		initData() {
 			// this.materialAttrList.splice(0);

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

@@ -83,7 +83,7 @@
 </template>
 
 <script>
-import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { getMaterialList } from '@/api/base/material';
 import { createMaterialPBDet, updateMaterialPBDet, getMaterialPBDet } from "@/api/base/materialProductBom";
 
 export default {
@@ -117,14 +117,8 @@ export default {
 	methods: {
 		async getDict() {
 			// 物料列表
-			const materRes = await getMaterialTree();
+			const res = await getMaterialList();
-      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+			this.materialList = res.data;
-      const listQuery= {
-        typeId:typeId
-      }
-			const materData = await getMaterialList(listQuery);
-			this.materialList = [];
-			this.materialList = materData.data;
 		},
 		init(id) {
 			this.dataForm.id = id || '';

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

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

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

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: zwq
+ * @LastEditors: zhp
- * @LastEditTime: 2024-07-05 10:10:12
+ * @LastEditTime: 2023-11-24 09:29:36
  * @Description:
  */
 export default {
@@ -53,12 +53,11 @@ export default {
       this.listQuery.pageNo = val;
       this.getDataList();
     },
-    // 新增
+    // 新增 / 修改
-    addOrUpdateHandle() {
+    addOrUpdateHandle(id) {
-      this.addOrEditTitle = '新增';
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init();
+        this.$refs.addOrUpdate.init(id);
       });
     },
     cancel(id) {

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

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

src/views/choicePart/index.vue

@@ -2,27 +2,17 @@
   <div class="choicepart-container">
     <navbar />
     <div class="choicepart-wrapper">
-			<div
+      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'" v-show="showItem">
-				class="choicepart-box"
-				id="choicepartBox"
-				:style="'transform:scale(' + scale + ');width:1574px;height:538px;'"
-				v-show="showItem">
       <div class="choicepart-line1">
         <div
           v-for="(item, index) in menuArr1"
           :key="index"
           class="choicepart-item"
           @click="handelClick(item, item.choicepart)"
-						:style="{
+          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-							opacity: item.visible ? 1 : 0.4,
+        >
-							pointerEvents: item.visible ? 'auto' : 'none',
-						}">
           <div>
-							<img
+            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
-								:src="
-									require(`../../assets/images/choicepart/${item.name}.png`)
-								"
-								alt="" />
           </div>
           <div class="choicepart-item-title">{{item.meta.title}}</div>
         </div>
@@ -33,16 +23,10 @@
           :key="index"
           class="choicepart-item"
           @click="handelClick(item, item.choicepart)"
-						:style="{
+          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-							opacity: item.visible ? 1 : 0.4,
+        >
-							pointerEvents: item.visible ? 'auto' : 'none',
-						}">
           <div>
-							<img
+            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
-								:src="
-									require(`../../assets/images/choicepart/${item.name}.png`)
-								"
-								alt="" />
           </div>
           <div class="choicepart-item-title">{{item.meta.title}}</div>
         </div>
@@ -53,8 +37,8 @@
   </div>
 </template>
 <script>
-import Navbar from './components/Navbar';
+import Navbar from './components/Navbar'
-import { debounce } from '@/utils/debounce';
+import { debounce } from '@/utils/debounce'
 export default {
   components: { Navbar },
   name: 'choicePart',
@@ -68,57 +52,57 @@ export default {
           title: '基础核心',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Order',
           title: '订单管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Equipment',
           title: '设备管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Group',
           title: '班组管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Quality',
           title: '质量管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Warehouse',
           title: '仓库管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Energy',
           title: '能源管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
-				},
+        }
       ],
       menuArr2: [
         {
@@ -126,107 +110,99 @@ export default {
           title: '包装管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Material',
           title: '物料管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Extend',
           title: '工艺管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Delivery',
           title: '成品发货',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Report',
           title: '报表管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'System',
           title: '系统管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
-				},
+        }
-				{
-					name: 'Devconfig',
-					title: '开发配置',
-					visible: false,
-					meta: {
-						title: '',
-					},
-				},
       ],
-			showItem: false,
+      showItem: false
-		};
+    }
   },
   // computed:{
   //   ...mapGetters(['sidebarRouters'])
   // },
   mounted() {
-		this.getMsg();
+    this.getMsg()
     this.boxReset = debounce(() => {
-			this.resetSize();
+      this.resetSize()
-		}, 300);
+    }, 300)
-		this.boxReset();
+    this.boxReset()
     window.addEventListener('resize', () => {
-			this.boxReset();
+      this.boxReset()
-		});
+    })
   },
   methods: {
     getMsg() {
-			let menuList = this.$store.state.permission.sidebarRouters;
+      let menuList = this.$store.state.permission.sidebarRouters
-			console.log(menuList);
+      console.log(menuList)
       if (menuList.length > 0) {
         for (let i = 0; i < menuList.length; i ++) {
           for (let k = 0; k < 7; k++) {
             if (menuList[i].name === this.menuArr1[k].name) {
-							this.menuArr1[k].visible = true;
+              this.menuArr1[k].visible = true
-							this.menuArr1[k].id = menuList[i].id;
+              this.menuArr1[k].id = menuList[i].id
-							this.menuArr1[k].choicepart = i;
+              this.menuArr1[k].choicepart = i
-							this.menuArr1[k].children = menuList[i].children;
+              this.menuArr1[k].children = menuList[i].children
-							this.menuArr1[k].meta = menuList[i].meta;
+              this.menuArr1[k].meta = menuList[i].meta
             }
           }
-					for (let j = 0; j < 7; j++) {
+          for (let j = 0; j < 6; j++) {
             if (menuList[i].name === this.menuArr2[j].name) {
-							this.menuArr2[j].visible = true;
+              this.menuArr2[j].visible = true
-							this.menuArr2[j].id = menuList[i].id;
+              this.menuArr2[j].id = menuList[i].id
-							this.menuArr2[j].choicepart = i;
+              this.menuArr2[j].choicepart = i
-							this.menuArr2[j].children = menuList[i].children;
+              this.menuArr2[j].children = menuList[i].children
-							this.menuArr2[j].meta = menuList[i].meta;
+              this.menuArr2[j].meta = menuList[i].meta
             }
           }
         }
       }
-			console.log(this.menuArr1);
+      console.log(this.menuArr1)
-			console.log(this.menuArr2);
+      console.log(this.menuArr2)
     },
     handelClick(item, index) {
       // this.$router.push({name: 'SystemUser'})
-			this.$store.dispatch('app/setChoicepart', index);
+      this.$store.dispatch('app/setChoicepart', index)
-			this.toRouter(item);
+      this.toRouter(item)
       // if (item.meta.unuse) {
       //   this.$message.warning(this.$t('暂无数据'))
       // } else {
@@ -234,38 +210,38 @@ export default {
       // }
     },
     toRouter(item) {
-			console.log(item);
+      console.log(item)
       if (item.children) {
-				this.toRouter(item.children[0]);
+        this.toRouter(item.children[0])
       } else {
-				this.$router.push({ name: item.name });
+        this.$router.push({ name: item.name })
       }
     },
     resetSize() {
-			let _this = this;
+      let _this = this
-			_this.showItem = false;
+      _this.showItem = false
-			_this.loading = true;
+      _this.loading = true
-			let choicepartBox = document.querySelector('#choicepartBox');
+      let choicepartBox = document.querySelector('#choicepartBox')
-			let rw = parseFloat(window.innerWidth);
+      let rw = parseFloat(window.innerWidth)
-			let rh = parseFloat(window.innerHeight);
+      let rh = parseFloat(window.innerHeight)
-			let bw = parseFloat(choicepartBox.style.width);
+      let bw = parseFloat(choicepartBox.style.width)
-			let bh = parseFloat(choicepartBox.style.height);
+      let bh = parseFloat(choicepartBox.style.height)
-			let wx = 0.82 / (bw / rw);
+      let wx = 0.82/(bw / rw)
-			let hx = 0.56 / (bh / rh);
+      let hx = 0.56/(bh / rh)
-			_this.scale = wx > hx ? hx : wx;
+      _this.scale = wx > hx ? hx : wx
-			setTimeout(_this.showItemFun, 700);
+      setTimeout(_this.showItemFun, 700)
     },
     showItemFun() {
-			this.loading = false;
+      this.loading = false
-			this.showItem = true;
+      this.showItem = true
-		},
+    }
   },
   beforeDestroy() {
-		this.showItem = false;
+    this.showItem = false
-	},
+  }
-};
+}
 </script>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 .choicepart-container {
   position: relative;
   width: 100%;
@@ -296,8 +272,7 @@ export default {
     .choicepart-item {
       width: 184px;
       height: 224px;
-			background: url('../../assets/images/choicepart/choice-item-back.png')
+      background: url('../../assets/images/choicepart/choice-item-back.png') no-repeat;
-				no-repeat;
       background-size: 100% 100%;
       border-radius: 5px;
       overflow: hidden;
@@ -335,7 +310,7 @@ export default {
   .choicepart-footer {
     position: absolute;
     width: 100%;
-		color: #c7c7c7;
+    color: #C7C7C7;
     user-select: none;
     font-size: 12px;
     letter-spacing: 1px;

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

@@ -1,104 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-20 15:23:59
- * @LastEditors: zhp
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="auto">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="报废原因编码" prop="code">
-					<el-input v-model="dataForm.code" placeholder="请输入报废原因编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="报废原因" prop="content">
-					<el-input v-model="dataForm.content" placeholder="请输入报废原因" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="报废类型" prop="typeId">
-					<el-select v-model="dataForm.typeId" placeholder="请选择报废类型">
-						<el-option
-							v-for="dict in typeList"
-							:key="dict.id"
-							:label="dict.name"
-							:value="dict.id" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../../core/mixins/basic-add';
-import {
-	createQualityScrapDet,
-	updateQualityScrapDet,
-	getQualityScrapDet,
-	getCode,
-} from '@/api/base/qualityScrapDet';
-import { getList } from '@/api/base/qualityScrapType';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createQualityScrapDet,
-				updateURL: updateQualityScrapDet,
-				infoURL: getQualityScrapDet,
-			},
-			typeList: [],
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				content: undefined,
-				typeId: null,
-				remark: undefined,
-			},
-			dataRule: {
-				code: [
-					{ required: true, message: '报废原因编码不能为空', trigger: 'blur' },
-				],
-				content: [
-					{ required: true, message: '报废原因不能为空', trigger: 'blur' },
-				],
-				typeId: [
-					{ required: true, message: '报废类型不能为空', trigger: 'change' },
-				],
-			},
-		};
-	},
-	mounted() {
-		this.getDict();
-	},
-	methods: {
-		async getDict() {
-			// 报废类型
-			const res = await getList();
-			this.typeList = res.data;
-		},
-	},
-};
-</script>

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

@@ -1,88 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-24 08:42:18
- * @LastEditors: zhp
- * @Description:
--->
-<template>
-	<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" label-width="120px">
-					<el-input v-model="dataForm.code" placeholder="请输入报废类型编码" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="报废类型" prop="name" label-width="90px">
-					<el-input v-model="dataForm.name" placeholder="请输入报废类型" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="24">
-			<el-col :span="12">
-				<el-form-item
-					label="报废类型描述"
-					prop="description"
-					label-width="120px">
-					<el-input
-						v-model="dataForm.description"
-						clearable
-						placeholder="报废类型描述" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark" label-width="90px">
-					<el-input
-						v-model="dataForm.remark"
-						clearable
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../../core/mixins/basic-add';
-import {
-	createQualityScrapType,
-	updateQualityScrapType,
-	getQualityScrapType,
-	getCode,
-} from '@/api/base/qualityScrapType';
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: true,
-				codeURL: getCode,
-				createURL: createQualityScrapType,
-				updateURL: updateQualityScrapType,
-				infoURL: getQualityScrapType,
-			},
-			dataForm: {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				description: undefined,
-				remark: undefined,
-			},
-			dataRule: {
-				code: [
-					{ required: true, message: '报废类型编码不能为空', trigger: 'blur' },
-				],
-				name: [
-					{ required: true, message: '报废类型不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-};
-</script>

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

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

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

@@ -94,7 +94,7 @@ export default {
 		return {
 			readOnly: false,
 			chosedLogId: false,
-			searchBarKeys: ['equipmentName', 'createTime'],
+			searchBarKeys: ['equipmentName', 'recordTime'],
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -124,11 +124,11 @@ export default {
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ prop: 'createTime', label: '报警时间', filter: timeFilter },
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
-				{ prop: 'alarmCode', label: '设备报警码' },
+				{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
 				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
-				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
+				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮， 群里问
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -145,8 +145,8 @@ export default {
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
-					// valueFormat: 'timestamp',
+					valueFormat: 'timestamp',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',

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

@@ -383,7 +383,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,

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

@@ -382,7 +382,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,

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

@@ -270,7 +270,7 @@ export default {
 			switch (btnName) {
 				case 'search':
 					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.warning('请选择时间段');
+						this.$message.error('请选择时间段');
 						return;
 					}
 					this.startTime = new Date(payload.recordTime).getTime();
@@ -493,7 +493,7 @@ export default {
 			if (code == 0) {
 				const newEqlist = this.objectToArray(data);
 				if (!newEqlist || newEqlist.length == 0) {
-					this.$message.warning('该设备没有产量数据');
+					this.$message.error('该设备没有产量数据');
 					return;
 				}
 				this.graphList.push(...newEqlist);

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

@@ -338,7 +338,7 @@ export default {
 			switch (btnName) {
 				case 'search':
 					if (!payload.recordTime || payload.recordTime.length <= 0) {
-						this.$message.warning('请选择时间段');
+						this.$message.error('请选择时间段');
 						return;
 					}
 
@@ -373,7 +373,7 @@ export default {
 
 		async submitForm() {
 			if (this.existingEquipments.indexOf(this.queryParams.equipmentId) >= 0) {
-				this.$message.warning('该设备已存在');
+				this.$message.error('该设备已存在');
 				return;
 			}
 			const { code, data } = await this.$axios({
@@ -387,7 +387,7 @@ export default {
 			if (code == 0) {
 				const newEqlist = this.objectToArray(data);
 				if (!newEqlist || newEqlist.length == 0) {
-					this.$message.warning('该设备没有状态数据');
+					this.$message.error('该设备没有状态数据');
 					return;
 				}
 				this.graphList.push(newEqlist[0]);

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
+ * @LastEditors: zhp
- * @LastEditTime: 2024-07-09 13:40:03
+ * @LastEditTime: 2023-11-28 10:03:20
  * @Description:
 -->
 <template>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2024-07-09 13:29:06
+ * @LastEditTime: 2023-11-23 14:27:59
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
@@ -42,8 +42,8 @@ import {
   getProcessEquMaterialBomDet,
   createProcessEquMaterialBomDetList,
   updateProcessEquMaterialBomDet,
+  getMaterialList
 } from '@/api/extend/processEquMaterialBom';
-import { getMaterialTree,getMaterialList } from '@/api/base/material';
 
 export default {
 	props: {
@@ -94,15 +94,11 @@ export default {
 				}
 			});
     },
-		async getDict() {
+    getDict() {
-			const materRes = await getMaterialTree();
+      getMaterialList().then((res) => [
-      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+        this.materialList = res.data,
-      const listQuery= {
+        console.log(res)
-        typeId:typeId
+      ])
-      }
-			const materData = await getMaterialList(listQuery);
-			this.materialList = [];
-			this.materialList = materData.data;
     },
 		// 表单提交
 		dataFormSubmit() {

src/views/group/base/groupClasses/components/groupClassAdd.vue

@@ -12,6 +12,32 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="生效时间" prop="enableTime">
+          <el-date-picker
+          v-model="form.enableTime"
+          type="datetime"
+          placeholder="选择日期时间"
+          label-format="yyyy-MM-dd HH:mm:ss"
+          value-format="timestamp"
+          style="width: 100%;">
+        </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="失效时间" prop="disableTime">
+          <el-date-picker
+            v-model="form.disableTime"
+            type="datetime"
+            placeholder="选择日期时间"
+            label-format="yyyy-MM-dd HH:mm:ss"
+            value-format="timestamp"
+            style="width: 100%;">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
     <el-row>
       <el-col :span="12">
         <el-form-item label="班次开始时间" prop="startTime">
@@ -65,6 +91,8 @@ export default {
         id: '',
         name: '',
         code: '',
+        enableTime: '',
+        disableTime: '',
         startTime: '',
         endTime: '',
         daySpan: '',
@@ -73,6 +101,7 @@ export default {
       isEdit: false, //是否是编辑
       rules: {
         name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
+        enableTime: [{ required: true, message: '请选择班次开始时间', trigger: 'change' }],
         code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
         startTime: [{ required: true, message: '请输入生效时间', trigger: 'change' }],
         endTime: [{ required: true, message: '请选择班次结束时间', trigger: 'change' }]
@@ -87,6 +116,7 @@ export default {
         getGroupClasses(id).then((res) => {
           if (res.code === 0) {
             this.form = res.data
+            this.form.disableTime = res.data.disableTime || ''
           }
         })
       } else {
@@ -116,6 +146,7 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.disableTime = this.form.disableTime || ''
           if (this.isEdit) {
             //编辑
             updateGroupClasses({ ...this.form }).then((res) => {

src/views/group/base/groupClasses/components/statusBtn.vue

@@ -1,52 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-10 10:28:05
- * @Description:
--->
-<template>
-  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
-</template>
-
-<script>
-export default {
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      state: false
-    }
-  },
-  computed: {
-    readonly() {
-      return !!this.injectData.readonly
-    }
-  },
-  mounted() {
-    this.mapToState()
-  },
-  methods: {
-    mapToState() {
-      if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
-      }
-    },
-    changeHandler() {
-      let params = {}
-      let payload = {}
-      params.name = 'state'
-      payload.id = this.injectData.id
-      payload.enabled = this.state ? '1' : '0'
-      payload.startTime = this.injectData.startTime
-      payload.endTime = this.injectData.endTime
-      params.payload = payload
-      this.$emit('emitData', params)
-    }
-  }
-}
-</script>

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

@@ -1,17 +1,12 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-12 16:19:13
- * @Description:
--->
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
+    />
     <!-- 列表 -->
     <base-table
       :page="queryParams.pageNo"
@@ -19,20 +14,22 @@
       :table-props="tableProps"
       :table-data="list"
       :max-height="tableH"
-			@emitFun="handleTableEvents">
+    >
       <method-btn
         v-if="tableBtn.length"
         slot="handleBtn"
         :width="120"
         label="操作"
         :method-list="tableBtn"
-				@clickBtn="handleClick" />
+        @clickBtn="handleClick"
+      />
     </base-table>
     <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
       :total="total"
-			@pagination="getList" />
+      @pagination="getList"
+    />
     <!-- 新增 -->
     <base-dialog
       :dialogTitle="addOrEditTitle"
@@ -40,47 +37,48 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-			width="50%">
+      width='50%'
+    >
       <group-class-add ref="classList" @successSubmit="successSubmit" />
     </base-dialog>
   </div>
 </template>
 
 <script>
-import {
+import { getGroupClassesPage, deleteGroupClasses, updateGroupClasses } from "@/api/base/groupClasses";
-	getGroupClassesPage,
+import GroupClassAdd from './components/groupClassAdd.vue'
-	deleteGroupClasses,
+import { formatDate } from '@/utils'
-	updateGroupClasses,
-} from '@/api/base/groupClasses';
-import GroupClassAdd from './components/groupClassAdd.vue';
-import StatusBtn from './components/statusBtn';
 const tableProps = [
+  {
+    prop: 'enableTimeStr',
+    label: '生效时段',
+    minWidth: 300
+  },
   {
     prop: 'name',
-		label: '班次名称',
+    label: '班次名称'
   },
   {
     prop: 'timeStr',
     label: '班次时间',
-		minWidth: 100,
+    minWidth: 100
   },
   {
     prop: 'code',
     label: '班次编码',
-		minWidth: 200,
+    minWidth: 200
   },
   {
-		prop: 'enabled',
+    prop: 'status',
-		label: '班次状态',
+    label: '班次状态'
-		subcomponent: StatusBtn,
   },
   {
     prop: 'remark',
-		label: '备注',
+    label: '备注'
-	},
+  }
-];
+]
 export default {
-	name: 'GroupClass',
+  name: "GroupClass",
   components: { GroupClassAdd },
   data() {
     return {
@@ -89,41 +87,55 @@ export default {
           type: 'input',
           label: '班次名称',
           placeholder: '班次名称',
-					param: 'name',
+          param: 'name'
         },
         {
           type: 'button',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: 'separate',
+          type: 'separate'
         },
         {
-					type: this.$auth.hasPermi('base:group-classes:create')
+          type: this.$auth.hasPermi('base:group-classes:create') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '新增',
           name: 'add',
           color: 'success',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       tableProps,
       tableBtn: [
+      this.$auth.hasPermi('base:group-classes:cancel')
+          ? {
+              type: 'cancel',
+              btnName: '作废',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'unequal',
+                    name: 'status',
+                    value: '不可用'
+                  }
+                ]
+              }
+            }
+          : undefined,
         this.$auth.hasPermi('base:group-classes:update')
           ? {
               type: 'edit',
-							btnName: '编辑',
+              btnName: '编辑'
             }
           : undefined,
         this.$auth.hasPermi('base:group-classes:delete')
           ? {
               type: 'delete',
-							btnName: '删除',
+              btnName: '删除'
             }
-					: undefined,
+          : undefined
       ].filter((v) => v),
       tableH: this.tableHeight(260),
       // 总条数
@@ -131,133 +143,120 @@ export default {
       // 班次基础信息列表
       list: [],
       // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
       // 是否显示弹出层
       centervisible: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 20,
-				name: null,
+        name: null
-			},
+      }
     };
   },
   created() {
     window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
+      this.tableH = this.tableHeight(260)
-		});
+    })
-		this.getList();
+    this.getList()
   },
   methods: {
     buttonClick(val) {
       switch (val.btnName) {
         case 'search':
           this.queryParams.pageNo = 1;
-					this.queryParams.name = val.name;
+          this.queryParams.name = val.name
-					this.getList();
+          this.getList()
-					break;
+          break
         default:
-					this.addOrEditTitle = '新增';
+          this.addOrEditTitle = '新增'
-					this.centervisible = true;
+          this.centervisible = true
           this.$nextTick(() => {
-						this.$refs.classList.init();
+            this.$refs.classList.init()
-					});
-			}
-		},
-		// 班组状态
-		handleTableEvents(params) {
-			if (params.name === 'state') {
-				// 班组状态
-				updateGroupClasses({ ...params.payload })
-					.then((res) => {
-						if (res.code === 0) {
-							this.$modal.msgSuccess('操作成功');
-							this.getList();
-						}
           })
-					.catch((res) => {
-						this.getList();
-					});
       }
     },
     /** 查询列表 */
     getList() {
-			getGroupClassesPage(this.queryParams).then((res) => {
+      getGroupClassesPage(this.queryParams).then(res => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
+        if (res.code === 0 && res.data.list.length > 0) {
-					res.data.list.map((item) => {
+          res.data.list.map(item => {
-						item.timeStr =
+            item.enableTimeStr = formatDate(item.enableTime) + '至' + (item.disableTime ? formatDate(item.disableTime) : '永久')
-							item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5);
+            item.timeStr = item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5)
-					});
+            item.status = item.status === true ? '可用' : '不可用'
+          })
           this.list = res.data.list;
           this.total = res.data.total;
         } else {
-					this.list = [];
+          this.list = []
-					this.total = 0;
+          this.total = 0
         }
       });
     },
     handleClick(val) {
       switch (val.type) {
         case 'edit':
-					this.addOrEditTitle = '编辑';
+          this.addOrEditTitle = '编辑'
           this.$nextTick(() => {
-						this.$refs.classList.init(val.data.id);
+            this.$refs.classList.init(val.data.id)
-					});
+          })
-					this.centervisible = true;
+          this.centervisible = true
-					break;
+          break
+        case 'cancel':
+          this.discard(val.data)
+          break
         default:
-					this.handleDelete(val.data);
+        this.handleDelete(val.data)
       }
     },
     handleCancel() {
-			this.$refs.classList.formClear();
+      this.$refs.classList.formClear()
-			this.centervisible = false;
+      this.centervisible = false
-			this.addOrEditTitle = '';
+      this.addOrEditTitle = ''
     },
     handleConfirm() {
-			this.$refs.classList.submitForm();
+      this.$refs.classList.submitForm()
     },
     successSubmit() {
-			this.handleCancel();
+      this.handleCancel()
+      this.getList()
+    },
+    discard(row) {
+      let obj = {}
+      obj.id = row.id
+      obj.startTime = row.startTime
+      obj.endTime = row.endTime
+      obj.enableTime = row.enableTime
+      obj.disableTime = Date.parse(new Date())
+      this.$modal.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?').then(function() {
+          return updateGroupClasses({ ...obj })
+        }).then(() => {
           this.getList();
+          this.$modal.msgSuccess("操作成功");
+        }).catch(() => {});
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-			console.log(row);
+      console.log(row)
-			let _this = this;
+      let _this = this
-			if (row.enabled) {
+      if (row.status === '可用') {// 可用
-				// 可用
+        _this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function() {
-				_this.$modal
+          return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() {
-					.confirm(
-						'删除的班次"' +
-							row.name +
-							'"可能会影响交接班计划，请点取消再次确认！'
-					)
-					.then(function () {
-						return _this.$modal
-							.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
-							.then(function () {
               return deleteGroupClasses(row.id);
-							})
+            }).then(() => {
-							.then(() => {
               _this.getList();
-								_this.$modal.msgSuccess('删除成功');
+              _this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
           })
-							.catch(() => {});
-					});
       } else {
-				_this.$modal
+        _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() {
-					.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
-					.then(function () {
             return deleteGroupClasses(row.id);
-					})
+          }).then(() => {
-					.then(() => {
             _this.getList();
-						_this.$modal.msgSuccess('删除成功');
+            _this.$modal.msgSuccess("删除成功");
-					})
+          }).catch(() => {});
-					.catch(() => {});
+      }
+    }
   }
-		},
-	},
 };
 </script>

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

@@ -14,18 +14,20 @@
     </el-row>
     <el-row>
       <el-col :span="12">
-        <el-form-item label="班组组长" prop="leaderName">
+        <el-form-item label="班组组长" prop="leaderId">
-          <el-input v-model="form.leaderName" clearable></el-input>
+          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
+            <el-option
+              v-for="item in workerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="手机号" prop="leaderPhone">
+        <el-form-item label="手机号" prop="telephone">
-          <el-input v-model="form.leaderPhone" clearable></el-input>
+          <el-input v-model="form.telephone" disabled></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="班组人数" prop="num">
-          <el-input-number style="width: 100%;" v-model="form.num" :step="1" step-strictly></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
@@ -33,6 +35,7 @@
 </template>
 <script>
 import { getGroupTeam, updateGroupTeam, createGroupTeam, getCode } from '@/api/base/groupTeam'
+import { getWorkerList } from '@/api/base/worker'
 export default {
   name: 'groupTeamAdd',
   data() {
@@ -41,26 +44,28 @@ export default {
         id: '',
         name: '',
         code: '',
-        leaderName: '',
+        leaderId: '',
-        leaderPhone: '',
+        telephone: ''
-        num: ''
       },
       isEdit: false, //是否是编辑
       rules: {
         name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
         code: [{ required: true, message: '请输入班组编码', trigger: 'blur' }],
-        leaderName: [{ required: true, message: '请输入组长', trigger: 'blur' }]
+        leaderId: [{ required: true, message: '请选择组长', trigger: 'select' }]
       },
+      workerList: []
     }
   },
   methods: {
     init(id) {
+      this.getWorkerList()
       if (id) {
         this.isEdit = true
         this.form.id = id
         getGroupTeam( id ).then((res) => {
           if (res.code === 0) {
             this.form = res.data
+            this.selectLeader()
           }
         })
       } else {
@@ -71,6 +76,24 @@ export default {
         })
       }
     },
+    // 获取员工list
+    getWorkerList() {
+      getWorkerList().then(res => {
+        this.workerList = res.data
+      })
+    },
+    // 获取手机号
+    selectLeader() {
+      if (this.form.leaderId) {
+        this.workerList.map(item => {
+          if (item.id === this.form.leaderId) {
+            this.form.telephone = item.telephone || ''
+          }
+        })
+      } else {
+        this.form.telephone = ''
+      }
+    },
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {

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

@@ -1,10 +1,3 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:53:55
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-10 10:00:03
- * @Description:
--->
 <template>
   <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
 </template>
@@ -44,7 +37,7 @@ export default {
       payload.enabled = this.state ? '1' : '0'
       payload.code = this.injectData.code
       payload.name = this.injectData.name
-      payload.leaderName = this.injectData.leaderName
+      payload.leaderId = this.injectData.leaderId
       params.payload = payload
       this.$emit('emitData', params)
     }

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

@@ -193,7 +193,7 @@ export default {
     },
     getList() {
       groupTeamPage({ ...this.queryParams }).then(res => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
+        if (res.code === 0 && res.data.list.length > 0) {
           let arr = []
           res.data.list.map(item => {
             let obj = {}

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

@@ -42,6 +42,8 @@
     >
       <group-team-add ref="groupList" @successSubmit="successSubmit" />
     </base-dialog>
+    <!-- 组员编辑 -->
+    <worker-edit v-if='paramVisible' ref='workerEditParam' @closeDrawer="closeDrawer"></worker-edit>
   </div>
 </template>
 
@@ -50,6 +52,8 @@ import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/g
 import { parseTime } from '@/utils/ruoyi'
 import GroupTeamAdd from './components/groupTeamAdd'
 import StatusBtn from './components/statusBtn'
+import WorkerOperate from './components/workerOperate'
+import WorkerEdit from './components/workerEdit'
 const tableProps = [
   {
     prop: 'createTime',
@@ -79,10 +83,15 @@ const tableProps = [
     label: '班组状态',
     subcomponent: StatusBtn
   },
+  {
+    prop: 'workerName',
+    label: '组员',
+    subcomponent: WorkerOperate
+  },
 ]
 export default {
   name: "GroupTeam",
-  components: { GroupTeamAdd },
+  components: { GroupTeamAdd, WorkerEdit },
   data() {
     return {
       formConfig: [
@@ -146,6 +155,7 @@ export default {
         name: null,
         code: null
       },
+      paramVisible: false
     };
   },
   created() {
@@ -193,14 +203,17 @@ export default {
     },
     // 班组状态
     handleTableEvents(params) {
+      console.log(params)
       if (params.name === 'state') {// 班组状态
         updateGroupTeam({ ...params.payload }).then((res) => {
           if (res.code === 0) {
             this.$modal.msgSuccess("操作成功");
-            this.getList()
           }
-        }).catch((res)=>{
+        })
-          this.getList()
+      }else {// 编辑&查看
+        this.paramVisible = true
+        this.$nextTick(() => {
+          this.$refs.workerEditParam.init(params)
         })
       }
     },

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

@@ -1,20 +1,6 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-01 14:54:06
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-15 14:55:35
- * @Description:
--->
 <template>
   <div class="groupTeamScheduling">
     <div class="operationArea">
-			<el-tabs v-model="planId" @tab-click="setPlan">
-				<el-tab-pane
-					v-for="item in planArr"
-					:key="item.id"
-					:label="item.name"
-					:name="item.id" />
-			</el-tabs>
       <el-form :inline="true" class="demo-form-inline">
         <span class="blue-block"></span>
         <el-form-item label="月份选择">
@@ -26,55 +12,42 @@
             :disabled="showSetting"
             @change="selectMonth"
             :clearable="false"
-						style="width: 120px"></el-date-picker>
+            style="width: 120px">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-					<span
+          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
-						class="separateStyle"
-						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
         </el-form-item>
         <el-form-item>
-					<el-button
+          <el-button type="primary" size="small" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
-						type="primary"
+        </el-form-item>
-						size="small"
+        <el-form-item>
-						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"
+          <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
-						:disabled="showSetting || settingBtnDis"
-						@click="settingMsg">
-						设置
-					</el-button>
         </el-form-item>
         <el-form-item>
           <span class="separateStyle" v-show="showSetting"></span>
         </el-form-item>
         <el-form-item>
-					<el-button
+          <el-button type="primary" size="small" v-show="showSetting" @click="confirmSetting">确认</el-button>
-						type="primary"
-						size="small"
-						v-show="showSetting"
-						@click="confirmSetting">
-						确认
-					</el-button>
         </el-form-item>
         <el-form-item>
-					<el-button
+          <el-button type="primary" size="small" plain v-show="showSetting" @click="cancelSetting">取消</el-button>
-						type="primary"
+        </el-form-item>
-						size="small"
+        <el-form-item label="请先选择查询的班组" class="rightItem">
-						plain
+          <!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button> -->
-						v-show="showSetting"
+          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button>
-						@click="cancelSetting">
+          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('3')">班组检测查询</el-button>
-						取消
-					</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 日历区域 -->
     <div class="calenderArea">
-			<div style="font-size: 24px; font-weight: 500">
+      <div style="font-size: 24px;font-weight: 500">{{ this.month }} {{ this.year }}</div>
-				{{ this.month }} {{ this.year }}
-			</div>
       <el-calendar v-model="startDay">
         <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-				<template slot="dateCell" slot-scope="{ date, data }">
+        <template
+          slot="dateCell"
+          slot-scope="{date, data}">
           <div v-if="data.type === 'current-month'">
             <!-- 日期 -->
             <div class="dateStyle">
@@ -82,62 +55,27 @@
             </div>
             <!-- 班次班组 -->
             <!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-						<el-row
+            <el-row :gutter="2" :class="'class' + (index+1) + (chooseTip === (item.startDay+item.classesId) ? ' team-active' : '')" v-for="(item, index) in list[Number(data.day.split('-')[2])]" :key='index'>
-							:gutter="2"
-							:class="
-								'class' +
-								(index + 1) +
-								(chooseTip === item.startDay + item.classesId
-									? ' team-active'
-									: '')
-							"
-							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
-							:key="index">
               <el-col :span="12">
                 <div class="selectDiv">
                   <!-- 选择班组图标 -->
-									<div
+                  <div class="toggle-icon" v-show="showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true)">
-										class="toggle-icon"
-										v-show="
-											showSetting &&
-											(new Date(data.day).valueOf() < new Date().valueOf()
-												? false
-												: true)
-										">
                     <svg-icon icon-class="toggle"/>
                   </div>
                   <!-- 不能选择班组 -->
-									<div
+                  <div class="toggle-icon-hide" v-show="!(showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true))"></div>
-										class="toggle-icon-hide"
+                  <el-select v-model="item.teamId" size='small' :disabled="!showSetting || (new Date(data.day).valueOf() > new Date().valueOf() ? false: true)">
-										v-show="
-											!(
-												showSetting &&
-												(new Date(data.day).valueOf() < new Date().valueOf()
-													? false
-													: true)
-											)
-										"></div>
-									<el-select
-										v-model="item.teamId"
-										size="small"
-										:disabled="
-											!showSetting ||
-											(new Date(data.day).valueOf() > new Date().valueOf()
-												? false
-												: true)
-										">
                     <el-option
                       v-for="i in teamList"
                       :key="i.id"
                       :label="i.name"
-											:value="i.id"></el-option>
+                      :value="i.id">
+                    </el-option>
                   </el-select>
               </div>
               </el-col>
               <el-col :span="12">
-								<el-button class="labelClass" @click="chooseTeam(item)">
+                <el-button class="labelClass" @click="chooseTeam(item)">{{ item.classesName }}</el-button>
-									{{ item.classesName }}
-								</el-button>
               </el-col>
             </el-row>
           </div>
@@ -148,211 +86,238 @@
 </template>
 
 <script>
-import {
+import { getPreset, createOrUpdateList, autoSet } from "@/api/base/groupTeamScheduling";
-	getScheduling,
+import { listEnabled } from "@/api/base/groupTeam";
-	createOrUpdateList,
-} from '@/api/base/groupTeamScheduling';
-import {
-	groupPlanList,
-	groupPlanTeamList,
-} from '@/api/base/groupSchedulingPlan';
-import { listEnabled } from '@/api/base/groupTeam';
 import moment from 'moment';
 
 export default {
-	name: 'GroupTeamScheduling',
+  name: "GroupTeamScheduling",
   data() {
     return {
       startDay: '',// 查询参数
       year: '',// 2023
       month: '',// 九月
-			monthList: [
+      monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
-				'一月',
-				'二月',
-				'三月',
-				'四月',
-				'五月',
-				'六月',
-				'七月',
-				'八月',
-				'九月',
-				'十月',
-				'十一月',
-				'十二月',
-			],
-			planId: undefined, //计划id
       list: {},
-			planArr: [], //排班计划数组
       teamList: [],// 班组下拉
       showSetting: false,// 设置模式。自动排班，确认，取消按钮显示
       settingBtnDis: false,
       jumpDisabled: true,// 操作按钮控制
       chooseObj: {}, //当前选中的数据，查询按钮用
       chooseTip: '',// 当前选中数据的唯一值，显示红框
-			autoScheduling: false, // 只有在当前日期后的月份才生效
+      autoScheduling: false // 只有在当前日期后的月份才生效
     };
   },
   created() {
-		this.startDay = new Date();
+    this.startDay = new Date()
-		groupPlanList().then((res) => {
-			this.planArr = res.data || [];
-			this.planId = this.planArr[0] ? this.planArr[0].id : undefined;
-			if (this.planId) {
-				this.getList();
-				this.getTeamList();
-			}
-		});
     // 设置按钮是否置灰
-		this.settingBtn();
+    this.settingBtn()
-		this.toggleMonth();
+    this.getTeamList()
+    this.toggleMonth()
+    this.getList()
   },
   methods: {
-		setPlan() {
-			this.getList();
-			this.getTeamList();
-		},
     // 切换月份
     selectMonth() {
       if (this.startDay) {
-				this.settingBtn(); // 设置按钮状态,需在getlist前面
+        this.settingBtn() // 设置按钮状态,需在getlist前面
-				this.toggleMonth();
+        this.toggleMonth()
-				this.getList();
+        this.getList()
-				this.clearChoose();
+        this.clearChoose()
-				if (
+        if ( moment(this.startDay).valueOf() > moment().endOf('month').valueOf()) {
-					moment(this.startDay).valueOf() > moment().endOf('month').valueOf()
+          this.autoScheduling = true
-				) {
-					this.autoScheduling = true;
         } else {
-					this.autoScheduling = false;
+          this.autoScheduling = false
         }
       }
     },
-		// 获取计划对应班组列表
+    // 获取班组列表
     getTeamList() {
-			groupPlanTeamList(this.planId).then((res) => {
+      listEnabled().then(res => {
-				this.teamList = res.data || [];
+        this.teamList = res.data || []
-			});
+      })
     },
     // 获取日历数据
     getList() {
-			let year = moment(this.startDay).format('YYYY');
+      let year = moment(this.startDay).format('YYYY')
-			let month = moment(this.startDay).format('M');
+      let month = moment(this.startDay).format('M')
-			getScheduling({
+      getPreset({
         year: year,
-				month: month,
+        month: month
-				planId: this.planId,
+      }).then(res => {
-			})
+        let obj = res.data || {}
-				.then((res) => {
-					let obj = res.data || {};
         if (obj) {
           for (let item in obj) {
             for (let i = 0; i < obj[item].length; i++) {
               if (!obj[item][i].teamId) {
-									obj[item][i].teamId = '';
+                obj[item][i].teamId = ''
               }
             }
           }
         }
-					this.list = obj;
+        this.list = obj
+      }).catch(() => {
+        this.list = {}
+        this.settingBtnDis = true // 禁用设置按钮
       })
-				.catch(() => {
-					this.list = {};
-					this.settingBtnDis = true; // 禁用设置按钮
-				});
     },
     // 设置
     settingMsg() {
-			this.showSetting = !this.showSetting;
+      this.showSetting = !this.showSetting
-			this.clearChoose();
+      this.clearChoose()
     },
     // 取消
     cancelSetting() {
-			this.showSetting = !this.showSetting;
+      this.showSetting = !this.showSetting
-			this.getList(); // 数据还原
+      this.getList() // 数据还原
     },
     // 确认
     confirmSetting() {
-			let num = 0;
+      let num = 0
       // 当月数据的话，今天及今天之前的不传
-			if (
+      if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
-				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
+        num = Number(moment().format('DD'))
-			) {
-				num = Number(moment().format('DD'));
       } else {
-				num = 0;
+        num = 0
       }
       // 下月数据全部都传
       // 打平数据
-			let tempArr = Object.values(this.list);
+      let tempArr = Object.values(this.list)
-			let arr = [];
+      let arr = []
       for (let i = num; i < tempArr.length; i++) {
         for (let j = 0; j < tempArr[i].length; j++) {
-					arr.push(tempArr[i][j]);
+          arr.push(tempArr[i][j])
         }
       }
-			createOrUpdateList(arr).then((res) => {
+      createOrUpdateList(arr).then(res => {
         if (res.code === 0) {
-					this.showSetting = !this.showSetting;
+          this.showSetting = !this.showSetting
-					this.$modal.msgSuccess('操作成功');
+          this.$modal.msgSuccess("操作成功")
-					this.getList(); // 数据更新
+          this.getList() // 数据更新
         }
-			});
+      })
     },
     // 点击班次红框选中当前数据
     chooseTeam(value) {
-			// if (this.showSetting) {
+      if (this.showSetting) {
-			// 	this.$modal.msgWarning('当前处于设置模式');
+        this.$modal.msgWarning("当前处于设置模式")
-			// 	return false;
+        return false
-			// }
+      }
-			this.chooseObj = value;
+      this.chooseObj = value
-			this.chooseTip = value.startDay + value.classesId; // 匹配当前的样式
+      this.chooseTip = value.startDay + value.classesId // 匹配当前的样式
-			this.jumpDisabled = false; //查询按钮不禁用
+      this.jumpDisabled = false //查询按钮不禁用
+    },
+    // 自动排班
+    schedulingBtn() {
+      let tempData = this.list
+      // 次月1号有值前端排班
+      if (this.list[1][0].teamId) {
+        let tempArr = Object.values(this.list)
+        let arr = []
+        let n = 0
+        for (let i = 0; i < tempArr.length; i++) {
+          if (n > 0) {
+            break;
+          }
+          for (let j = 0; j < tempArr[i].length; j++) {
+            if (tempArr[i][j].teamId) {
+              arr.push(tempArr[i][j].teamId)
+            } else {
+              n++
+            }
+          }
+        }
+        let tempNum = 0
+        for (let k = 0; k < tempArr.length; k++) {
+          for (let v = 0; v < tempArr[k].length; v++) {
+            let t = tempNum % arr.length
+            if (arr.length === 1) {
+              tempData[k+1][v].teamId = arr[0]
+            } else {
+              tempData[k+1][v].teamId = arr[t]
+            }
+            tempNum++
+          }
+        }
+        this.list = []
+        this.list = tempData
+      } else {
+        // 次月1号没有值,接口排班
+        // console.log(moment(this.startDay).format("YYYY-MM-DD"))
+        autoSet({
+          year: this.year,
+          month: moment(this.startDay).month() + 1
+        }).then(res => {
+          this.list = res.data || {}
+        })
+      }
     },
     // 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
     settingBtn() {
-			let nowMonth = moment().startOf('month').valueOf();
+      let nowMonth = moment().startOf('month').valueOf()
-			let startMonth = moment(this.startDay).valueOf();
+      let startMonth = moment(this.startDay).valueOf()
-			let nowDate = moment(new Date()).date();
+      let nowDate = moment(new Date()).date()
-			let sumDate = moment().daysInMonth();
+      let sumDate = moment().daysInMonth()
-			if (nowMonth > startMonth) {
+      if (nowMonth > startMonth) { // 之前月
-				// 之前月
+        this.settingBtnDis = true
-				this.settingBtnDis = true;
       } else {
         if (nowDate < sumDate) {
-					this.settingBtnDis = false;
+          this.settingBtnDis = false
         } else {
-					this.settingBtnDis = true;
+          this.settingBtnDis = true
         }
       }
     },
     // 清除红框选中数据
     clearChoose() {
-			this.chooseObj = {};
+      this.chooseObj = {}
-			this.chooseTip = '';
+      this.chooseTip = ""
-			this.jumpDisabled = true;
+      this.jumpDisabled = true
     },
     // 切换月份显示
     toggleMonth() {
-			this.year = moment(this.startDay).format('YYYY');
+      this.year = moment(this.startDay).format("YYYY")
-			let month = Number(moment(this.startDay).format('MM'));
+      let month = Number(moment(this.startDay).format("MM"))
-			this.month = this.monthList[month - 1];
+      this.month = this.monthList[month - 1]
     },
-	},
+    // 3个跳转按钮
-};
+    toOtherPage(val) {
+      switch (val) {
+        case '1':
+          this.$router.push({
+            path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
+          })
+          break;
+        case '2': // 能源
+          this.$router.push({
+            // 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:
+          this.$router.push({
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
+            // name: 'QualityStatistics',
+            // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
+          })
+      }
+    }
+    }
+  }
 </script>
-<style lang="scss">
+<style lang='scss'>
 .demo-form-inline {
   .el-date-editor .el-range__icon {
     font-size: 16px;
-		color: #0b58ff;
+    color: #0B58FF;
   }
   .el-input__prefix .el-icon-date {
     font-size: 16px;
-		color: #0b58ff;
+    color: #0B58FF;
   }
 }
 .groupTeamScheduling {
-	background-color: #f2f4f9;
+  background-color: #F2F4F9;
   .operationArea {
     padding: 14px 10px 0 16px;
     margin-bottom: 8px;
@@ -362,7 +327,7 @@ export default {
       display: inline-block;
       width: 4px;
       height: 16px;
-			background-color: #0b58ff;
+      background-color: #0B58FF;
       border-radius: 1px;
       margin-right: 8px;
       margin-top: 10px;
@@ -371,7 +336,7 @@ export default {
       display: inline-block;
       width: 1px;
       height: 24px;
-			background: #e8e8e8;
+      background: #E8E8E8;
       vertical-align: middle;
     }
     .el-form-item {
@@ -401,8 +366,7 @@ export default {
     }
     .el-calendar-table__row {
       height: 133px;
-			.prev,
+      .prev, .next {
-			.next {
         pointer-events: none;
       }
       .el-calendar-day {
@@ -419,13 +383,10 @@ export default {
         }
       }
     }
-		.team-active {
+    .team-active {// 选中班组
-			// 选中班组
+      border:2px solid red
-			border: 2px solid #409eff;
     }
-		.class1,
+    .class1, .class2, .class3 {
-		.class2,
-		.class3 {
       padding: 0;
       font-weight: 600;
       margin-bottom: 2px;
@@ -469,50 +430,47 @@ export default {
     }
     .class1 {
       .selectDiv {
-				.toggle-icon,
+        .toggle-icon, .toggle-icon-hide {
-				.toggle-icon-hide {
+          background-color: #FACE00;
-					background-color: #face00;
         }
         .el-input--small .el-input__inner {
-					color: #e7a200;
+          color: #E7A200;
-					background-color: #ffefc0;
+          background-color: #FFEFC0;
         }
       }
       .labelClass {
-				color: #e7a200;
+        color: #E7A200;
-				background-color: #ffefc0;
+        background-color: #FFEFC0;
       }
     }
     .class2 {
       .selectDiv {
-				.toggle-icon,
+        .toggle-icon, .toggle-icon-hide {
-				.toggle-icon-hide {
+          background-color: #3984FF;
-					background-color: #3984ff;
         }
         .el-input--small .el-input__inner {
-					color: #2d7bff;
+          color: #2D7BFF;
-					background-color: #beeaff;
+          background-color: #BEEAFF;
         }
       }
       .labelClass {
-				color: #2d7bff;
+        color: #2D7BFF;
-				background-color: #beeaff;
+        background-color: #BEEAFF;
       }
     }
     .class3 {
       .selectDiv {
-				.toggle-icon,
+        .toggle-icon, .toggle-icon-hide {
-				.toggle-icon-hide {
+          background-color: #37D97F;
-					background-color: #37d97f;
         }
         .el-input--small .el-input__inner {
-					color: #129f51;
+          color: #129F51;
-					background-color: #e0ffee;
+          background-color: #E0FFEE;
         }
       }
       .labelClass {
-				color: #129f51;
+        color: #129F51;
-				background-color: #e0ffee;
+        background-color: #E0FFEE;
       }
     }
   }

src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue

@@ -1,260 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-10 13:43:41
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-15 16:00:36
- * @Description:
--->
-<template>
-	<el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="部门名称" prop="deptId">
-					<el-select
-						v-model="form.deptId"
-						filterable
-						clearable
-						style="width: 100%"
-						placeholder="请选择部门">
-						<el-option
-							v-for="item in deptArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="计划名称" prop="name">
-					<el-input v-model="form.name" clearable />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="相关班组" prop="teamIdList">
-					<el-select
-						v-model="form.teamIdList"
-						filterable
-						clearable
-						multiple
-						style="width: 100%"
-						placeholder="请选择班组">
-						<el-option
-							v-for="item in teamList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="相关班次" prop="classesIdList">
-					<el-select
-						v-model="form.classesIdList"
-						filterable
-						clearable
-						multiple
-						style="width: 100%"
-						placeholder="请选择班次">
-						<el-option
-							v-for="item in classList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="form.remark"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否生产班组" prop="isProduction">
-					<el-radio-group v-model="form.isProduction">
-						<el-radio :label="true">是</el-radio>
-						<el-radio :label="false">否</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24" v-show="form.isProduction">
-				<tree-transfer
-					:title="title"
-					:from_data="fromData"
-					:to_data="toData"
-					@add-btn="add"
-					@remove-btn="remove"
-					pid="productionLineId"
-					:defaultProps="{ label: 'name' }"
-					height="450px"
-					:mode="mode"
-					filter
-					openAll></tree-transfer>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getGroupPlan,
-	updateGroupPlan,
-	createGroupPlan,
-	getGroupPlanTree,
-	createGroupPlanLine,
-	updateGroupPlanLine,
-	getGroupPlanLine,
-	getLoginUserDeptId,
-} from '@/api/base/groupSchedulingPlan';
-
-import { listDept } from '@/api/system/dept';
-import { listEnabled } from '@/api/base/groupTeam';
-import { listClassesEnabled } from '@/api/base/groupClasses';
-import treeTransfer from 'el-tree-transfer';
-
-export default {
-	components: { treeTransfer },
-	name: '',
-	data() {
-		return {
-			form: {
-				id: '',
-				name: '',
-				deptId: '',
-				teamIdList: [],
-				classesIdList: [],
-				remark: '',
-				isProduction: false,
-			},
-			deptArr: [], //部门
-			teamList: [], //班组
-			classList: [], //班次
-			rules: {
-				name: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
-				deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
-				teamIdList: [
-					{ required: true, message: '请选择相关班组', trigger: 'change' },
-				],
-				classesIdList: [
-					{ required: true, message: '请选择相关班次', trigger: 'change' },
-				],
-			},
-			title: ['待选', '已选'], //标题 类型：Array 必填：false 默认：["源列表", "目标列表"]
-			mode: 'transfer',
-			fromData: [], //左边内容
-			toData: [], //右边已选内容
-		};
-	},
-	methods: {
-		init(id) {
-			this.form.id = id || undefined;
-			this.fromData = [];
-			this.toData = [];
-			this.getArr();
-			this.$nextTick(() => {
-				this.$refs['form'].resetFields();
-				if (this.form.id) {
-					getGroupPlan(id).then((response) => {
-						this.form = response.data;
-						if (this.form.isProduction) {
-							getGroupPlanLine(id).then((res) => {
-								this.toData = res.data ? res.data.datas : [];
-								this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
-							});
-						}
-					});
-				} else {
-					getLoginUserDeptId().then((res) => {
-						this.form.deptId = res.data;
-					});
-				}
-			});
-		},
-		getArr() {
-			listDept().then((response) => {
-				this.deptArr = response.data;
-			});
-			listEnabled().then((res) => {
-				this.teamList = res.data || [];
-			});
-			listClassesEnabled().then((res) => {
-				this.classList = res.data || [];
-			});
-			getGroupPlanTree().then((res) => {
-				this.fromData = res.data;
-				this.fromData.forEach((item) => {
-					item.productionLineId = 0;
-				});
-			});
-		},
-		// 监听穿梭框组件添加
-		add(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData);
-		},
-		// 监听穿梭框组件移除
-		remove(fromData, toData, obj) {
-			console.log('fromData:', fromData);
-			console.log('toData:', toData);
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.form.id) {
-						//编辑
-						updateGroupPlan({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								if (this.form.isProduction) {
-									const params = {
-										planId: this.form.id,
-										list: this.toData,
-									};
-									updateGroupPlanLine(params).then((res) => {
-										this.$modal.msgSuccess('操作成功');
-										this.$emit('successSubmit');
-									});
-								}
-							}
-						});
-					} else {
-						createGroupPlan({ ...this.form }).then((res) => {
-							if (res.code === 0) {
-								if (this.form.isProduction) {
-									const params = {
-										planId: res.data,
-										list: this.toData,
-									};
-									createGroupPlanLine(params).then((res) => {
-										this.$modal.msgSuccess('操作成功');
-										this.$emit('successSubmit');
-									});
-								}
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-		},
-
-		/** 消除组件左边与右边选中数据相同项 */
-		// 处理过滤数据
-		getFilterLeftData(data, selData) {
-			for (let i = data.length - 1; i >= 0; i--) {
-				for (let j = selData.length - 1; j >= 0; j--) {
-					if (data[i] && data[i].id === selData[j].id) {
-						// 当id相等可以删除的情况 即：没有子级可以删除；
-						if (!data[i].children) {
-							data.splice(i, 1);
-						} else {
-							this.getFilterLeftData(data[i].children, selData[j].children);
-						}
-					}
-				}
-			}
-		},
-	},
-};
-</script>

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

@@ -1,233 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-10 11:08:48
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-12 16:19:28
- * @Description:
--->
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<schedulingPlanConfigAdd ref="classList" @successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	getGroupPlanPage,
-	deleteGroupPlan,
-} from '@/api/base/groupSchedulingPlan';
-import { listDept } from '@/api/system/dept';
-import schedulingPlanConfigAdd from './components/schedulingPlanConfigAdd.vue';
-const tableProps = [
-	{
-		prop: 'deptName',
-		label: '部门名称',
-	},
-	{
-		prop: 'name',
-		label: '计划名称',
-	},
-	{
-		prop: 'str',
-		label: '产线及工段',
-		minWidth: 200,
-	},
-	{
-		prop: 'teamName',
-		label: '班组名称',
-	},
-	{
-		prop: 'classesName',
-		label: '班次名称',
-	},
-];
-export default {
-	name: 'schedulingPlanConfig',
-	components: { schedulingPlanConfigAdd },
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'select',
-					label: '部门名称',
-					selectOptions: [],
-					param: 'deptId',
-					defaultSelect: '',
-					filterable: true,
-				},
-				{
-					type: 'input',
-					label: '计划名称',
-					placeholder: '计划名称',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:group-scheduling-plan:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-plan:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-plan:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableH: this.tableHeight(260),
-			// 总条数
-			total: 0,
-			// 列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				name: null,
-			},
-		};
-	},
-	created() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-		});
-		listDept().then((response) => {
-			this.formConfig[0].selectOptions = response.data;
-		});
-		this.getList();
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.name = val.name || undefined;
-					this.queryParams.deptId = val.deptId || undefined;
-					this.getList();
-					break;
-				default:
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					this.$nextTick(() => {
-						this.$refs.classList.init();
-					});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			getGroupPlanPage(this.queryParams).then((res) => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
-          res.data.list.forEach(item => {
-            if(item.isProduction){
-              item.str = item.strList?item.strList.join(','):'-'
-            }
-          });
-					this.list = res.data.list;
-					this.total = res.data.total;
-				} else {
-					this.list = [];
-					this.total = 0;
-				}
-			});
-		},
-		handleClick(val) {
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.$nextTick(() => {
-						this.$refs.classList.init(val.data.id);
-					});
-					this.centervisible = true;
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		handleCancel() {
-			this.$refs.classList.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.classList.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			let _this = this;
-			_this.$modal
-				.confirm('是否确认删除名称为"' + row.name + '"的数据项?')
-				.then(function () {
-					return deleteGroupPlan(row.id);
-				})
-				.then(() => {
-					_this.getList();
-					_this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>

src/views/group/base/schedulingRuleConfig/components/schedulingRuleConfigAdd.vue

@@ -1,280 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-11 09:30:21
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-12 16:09:46
- * @Description:
--->
-<template>
-	<el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="排班开始日期" prop="startDay">
-					<el-date-picker
-						v-model="form.startDay"
-						type="datetime"
-						placeholder="选择日期时间"
-						label-format="yyyy-MM-dd HH:mm:ss"
-						value-format="timestamp"
-						style="width: 100%"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="排班结束日期" prop="endDay">
-					<el-date-picker
-						v-model="form.endDay"
-						type="datetime"
-						placeholder="选择日期时间"
-						label-format="yyyy-MM-dd HH:mm:ss"
-						value-format="timestamp"
-						style="width: 100%"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="排班计划" prop="planId">
-					<el-select
-						v-model="form.planId"
-						filterable
-						clearable
-						@change="setTableArr"
-						style="width: 100%"
-						placeholder="请选择排班计划">
-						<el-option
-							v-for="item in planArr"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="form.remark"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="24">
-				<div class="min-title">班组上班顺序</div>
-				<base-table
-					border
-					:table-props="tableProps"
-					:table-data="tableData"
-					:page="1"
-					:limit="100"
-					:height="300"
-					@emitButtonClick="addNew"
-					@emitFun="inputChange"
-					:add-button-show="addButtonShow">
-					<method-btn
-						slot="handleBtn"
-						:width="60"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-<script>
-import {
-	getGroupRule,
-	updateGroupRule,
-	createGroupRule,
-} from '@/api/base/groupSchedulingRule';
-import {
-	groupPlanList,
-	groupPlanTeamList,
-	groupPlanClassesList,
-} from '@/api/base/groupSchedulingPlan';
-import tableSelect from './tableSelect';
-
-const tableBtn = [
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-const tableProps = [
-	{
-		prop: 'classesId',
-		label: '班次',
-		classesArr: [],
-		subcomponent: tableSelect,
-	},
-	{
-		prop: 'teamId',
-		label: '班组',
-		teamArr: [],
-		subcomponent: tableSelect,
-	},
-];
-export default {
-	name: 'schedulingRuleConfigAdd',
-	data() {
-		return {
-			form: {
-				id: '',
-				startDay: '',
-				endDay: '',
-				planId: '',
-				remark: '',
-			},
-			tableBtn,
-			tableProps,
-			tableData: [],
-			addButtonShow: '',
-			planArr: [], //排班计划数组
-			rules: {
-				name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
-				startDay: [
-					{ required: true, message: '请选择排班开始时间', trigger: 'change' },
-				],
-				endDay: [
-					{ required: true, message: '请选择排班结束时间', trigger: 'change' },
-				],
-			},
-		};
-	},
-	methods: {
-		init(id) {
-			this.form = {
-				id: id || undefined,
-				startDay: '',
-				endDay: '',
-				planId: '',
-				remark: '',
-			};
-			this.getArr();
-			this.tableData = [];
-			this.$nextTick(() => {
-				this.$refs['form'].resetFields();
-				if (this.form.id) {
-					getGroupRule(id).then((response) => {
-						this.form = response.data;
-						this.getTableArr(response.data.planId);
-						this.tableData = [];
-					});
-				}
-			});
-		},
-		getArr() {
-			groupPlanList().then((res) => {
-				this.planArr = res.data || [];
-			});
-		},
-		setTableArr() {
-			if (this.form.planId) {
-				this.tableData = [];
-				this.getTableArr(this.form.planId);
-			} else {
-				this.tableData = [];
-				this.addButtonShow = '';
-			}
-		},
-		async getTableArr(id) {
-			//获取表格下拉框
-			this.addButtonShow = '新增';
-			const res0 = await groupPlanClassesList(id);
-			this.tableProps[0].classesArr = res0.data || [];
-			const res1 = await groupPlanTeamList(id);
-			this.tableProps[1].teamArr = res1.data || [];
-			if (this.form.id) {
-				//编辑时获取班组上班顺序
-				this.form.sequenceList.forEach((item) => {
-					this.tableData.push(item);
-				});
-			}
-		},
-		inputChange(data) {
-			this.tableData[data._pageIndex - 1][data.prop] = data[data.prop];
-		},
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(
-					`确定对${
-						raw.data.name
-							? '[名称=' + raw.data.name + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
-					'提示',
-					{
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						this.tableData.splice(raw.data._pageIndex - 1, 1);
-						this.tableData.forEach((item, index) => {
-							item.sequence = index;
-						});
-						console.log(this.tableData);
-					})
-					.catch(() => {});
-			}
-		},
-		// 新增
-		addNew() {
-			this.tableData.push({ sequence: this.tableData.length });
-		},
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.form.id) {
-						//编辑
-						let list = [];
-						this.tableData.forEach((item) => {
-							const obj = {
-								classesId: item.classesId,
-								sequence: item.sequence,
-								teamId: item.teamId,
-							};
-							list.push(obj);
-						});
-						this.form.list = list;
-						updateGroupRule({ ...this.form }).then((res) => {
-							this.$modal.msgSuccess('操作成功');
-							this.$emit('successSubmit');
-						});
-					} else {
-						let list = [];
-						this.tableData.forEach((item) => {
-							const obj = {
-								classesId: item.classesId,
-								sequence: item.sequence,
-								teamId: item.teamId,
-							};
-							list.push(obj);
-						});
-						this.form.list = list;
-						createGroupRule({ ...this.form }).then((res) => {
-							this.$modal.msgSuccess('操作成功');
-							this.$emit('successSubmit');
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.form.resetFields();
-		},
-	},
-};
-</script>
-<style scoped>
-.min-title {
-	margin-bottom: 5px;
-}
-.min-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: middle;
-	width: 6px;
-	height: 6px;
-	border-radius: 50%;
-	margin: auto 5px;
-	background-color: #0b58ff;
-}
-</style>

src/views/group/base/schedulingRuleConfig/components/tableSelect.vue

@@ -1,44 +0,0 @@
-<template>
-	<div class="tableInner">
-		<el-select :key="itemProp+list._pageIndex" v-model="list[itemProp]" @change="changeInput">
-			<el-option
-				v-for="item in itemProp==='classesId'?list.classesArr:list.teamArr"
-				:key="item.id"
-				:label="item.name"
-				:value="item.id"></el-option>
-		</el-select>
-	</div>
-</template>
-<script>
-export default {
-	name: 'tableSelect',
-	props: {
-		injectData: {
-			type: Object,
-			default: () => ({}),
-		},
-		itemProp: {
-			type: String,
-		},
-	},
-	data() {
-		return {
-			list: this.injectData,
-		};
-	},
-	methods: {
-		changeInput() {
-			this.$emit('emitData', this.list);
-		},
-	},
-};
-</script>
-<style scoped>
-.tableInner >>> .el-input__inner {
-  color: #409EFF;
-  border: 1px rgb(232, 231, 231) solid;
-  padding: 0;
-  text-align: center;
-  height: 30px;
-}
-</style>

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

@@ -1,261 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<schedulingRuleConfigAdd ref="classList" @successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import {
-	getGroupRulePage,
-	deleteGroupRule,
-	updateGroupRule,
-	getGroupRule,
-} from '@/api/base/groupSchedulingRule';
-import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
-import { formatDate } from '@/utils';
-const tableProps = [
-	{
-		prop: 'enableTimeStr',
-		label: '排班日期',
-		minWidth: 200,
-	},
-	{
-		prop: 'planName',
-		label: '排班计划',
-	},
-	{
-		prop: 'str',
-		label: '排班规则',
-		minWidth: 100,
-	},
-	{
-		prop: 'enabled',
-		label: '状态',
-		filter: (val) => (val ? '正常' : '作废'),
-	},
-];
-export default {
-	name: 'schedulingRuleConfig',
-	components: { schedulingRuleConfigAdd },
-	data() {
-		return {
-			formConfig: [
-				{
-					type: 'input',
-					label: '班次',
-					placeholder: '班次',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:group-scheduling-rule:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-			],
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi('base:group-scheduling-rule:cancel')
-					? {
-							type: 'cancel',
-							btnName: '作废',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'unequal',
-										name: 'enabled',
-										value: 0,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-rule:update')
-					? {
-							type: 'edit',
-							btnName: '编辑',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										type: 'unequal',
-										name: 'enabled',
-										value: 0,
-									},
-								],
-							},
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:group-scheduling-rule:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableH: this.tableHeight(260),
-			// 总条数
-			total: 0,
-			// 班次基础信息列表
-			list: [],
-			// 弹出层标题
-			addOrEditTitle: '',
-			// 是否显示弹出层
-			centervisible: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 20,
-				name: null,
-			},
-		};
-	},
-	created() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-		});
-		this.getList();
-	},
-	methods: {
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.queryParams.pageNo = 1;
-					this.queryParams.classesName = val.name || undefined;
-					this.getList();
-					break;
-				default:
-					this.addOrEditTitle = '新增';
-					this.centervisible = true;
-					this.$nextTick(() => {
-						this.$refs.classList.init();
-					});
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			getGroupRulePage(this.queryParams).then((res) => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
-					res.data.list.map((item) => {
-						item.enableTimeStr =
-							formatDate(item.startDay) +
-							'至' +
-							(item.endDay ? formatDate(item.endDay) : '永久');
-						item.str = item.strList.join(',');
-					});
-					this.list = res.data.list;
-					this.total = res.data.total;
-				} else {
-					this.list = [];
-					this.total = 0;
-				}
-			});
-		},
-		handleClick(val) {
-			switch (val.type) {
-				case 'edit':
-					this.addOrEditTitle = '编辑';
-					this.$nextTick(() => {
-						this.$refs.classList.init(val.data.id);
-					});
-					this.centervisible = true;
-					break;
-				case 'cancel':
-					this.discard(val.data);
-					break;
-				default:
-					this.handleDelete(val.data);
-			}
-		},
-		handleCancel() {
-			this.$refs.classList.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.classList.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		discard(row) {
-      let _this = this
-			this.$modal
-				.confirm('是否确认作废序号为"' + row._pageIndex + '"的数据项?')
-				.then(() => {
-					getGroupRule(row.id).then((response) => {
-						let datas = response.data;
-						datas.list = datas.sequenceList;
-						datas.enabled = 0;
-						updateGroupRule(datas).then(() => {
-							_this.getList();
-							_this.$modal.msgSuccess('操作成功');
-						});
-					});
-				})
-				.catch(() => {});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			this.$modal
-				.confirm('是否确认删除序号为"' + row._pageIndex + '"的数据项?')
-				.then(function () {
-					return deleteGroupRule(row.id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>

src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue

@@ -36,8 +36,8 @@ export default {
           minWidth: 150
         },
         {
-          prop: 'specifications',
+          prop: 'workOrderList',
-          label: '产品规格'
+          label: '生产工单'
         }
       ],
       tableData: [],
@@ -147,8 +147,8 @@ export default {
           minWidth: 150
         },
         {
-          prop: 'specifications',
+          prop: 'workOrderList',
-          label: '产品规格'
+          label: '生产工单'
         }
       ]
     }

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

@@ -6,54 +6,27 @@
 -->
 
 <template>
-	<el-form
+  <el-form ref="form" :model="dataForm" label-width="120px" v-loading="formLoading">
-		ref="form"
-		:model="dataForm"
-		label-width="110px"
-		v-loading="formLoading">
     <el-row :gutter="20">
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="产线" prop="productionLineId"
-					label="产线"
-					prop="productionLineId"
           :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
+          <el-select v-model="dataForm.productionLineId" placeholder="请选择产线" filterable
-						v-model="dataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
             @change="handleProductlineChange">
-						<el-option
+            <el-option v-for="opt in productionLineList" :key="opt.value" :label="opt.label" :value="opt.value" />
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="工段" prop="sectionId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					label="工段"
+          <el-select v-model="dataForm.sectionId" placeholder="请选择工段" filterable @change="$emit('update', dataForm)">
-					prop="sectionId"
+            <el-option v-for="opt in workshopSectionList" :key="opt.value" :label="opt.label" :value="opt.value" />
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.sectionId"
-						placeholder="请选择工段"
-						filterable
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in workshopSectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
           </el-select>
         </el-form-item>
       </el-col>
 
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="按钮盒识别码" prop="buttonId" :rules="[
-					label="按钮盒识别码"
-					prop="buttonId"
-					:rules="[
         	{ required: true, message: '不能为空', trigger: 'blur' },
         	{
         		type: 'number',
@@ -62,10 +35,7 @@
         		transform: (val) => Number.isInteger(Number(val)) && Number(val),
         	},
         ]">
-					<el-input
+          <el-input v-model="dataForm.buttonId" @change="$emit('update', dataForm)" placeholder="请输入整数" />
-						v-model="dataForm.buttonId"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入整数" />
         </el-form-item>
 				<el-form-item
 					label="产线"
@@ -132,10 +102,7 @@
 			</el-col>
 
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="按钮值" prop="keyValue" :rules="[
-					label="按钮值"
-					prop="keyValue"
-					:rules="[
         	{ required: true, message: '不能为空', trigger: 'blur' },
         	{
         		type: 'number',
@@ -148,28 +115,16 @@
         			Number(val),
         	},
         ]">
-					<el-input
+          <el-input v-model="dataForm.keyValue" type="number" min="0" max="100" @change="$emit('update', dataForm)"
-						v-model="dataForm.keyValue"
-						type="number"
-						min="0"
-						max="100"
-						@change="$emit('update', dataForm)"
             placeholder="请输入按钮盒模式" />
         </el-form-item>
       </el-col>
 
       <el-col :span="12">
         <el-form-item label="检测内容" prop="inspectionDetId">
-					<el-select
+          <el-select v-model="dataForm.inspectionDetId" placeholder="请选择检测内容" filterable
-						v-model="dataForm.inspectionDetId"
-						placeholder="请选择检测内容"
-						filterable
             @change="$emit('update', dataForm)">
-						<el-option
+            <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
-							v-for="opt in inspectionDetList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
           </el-select>
         </el-form-item>
       </el-col>
@@ -201,8 +156,8 @@ export default {
 		};
 	},
 	mounted() {
-		this.getProductionLineList();
+    this.getProductionLineList()
-		this.getQualityInspectionDetList();
+    this.getQualityInspectionDetList()
 		// this.getWorksectionList();
 		// this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
 		// 	this.formLoading = false;

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

@@ -12,13 +12,12 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="80"
+				:width="120"
 				fixed="right"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
@@ -57,11 +56,10 @@ import {
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import moment from 'moment';
 import DialogForm from './dialogForm.vue';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 export default {
 	name: 'QualityInspectionBoxBtn',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: { DialogForm },
 	data() {
 		return {
@@ -72,9 +70,7 @@ export default {
 						label: '产线',
 						url: '/base/production-line/listAll',
 						prop: 'productionId',
-						rules: [
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
-							{ required: true, message: '产线不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -84,9 +80,7 @@ export default {
 						label: '工段',
 						url: '/base/workshop-section/listAll',
 						prop: 'sectionId',
-						rules: [
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
-							{ required: true, message: '工段不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -188,40 +182,39 @@ export default {
 				{
           prop: 'productionLineName',
 					label: '产线',
-					showOverflowtooltip: true,
 				},
 				{
 					prop: 'sectionName',
 					label: '工段',
-					showOverflowtooltip: true,
 				},
 				{
 					prop: 'inspectionDetContent',
 					label: '检测内容',
-					showOverflowtooltip: true,
 				},
 				{
 					width: 160,
 					prop: 'buttonId',
 					label: '按钮盒识别码',
 				},
-				{
+				// {
-					width: 90,
+				// 	width: 256,
-					prop: 'keyValue',
+				// 	prop: 'productionId',
-					label: '按钮值',
+				// 	label: '按钮盒所在产线ID',
-					showOverflowtooltip: true,
+				// 	,
-				},
+				// },
-				{
+				// {
-					width: 128,
+				// 	width: 256,
-					prop: 'model',
+				// 	prop: 'sectionId',
-					label: '按钮盒模式',
+				// 	label: '按钮盒所在工段ID',
-					showOverflowtooltip: true,
+				// 	,
-				},
+				// },
+				{ width: 90, prop: 'keyValue', label: '按钮值' },
+				{ width: 128, prop: 'model', label: '按钮盒模式' },
 			],
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				inspectionDetContent: null,
 			},
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
@@ -268,7 +261,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '新增';
+			this.title = '添加安灯按钮16键对应';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -277,7 +270,7 @@ export default {
 			getQualityInspectionBoxBtn(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '编辑';
+				this.title = '修改安灯按钮16键对应';
 			});
 		},
 		/** 提交按钮 */

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

@@ -1,63 +1,30 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-		<SearchBar
+    <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
     <!-- 列表 -->
-		<base-table
+    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
-			:table-props="tableProps"
+      @emitFun="handleEmitFun">
-			:page="queryParams.pageNo"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="80"
-				fixed="right"
-				:method-list="tableBtn"
         @clickBtn="handleTableBtnClick" />
     </base-table>
 
     <!-- 分页组件 -->
-		<pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
-		<base-dialog
+    <base-dialog :dialogTitle="title" :dialogVisible="open" width="40%" @close="cancel" @cancel="cancel"
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="40%"
-			@close="cancel"
-			@cancel="cancel"
       @confirm="submitForm">
-			<DialogForm
+      <DialogForm v-if="open" ref="form" v-model="form" :rows="[
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
       	[
       		{
       			select: true,
       			label: '检测类型',
       			prop: 'typeId',
       			url: '/base/quality-inspection-type/listAll',
-							rules: [
+      			rules: [{ required: true, message: '检测类型不能为空', trigger: 'blur' }],
-								{
-									required: true,
-									message: '检测类型不能为空',
-									trigger: 'blur',
-								},
-							],
       			bind: {
       				filterable: true,
       			},
@@ -66,13 +33,7 @@
       			input: true,
       			label: '检测内容',
       			prop: 'content',
-							rules: [
+      			rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
-								{
-									required: true,
-									message: '检测内容不能为空',
-									trigger: 'blur',
-								},
-							],
       		},
       	],
 
@@ -83,8 +44,7 @@
             prop: 'code',
             url: '/base/quality-inspection-det/getCode',
           },
-						{ input: true, label: '备注', prop: 'remark' },
+          { input: true, label: '备注', prop: 'remark' }],
-					],
       ]" />
     </base-dialog>
   </div>
@@ -103,11 +63,10 @@ import {
 import moment from 'moment';
 
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 export default {
 	name: 'QualityInspectionDet',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			typeList: [], // 检测类型列表
@@ -182,18 +141,19 @@ export default {
 				{
 					prop: 'createTime',
 					label: '添加时间',
-					width: 160,
+					fixed: true,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'typeName', label: '检测类型', showOverflowtooltip: true },
+				{ prop: 'typeName', label: '类型名称',  },
-				{ prop: 'content', label: '检测内容', showOverflowtooltip: true },
+				{ prop: 'content', label: '检测内容',  },
-				{ prop: 'code', label: '检测编码', showOverflowtooltip: true },
+				{ prop: 'code', label: '检测编码',  },
-				{ prop: 'remark', label: '备注', showOverflowtooltip: true },
+				{ prop: 'remark', label: '备注',  },
 			],
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				content: null,
 				createTime: [],
 			},

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

@@ -1,58 +1,32 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-		<SearchBar
+    <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
     <!-- 列表 -->
-		<base-table
+    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
-			:table-props="tableProps"
+      @emitFun="handleEmitFun">
-			:page="queryParams.pageNo"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="80"
-				:method-list="tableBtn"
         @clickBtn="handleTableBtnClick" />
     </base-table>
 
     <!-- 分页组件 -->
-		<pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
-		<base-dialog
+    <base-dialog :dialogTitle="title" :dialogVisible="open" @close="cancel" width="30%" @cancel="cancel"
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			width="40%"
-			@cancel="cancel"
       @confirm="submitForm">
-			<DialogForm
+      <DialogForm v-if="open" ref="form" v-model="form" :rows="[
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
       	[
       		{
       			input: true,
-							label: '检测类型',
+      			label: '检测类型名称',
       			prop: 'name',
       			rules: [
       				{
       					required: true,
-									message: '检测类型不能为空',
+      					message: '检测类型名称不能为空',
       					trigger: 'blur',
       				},
       			],
@@ -87,11 +61,10 @@ import {
 	exportQualityInspectionTypeExcel,
 } from '@/api/base/qualityInspectionType';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 export default {
 	name: 'QualityInspectionType',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			tableBtn: [
@@ -112,12 +85,45 @@ export default {
 				{
 					prop: 'createTime',
 					label: '添加时间',
-					width: 160,
+					fixed: true,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '检测类型', showOverflowtooltip: true },
+				{ prop: 'name', label: '检测类型名称' },
-				{ prop: 'code', label: '类型编码', showOverflowtooltip: true },
+				{ prop: 'code', label: '检测类型编码' },
-				{ prop: 'remark', label: '备注', showOverflowtooltip: true },
+				{ prop: 'remark', label: '备注' },
+				// {
+				// 	label: '操作',
+				// 	alignt: 'center',
+				// 	subcomponent: {
+				// 		render: function (h) {
+				// 			return h('div', null, [
+				// 				h(
+				// 					'el-button',
+				// 					{
+				// 						props: {
+				// 							icon: 'el-icon-edit',
+				// 							size: 'mini',
+				// 							type: 'text',
+				// 						},
+				// 					},
+				// 					' 修改'
+				// 				),
+				// 				h(
+				// 					'el-button',
+				// 					{
+				// 						props: {
+				// 							icon: 'el-icon-edit',
+				// 							size: 'mini',
+				// 							type: 'text',
+				// 						},
+				// 					},
+				// 					' 修改'
+				// 				),
+				// 			]);
+				// 		},
+				// 	},
+				// },
 			],
 			//
 			searchBarFormConfig: [
@@ -133,6 +139,11 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
 				{
 					type: 'separate',
 				},
@@ -151,7 +162,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				name: null,
 			},
 			// 表单参数
@@ -231,7 +242,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '新增';
+			this.title = '添加质量检测类型基础';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -240,7 +251,7 @@ export default {
 			getQualityInspectionType(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '编辑';
+				this.title = '修改质量检测类型基础';
 			});
 		},
 		/** 提交按钮 */

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

@@ -0,0 +1,93 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2023-11-20 15:23:59
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="报废原因编码" prop="code">
+          <el-input v-model="dataForm.code" placeholder="请输入报废原因编码" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="报废原因" prop="content">
+          <el-input v-model="dataForm.content" placeholder="请输入报废原因" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="报废类型" prop="typeId">
+          <el-select v-model="dataForm.typeId" placeholder="请选择报废类型">
+            <el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import basicAdd from '../../../core/mixins/basic-add';
+import { createQualityScrapDet, updateQualityScrapDet, getQualityScrapDet, getCode } from "@/api/base/qualityScrapDet";
+import { getList,} from "@/api/base/qualityScrapType";
+
+// import { getMaterialList } from "@/api/base/material";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+        createURL: createQualityScrapDet,
+        updateURL: updateQualityScrapDet,
+        infoURL: getQualityScrapDet,
+      },
+      typeList:[],
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        content: undefined,
+        typeId:null,
+        // description: undefined,
+        remark: undefined,
+			},
+			// materialList: [],
+			dataRule: {
+				// materialId: [{ required: true, message: "", trigger: "blur" }],
+        code: [{ required: true, message: "报废原因编码不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "报废原因不能为空", trigger: "blur" }],
+        typeId: [{ required: true, message: "报废类型不能为空", trigger: "change" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+		console.log('我看看', this.dataForm)
+	},
+	methods: {
+		async getDict() {
+			// 物料列表
+      const res = await getList();
+			this.typeList = res.data;
+		},
+		// setMaterialCode() {
+		// 	const chooseM = this.materialList.filter(item => {
+		// 		return item.id === this.dataForm.materialId
+		// 	})
+		// 	this.dataForm.materialCode = chooseM[0].code
+		// }
+	},
+};
+</script>

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

@@ -9,12 +9,11 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="80"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -22,7 +21,7 @@
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
-			:total="total"
+			:total="listQuery.total"
 			@pagination="getDataList" />
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -30,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="30%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -46,39 +45,33 @@ import {
   getQualityScrapDetPage,
   deleteQualityScrapDet,
 } from '@/api/base/qualityScrapDet';
-import { getList } from '@/api/base/qualityScrapType';
+import { getList, } from "@/api/base/qualityScrapType";
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 160,
   },
   {
     prop: 'content',
-		label: '报废原因',
+    label: '报废原因'
-		showOverflowtooltip: true,
   },
 	{
 		prop: 'code',
-		label: '报废原因编码',
+    label: '报废原因编码'
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'typeName',
-		label: '报废类型',
+    label: '报废类型'
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		showOverflowtooltip: true,
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -116,7 +109,6 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'typeId',
-					filterable: true,
         },
 				{
 					type: 'button',
@@ -128,20 +120,13 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:quality-scrap-det:create')
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true,
+					plain: true
 				},
 			],
-			listQuery: {
-				pageNo: 1,
-				pageSize: 20,
-			},
-			total: 0,
 		};
 	},
 	components: {
@@ -155,9 +140,9 @@ export default {
 		// 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
         this.tableData = response.data.list;
-				this.total = response.data.total;
+        this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });
     },
@@ -170,10 +155,20 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
           this.listQuery.content = val.content ? val.content : undefined;
           this.listQuery.typeId = val.typeId ? val.typeId : undefined;
 					this.getDataList();
 					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
 				case 'add':
 					this.addOrEditTitle = '新增';
 					this.addOrUpdateVisible = true;

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

@@ -0,0 +1,209 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2023-11-21 14:11:18
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
+    <el-row :gutter="24">
+      <el-col :span="8">
+        <el-form-item label="工单号" prop="workOrderId">
+          <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号">
+            <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="班组" prop="teamId">
+          <el-select v-model="dataForm.teamId" placeholder="请选择班组">
+            <el-option v-for="dict in teamList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="数量" prop="num">
+          <el-input v-model="dataForm.num" placeholder="请输入数量" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="产线" prop="lineId">
+          <el-select v-model="dataForm.lineId" placeholder="请选择产线">
+            <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="报废原因" prop="detId">
+          <el-select v-model="dataForm.detId" placeholder="请选择报废原因">
+            <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="8">
+        <el-form-item label="报废时间" prop="logTime">
+          <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="来源" prop="source">
+          <el-select v-model="dataForm.source" placeholder="请选择来源">
+            <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="dataForm.description" placeholder="请输入描述" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="8">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import basicAdd from '../../../core/mixins/basic-add';
+import {
+  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
+  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
+import { getList,} from "@/api/base/qualityScrapType";
+// import { getMaterialList } from "@/api/base/material";
+import moment from 'moment';
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: false,
+        // codeURL: getCode,
+        createURL: createQualityScrapLog,
+        updateURL: updateQualityScrapLog,
+        infoURL: getQualityScrapLog,
+      },
+      lineList:[],
+      typeList: [],
+      workOrderList: [],
+      detList:[],
+      teamList: [],
+      sourceList: [
+        {
+          id: 1,
+          name: '手动',
+        },
+        {
+          id: 2,
+          name: '自动',
+        }
+      ],
+			dataForm: {
+        id: undefined,
+        logTime: undefined,
+        source:1,
+        detId: undefined,
+        workOrderId: null,
+        teamId: undefined,
+        num: undefined,
+        lineId:undefined,
+        description:undefined,
+        // description: undefined,
+        remark: undefined,
+			},
+			// materialList: [],
+			dataRule: {
+				// materialId: [{ required: true, message: "", trigger: "blur" }],
+        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+
+        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+    console.log('我看看', this.dataForm)
+    this.getCurrentTime()
+	},
+  methods: {
+    getCurrentTime() {
+      // new Date().Format("yyyy-MM-dd HH:mm:ss")
+      this.dataForm.logTime = new Date()
+      // this.dataForm.logTime = year + "-" + month + "-" + day;
+      console.log(this.dataForm.logTime);
+    },
+		async getDict() {
+			// 物料列表
+      const res = await getList()
+      this.typeList = res.data
+      getWorkOrderList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.workOrderList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getLineList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.lineList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getDetList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.detList = res.data.map((item) => {
+          return {
+            name: item.content,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getTeamList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.teamList = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+		},
+		// setMaterialCode() {
+		// 	const chooseM = this.materialList.filter(item => {
+		// 		return item.id === this.dataForm.materialId
+		// 	})
+		// 	this.dataForm.materialCode = chooseM[0].code
+		// }
+	},
+};
+</script>

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

@@ -0,0 +1,222 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2023-11-07 19:38:13
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-dialog :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+    <small-title slot="title" :no-padding="true">
+      {{ '详情' }}
+    </small-title>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+      label-width="auto">
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="工单号" prop="workOrderId">
+            <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号" disabled>
+              <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="班组" prop="teamId">
+            <el-select v-model="dataForm.teamId" placeholder="请选择班组" disabled>
+              <el-option v-for="dict in teamList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="数量" prop="sum">
+            <el-input v-model="dataForm.sum" placeholder="请输入数量" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="产线" prop="lineId">
+            <el-select v-model="dataForm.lineId" placeholder="请选择产线" disabled>
+              <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="报废原因" prop="detId">
+            <el-select v-model="dataForm.detId" placeholder="请选择报废原因" disabled>
+              <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="报废时间" prop="logTime">
+            <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" disabled
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="来源" prop="source">
+            <el-select v-model="dataForm.source" placeholder="请选择来源" disabled>
+              <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="描述" prop="description">
+            <el-input v-model="dataForm.description" placeholder="请输入描述" disabled />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="dataForm.remark" placeholder="备注" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+import basicAdd from '../../../core/mixins/basic-add';
+import {
+  createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
+  getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
+import { getList,} from "@/api/base/qualityScrapType";
+import SmallTitle from './SmallTitle';
+export default {
+  components: {
+    SmallTitle,
+  },
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: false,
+        // codeURL: getCode,
+        createURL: createQualityScrapLog,
+        updateURL: updateQualityScrapLog,
+        infoURL: getQualityScrapLog,
+      },
+      lineList:[],
+      typeList: [],
+      workOrderList: [],
+      detList:[],
+      teamList: [],
+      sourceList: [
+        {
+          id: 1,
+          name: '手动',
+        },
+        {
+          id: 2,
+          name: '自动',
+        }
+      ],
+      dialogVisible:false,
+			dataForm: {
+        id: undefined,
+        logTime: undefined,
+        source:1,
+        detId: undefined,
+        workOrderId: null,
+        teamId: undefined,
+        num: undefined,
+        lineId:undefined,
+        description:undefined,
+        // description: undefined,
+        remark: undefined,
+			},
+			// materialList: [],
+			dataRule: {
+				// materialId: [{ required: true, message: "", trigger: "blur" }],
+        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+
+        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
+      }
+		};
+	},
+	mounted() {
+		// this.getDict()
+    console.log('我看看', this.dataForm)
+    this.getCurrentTime()
+	},
+  methods: {
+    init() {
+      this.dialogVisible = true
+    },
+    getCurrentTime() {
+      // new Date().Format("yyyy-MM-dd HH:mm:ss")
+      this.dataForm.logTime = new Date()
+      // this.dataForm.logTime = year + "-" + month + "-" + day;
+      console.log(this.dataForm.logTime);
+    },
+		// async getDict() {
+		// 	// 物料列表
+    //   const res = await getList()
+    //   this.typeList = res.data
+    //   getWorkOrderList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.workOrderList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getLineList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.lineList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getDetList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.workOrderList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getTeamList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.teamList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+		// },
+		// setMaterialCode() {
+		// 	const chooseM = this.materialList.filter(item => {
+		// 		return item.id === this.dataForm.materialId
+		// 	})
+		// 	this.dataForm.materialCode = chooseM[0].code
+		// }
+	},
+};
+</script>

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

@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+      :limit="listQuery.pageSize" :table-data="tableData">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
+    </base-table>
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+      @pagination="getDataList" />
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      @confirm="handleConfirm" :before-close="handleCancel" width="50%">
+      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
+    </base-dialog>
+    <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import DetailOrUpdate from './detail-or-updata';
+
+import basicPage from '../../../core/mixins/basic-page';
+import { parseTime } from '../../../core/mixins/code-filter';
+import {
+  getQualityScrapLogPage,
+  deleteQualityScrapLog,
+  getWorkOrderList,
+  getTeamList
+} from '@/api/base/qualityScrapLog';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+  },
+  {
+    prop: 'workOrderName',
+    label: '工单'
+  },
+  {
+    prop: 'teamId',
+    label: '班组'
+  },
+	{
+    prop: 'detContent',
+    label: '报废原因'
+	},
+	{
+    prop: 'logTime',
+    label: '报废时间',
+    filter: parseTime
+	},
+	{
+    prop: 'num',
+		label: '数量'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+        getDataListURL: getQualityScrapLogPage,
+        deleteURL: deleteQualityScrapLog,
+				// exportURL: exportFactoryExcel,
+			},
+			tableProps,
+			tableBtn: [
+        this.$auth.hasPermi(`base:quality-scrap-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+          : undefined,
+        this.$auth.hasPermi(`base:quality-scrap-log:detail`)
+          ? {
+            type: 'detail',
+            btnName: '详情',
+          }
+          : undefined,
+        this.$auth.hasPermi(`base:quality-scrap-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+      tableData: [],
+      detailOrUpdateVisible:false,
+			formConfig: [
+        {
+          type: 'select',
+          label: '工单',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'workOrderId',
+        },
+        {
+          type: 'select',
+          label: '班组',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'teamId',
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+    AddOrUpdate,
+    DetailOrUpdate
+	},
+  created() {
+    this.getDict()
+  },
+  methods: {
+    otherMethods(val) {
+      if (val.type === 'detail') {
+        this.detailOrUpdateVisible = true;
+        // this.addOrEditTitle = "详情";
+        this.$nextTick(() => {
+          this.$refs.detailOrUpdate.init(val.data.id, true);
+        });
+      }
+    },
+    // 获取数据列表
+    getDict() {
+      getWorkOrderList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.formConfig[0].selectOptions = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+      getTeamList().then((res) => {
+        console.log(res);
+        // console.log(response);
+        this.formConfig[1].selectOptions = res.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        // console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+    },
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+          this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined;
+          this.listQuery.teamId = val.teamId ? val.teamId : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

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

@@ -0,0 +1,86 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2023-11-24 08:42:18
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <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="请输入报废类型编码" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="报废类型" prop="name">
+          <el-input v-model="dataForm.name" placeholder="请输入报废类型" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="描述类型" prop="description">
+          <el-input v-model="dataForm.description" clearable placeholder="描述类型" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import basicAdd from '../../../core/mixins/basic-add';
+import { createQualityScrapType, updateQualityScrapType, getQualityScrapType, getCode } from "@/api/base/qualityScrapType";
+// import { getMaterialList } from "@/api/base/material";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+        createURL: createQualityScrapType,
+        updateURL: updateQualityScrapType,
+        infoURL: getQualityScrapType,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        description: undefined,
+        remark: undefined,
+			},
+			// materialList: [],
+			dataRule: {
+				// materialId: [{ required: true, message: "", trigger: "blur" }],
+        code: [{ required: true, message: "报废类型编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "报废类型不能为空", trigger: "blur" }],
+      }
+		};
+	},
+	mounted() {
+		// this.getDict()
+		console.log('我看看', this.dataForm)
+	},
+	methods: {
+		// async getDict() {
+		// 	// 物料列表
+		// 	const res = await getMaterialList();
+		// 	this.materialList = res.data;
+		// },
+		// setMaterialCode() {
+		// 	const chooseM = this.materialList.filter(item => {
+		// 		return item.id === this.dataForm.materialId
+		// 	})
+		// 	this.dataForm.materialCode = chooseM[0].code
+		// }
+	},
+};
+</script>

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

@@ -9,12 +9,11 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="80"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -22,7 +21,7 @@
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
-			:total="total"
+			:total="listQuery.total"
 			@pagination="getDataList" />
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -30,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="30%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -44,41 +43,35 @@ import basicPage from '../../../core/mixins/basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
   getQualityScrapTypePage,
-	deleteQualityScrapType,
+  deleteQualityScrapType
 } from '@/api/base/qualityScrapType';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 160,
   },
   {
     prop: 'name',
-		label: '报废类型',
+    label: '报废类型'
-		showOverflowtooltip: true,
   },
 	{
 		prop: 'code',
-		label: '报废类型编码',
+    label: '报废类型编码'
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'description',
-		label: '描述信息',
+		label: '描述信息'
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		showOverflowtooltip: true,
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -119,20 +112,13 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:quality-scrap-type:create')
+          type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true,
+					plain: true
 				},
 			],
-			listQuery: {
-				pageNo: 1,
-				pageSize: 20,
-			},
-			total: 0,
 		};
 	},
 	components: {
@@ -143,9 +129,9 @@ export default {
 		// 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
         this.tableData = response.data.list;
-				this.total = response.data.total;
+        this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });
     },
@@ -153,9 +139,19 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
 				case 'add':
 					this.addOrEditTitle = '新增';
 					this.addOrUpdateVisible = true;

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

@@ -7,39 +7,23 @@
 
 <template>
   <div style="flex: 1; display: flex; background: #f2f4f9">
-		<div
+    <div class="app-container" style="
-			class="app-container"
-			style="
 				margin-right: 12px;
 				border-radius: 8px;
 				background: #fff;
 				padding: 0;
 			">
-			<div
+      <div class="factory-list__selector" style="margin: 12px" title="点击切换工厂" @mouseenter="factoryListOpen = true"
-				class="factory-list__selector"
-				style="margin: 12px"
-				title="点击切换工厂"
-				@mouseenter="factoryListOpen = true"
         @mouseleave="factoryListOpen = false">
         {{ currentFactory?.label || '点我选择设备' }}
         <div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
-					<ul
+          <ul class="factory-list" v-if="sidebarContent.length" @click.prevent="factoryChangeHandler">
-						class="factory-list"
+            <li v-for="fc in sidebarContent" :key="fc.id" :data-value="fc.id" class="factory-list__item"
-						v-if="sidebarContent.length"
-						@click.prevent="factoryChangeHandler">
-						<li
-							v-for="fc in sidebarContent"
-							:key="fc.id"
-							:data-value="fc.id"
-							class="factory-list__item"
               :class="{ 'is-current': fc.id == currentFactory?.id }">
               <span>
                 {{ fc.label }}
               </span>
-							<svg-icon
+              <svg-icon v-if="fc.id == currentFactory?.id" icon-class="Confirm" style="height: 14px; width: 14px" />
-								v-if="fc.id == currentFactory?.id"
-								icon-class="Confirm"
-								style="height: 14px; width: 14px" />
             </li>
           </ul>
           <div v-else style="color: #0008; width: 128px; text-align: center">
@@ -49,13 +33,8 @@
       </div>
       <!-- side bar  -->
       <div class="side-bar__left" style="width: 240px; height: 100%">
-				<el-tree
+        <el-tree class="custom-tree-class" :data="currentFactory?.children" :props="treeProps" :empty-text="''"
-					class="custom-tree-class"
+          icon-class="custom-icon-class" @node-click="handleSidebarItemClick">
-					:data="currentFactory?.children"
-					:props="treeProps"
-					:empty-text="''"
-					icon-class="custom-icon-class"
-					@node-click="handleSidebarItemClick">
           <!-- <div class="custom-tree-node" slot-scope="{ node, data }">
 						<span class="icon"></span>
 						<span>{{ node.label }}</span>
@@ -63,46 +42,30 @@
         </el-tree>
       </div>
     </div>
-		<div
+    <div class="app-container equipment-process-amount" style="flex: 1; border-radius: 8px; background: #fff">
-			class="app-container equipment-process-amount"
-			style="flex: 1; border-radius: 8px; background: #fff">
       <!-- main area  -->
       <div class="main-content" style="display: flex; flex-direction: column">
-				<SearchBar
+        <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick"
-					:formConfigs="searchBarFormConfig"
-					ref="search-bar"
-					@headBtnClick="handleSearchBarBtnClick"
           @select-changed="handleSearchBarChanged" />
 
         <el-row>
           <el-col class="custom-tabs">
             <div v-if="tableList.length" class="tables">
-							<div
+              <div class="custom-table" v-for="table in tableList" :key="table.key">
-								class="custom-table"
-								v-for="table in tableList"
-								:key="table.key">
                 <!-- {{ JSON.stringify(spanMethod) }} -->
-								<base-table
+                <base-table :key="table.key + '__basetable'" :table-props="table.tableProps"
-									:key="table.key + '__basetable'"
+                  :table-data="table.dataManager?.dataList ?? []" :span-method="spanMethod"
-									:table-props="table.tableProps"
-									:table-data="table.dataManager?.dataList ?? []"
-									:span-method="spanMethod"
                   @emitFun="(val) => handleEmitFun(table, val)"></base-table>
-								<pagination
+                <pagination :key="table.key + '__pagination'" v-show="table.total > 0" :total="table.total"
-									:key="table.key + '__pagination'"
+                  :page.sync="table.pageNo" :limit.sync="table.pageSize" :page-size="table.pageSize"
-									v-show="table.total > 0"
+                  :page-sizes="[1, 3, 5, 10, 20]" @pagination="
-									:total="table.total"
-									:page.sync="table.pageNo"
-									:limit.sync="table.pageSize"
-									:page-size="table.pageSize"
-									:page-sizes="[1, 3, 5, 10, 20]"
-									@pagination="
 						({ page, limit, current }) =>
 							getListFor(table, { page, limit, current })
 					" />
               </div>
             </div>
-						<div v-else class="no-data-bg"></div>
+            <div v-else class="no-data-bg">
+            </div>
           </el-col>
         </el-row>
 
@@ -114,7 +77,10 @@
 
 <script>
 // import Graph from './graph.vue';
-import { getWorkOrderList, getTreeData } from '@/api/quality/deviceParameters';
+import {
+  getWorkOrderList,
+  getTreeData
+} from '@/api/quality/deviceParameters';
 export default {
   name: 'EquipmentProcessAmount',
   // components: { Graph },
@@ -237,7 +203,6 @@ export default {
           valueField: 'id',
           param: 'workOrderId',
           onchange: true,
-					filterable: true,
         },
         {
           type: 'datePicker',
@@ -258,9 +223,9 @@ export default {
           name: 'search',
           color: 'primary',
         },
-				{
+        // {
-					type: 'separate',
+        // 	type: 'separate',
-				},
+        // },
         // {
         // 	type: 'button',
         // 	btnName: '表格',
@@ -275,15 +240,12 @@ export default {
         // 	plain: true,
         // 	color: 'warning',
         // },
-				{
+        // {
-					type: this.$auth.hasPermi('base:equipment-group:export')
+        // 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-						? 'button'
+        // 	btnName: '导出',
-						: '',
+        // 	name: 'export',
-					btnName: '导出',
+        // 	color: 'warning',
-					name: 'export',
+        // },
-					plain: true,
-					color: 'success',
-				},
       ],
       tableProps: [
         { prop: 'lineName', label: '产线' },
@@ -324,7 +286,7 @@ export default {
     // },
   },
   mounted() {
-		this.getDict();
+    this.getDict()
     // if (this.id) this.$set(this.queryParams, 'id', this.id);
     // if (this.code)
     //   this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
@@ -341,7 +303,7 @@ export default {
       }
       switch (param) {
         case 'workOrderId':
-					this.getTree(value);
+          this.getTree(value)
           break;
       }
     },
@@ -363,12 +325,12 @@ export default {
         this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
           return {
             name: item.name,
-						id: item.id,
+            id: item.id
-					};
+          }
-				});
+        })
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
-			});
+      })
     },
     buildProps(table) {
       console.log('building props', table);
@@ -403,8 +365,7 @@ export default {
           prop: item.name,
           width: 128,
         });
-				firstLineData[item.name] = `${item.minValue ?? ''}-${
+        firstLineData[item.name] = `${item.minValue ?? ''}-${item.maxValue ?? ''
-					item.maxValue ?? ''
           }${item.defaultValue != null ? '/' + item.defaultValue : ''}`;
       });
       return { props, firstLineData };
@@ -532,9 +493,10 @@ export default {
         console.log('tree', this.sidebarContent);
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
-			});
+      })
       // const { data } = await this.$axios('/base/core-factory/getTreeByWorkOrder');
       // console.log(data)
+
     },
 
     handleTabClick(tab, event) {
@@ -549,7 +511,7 @@ export default {
     },
 
     handleSidebarItemClick({ label, id, type }) {
-			this.equipmentId = id;
+      this.equipmentId = id
       console.log('label clicked!', label, id, type);
       switch (type) {
         case '设备':
@@ -725,10 +687,7 @@ li {
   padding: 8px 18px !important;
 }
 
-.custom-tree-class
+.custom-tree-class>>>.el-tree-node__children .el-tree-node__children .el-tree-node__content {
-	>>> .el-tree-node__children
-	.el-tree-node__children
-	.el-tree-node__content {
   padding: 8px 24px !important;
 }
 </style>
@@ -738,8 +697,7 @@ li {
   margin-right: 8px;
   width: 20px;
   height: 20px;
-	background: url('../../../../assets/images/Qian.png') center center / contain
+  background: url('../../../../assets/images/Qian.png') center center / contain no-repeat;
-		no-repeat;
 }
 
 .custom-icon-class.el-tree-node__expand-icon.expanded {
@@ -747,8 +705,7 @@ li {
 }
 
 .el-tree-node__children .custom-icon-class {
-	background: url('../../../../assets/images/tree-icon-2.png') 100% / contain
+  background: url('../../../../assets/images/tree-icon-2.png') 100% / contain no-repeat;
-		no-repeat;
 }
 
 .el-tree-node__children .el-tree-node__children .custom-icon-class {

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

@@ -1,3 +1,10 @@
+<!--
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备效率分析
+-->
+
 <template>
 	<div class="app-container allow-overflow">
 		<!-- 搜索工作栏 -->
@@ -8,7 +15,10 @@
 
 		<el-row>
 			<el-col class="custom-tabs">
-				<el-tabs v-model="activeName" :stretch="true">
+				<el-tabs
+					v-model="activeName"
+					:stretch="true"
+					@tab-click="handleTabClick">
 					<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
 						<!-- 列表 -->
 						<base-table
@@ -17,7 +27,7 @@
 							:page="1"
 							:limit="10"
 							:table-data="list"
-							:max-height="tableH"></base-table>
+							@emitFun="handleEmitFun"></base-table>
 					</el-tab-pane>
 					<el-tab-pane
 						:label="'\u3000可视化\u3000'"
@@ -64,6 +74,7 @@
 										v-for="item in list"
 										:key="item.id"
 										:value="item" />
+									<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
 								</div>
 							</div>
 						</div>
@@ -75,43 +86,40 @@
 </template>
 
 <script>
+// import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import PieChart from './components/pieChart.vue';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 export default {
 	name: 'EfficiencyAnalysis',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: { PieChart },
 	props: {},
 	data() {
 		return {
 			activeName: 'table',
+			open: false,
+			visualizationOpen: false,
+			trendOpen: false,
+			// tableBtn: [
+			// 	this.$auth.hasPermi('base:equipment-group:update')
+			// 		? {
+			// 				type: 'edit',
+			// 				btnName: '修改',
+			// 		  }
+			// 		: undefined,
+			// 	this.$auth.hasPermi('base:equipment-group:delete')
+			// 		? {
+			// 				type: 'delete',
+			// 				btnName: '删除',
+			// 		  }
+			// 		: undefined,
+			// ].filter((v) => v),
 			tableProps: [
-				{
+				{ prop: 'factoryName', label: '工厂' },
-					prop: 'factoryName',
+				{ prop: 'lineName', label: '产线' },
-					label: '工厂',
+				{ prop: 'sectionName', label: '工段' },
-					minWidth: 120,
+				{ prop: 'equipmentName', label: '设备' },
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'lineName',
-					label: '产线',
-					minWidth: 120,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'sectionName',
-					label: '工段',
-					minWidth: 120,
-					showOverflowtooltip: true,
-				},
-				{
-					prop: 'equipmentName',
-					label: '设备',
-					minWidth: 120,
-					showOverflowtooltip: true,
-				},
 				{
 					label: '有效时间',
 					children: [
@@ -119,13 +127,12 @@ export default {
 							width: 128,
 							prop: 'workTime',
 							label: '工作时长[h]',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
 						{
 							width: 128,
 							prop: 'workRate',
 							label: '百分比[%]',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
@@ -136,14 +143,8 @@ export default {
 							width: 128,
 							prop: 'stopTime',
 							label: '停机时长[h]',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'stopRate',
-							label: '百分比[%]',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
+						{ width: 128, prop: 'stopRate', label: '百分比[%]' },
 					],
 				},
 				{
@@ -153,19 +154,14 @@ export default {
 							width: 128,
 							prop: 'downTime',
 							label: '故障时长[h]',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
-						},
-						{
-							width: 128,
-							prop: 'downRate',
-							label: '百分比[%]',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
+						{ width: 128, prop: 'downRate', label: '百分比[%]' },
 						{
 							width: 128,
 							prop: 'timeEfficiency',
 							label: '时间开动率',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
@@ -176,36 +172,91 @@ export default {
 							width: 128,
 							prop: 'realProcSpeed',
 							label: '实际加工速度',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
 						{
 							width: 128,
 							prop: 'designProcSpeed',
 							label: '理论加工速度',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
 						{
 							width: 128,
 							prop: 'peEfficiency',
 							label: '速度开动率',
-							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
+				{
+					prop: 'oee',
+					label: 'OEE',
+					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				},
+				{
+					prop: 'teep',
+					label: 'TEEP',
+					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				},
+				// {
+				// 	_action: 'view-trend',
+				// 	label: '趋势',
+				// 	,
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								// value: _this.injectData.id,
+				// 								value: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看趋势'
+				// 			);
+				// 		},
+				// 	},
+				// },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
-					label: '工单名称',
+					label: '工单',
+					placeholder: '请选择工单',
           param: 'workOrderId',
 					selectOptions: [],
-					filterable: true,
 				},
+				// {
+				// 	type: 'select',
+				// 	label: '产线',
+				// 	placeholder: '请选择产线',
+				// 	param: 'lineId',
+				// 	selectOptions: [],
+				// },
+				// 选项切换
+				// {
+				// 	type: 'select',
+				// 	label: '时间类型',
+				// 	param: 'dateFilterType',
+				// 	defaultSelect: 0,
+				// 	selectOptions: [
+				// 		{ id: 0, name: '按时间段' },
+				// 		{ id: 1, name: '按日期' },
+				// 	],
+				// 	index: 2,
+				// 	extraOptions: [
 						{
 							// parent: 'dateFilterType',
 							// 时间段选择
 							type: 'datePicker',
-					label: '时间段',
+							// label: '时间段',
 							dateType: 'daterange',
 							format: 'yyyy-MM-dd',
 							valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -213,27 +264,57 @@ export default {
 							rangeSeparator: '-',
 							startPlaceholder: '开始时间',
 							endPlaceholder: '结束时间',
-					param: 'recordTime',
+							param: 'timerange',
 						},
+				// 		{
+				// 			parent: 'dateFilterType',
+				// 			// 日期选择
+				// 			type: 'datePicker',
+				// 			// label: '日期',
+				// 			dateType: 'date',
+				// 			placeholder: '选择日期',
+				// 			format: 'yyyy-MM-dd',
+				// 			valueFormat: 'yyyy-MM-dd',
+				// 			param: 'timeday',
+				// 		},
+				// 	],
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
-				{
+				// {
-					type: 'separate',
+				// 	type: 'separate',
-				},
+				// },
-				{
+				// {
-					type: 'button',
+				// 	type: 'button',
-					btnName: '导出',
+				// 	btnName: '设备可视化',
-					name: 'export',
+				// 	name: 'visualization',
-					plain: true,
+				// 	plain: true,
-					color: 'success',
+				// 	color: 'success',
-				},
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: 'OEE',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: 'TEEP',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'warning',
+				// },
 			],
+			// 是否显示弹出层
+			open: false,
 			// 查询参数
 			queryParams: {
+				// lineId: null,
         workOrderId: null,
 				recordTime: [],
 			},
@@ -243,17 +324,20 @@ export default {
 		};
 	},
 	created() {
-		this.getWorkOrder();
+		this.getWorkOrder()
+		// this.getLine();
 		this.getList();
 	},
 	methods: {
 		/** 准备工厂数据 */
     async getWorkOrder() {
+      console.log(1111);
 			const { code, data } = await this.$axios({
         url: '/base/core-work-order/listbyfilter',
 				method: 'get',
 			});
       if (code == 0) {
+        console.log('1111', data);
 				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
 					return {
 						name: item.name,
@@ -262,6 +346,33 @@ export default {
 				});
 			}
 		},
+
+		// /** 准备产线数据 */
+		// async getLine() {
+		// 	const { code, data } = await this.$axios({
+		// 		url: '/base/production-line/listAll',
+		// 		method: 'get',
+		// 	});
+		// 	if (code == 0) {
+		// 		this.searchBarFormConfig[1].selectOptions = data.map((item) => {
+		// 			return {
+		// 				name: item.name,
+		// 				id: item.id,
+		// 			};
+		// 		});
+		// 	}
+		// },
+
+		/** 覆盖 handleEmitFun 的默认实现 */
+		handleEmitFun({ action, value }) {
+			switch (action) {
+				case 'view-trend':
+					const { id } = value;
+					this.open = true;
+					this.trendOpen = true;
+					break;
+			}
+		},
 		/** 查询列表 */
 		async getList() {
 			this.loading = true;
@@ -276,17 +387,41 @@ export default {
 		},
 
 		handleSearchBarBtnClick({ btnName, ...payload }) {
-			console.log(btnName);
+			console.log('handleSearchBarBtnClick', btnName, payload);
-			console.log(payload);
+			if (btnName == 'visualization') {
+				// 可视化
+				this.visualizationOpen = true;
+				this.open = true;
+			}
 			if (btnName == 'search') {
         this.queryParams.workOrderId = payload.workOrderId || null;
-				this.queryParams.recordTime = payload.recordTime || undefined;
+				// this.queryParams.lineId = payload.lineId || null;
-				this.getList();
+				if (0 == payload.dateFilterType) {
+					this.queryParams.recordTime = payload.timerange;
+				} else if (1 == payload.dateFilterType) {
+					this.queryParams.recordTime = [
+						`${payload.timeday} 00:00:00`,
+						`${payload.timeday} 23:59:59`,
+					];
+				}
 			} else {
 				this.queryParams.recordTime = null;
-				console.log('导出');
 			}
+			this.getList();
 		},
+
+		cancel() {
+			this.open = false;
+		},
+
+		closed() {
+			this.visualizationOpen = false;
+			this.trendOpen = false;
+		},
+
+		submitForm() {},
+
+		handleTabClick() {},
 	},
 };
 </script>

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

@@ -1,87 +1,84 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 14:55:51
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-24 10:55:54
+ * @Description:
+-->
 <template>
   <div class="app-container">
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-			ref="searchBarForm"
+      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-			@headBtnClick="buttonClick" />
+        @clickBtn="handleClick" /> -->
-		<base-table
+    </base-table>
-			:table-props="tableProps"
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="list"
-			:max-height="tableH"></base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
       @pagination="getList" />
+    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
   </div>
 </template>
 
 <script>
+// import AddOrUpdate from './add-or-updata';
+// import unitDict from './unitDict';
+// import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import {
   getMaterialUseLogPage,
   getWorkOrderList,
-	exportEnergyPlcExcel,
+  exportEnergyPlcExcel
 } from '@/api/quality/materialTraceability';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
   {
     prop: 'materialName',
-		label: '物料名称',
+    label: '物料名称'
-		showOverflowtooltip: true,
   },
   {
     prop: 'materialCode',
-		label: '物料编码',
+    label: '物料编码'
-		showOverflowtooltip: true,
-		minWidth: 120,
   },
   {
     prop: 'dateName',
-		label: '物料批次',
+    label: '物料批次'
-		showOverflowtooltip: true,
   },
   {
     prop: 'equipName',
-		label: '使用设备',
+    label: '使用设备'
-		showOverflowtooltip: true,
   },
   {
     prop: 'num',
-		label: '使用数量',
+    label: '使用数量'
-		showOverflowtooltip: true,
   },
   {
     prop: 'useTime',
     label: '使用时间',
-		filter: parseTime,
+    filter: parseTime
-		width: 160,
   },
   {
     prop: 'userName',
-		label: '操作人',
+    label: '操作人'
-		showOverflowtooltip: true,
   },
   {
     prop: 'source',
     label: '数据来源',
-		filter: (val) => (val == 1 ? '内部' : '外部'),
+    filter: (val) => val == 1 ? '内部' : '外部'
   },
   {
     prop: 'remark',
-		label: '备注',
+    label: '备注'
-		showOverflowtooltip: true,
+  }
-	},
 ];
 
 export default {
-	mixins: [tableHeightMixin],
+  // mixins: [basicPage],
   data() {
     return {
-			heightNum: 220,
+      // urlOptions: {
+      //   getDataListURL: getMaterialUseLogPage,
+      //   // deleteURL: deletePackingType,
+      //   // exportURL: exportPackingExcel,
+      // },
       tableProps,
       tableBtn: [
         this.$auth.hasPermi(`base:packaging-print-log:update`)
@@ -96,6 +93,7 @@ export default {
             btnName: '删除',
           }
           : undefined,
+
       ].filter((v) => v),
       list: [],
       listQuery: {
@@ -109,42 +107,61 @@ export default {
       formConfig: [
         {
           type: 'select',
-					label: '工单名称',
+          label: '工单',
           selectOptions: [],
           labelField: 'name',
           valueField: 'id',
-					param: 'workOrderId',
+          param: 'workOrderId'
         },
         {
           type: 'datePicker',
           label: '时间段',
           dateType: 'daterange',
           format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
           defaultSelect: [],
-					width: 250,
+          width: 250
         },
         {
           type: 'button',
-					btnName: '查询',
+          btnName: '搜索',
           name: 'search',
           color: 'primary',
         },
         {
           type: 'separate',
         },
+        // {
+        // 	type: 'separate',
+        // },
+        // {
+        // 	type: 'button',
+        // 	btnName: '重置',
+        // 	name: 'reset',
+        // },
+        // {
+        //   type: 'separate',
+        // },
+        // {
+        //   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+        //   btnName: '新增',
+        //   name: 'add',
+        //   color: 'success',
+        //   plain: true,
+        // },
+        // {
+        // 	type: 'separate',
+        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+        // },
         {
-					type: this.$auth.hasPermi('monitoring:materiel-date-from:export')
+          type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
-						? 'button'
-						: '',
         	btnName: '导出',
         	name: 'export',
-					plain: true,
+        	color: 'warning',
-					color: 'success',
         },
       ],
     };
@@ -153,60 +170,73 @@ export default {
     // AddOrUpdate,
   },
   created() {
-		this.getList();
+    this.getList()
-		this.getDict();
+    this.getDict()
   },
   methods: {
     getList() {
-			getMaterialUseLogPage({ ...this.listQuery }).then((res) => {
+      getMaterialUseLogPage({ ...this.listQuery }).then(res => {
-				this.list = res.data || [];
+        this.list = res.data || []
-				this.listQuery.total = res.data.total || 0;
+        this.listQuery.total = res.data.total || 0
-			});
+      })
     },
     getDict() {
+      // 获取产品的属性列表
+      // getCustomerList().then((response) => {
+      //   console.log(response);
+      //   this.customerList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      // getModelList().then((response) => {
+      //   console.log(response);
+      //   this.modelList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
       getWorkOrderList().then((response) => {
+        // console.log(response);
         this.formConfig[0].selectOptions = response.data.map((item) => {
           return {
             name: item.name,
-						id: item.id,
+            id: item.id
-					};
+          }
-				});
+        })
         console.log(this.formConfig[0].selectOptions);
-			});
+        // this.listQuery.total = response.data.total;
+      })
     },
     handleExport() {
       // 处理查询参数
       let params = { ...this.listQuery };
       params.pageNo = undefined;
       params.pageSize = undefined;
-			this.$modal
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
         this.exportLoading = true;
         return exportEnergyPlcExcel(params);
-				})
+      }).then(response => {
-				.then((response) => {
         this.$download.excel(response, '物料信息追溯  ');
         this.exportLoading = false;
-				})
+      }).catch(() => { });
-				.catch(() => {});
     },
     buttonClick(val) {
-			console.log(val);
+      console.log(val)
       if (val.btnName === 'search') {
-				this.listQuery.workOrderId = val.workOrderId
+        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
-					? val.workOrderId
+        // this.queryParams.status = val.status
-					: undefined;
         if (val.timeVal && val.timeVal.length != 0 ) {
-					this.listQuery.startTime = val.timeVal[0] + ' 00:00:00';
+        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-					this.listQuery.endTime = val.timeVal[1] + ' 23:59:59';
+        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
         } else {
-					this.listQuery.startTime = undefined;
+          this.listQuery.startTime = undefined
-					this.listQuery.endTime = undefined;
+          this.listQuery.endTime = undefined
         }
-				this.getList();
+        this.getList()
       } else {
-				this.handleExport();
+        this.handleExport()
+        // this.addOrEditTitle = '新增'
+        // this.centervisible = true
+        // this.$nextTick(() => {
+        //   this.$refs.orderAdd.init()
+        // })
       }
     },
     otherMethods(val) {

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

@@ -1,126 +1,118 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 14:55:51
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-28 10:51:44
+ * @Description:
+-->
 <template>
   <div class="app-container">
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-			ref="searchBarForm"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="list"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
-		<pagination
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
       @pagination="getList" />
+    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
   </div>
 </template>
 
 <script>
+// import AddOrUpdate from './add-or-updata';
+// import unitDict from './unitDict';
+// import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import {
   getProcessTraceabilityPage,
   getWorkOrderList,
-	getCoreProduct,
+  getCoreProduct
+  // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
   {
     prop: 'name',
-		label: '工单名称',
+    label: '工单名称'
-		showOverflowtooltip: true,
-		minWidth: 120,
   },
   {
     prop: 'code',
-		label: '工单编码',
+    label: '工单编码'
-		showOverflowtooltip: true,
-		minWidth: 120,
   },
   {
     prop: 'planProductName',
-		label: '产品名',
+    label: '产品名'
-		showOverflowtooltip: true,
   },
   {
     prop: 'status',
     label: '状态',
-		filter: (val) =>
+    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
-			val == 1
-				? '等待'
-				: val == 2
-				? '激活'
-				: val == 3
-				? '暂停'
-				: val == 4
-				? '完成'
-				: '作废',
   },
   {
     prop: 'startProduceTime',
     label: '开始生产时间',
-		filter: parseTime,
+    filter: parseTime
-		width: 160,
   },
   {
     prop: 'finishProduceTime',
     label: '结束生产时间',
-		filter: parseTime,
+    filter: parseTime
-		width: 160,
   },
   {
     prop: 'actualQuantity',
-		label: '生产数量',
+    label: '生产数量'
   },
   {
     prop: 'planProductUnit',
     label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('unit_dict')
-	},
-	{
-		prop: 'yield',
-		label: '合格率',
-		filter: (val) => (val ? val.toFixed(2) + '%' : '-'),
-		align: 'center',
   },
   {
     prop: 'processFlowName',
-		label: '工艺名称',
+    label: '工艺名称'
-		showOverflowtooltip: true,
   },
+  {
+    prop: 'yield',
+    label: '合格率'
+  }
 ];
 
 export default {
-	mixins: [tableHeightMixin],
+  // mixins: [basicPage],
   data() {
     return {
+      // urlOptions: {
+      //   getDataListURL: getMaterialUseLogPage,
+      //   // deleteURL: deletePackingType,
+      //   // exportURL: exportPackingExcel,
+      // },
       tableProps,
       tableBtn: [
+        // this.$auth.hasPermi(`base:packaging-print-log:update`)
+        //   ? {
+        //     type: 'edit',
+        //     btnName: '编辑',
+        //   }
+        //   : undefined,
           {
             type: 'processDetail',
             btnName: '查看工艺详情',
           },
+
       ].filter((v) => v),
       list: [],
       listQuery: {
         pageSize: 10,
         pageNo: 1,
+        // total: 0,
+        // orderName: '工单',
+        // startTime: undefined,
+        // endTime:undefined,
       },
       formConfig: [
         {
           type: 'select',
-					label: '工单名称',
+          label: '工单',
           selectOptions: [],
           labelField: 'name',
           valueField: 'id',
@@ -132,40 +124,71 @@ export default {
           label: '工单开始时间',
           dateType: 'daterange',
           format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
           defaultSelect: [],
-					width: 250,
+          width: 250
         },
         {
           type: 'button',
-					btnName: '查询',
+          btnName: '搜索',
           name: 'search',
           color: 'primary',
         },
+        // {
+        // 	type: 'separate',
+        // },
+        // {
+        // 	type: 'button',
+        // 	btnName: '重置',
+        // 	name: 'reset',
+        // },
+        // {
+        //   type: 'separate',
+        // },
+        // {
+        //   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+        //   btnName: '新增',
+        //   name: 'add',
+        //   color: 'success',
+        //   plain: true,
+        // },
+        // {
+        // 	type: 'separate',
+        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+        // },
+        // {
+        //   type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
+        // 	btnName: '导出',
+        // 	name: 'export',
+        // 	color: 'warning',
+        // },
       ],
     };
   },
+  components: {
+    // AddOrUpdate,
+  },
   created() {
-		this.getList();
+    this.getList()
-		this.getDict();
+    this.getDict()
   },
   methods: {
     getList() {
-			getProcessTraceabilityPage(this.listQuery).then((res) => {
+      getProcessTraceabilityPage(this.listQuery).then(res => {
-				this.list = res.data.list || [];
+        this.list = res.data.list || []
-				this.listQuery.total = res.data.total || 0;
+        this.listQuery.total = res.data.total || 0
-			});
+      })
     },
     handleClick(val) {
-			if (val.type === 'processDetail') {
+      if (val.type === "processDetail") {
         console.log(val);
-				let specificationsData = '';
+        let specificationsData =''
         getCoreProduct(val.data.planProductId).then((res) => {
-					console.log(res);
+          console.log(res)
 
           this.$router.push({
             path: 'process-traceability-detail',
@@ -176,34 +199,72 @@ export default {
               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)
       }
     },
     getDict() {
+      // 获取产品的属性列表
+      // getCustomerList().then((response) => {
+      //   console.log(response);
+      //   this.customerList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      // getModelList().then((response) => {
+      //   console.log(response);
+      //   this.modelList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
       getWorkOrderList().then((response) => {
+        // console.log(response);
         this.formConfig[0].selectOptions = response.data.map((item) => {
           return {
             name: item.name,
-						id: item.name,
+            id: item.name
-					};
-				});
-				console.log(this.formConfig[0].selectOptions);
-			});
-		},
-		buttonClick(val) {
-			console.log(val);
-			if (val.btnName === 'search') {
-				this.listQuery.orderName = val.orderName ? val.orderName : 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();
+        })
+        console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+    },
+    // handleExport() {
+    //   // 处理查询参数
+    //   let params = { ...this.listQuery };
+    //   params.pageNo = undefined;
+    //   params.pageSize = undefined;
+    //   this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+    //     this.exportLoading = true;
+    //     return exportEnergyPlcExcel(params);
+    //   }).then(response => {
+    //     this.$download.excel(response, '物料信息追溯  ');
+    //     this.exportLoading = false;
+    //   }).catch(() => { });
+    // },
+    buttonClick(val) {
+      console.log(val)
+      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
+        }
+        this.getList()
+      } else {
+        // this.handleExport()
+        // this.addOrEditTitle = '新增'
+        // this.centervisible = true
+        // this.$nextTick(() => {
+        //   this.$refs.orderAdd.init()
+        // })
       }
     },
     otherMethods(val) {

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

@@ -0,0 +1,219 @@
+<!--
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-09-11 15:55:13
+    description: DialogForm for qualityInspectionRecord only
+-->
+
+<template>
+  <el-form ref="form" :model="innerDataForm" label-width="100px" v-loading="formLoading">
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="工单名称" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单名称" filterable clearable>
+            <el-option v-for="opt in workOrderList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="检测内容" prop="inspectionDetId"
+          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.inspectionDetId" placeholder="请选择检测内容" filterable clearable
+            @change="handleInspectionDetChange">
+            <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="产线" prop="productionLineId"
+          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.productionLineId" placeholder="请选择产线" filterable clearable
+            @change="handleProductlineChange">
+            <el-option v-for="opt in productionLineList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="工段" prop="sectionId" :rules="[{ required: false, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.sectionId" placeholder="请选择工段" clearable filterable
+            @change="$emit('update', innerDataForm)">
+            <el-option v-for="opt in sectionList" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="检测人员" prop="checkPerson">
+          <el-input v-model="innerDataForm.checkPerson" clearable @change="$emit('update', innerDataForm)"
+            placeholder="请输入检测人员" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="检测时间" prop="checkTime" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-date-picker v-model="innerDataForm.checkTime" type="datetime" placeholder="请选择检测时间"
+            value-format="timestamp" @change="$emit('update', innerDataForm)"></el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="来源" prop="source" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+          <el-select v-model="innerDataForm.source" placeholder="请选择来源" filterable clearable
+            @change="$emit('update', innerDataForm)">
+            <el-option v-for="opt in [
+            	{ label: '手动', value: 1 },
+            	{ label: '自动', value: 2 },
+            ]" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="innerDataForm.remark" @change="$emit('update', innerDataForm)" placeholder="请输入备注">
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+			inspectionDetList: [],
+			productionLineList: [],
+      sectionList: [],
+      workOrderList:[],
+			innerDataForm: {},
+			cacheInspectionDetList: null,
+		};
+	},
+	mounted() {
+    Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList()]).then(
+			() => {
+				this.formLoading = false;
+			}
+		);
+	},
+	watch: {
+		// 'innerDataForm.productionLineId': {
+		// 	handler: async function (plId) {
+		// 		if (plId) await this.getWorksectionList(plId);
+		// 	},
+		// 	immediate: true,
+		// },
+		dataForm: {
+			handler: function (dataForm) {
+				this.innerDataForm = Object.assign({}, dataForm);
+
+				if (dataForm.productionLineId)
+					this.getWorksectionList(dataForm.productionLineId);
+			},
+			immediate: true,
+		},
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+
+		handleInspectionDetChange(value) {
+			const { id, content } = this.cacheInspectionDetList.find(
+				(item) => item.id == value
+			);
+			this.innerDataForm.inspectionDetId = id;
+			this.innerDataForm.inspectionDetContent = content;
+			this.$emit('update', this.innerDataForm);
+		},
+
+		async handleProductlineChange(id) {
+			// await this.getWorksectionList(id);
+			this.innerDataForm.sectionId = null;
+			this.$emit('update', this.innerDataForm);
+		},
+
+		// getCode
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+
+		// 获取产线列表
+		async getProductLineList() {
+      const response = await this.$axios('/base/core-production-line/listAll');
+			this.productionLineList = response.data.map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+
+    async getWorkOrderList() {
+      const response = await this.$axios('base/core-work-order/listbyfilter');
+      this.workOrderList = response.data.map((item) => ({
+        label: item.name,
+        value: item.id,
+      }));
+    },
+
+		// 获取检测内容列表
+		async getInspectionDetList() {
+			const response = await this.$axios(
+				'/base/quality-inspection-det/listAll'
+			);
+			this.cacheInspectionDetList = response.data;
+			this.inspectionDetList = response.data.map((item) => ({
+				label: item.content,
+				value: item.id,
+			}));
+		},
+
+		// 获取工段列表
+		async getWorksectionList(plId) {
+			const response = await this.$axios(
+				'/base/core-workshop-section/listByParentId',
+				{
+					params: {
+						id: plId,
+					},
+				}
+			);
+			this.sectionList = response.data.map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>

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

@@ -12,13 +12,12 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="80"
+				:width="120"
 				fixed="right"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
@@ -59,29 +58,102 @@ import moment from 'moment';
 import DialogForm from './dialogForm.vue';
 
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 export default {
 	name: 'QualityInspectionRecord',
 	components: {
 		DialogForm,
 	},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
+			rows: [
+				[
+					{
+						select: true,
+						label: '检测内容',
+						url: '/base/quality-inspection-det/listAll',
+						prop: 'inspectionDetId',
+						labelKey: 'content',
+						rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+						},
+					},
+					{
+						select: true,
+						label: '来源',
+						prop: 'source',
+						value: 1, // 默认手动
+						options: [
+							{ label: '手动', value: 1 },
+							{ label: '自动', value: 2 },
+						],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
+				[
+					{
+						select: true,
+						label: '产线',
+						url: '/base/production-line/listAll',
+						prop: 'productionLineId',
+						bind: {
+							filterable: true,
+						},
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '工段',
+						url: '/base/workshop-section/listAll', // 这个 url 其实可加可不加，因为下面会更新 options
+						options: [], // 这个options也可加可不加, 因为下面会更新 options
+						prop: 'sectionId',
+						bind: {
+							filterable: true,
+						},
+						rules: [{ required: false, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '检测人员',
+						prop: 'checkPerson',
+					},
+					{
+						datetime: true,
+						label: '检测时间',
+						prop: 'checkTime',
+						rules: [{ required: true, message: '检测时间不能为空', trigger: 'blur' }],
+						bind: {
+							format: 'yyyy-MM-dd HH:mm:ss',
+							'value-format': 'timestamp',
+							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
+							clearable: true,
+						},
+					},
+				],
+				[{ textarea: true, label: '描述', prop: 'explainText' }],
+				[{ input: true, label: '备注', prop: 'remark' }],
+			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
           label: '工单名称',
+          placeholder: '请选择工单名称',
 					param: 'workOrderId',
           selectOptions: [],
-					filterable: true,
+          filterable:true
 				},
 				{
           type: 'select',
 					label: '检测内容',
+          placeholder: '请输入检测内容',
           selectOptions: [],
           param: 'inspectionDetContent',
-					filterable: true,
+          filterable: true
 				},
 				{
 					type: 'datePicker',
@@ -107,7 +179,9 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:quality-inspection-record:create')
+					type: this.$auth.hasPermi(
+						'base:quality-inspection-record:create'
+					)
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -134,31 +208,32 @@ export default {
 				{
 					prop: 'createTime',
 					label: '添加时间',
-					width: 160,
+					fixed: true,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
         },
         {
+          // width: 128,
           prop: 'workOrderName',
           label: '工单名称',
-					showOverflowtooltip: true,
         },
 				{
+					// width: 128,
 					prop: 'inspectionDetContent',
 					label: '检测内容',
-					showOverflowtooltip: true,
 				},
 				{
-					prop: 'productionLineName',
+					// width: 128,
+					prop: 'lineName',
 					label: '产线',
-					showOverflowtooltip: true,
 				},
 				{
+					// width: 128,
 					prop: 'checkPerson',
 					label: '检测人员',
-					showOverflowtooltip: true,
 				},
 				{
-					width: 160,
+					// width: 160,
 					prop: 'checkTime',
 					label: '检测时间',
 					filter: (val) =>
@@ -172,7 +247,7 @@ export default {
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-			searchBarKeys: ['workOrderId', 'inspectionDetContent', 'checkTime'],
+			searchBarKeys: ['inspectionDetContent', 'checkTime', 'productionLineId'],
 			form: {
 				id: undefined,
 				inspectionDetId: undefined,
@@ -183,13 +258,13 @@ export default {
         workOrderId:undefined,
 				checkTime: undefined,
 				source: undefined,
-				workOrderId: undefined,
+				explainText: undefined,
 				remark: undefined,
 			},
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+        pageSize: 10,
         workOrderId:null,
 				inspectionDetContent: null,
 				checkTime: [],
@@ -199,15 +274,38 @@ export default {
 	},
 	created() {
 		this.getList();
-		this.getProductLineList();
+		this.getProductLineList()
 	},
 	watch: {
 		form: {
 			handler: function (val) {
 				console.log('form change:', val);
 			},
-			deep: true,
+			deep: true
-		},
+		}
+		// 注册弹窗里产线改变时的监听事件
+		// 'form.productionLineId': {
+		// 	handler: function (val) {
+		// 		if (val == null) return;
+		// 		this.$axios('/base/workshop-section/listByParentId', {
+		// 			params: {
+		// 				id: val,
+		// 			},
+		// 		}).then((response) => {
+		// 			this.$set(
+		// 				this.rows[1][1], // 这里索引是硬编码，所以当 this.rows 里数据顺序改变时，此处也要改
+		// 				'options',
+		// 				response.data.map((item) => {
+		// 					return {
+		// 						label: item.name,
+		// 						value: item.id,
+		// 					};
+		// 				})
+		// 			);
+		// 		});
+		// 	},
+		// 	immediate: true,
+		// },
 	},
 	methods: {
 		/** 获取搜索栏的产线列表 */
@@ -221,7 +319,7 @@ export default {
 						};
 					}
 				);
-			});
+      })
       this.$axios('/base/quality-inspection-det/listAll').then((response) => {
         this.searchBarFormConfig[1].selectOptions = response.data.map(
           (item) => {
@@ -258,7 +356,7 @@ export default {
 				checkPerson: undefined,
 				checkTime: undefined,
 				source: undefined,
-				workOrderId: undefined,
+				explainText: undefined,
 				remark: undefined,
 				productionLineId: undefined,
 			};
@@ -278,7 +376,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '新增';
+			this.title = '添加质量检查信息记录表';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -286,13 +384,13 @@ export default {
 			const id = row.id;
 			getQualityInspectionRecord(id).then((response) => {
 				/** 因为后端返回的时间是时间戳格式，需转换 */
-				const info = {};
+				const info = {}
-				Object.keys(this.form).forEach((key) => {
+				Object.keys(this.form).forEach(key => {
-					info[key] = response.data[key];
+					info[key] = response.data[key]
 				});
 				this.form = info;
 				this.open = true;
-				this.title = '编辑';
+				this.title = '修改质量检查信息记录表';
 			});
 		},
 		/** 提交按钮 */

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

@@ -0,0 +1,120 @@
+<!--
+    filename: index.vue
+    author: liubin
+    date: 2023-08-04 14:44:58
+    description:
+-->
+
+<template>
+	<div class="app-container">
+		<SearchBar
+			:formConfigs="[{ label: '近24小时检测记录', type: 'title' }]"
+			ref="search-bar" />
+		<!-- <pre><code v-html="jsondemo"></code></pre> -->
+
+		<el-skeleton v-if="initing" :rows="6" animated />
+		<div v-else >
+			<base-table
+				:table-props="tableProps"
+				:page="queryParams.pageNo"
+				:limit="queryParams.pageSize"
+				:table-data="list"
+				@emitFun="handleEmitFun"></base-table>
+		</div>
+	</div>
+</template>
+
+<script>
+// import response from './response.json';
+import { handleNameData, handleDynamicData } from '@/utils/dynamicProps';
+// import hljs from 'highlight.js/lib/highlight';
+// import json from 'highlight.js/lib/languages/json';
+// import 'highlight.js/styles/github-gist.css';
+
+// hljs.registerLanguage('json', json);
+
+export default {
+	name: 'QualityRecentHours',
+	components: {},
+	props: {},
+	data() {
+		return {
+			initing: false,
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+			},
+			list: [
+				// {
+				// 	inspectionContent: '检测内容1',
+				// 	'2023-03-18T00:00:00-产线1': '产线1-asdf',
+				// 	'2023-03-18T01:00:00-产线2': '产线2-kldf',
+				// 	'2023-03-18T02:00:00-产线1': '产线1-vasdkj',
+				// },
+			],
+			tableProps: [
+				{
+					prop: 'inspectionContent',
+					label: '检测内容',
+				},
+			],
+		};
+	},
+	computed: {},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		async getList() {
+			const response = await this.$axios({
+        url: '/analysis/record-in-one-day/get',
+				method: 'get',
+			});
+			const {
+				data: { data: dyanmicData, nameData },
+			} = response;
+
+			this.initing = true;
+			const dynamicProps = handleNameData(nameData);
+			this.tableProps.push(...dynamicProps);
+			const dataList = handleDynamicData(dyanmicData);
+			this.list = dataList;
+			this.queryParams.pageSize = dataList.length;
+
+			setTimeout(() => {
+				this.initing = false;
+			}, 1000);
+		},
+
+		handleEmitFun(payload) {
+			console.log('payload', payload);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+::-webkit-scrollbar {
+	display: none;
+}
+
+pre {
+	margin: 10px;
+	background: #f6f8faf6;
+	border: 1px solid #e1e4e8;
+	padding: 12px;
+	border-radius: 12px;
+	position: fixed;
+	// top: 15vh;
+	top: 10vh;
+	left: 0;
+	max-height: 80vh;
+	overflow-y: auto;
+	z-index: 100000;
+	box-shadow: 0 0 32px 12px #0001;
+}
+
+code {
+	font-family: 'IntelOne Mono', 'Ubuntu', 'Courier New', Courier, monospace;
+}
+</style>

src/views/quality/monitoring/qualityRecentHours/props.json

@@ -0,0 +1,80 @@
+{
+	"tableProps": [
+		{
+			"prop": "inspectionContent",
+			"label": "检测内容",
+			"align": "center"
+		},
+		{
+			"prop": "2023-03-18T00:00:00",
+			"label": "2023-03-18T00:00:00",
+			"align": "center",
+			"children": [
+				{
+					"prop": "2023-03-18T00:00:00-产线1",
+					"label": "产线1",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T00:00:00-产线2",
+					"label": "产线2",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T00:00:00-产线3",
+					"label": "产线3",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T00:00:00-产线4",
+					"label": "产线4",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T00:00:00-产线5",
+					"label": "产线5",
+					"align": "center"
+				}
+			]
+		},
+		{
+			"prop": "2023-03-18T01:00:00",
+			"label": "2023-03-18T01:00:00",
+			"align": "center",
+			"children": [
+				{
+					"prop": "2023-03-18T01:00:00-产线1",
+					"label": "产线1",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T01:00:00-产线2",
+					"label": "产线2",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T01:00:00-产线3",
+					"label": "产线3",
+					"align": "center"
+				}
+			]
+		},
+		{
+			"prop": "2023-03-18T02:00:00",
+			"label": "2023-03-18T02:00:00",
+			"align": "center",
+			"children": [
+				{
+					"prop": "2023-03-18T02:00:00-产线1",
+					"label": "产线1",
+					"align": "center"
+				},
+				{
+					"prop": "2023-03-18T02:00:00-产线2",
+					"label": "产线2",
+					"align": "center"
+				}
+			]
+		}
+	]
+}

src/views/quality/monitoring/qualityRecentHours/response.json

@@ -0,0 +1,176 @@
+{
+	"code": 0,
+	"data": {
+		"data": [
+			{
+				"data": [
+					{
+						"id": "测试222023-08-09T02:00",
+						"parentId": "测试22",
+						"dynamicName": "2023-08-09T02:00",
+						"dynamicValue": 1691517600000,
+						"children": [
+							{
+								"id": "1672847052717821953",
+								"parentId": "测试222023-08-09T02:00",
+								"dynamicName": "产线1",
+								"dynamicValue": 1
+							}
+						]
+					},
+					{
+						"id": "测试222023-08-09T08:00",
+						"parentId": "测试22",
+						"dynamicName": "2023-08-09T08:00",
+						"dynamicValue": 1691539200000,
+						"children": [
+							{
+								"id": "1672847052717821953",
+								"parentId": "测试222023-08-09T08:00",
+								"dynamicName": "产线1",
+								"dynamicValue": 1
+							}
+						]
+					},
+					{
+						"id": "测试222023-08-09T11:00",
+						"parentId": "测试22",
+						"dynamicName": "2023-08-09T11:00",
+						"dynamicValue": 1691550000000,
+						"children": [
+							{
+								"id": "1672847052717821953",
+								"parentId": "测试222023-08-09T11:00",
+								"dynamicName": "产线1",
+								"dynamicValue": 1
+							}
+						]
+					}
+				],
+				"inspectionDetContent": "测试22"
+			},
+			{
+				"data": [
+					{
+						"id": "测试112023-08-09T02:00",
+						"parentId": "测试11",
+						"dynamicName": "2023-08-09T02:00",
+						"dynamicValue": 1691517600000,
+						"children": [
+							{
+								"id": "1672847052717821954",
+								"parentId": "测试112023-08-09T02:00",
+								"dynamicName": "产线22",
+								"dynamicValue": 1
+							}
+						]
+					},
+					{
+						"id": "测试112023-08-09T08:00",
+						"parentId": "测试11",
+						"dynamicName": "2023-08-09T08:00",
+						"dynamicValue": 1691539200000,
+						"children": [
+							{
+								"id": "1672847052717821953",
+								"parentId": "测试112023-08-09T08:00",
+								"dynamicName": "产线1",
+								"dynamicValue": 1
+							}
+						]
+					},
+					{
+						"id": "测试112023-08-09T09:00",
+						"parentId": "测试11",
+						"dynamicName": "2023-08-09T09:00",
+						"dynamicValue": 1691542800000,
+						"children": [
+							{
+								"id": "1672847052717821954",
+								"parentId": "测试112023-08-09T09:00",
+								"dynamicName": "产线22",
+								"dynamicValue": 2
+							}
+						]
+					}
+				],
+				"inspectionDetContent": "测试11"
+			}
+		],
+		"nameData": [
+			{
+				"name": "2023-08-09T02:00",
+				"tree": 1,
+				"id": "测试222023-08-09T02:00",
+				"parentId": "测试22"
+			},
+			{
+				"name": "产线1",
+				"tree": 2,
+				"id": "1672847052717821953",
+				"parentId": "测试222023-08-09T02:00"
+			},
+			{
+				"name": "2023-08-09T08:00",
+				"tree": 1,
+				"id": "测试222023-08-09T08:00",
+				"parentId": "测试22"
+			},
+			{
+				"name": "产线1",
+				"tree": 2,
+				"id": "1672847052717821953",
+				"parentId": "测试222023-08-09T08:00"
+			},
+			{
+				"name": "2023-08-09T11:00",
+				"tree": 1,
+				"id": "测试222023-08-09T11:00",
+				"parentId": "测试22"
+			},
+			{
+				"name": "产线1",
+				"tree": 2,
+				"id": "1672847052717821953",
+				"parentId": "测试222023-08-09T11:00"
+			},
+			{
+				"name": "2023-08-09T02:00",
+				"tree": 1,
+				"id": "测试112023-08-09T02:00",
+				"parentId": "测试11"
+			},
+			{
+				"name": "产线22",
+				"tree": 2,
+				"id": "1672847052717821954",
+				"parentId": "测试112023-08-09T02:00"
+			},
+			{
+				"name": "2023-08-09T08:00",
+				"tree": 1,
+				"id": "测试112023-08-09T08:00",
+				"parentId": "测试11"
+			},
+			{
+				"name": "产线1",
+				"tree": 2,
+				"id": "1672847052717821953",
+				"parentId": "测试112023-08-09T08:00"
+			},
+			{
+				"name": "2023-08-09T09:00",
+				"tree": 1,
+				"id": "测试112023-08-09T09:00",
+				"parentId": "测试11"
+			},
+			{
+				"name": "产线22",
+				"tree": 2,
+				"id": "1672847052717821954",
+				"parentId": "测试112023-08-09T09:00"
+			}
+		]
+	},
+	"msg": ""
+}

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

@@ -1,74 +1,79 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 14:55:51
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-10 16:26:45
+ * @Description:
+-->
 <template>
   <div class="app-container">
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-			ref="searchBarForm"
+      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-			@headBtnClick="buttonClick" />
+        @clickBtn="handleClick" /> -->
-		<base-table
+    </base-table>
-			:table-props="tableProps"
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="list"
-			:max-height="tableH"></base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="total"
       @pagination="getList" />
+    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
   </div>
 </template>
 
 <script>
+// import AddOrUpdate from './add-or-updata';
+// import unitDict from './unitDict';
+// import basicPage from '../mixins/basic-page';
 import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '../mixins/code-filter';
 import {
   getRawMaterialPage,
   getWorkOrderList,
+  // exportEnergyPlcExcel
 } from '@/api/quality/rawMaterialTraceability';
-import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
   {
     prop: 'createTime',
     label: '添加时间',
-		filter: parseTime,
+    filter: parseTime
-		width: 150,
   },
   {
     prop: 'material',
     label: '原料名称',
-		filter: publicFormatter('material'),
+    filter: publicFormatter('material')
-		showOverflowtooltip: true,
   },
   {
     prop: 'origin',
     label: '来源',
-		filter: (val) => (val == 1 ? '内部' : '外部'),
+    filter: (val)=>val == 1 ? '内部' : '外部'
   },
   {
-		prop: 'supplierName',
+    prop: 'supplierId',
-		label: '供应商',
+    label: '供应商'
   },
   {
     prop: 'batch',
-		label: '批次',
+    label: '批次'
-		showOverflowtooltip: true,
   },
   {
     prop: 'num',
-		label: '数量',
+    label: '数量'
   },
   {
     prop: 'unit',
     label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('unit_dict')
-	},
+  }
 ];
 
 export default {
-	mixins: [tableHeightMixin],
+  // mixins: [basicPage],
   data() {
     return {
+      // urlOptions: {
+      //   getDataListURL: getMaterialUseLogPage,
+      //   // deleteURL: deletePackingType,
+      //   // exportURL: exportPackingExcel,
+      // },
       tableProps,
       tableBtn: [
         this.$auth.hasPermi(`base:packaging-print-log:update`)
@@ -83,63 +88,147 @@ export default {
             btnName: '删除',
           }
           : undefined,
+
       ].filter((v) => v),
       list: [],
       listQuery: {
         pageSize: 10,
         pageNo: 1,
+        total: 0,
         workOrderId: undefined,
         startTime: undefined,
         endTime:undefined,
       },
-			total: 0,
       formConfig: [
         {
           type: 'select',
-					label: '工单名称',
+          label: '工单',
           selectOptions: [],
           labelField: 'name',
           valueField: 'id',
-					param: 'workOrderId',
+          param: 'workOrderId'
         },
+        // {
+        //   type: 'datePicker',
+        //   label: '时间段',
+        //   dateType: 'daterange',
+        //   format: 'yyyy-MM-dd',
+        //   valueFormat: "yyyy-MM-dd",
+        //   rangeSeparator: '-',
+        //   startPlaceholder: '开始时间',
+        //   endPlaceholder: '结束时间',
+        //   param: 'timeVal',
+        //   defaultSelect: [],
+        //   width: 250
+        // },
         {
           type: 'button',
-					btnName: '查询',
+          btnName: '搜索',
           name: 'search',
           color: 'primary',
         },
+        // {
+        // 	type: 'separate',
+        // },
+        // {
+        // 	type: 'button',
+        // 	btnName: '重置',
+        // 	name: 'reset',
+        // },
+        // {
+        //   type: 'separate',
+        // },
+        // {
+        //   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+        //   btnName: '新增',
+        //   name: 'add',
+        //   color: 'success',
+        //   plain: true,
+        // },
+        // {
+        // 	type: 'separate',
+        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+        // },
+        // {
+        //   type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
+        // 	btnName: '导出',
+        // 	name: 'export',
+        // 	color: 'warning',
+        // },
       ],
     };
   },
+  components: {
+    // AddOrUpdate,
+  },
   created() {
-		this.getList();
+    this.getList()
-		this.getDict();
+    this.getDict()
   },
   methods: {
     getList() {
-			getRawMaterialPage({ ...this.listQuery }).then((res) => {
+      getRawMaterialPage({ ...this.listQuery }).then(res => {
-				this.list = res.data.records || [];
+        this.list = res.data.list || []
-				this.total = res.data.total || 0;
+        this.listQuery.total = res.data.total || 0
-			});
+      })
     },
     getDict() {
+      // 获取产品的属性列表
+      // getCustomerList().then((response) => {
+      //   console.log(response);
+      //   this.customerList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      // getModelList().then((response) => {
+      //   console.log(response);
+      //   this.modelList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
       getWorkOrderList().then((response) => {
+        // console.log(response);
         this.formConfig[0].selectOptions = response.data.map((item) => {
           return {
             name: item.name,
-						id: item.id,
+            id: item.id
-					};
+          }
-				});
+        })
         console.log(this.formConfig[0].selectOptions);
-			});
+        // this.listQuery.total = response.data.total;
+      })
     },
+    // handleExport() {
+    //   // 处理查询参数
+    //   let params = { ...this.listQuery };
+    //   params.pageNo = undefined;
+    //   params.pageSize = undefined;
+    //   this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+    //     this.exportLoading = true;
+    //     return exportEnergyPlcExcel(params);
+    //   }).then(response => {
+    //     this.$download.excel(response, '物料信息追溯  ');
+    //     this.exportLoading = false;
+    //   }).catch(() => { });
+    // },
     buttonClick(val) {
-			console.log(val);
+      console.log(val)
       if (val.btnName === 'search') {
-				this.listQuery.workOrderId = val.workOrderId
+        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
-					? val.workOrderId
+        // this.queryParams.status = val.status
-					: undefined;
+        // if (val.timeVal && val.timeVal.length != 0 ) {
-				this.getList();
+        // 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()
+        // this.addOrEditTitle = '新增'
+        // this.centervisible = true
+        // this.$nextTick(() => {
+        //   this.$refs.orderAdd.init()
+        // })
       }
     },
     otherMethods(val) {

src/views/quality/qualityInspectionRecord/dialogForm.vue

@@ -1,290 +0,0 @@
-<!--
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-09-11 15:55:13
-    description: DialogForm for qualityInspectionRecord only
--->
-
-<template>
-	<el-form
-		ref="form"
-		:model="innerDataForm"
-		label-width="100px"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="工单名称"
-					prop="workOrderId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.workOrderId"
-						placeholder="请选择工单名称"
-						filterable
-						clearable>
-						<el-option
-							v-for="opt in workOrderList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="检测内容"
-					prop="inspectionDetId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.inspectionDetId"
-						placeholder="请选择检测内容"
-						filterable
-						clearable
-						@change="handleInspectionDetChange">
-						<el-option
-							v-for="opt in inspectionDetList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						clearable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: false, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.sectionId"
-						placeholder="请选择工段"
-						clearable
-						filterable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in sectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="检测人" prop="checkPerson">
-					<el-input
-						v-model="innerDataForm.checkPerson"
-						clearable
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入检测人" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="检测时间"
-					prop="checkTime"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="innerDataForm.checkTime"
-						type="datetime"
-						placeholder="请选择检测时间"
-						value-format="timestamp"
-						@change="$emit('update', innerDataForm)"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="来源"
-					prop="source"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.source"
-						placeholder="请选择来源"
-						filterable
-						clearable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in [
-								{ label: '手动', value: 1 },
-								{ label: '自动', value: 2 },
-							]"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="innerDataForm.remark"
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入备注"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-export default {
-	name: 'DialogForm',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: {},
-	props: {
-		dataForm: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	data() {
-		return {
-			formLoading: true,
-			inspectionDetList: [],
-			productionLineList: [],
-			sectionList: [],
-			workOrderList: [],
-			innerDataForm: {},
-			cacheInspectionDetList: null,
-		};
-	},
-	mounted() {
-		Promise.all([
-			this.getProductLineList(),
-			this.getInspectionDetList(),
-			this.getWorkOrderList(),
-		]).then(() => {
-			this.formLoading = false;
-		});
-	},
-	watch: {
-		// 'innerDataForm.productionLineId': {
-		// 	handler: async function (plId) {
-		// 		if (plId) await this.getWorksectionList(plId);
-		// 	},
-		// 	immediate: true,
-		// },
-		dataForm: {
-			handler: function (dataForm) {
-				this.innerDataForm = Object.assign({}, dataForm);
-
-				if (dataForm.productionLineId)
-					this.getWorksectionList(dataForm.productionLineId);
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.form.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.form.resetFields(args);
-		},
-
-		handleInspectionDetChange(value) {
-			const { id, content } = this.cacheInspectionDetList.find(
-				(item) => item.id == value
-			);
-			this.innerDataForm.inspectionDetId = id;
-			this.innerDataForm.inspectionDetContent = content;
-			this.$emit('update', this.innerDataForm);
-		},
-
-		async handleProductlineChange(id) {
-			// await this.getWorksectionList(id);
-			this.innerDataForm.sectionId = null;
-			this.$emit('update', this.innerDataForm);
-		},
-
-		// getCode
-		async getCode(url) {
-			const response = await this.$axios(url);
-			return response.data;
-		},
-
-		// 获取产线列表
-		async getProductLineList() {
-			const response = await this.$axios('/base/core-production-line/listAll');
-			this.productionLineList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-
-		async getWorkOrderList() {
-			const response = await this.$axios('base/core-work-order/listbyfilter');
-			this.workOrderList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-
-		// 获取检测内容列表
-		async getInspectionDetList() {
-			const response = await this.$axios(
-				'/base/quality-inspection-det/listAll'
-			);
-			this.cacheInspectionDetList = response.data;
-			this.inspectionDetList = response.data.map((item) => ({
-				label: item.content,
-				value: item.id,
-			}));
-		},
-
-		// 获取工段列表
-		async getWorksectionList(plId) {
-			const response = await this.$axios(
-				'/base/core-workshop-section/listByParentId',
-				{
-					params: {
-						id: plId,
-					},
-				}
-			);
-			this.sectionList = response.data.map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-</style>