.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-21 10:36:47
+ # @LastEditTime: 2024-07-29 15:00:13
  # @LastEditors: DY
  # @Description:
 ###
@@ -14,9 +14,9 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.164:48082'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.81:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48082'

package.json

@@ -53,6 +53,7 @@
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",
     "echarts": "5.4.0",
+    "el-tree-transfer": "^2.4.7",
     "element-ui": "2.15.12",
     "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",

src/api/base/coreProduct.js

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

src/api/base/groupClasses.js

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

src/api/base/groupSchedulingPlan.js

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

src/api/base/groupSchedulingRule.js

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

src/api/base/groupTeamScheduling.js

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

src/api/base/material.js

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

src/api/base/materialProductBom.js

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

src/api/base/product.js

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

src/api/equipment/analysis/statistics.js

@@ -25,3 +25,13 @@ export function exportEqAnalysisExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 导出设备状态追溯
+export function exportEfficiencyExcel(query) {
+  return request({
+    url: '/analysis/equipment-analysis/export-efficiency',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/extend/processEquMaterialBom.js

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

src/api/monitoring/statisticalData.js

@@ -25,7 +25,7 @@ export function getWorkOrderList(query) {
 }
 export function getProductList(query) {
   return request({
-    url: '/base/core-product/listAll',
+    url: '/base/core-product-material/listAll',
     method: 'get',
     params: query,
   })
@@ -38,3 +38,11 @@ export function getInspectionData(query) {
     params: query,
   })
 }
+
+export function getRecordInOneDay(query) {
+  return request({
+    url: '/analysis/record-in-one-day/get',
+    method: 'get',
+    params: query,
+  })
+}

src/mixins/tableHeightMixin.js

@@ -0,0 +1,20 @@
+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,6 +59,33 @@ 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,3 +201,34 @@ 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/choicePart/index.vue

@@ -1,44 +1,60 @@
 <template>
-  <div class="choicepart-container">
-    <navbar />
-    <div class="choicepart-wrapper">
-      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'" v-show="showItem">
-      <div class="choicepart-line1">
-        <div
-          v-for="(item, index) in menuArr1"
-          :key="index"
-          class="choicepart-item"
-          @click="handelClick(item, item.choicepart)"
-          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-        >
-          <div>
-            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
-          </div>
-          <div class="choicepart-item-title">{{item.meta.title}}</div>
-        </div>
-      </div>
-      <div class="choicepart-line2">
-        <div
-          v-for="(item, index) in menuArr2"
-          :key="index"
-          class="choicepart-item"
-          @click="handelClick(item, item.choicepart)"
-          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-        >
-          <div>
-            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
-          </div>
-          <div class="choicepart-item-title">{{item.meta.title}}</div>
-        </div>
-      </div>
-    </div>
-    </div>
-    <div class="choicepart-footer">&copy; 中建材智能自动化研究院有限公司</div>
-  </div>
+	<div class="choicepart-container">
+		<navbar />
+		<div class="choicepart-wrapper">
+			<div
+				class="choicepart-box"
+				id="choicepartBox"
+				:style="'transform:scale(' + scale + ');width:1574px;height:538px;'"
+				v-show="showItem">
+				<div class="choicepart-line1">
+					<div
+						v-for="(item, index) in menuArr1"
+						:key="index"
+						class="choicepart-item"
+						@click="handelClick(item, item.choicepart)"
+						:style="{
+							opacity: item.visible ? 1 : 0.4,
+							pointerEvents: item.visible ? 'auto' : 'none',
+						}">
+						<div>
+							<img
+								:src="
+									require(`../../assets/images/choicepart/${item.name}.png`)
+								"
+								alt="" />
+						</div>
+						<div class="choicepart-item-title">{{ item.meta.title }}</div>
+					</div>
+				</div>
+				<div class="choicepart-line2">
+					<div
+						v-for="(item, index) in menuArr2"
+						:key="index"
+						class="choicepart-item"
+						@click="handelClick(item, item.choicepart)"
+						:style="{
+							opacity: item.visible ? 1 : 0.4,
+							pointerEvents: item.visible ? 'auto' : 'none',
+						}">
+						<div>
+							<img
+								:src="
+									require(`../../assets/images/choicepart/${item.name}.png`)
+								"
+								alt="" />
+						</div>
+						<div class="choicepart-item-title">{{ item.meta.title }}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="choicepart-footer">&copy; 中建材智能自动化研究院有限公司</div>
+	</div>
 </template>
 <script>
-import Navbar from './components/Navbar'
-import { debounce } from '@/utils/debounce'
+import Navbar from './components/Navbar';
+import { debounce } from '@/utils/debounce';
 export default {
   components: { Navbar },
   name: 'choicePart',
@@ -57,7 +73,7 @@ export default {
         },
         {
           name: 'Produce',
-          title: '订单管理',
+          title: '生产管理',
           visible: false,
           meta: {
             title: ''
@@ -242,84 +258,85 @@ export default {
   }
 }
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .choicepart-container {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  background: url('../../assets/images/choicepart/choicepart-back.png') repeat;
-  background-size: 100% 100%;
-  .choicepart-wrapper {
-    width: 100vw;
-    height: calc(100vh - 94px);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .choicepart-box {
-    // transition: all 0.3s linear;
-    .choicepart-line1 {
-      width: 100%;
-      margin-bottom: 80px;
-      display: flex;
-      flex-flow: row nowrap;
-    }
-    .choicepart-line2 {
-      width: 100%;
-      display: flex;
-      flex-flow: row nowrap;
-      justify-content: center;
-    }
-    .choicepart-item {
-      width: 184px;
-      height: 224px;
-      background: url('../../assets/images/choicepart/choice-item-back.png') no-repeat;
-      background-size: 100% 100%;
-      border-radius: 5px;
-      overflow: hidden;
-      cursor: pointer;
-      position: relative;
-      margin: 0 20px;
-      img {
-        width: 184px;
-        height: 224px;
-      }
-      .choicepart-item-title {
-        overflow: hidden;
-        padding: 0 10px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        position: absolute;
-        bottom: 0;
-        left: 2px;
-        right: 2px;
-        text-align: center;
-        color: #fff;
-        font-size: 16px;
-        line-height: 40px;
-        height: 40px;
-        letter-spacing: 2px;
-        background-color: rgba($color: #0b58ff, $alpha: 0.45);
-      }
-    }
-    .choicepart-item:hover {
-      .choicepart-item-title {
-        background-color: rgba($color: #0b58ff, $alpha: 1);
-      }
-    }
-  }
-  .choicepart-footer {
-    position: absolute;
-    width: 100%;
-    color: #C7C7C7;
-    user-select: none;
-    font-size: 12px;
-    letter-spacing: 1px;
-    height: 30px;
-    display: grid;
-    place-content: center;
-    bottom: 0;
-    opacity: 0.5;
-  }
+	position: relative;
+	width: 100%;
+	height: 100%;
+	background: url('../../assets/images/choicepart/choicepart-back.png') repeat;
+	background-size: 100% 100%;
+	.choicepart-wrapper {
+		width: 100vw;
+		height: calc(100vh - 94px);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.choicepart-box {
+		// transition: all 0.3s linear;
+		.choicepart-line1 {
+			width: 100%;
+			margin-bottom: 80px;
+			display: flex;
+			flex-flow: row nowrap;
+		}
+		.choicepart-line2 {
+			width: 100%;
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: center;
+		}
+		.choicepart-item {
+			width: 184px;
+			height: 224px;
+			background: url('../../assets/images/choicepart/choice-item-back.png')
+				no-repeat;
+			background-size: 100% 100%;
+			border-radius: 5px;
+			overflow: hidden;
+			cursor: pointer;
+			position: relative;
+			margin: 0 20px;
+			img {
+				width: 184px;
+				height: 224px;
+			}
+			.choicepart-item-title {
+				overflow: hidden;
+				padding: 0 10px;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				position: absolute;
+				bottom: 0;
+				left: 2px;
+				right: 2px;
+				text-align: center;
+				color: #fff;
+				font-size: 16px;
+				line-height: 40px;
+				height: 40px;
+				letter-spacing: 2px;
+				background-color: rgba($color: #0b58ff, $alpha: 0.45);
+			}
+		}
+		.choicepart-item:hover {
+			.choicepart-item-title {
+				background-color: rgba($color: #0b58ff, $alpha: 1);
+			}
+		}
+	}
+	.choicepart-footer {
+		position: absolute;
+		width: 100%;
+		color: #c7c7c7;
+		user-select: none;
+		font-size: 12px;
+		letter-spacing: 1px;
+		height: 30px;
+		display: grid;
+		place-content: center;
+		bottom: 0;
+		opacity: 0.5;
+	}
 }
 </style>

src/views/devConfig/energy/energyPlc/index.vue

@@ -0,0 +1,215 @@
+<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="80"
+				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">
+			<energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import { getEnergyPlcPage, deleteEnergyPlc } from '@/api/base/energyPlc';
+// import { publicFormatter } from '@/utils/dict'
+import EnergyPlcAdd from './components/energyPlcAdd.vue';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+const tableProps = [
+	{
+		prop: 'plcTableName',
+		label: '关联表名',
+	},
+	{
+		prop: 'code',
+		label: '关联表编码',
+		minWidth: 150,
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'name',
+		label: '标识名',
+	},
+	{
+		prop: 'enName',
+		label: '英文标识名',
+	},
+	{
+		prop: 'collection',
+		label: '是否采集',
+	},
+	{
+		prop: 'description',
+		label: '描述',
+		showOverflowtooltip: true,
+	},
+];
+export default {
+	name: 'EnergyPlc',
+	components: { EnergyPlcAdd },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			formConfig: [
+				{
+					type: 'input',
+					label: '标识名',
+					placeholder: '标识名',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi('base:energy-plc:update')
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:energy-plc:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			collectionList: [
+				{ value: 0, label: '否' },
+				{ value: 1, label: '是' },
+			],
+			// 总条数
+			total: 0,
+			// 班次基础信息列表
+			list: [],
+			// 弹出层标题
+			addOrEditTitle: '',
+			// 是否显示弹出层
+			centervisible: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 20,
+				name: null,
+			},
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.queryParams.pageNo = 1;
+					this.queryParams.name = val.name;
+					this.getList();
+					break;
+				default:
+					this.addOrEditTitle = '新增';
+					this.centervisible = true;
+					this.$nextTick(() => {
+						this.$refs.energyPlc.init();
+					});
+			}
+		},
+		/** 查询列表 */
+		getList() {
+			getEnergyPlcPage(this.queryParams).then((response) => {
+				let arr = response.data.list || [];
+				arr &&
+					arr.map((item) => {
+						this.collectionList.map((i) => {
+							if (item.collection === i.value) {
+								item.collection = i.label;
+							}
+						});
+					});
+				this.list = arr;
+				this.total = response.data.total;
+			});
+		},
+		handleClick(val) {
+			switch (val.type) {
+				case 'edit':
+					this.addOrEditTitle = '编辑';
+					this.$nextTick(() => {
+						this.$refs.energyPlc.init(val.data.id);
+					});
+					this.centervisible = true;
+					break;
+				default:
+					this.handleDelete(val.data);
+			}
+		},
+		handleCancel() {
+			this.$refs.energyPlc.formClear();
+			this.centervisible = false;
+			this.addOrEditTitle = '';
+		},
+		handleConfirm() {
+			this.$refs.energyPlc.submitForm();
+		},
+		successSubmit() {
+			this.handleCancel();
+			this.getList();
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			this.$modal
+				.delConfirm(row.name)
+				.then(function () {
+					return deleteEnergyPlc(row.id);
+				})
+				.then(() => {
+					this.queryParams.pageNo = 1;
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/devConfig/quality/qualityInspectionBoxBtn/dialogForm.vue

@@ -6,37 +6,67 @@
 -->
 
 <template>
-  <el-form ref="form" :model="dataForm" label-width="120px" v-loading="formLoading">
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-form-item label="产线" prop="productionLineId"
-          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="dataForm.productionLineId" placeholder="请选择产线" filterable
-            @change="handleProductlineChange">
-            <el-option v-for="opt in productionLineList" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="工段" prop="sectionId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="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-form
+		ref="form"
+		:model="dataForm"
+		label-width="110px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="productionLineId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="dataForm.productionLineId"
+						placeholder="请选择产线"
+						filterable
+						@change="handleProductlineChange">
+						<el-option
+							v-for="opt in productionLineList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="工段"
+					prop="sectionId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="dataForm.sectionId"
+						placeholder="请选择工段"
+						filterable
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in workshopSectionList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
 
-      <el-col :span="12">
-        <el-form-item label="按钮盒识别码" prop="buttonId" :rules="[
-        	{ required: true, message: '不能为空', trigger: 'blur' },
-        	{
-        		type: 'number',
-        		message: '请输入整数',
-        		trigger: 'blur',
-        		transform: (val) => Number.isInteger(Number(val)) && Number(val),
-        	},
-        ]">
-          <el-input v-model="dataForm.buttonId" @change="$emit('update', dataForm)" placeholder="请输入整数" />
-        </el-form-item>
+			<el-col :span="12">
+				<el-form-item
+					label="按钮盒识别码"
+					prop="buttonId"
+					:rules="[
+						{ required: true, message: '不能为空', trigger: 'blur' },
+						{
+							type: 'number',
+							message: '请输入整数',
+							trigger: 'blur',
+							transform: (val) => Number.isInteger(Number(val)) && Number(val),
+						},
+					]">
+					<el-input
+						v-model="dataForm.buttonId"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入整数" />
+				</el-form-item>
 				<el-form-item
 					label="产线"
 					prop="productionLineId"
@@ -101,35 +131,50 @@
 				</el-form-item>
 			</el-col>
 
-      <el-col :span="12">
-        <el-form-item label="按钮值" prop="keyValue" :rules="[
-        	{ required: true, message: '不能为空', trigger: 'blur' },
-        	{
-        		type: 'number',
-        		message: '请输入100以内的整数',
-        		trigger: 'blur',
-        		transform: (val) =>
-        			Number.isInteger(+val) &&
-        			Number(val) >= 0 &&
-        			Number(val) <= 100 &&
-        			Number(val),
-        	},
-        ]">
-          <el-input v-model="dataForm.keyValue" type="number" min="0" max="100" @change="$emit('update', dataForm)"
-            placeholder="请输入按钮盒模式" />
-        </el-form-item>
-      </el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="按钮值"
+					prop="keyValue"
+					:rules="[
+						{ required: true, message: '不能为空', trigger: 'blur' },
+						{
+							type: 'number',
+							message: '请输入100以内的整数',
+							trigger: 'blur',
+							transform: (val) =>
+								Number.isInteger(+val) &&
+								Number(val) >= 0 &&
+								Number(val) <= 100 &&
+								Number(val),
+						},
+					]">
+					<el-input
+						v-model="dataForm.keyValue"
+						type="number"
+						min="0"
+						max="100"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入按钮盒模式" />
+				</el-form-item>
+			</el-col>
 
-      <el-col :span="12">
-        <el-form-item label="检测内容" prop="inspectionDetId">
-          <el-select v-model="dataForm.inspectionDetId" placeholder="请选择检测内容" filterable
-            @change="$emit('update', dataForm)">
-            <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+			<el-col :span="12">
+				<el-form-item label="检测内容" prop="inspectionDetId">
+					<el-select
+						v-model="dataForm.inspectionDetId"
+						placeholder="请选择检测内容"
+						filterable
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in inspectionDetList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
 </template>
 
 <script>
@@ -150,14 +195,14 @@ export default {
 	data() {
 		return {
 			formLoading: true,
-      productionLineList: [],
-      inspectionDetList:[],
+			productionLineList: [],
+			inspectionDetList: [],
 			workshopSectionList: [],
 		};
 	},
 	mounted() {
-    this.getProductionLineList()
-    this.getQualityInspectionDetList()
+		this.getProductionLineList();
+		this.getQualityInspectionDetList();
 		// this.getWorksectionList();
 		// this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
 		// 	this.formLoading = false;
@@ -197,20 +242,20 @@ export default {
 			}
 			this.formLoading = false;
 		},
-    async getQualityInspectionDetList() {
-      this.formLoading = true;
-      const res = await this.$axios({
-        url: '/base/quality-inspection-det/listAll',
-        method: 'get',
-      });
-      if (res.code == 0) {
-        this.inspectionDetList = res.data.map((item) => ({
-          label: item.content,
-          value: item.id,
-        }));
-      }
-      this.formLoading = false;
-    },
+		async getQualityInspectionDetList() {
+			this.formLoading = true;
+			const res = await this.$axios({
+				url: '/base/quality-inspection-det/listAll',
+				method: 'get',
+			});
+			if (res.code == 0) {
+				this.inspectionDetList = res.data.map((item) => ({
+					label: item.content,
+					value: item.id,
+				}));
+			}
+			this.formLoading = false;
+		},
 		async getWorksectionList(id) {
 			this.formLoading = true;
 			const res = await this.$axios({

src/views/devConfig/quality/qualityInspectionBoxBtn/index.vue

@@ -12,12 +12,13 @@
 			: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="120"
+				:width="80"
 				fixed="right"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
@@ -56,10 +57,11 @@ 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],
+	mixins: [basicPageMixin, tableHeightMixin],
 	components: { DialogForm },
 	data() {
 		return {
@@ -70,7 +72,9 @@ export default {
 						label: '产线',
 						url: '/base/production-line/listAll',
 						prop: 'productionId',
-						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '产线不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -80,7 +84,9 @@ export default {
 						label: '工段',
 						url: '/base/workshop-section/listAll',
 						prop: 'sectionId',
-						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '工段不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -118,17 +124,17 @@ export default {
 							},
 						],
 						bind: { type: 'number', min: 0, max: 100 },
-          },
-          {
-            select: true,
-            label: '检测内容',
-            url: '/base/quality-inspection-det/listAll',
-            prop: 'inspectionDetId',
-            rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-            bind: {
-              filterable: true,
-            },
-          },
+					},
+					{
+						select: true,
+						label: '检测内容',
+						url: '/base/quality-inspection-det/listAll',
+						prop: 'inspectionDetId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+						},
+					},
 				],
 			],
 			searchBarFormConfig: [
@@ -180,41 +186,42 @@ export default {
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
 				{
-          prop: 'productionLineName',
+					prop: 'productionLineName',
 					label: '产线',
+					showOverflowtooltip: true,
 				},
 				{
 					prop: 'sectionName',
 					label: '工段',
+					showOverflowtooltip: true,
 				},
 				{
 					prop: 'inspectionDetContent',
 					label: '检测内容',
+					showOverflowtooltip: true,
 				},
 				{
 					width: 160,
 					prop: 'buttonId',
 					label: '按钮盒识别码',
 				},
-				// {
-				// 	width: 256,
-				// 	prop: 'productionId',
-				// 	label: '按钮盒所在产线ID',
-				// 	,
-				// },
-				// {
-				// 	width: 256,
-				// 	prop: 'sectionId',
-				// 	label: '按钮盒所在工段ID',
-				// 	,
-				// },
-				{ width: 90, prop: 'keyValue', label: '按钮值' },
-				{ width: 128, prop: 'model', label: '按钮盒模式' },
+				{
+					width: 90,
+					prop: 'keyValue',
+					label: '按钮值',
+					showOverflowtooltip: true,
+				},
+				{
+					width: 128,
+					prop: 'model',
+					label: '按钮盒模式',
+					showOverflowtooltip: true,
+				},
 			],
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				inspectionDetContent: null,
 			},
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
@@ -222,8 +229,8 @@ export default {
 			form: {
 				id: null,
 				buttonId: null,
-        inspectionDetId: null,
-        productionLineId: null,
+				inspectionDetId: null,
+				productionLineId: null,
 				sectionId: null,
 				model: null,
 				keyValue: null,
@@ -261,7 +268,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加安灯按钮16键对应';
+			this.title = '新增';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -270,7 +277,7 @@ export default {
 			getQualityInspectionBoxBtn(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改安灯按钮16键对应';
+				this.title = '编辑';
 			});
 		},
 		/** 提交按钮 */
@@ -300,7 +307,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除"' + row.sectionName + '"?')
+				.delConfirm(row.buttonId)
 				.then(function () {
 					return deleteQualityInspectionBoxBtn(id);
 				})

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

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

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

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

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

@@ -0,0 +1,104 @@
+<!--
+ * @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/qualityScrapDet/basic-page.js

@@ -0,0 +1,159 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: DY
+ * @LastEditTime: 2023-09-21 16:02:07
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    cancel(id) {
+      this.$refs["popover-" + id].showPopper = false;
+    },
+    //改变状态
+    changeStatus(id) {
+      this.$http
+        .post(this.urlOptions.statusUrl, { id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$refs["popover-" + id].showPopper = false;
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.getDataList();
+            },
+          });
+        })
+        .catch(() => { });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.content)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id,name) {
+      this.$modal
+				.delConfirm(name)
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.getDataList();
+            this.$modal.msgSuccess('删除成功');
+          });
+        })
+        .catch(() => { });
+    },
+    //search-bar点击
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.xm1 = val.xm1;
+          this.listQuery.xm2 = val.xm2;
+          this.listQuery.pageNo = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

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

@@ -9,11 +9,12 @@
 			: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="120"
+				:width="80"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -21,7 +22,7 @@
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
+			:total="total"
 			@pagination="getDataList" />
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -29,7 +30,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="30%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -39,77 +40,84 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../../core/mixins/basic-page';
+import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getQualityScrapDetPage,
-  deleteQualityScrapDet,
+	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
-  },
-  {
-    prop: 'content',
-    label: '报废原因'
-  },
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'content',
+		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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
-        getDataListURL: getQualityScrapDetPage,
-        deleteURL: deleteQualityScrapDet,
+				getDataListURL: getQualityScrapDetPage,
+				deleteURL: deleteQualityScrapDet,
 				// exportURL: exportFactoryExcel,
 			},
 			tableProps,
 			tableBtn: [
-        this.$auth.hasPermi(`base:quality-inspection-det:update`)
+				this.$auth.hasPermi(`base:quality-inspection-det:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-        this.$auth.hasPermi(`base:quality-inspection-det:delete`)
+				this.$auth.hasPermi(`base:quality-inspection-det:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
 					type: 'input',
-          label: '报废原因',
-          placeholder: '报废原因',
-          param: 'content',
-        },
-        {
-          type: 'select',
-          label: '报废类型',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'typeId',
-        },
+					label: '报废原因',
+					placeholder: '报废原因',
+					param: 'content',
+				},
+				{
+					type: 'select',
+					label: '报废类型',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'typeId',
+					filterable: true,
+				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -120,53 +128,50 @@ export default {
 					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:quality-scrap-det:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true
+					plain: true,
 				},
 			],
+			listQuery: {
+				pageNo: 1,
+				pageSize: 20,
+			},
+			total: 0,
 		};
 	},
 	components: {
 		AddOrUpdate,
 	},
-  created() { },
-  mounted () {
-    this.getDict();
-  },
+	created() {},
+	mounted() {
+		this.getDict();
+	},
 	methods: {
 		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    async getDict() {
-      // 物料列表
-      const res = await getList();
-      this.formConfig[1].selectOptions = res.data;
-    },
+		getDataList() {
+			this.dataListLoading = true;
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+				this.tableData = response.data.list;
+				this.total = response.data.total;
+				this.dataListLoading = false;
+			});
+		},
+		async getDict() {
+			// 物料列表
+			const res = await getList();
+			this.formConfig[1].selectOptions = res.data;
+		},
 		buttonClick(val) {
 			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.listQuery.content = val.content ? val.content : undefined;
+					this.listQuery.typeId = val.typeId ? val.typeId : undefined;
 					this.getDataList();
 					break;
 				case 'add':

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

@@ -0,0 +1,88 @@
+<!--
+ * @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/devConfig/quality/qualityScrapType/basic-page.js

@@ -0,0 +1,159 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: DY
+ * @LastEditTime: 2023-09-21 16:02:07
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    cancel(id) {
+      this.$refs["popover-" + id].showPopper = false;
+    },
+    //改变状态
+    changeStatus(id) {
+      this.$http
+        .post(this.urlOptions.statusUrl, { id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$refs["popover-" + id].showPopper = false;
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.getDataList();
+            },
+          });
+        })
+        .catch(() => { });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id,name) {
+      this.$modal
+				.delConfirm(name)
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.getDataList();
+            this.$modal.msgSuccess('删除成功');
+          });
+        })
+        .catch(() => { });
+    },
+    //search-bar点击
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.xm1 = val.xm1;
+          this.listQuery.xm2 = val.xm2;
+          this.listQuery.pageNo = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

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

@@ -9,11 +9,12 @@
 			: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="120"
+				:width="80"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -21,7 +22,7 @@
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
+			:total="total"
 			@pagination="getDataList" />
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -29,7 +30,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="30%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -39,39 +40,45 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../../core/mixins/basic-page';
+import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getQualityScrapTypePage,
-  deleteQualityScrapType
+	getQualityScrapTypePage,
+	deleteQualityScrapType,
 } from '@/api/base/qualityScrapType';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
-  },
-  {
-    prop: 'name',
-    label: '报废类型'
-  },
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'name',
+		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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -81,25 +88,25 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-        this.$auth.hasPermi(`base:quality-scrap-type:update`)
+				this.$auth.hasPermi(`base:quality-scrap-type:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-        this.$auth.hasPermi(`base:quality-scrap-type:delete`)
+				this.$auth.hasPermi(`base:quality-scrap-type:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
 					type: 'input',
 					label: '报废类型',
-          placeholder: '报废类型',
+					placeholder: '报废类型',
 					param: 'name',
 				},
 				{
@@ -112,13 +119,20 @@ export default {
 					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:quality-scrap-type:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-					plain: true
+					plain: true,
 				},
 			],
+			listQuery: {
+				pageNo: 1,
+				pageSize: 20,
+			},
+			total: 0,
 		};
 	},
 	components: {
@@ -127,31 +141,21 @@ export default {
 	created() {},
 	methods: {
 		// 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
+		getDataList() {
+			this.dataListLoading = true;
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+				this.tableData = response.data.list;
+				this.total = response.data.total;
+				this.dataListLoading = false;
+			});
+		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
 				case 'add':
 					this.addOrEditTitle = '新增';
 					this.addOrUpdateVisible = true;

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

@@ -1,218 +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="80"
-        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"
-    >
-      <energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
-</template>
-
-<script>
-import { getEnergyPlcPage, deleteEnergyPlc } from "@/api/base/energyPlc";
-// import { publicFormatter } from '@/utils/dict'
-import EnergyPlcAdd from './components/energyPlcAdd.vue'
-const tableProps = [
-  {
-    prop: 'plcTableName',
-    label: '关联表名'
-  },
-  {
-    prop: 'code',
-    label: '关联表编码',
-    minWidth: 150,
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'name',
-    label: '标识名'
-  },
-  {
-    prop: 'enName',
-    label: '英文标识名'
-  },
-  {
-    prop: 'collection',
-    label: '是否采集'
-  },
-  {
-    prop: 'description',
-    label: '描述',
-    showOverflowtooltip: true
-  }
-]
-export default {
-  name: "EnergyPlc",
-  components: { EnergyPlcAdd },
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '标识名',
-          placeholder: '标识名',
-          param: 'name'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi('base:energy-plc:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:energy-plc:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除'
-            }
-          : undefined
-      ].filter((v) => v),
-      tableH: this.tableHeight(260),
-      collectionList: [
-        {value: 0,label: '否'},
-        {value: 1,label: '是'}
-      ],
-      // 总条数
-      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.name = val.name
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.energyPlc.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getEnergyPlcPage(this.queryParams).then(response => {
-        let arr = response.data.list || [];
-        arr&&arr.map(item => {
-          this.collectionList.map(i => {
-            if (item.collection === i.value) {
-              item.collection = i.label
-            }
-          })
-        })
-        this.list = arr
-        this.total = response.data.total;
-      });
-    },
-    handleClick(val) {
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.$nextTick(() => {
-            this.$refs.energyPlc.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        default:
-        this.handleDelete(val.data)
-      }
-    },
-    handleCancel() {
-      this.$refs.energyPlc.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.energyPlc.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function() {
-          return deleteEnergyPlc(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-    }
-  }
-};
-</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/listAll',
+				url: '/base/core-product-material/listAll',
 				method: 'get',
 			});
 			const cfg = this.searchBarFormConfig.find(

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

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

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

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

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.error('请选择时间段');
+						this.$message.warning('请选择时间段');
 						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.error('该设备没有产量数据');
+					this.$message.warning('该设备没有产量数据');
 					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.error('请选择时间段');
+						this.$message.warning('请选择时间段');
 						return;
 					}
 
@@ -373,7 +373,7 @@ export default {
 
 		async submitForm() {
 			if (this.existingEquipments.indexOf(this.queryParams.equipmentId) >= 0) {
-				this.$message.error('该设备已存在');
+				this.$message.warning('该设备已存在');
 				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.error('该设备没有状态数据');
+					this.$message.warning('该设备没有状态数据');
 					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: zhp
- * @LastEditTime: 2023-11-28 10:03:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-09 13:40:03
  * @Description:
 -->
 <template>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-11-23 14:27:59
- * @LastEditors: zhp
+ * @LastEditTime: 2024-07-09 13:29:06
+ * @LastEditors: zwq
  * @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,12 +94,16 @@ export default {
 				}
 			});
     },
-    getDict() {
-      getMaterialList().then((res) => [
-        this.materialList = res.data,
-        console.log(res)
-      ])
-    },
+		async getDict() {
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.materialList = [];
+			this.materialList = materData.data;
+		},
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {

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

@@ -12,32 +12,6 @@
         </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">
@@ -91,8 +65,6 @@ export default {
         id: '',
         name: '',
         code: '',
-        enableTime: '',
-        disableTime: '',
         startTime: '',
         endTime: '',
         daySpan: '',
@@ -101,7 +73,6 @@ 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' }]
@@ -116,7 +87,6 @@ export default {
         getGroupClasses(id).then((res) => {
           if (res.code === 0) {
             this.form = res.data
-            this.form.disableTime = res.data.disableTime || ''
           }
         })
       } else {
@@ -146,7 +116,6 @@ 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

@@ -0,0 +1,52 @@
+<!--
+ * @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,262 +1,263 @@
+<!--
+ * @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"
-    />
-    <!-- 列表 -->
-    <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%'
-    >
-      <group-class-add ref="classList" @successSubmit="successSubmit" />
-    </base-dialog>
-  </div>
+	<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"
+			@emitFun="handleTableEvents">
+			<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%">
+			<group-class-add ref="classList" @successSubmit="successSubmit" />
+		</base-dialog>
+	</div>
 </template>
 
 <script>
-import { getGroupClassesPage, deleteGroupClasses, updateGroupClasses } from "@/api/base/groupClasses";
-import GroupClassAdd from './components/groupClassAdd.vue'
-import { formatDate } from '@/utils'
+import {
+	getGroupClassesPage,
+	deleteGroupClasses,
+	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: '班次名称'
-  },
-  {
-    prop: 'timeStr',
-    label: '班次时间',
-    minWidth: 100
-  },
-  {
-    prop: 'code',
-    label: '班次编码',
-    minWidth: 200
-  },
-  {
-    prop: 'status',
-    label: '班次状态'
-  },
-  {
-    prop: 'remark',
-    label: '备注'
-  }
-]
+	{
+		prop: 'name',
+		label: '班次名称',
+	},
+	{
+		prop: 'timeStr',
+		label: '班次时间',
+		minWidth: 100,
+	},
+	{
+		prop: 'code',
+		label: '班次编码',
+		minWidth: 200,
+	},
+	{
+		prop: 'enabled',
+		label: '班次状态',
+		subcomponent: StatusBtn,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
 export default {
-  name: "GroupClass",
-  components: { GroupClassAdd },
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '班次名称',
-          placeholder: '班次名称',
-          param: 'name'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: 'separate'
-        },
-        {
-          type: this.$auth.hasPermi('base:group-classes:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          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: '编辑'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:group-classes: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.name = val.name
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.classList.init()
-          })
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      getGroupClassesPage(this.queryParams).then(res => {
-        if (res.code === 0 && res.data.list.length > 0) {
-          res.data.list.map(item => {
-            item.enableTimeStr = formatDate(item.enableTime) + '至' + (item.disableTime ? formatDate(item.disableTime) : '永久')
-            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.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 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)
-      let _this = this
-      if (row.status === '可用') {// 可用
-        _this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function() {
-          return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() {
-              return deleteGroupClasses(row.id);
-            }).then(() => {
-              _this.getList();
-              _this.$modal.msgSuccess("删除成功");
-            }).catch(() => {});
-          })
-      } else {
-        _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() {
-            return deleteGroupClasses(row.id);
-          }).then(() => {
-            _this.getList();
-            _this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
-      }
-    }
-  }
+	name: 'GroupClass',
+	components: { GroupClassAdd },
+	data() {
+		return {
+			formConfig: [
+				{
+					type: 'input',
+					label: '班次名称',
+					placeholder: '班次名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:group-classes:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+			],
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi('base:group-classes:update')
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-classes: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.name = val.name;
+					this.getList();
+					break;
+				default:
+					this.addOrEditTitle = '新增';
+					this.centervisible = true;
+					this.$nextTick(() => {
+						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) => {
+				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
+					res.data.list.map((item) => {
+						item.timeStr =
+							item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5);
+					});
+					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) {
+			console.log(row);
+			let _this = this;
+			if (row.enabled) {
+				// 可用
+				_this.$modal
+					.confirm(
+						'删除的班次"' +
+							row.name +
+							'"可能会影响交接班计划，请点取消再次确认！'
+					)
+					.then(function () {
+						return _this.$modal
+							.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
+							.then(function () {
+								return deleteGroupClasses(row.id);
+							})
+							.then(() => {
+								_this.getList();
+								_this.$modal.msgSuccess('删除成功');
+							})
+							.catch(() => {});
+					});
+			} else {
+				_this.$modal
+					.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
+					.then(function () {
+						return deleteGroupClasses(row.id);
+					})
+					.then(() => {
+						_this.getList();
+						_this.$modal.msgSuccess('删除成功');
+					})
+					.catch(() => {});
+			}
+		},
+	},
 };
 </script>

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

@@ -14,20 +14,18 @@
     </el-row>
     <el-row>
       <el-col :span="12">
-        <el-form-item label="班组组长" prop="leaderId">
-          <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 label="班组组长" prop="leaderName">
+          <el-input v-model="form.leaderName" clearable></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="手机号" prop="telephone">
-          <el-input v-model="form.telephone" disabled></el-input>
+        <el-form-item label="手机号" prop="leaderPhone">
+          <el-input v-model="form.leaderPhone" clearable></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>
@@ -35,7 +33,6 @@
 </template>
 <script>
 import { getGroupTeam, updateGroupTeam, createGroupTeam, getCode } from '@/api/base/groupTeam'
-import { getWorkerList } from '@/api/base/worker'
 export default {
   name: 'groupTeamAdd',
   data() {
@@ -44,28 +41,26 @@ export default {
         id: '',
         name: '',
         code: '',
-        leaderId: '',
-        telephone: ''
+        leaderName: '',
+        leaderPhone: '',
+        num: ''
       },
       isEdit: false, //是否是编辑
       rules: {
         name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
         code: [{ required: true, message: '请输入班组编码', trigger: 'blur' }],
-        leaderId: [{ required: true, message: '请选择组长', trigger: 'select' }]
+        leaderName: [{ required: true, message: '请输入组长', trigger: 'blur' }]
       },
-      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 {
@@ -76,24 +71,6 @@ 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,3 +1,10 @@
+<!--
+ * @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>
@@ -37,7 +44,7 @@ export default {
       payload.enabled = this.state ? '1' : '0'
       payload.code = this.injectData.code
       payload.name = this.injectData.name
-      payload.leaderId = this.injectData.leaderId
+      payload.leaderName = this.injectData.leaderName
       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.length > 0) {
+				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
           let arr = []
           res.data.list.map(item => {
             let obj = {}

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

@@ -42,8 +42,6 @@
     >
       <group-team-add ref="groupList" @successSubmit="successSubmit" />
     </base-dialog>
-    <!-- 组员编辑 -->
-    <worker-edit v-if='paramVisible' ref='workerEditParam' @closeDrawer="closeDrawer"></worker-edit>
   </div>
 </template>
 
@@ -52,8 +50,6 @@ 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',
@@ -83,15 +79,10 @@ const tableProps = [
     label: '班组状态',
     subcomponent: StatusBtn
   },
-  {
-    prop: 'workerName',
-    label: '组员',
-    subcomponent: WorkerOperate
-  },
 ]
 export default {
   name: "GroupTeam",
-  components: { GroupTeamAdd, WorkerEdit },
+  components: { GroupTeamAdd },
   data() {
     return {
       formConfig: [
@@ -155,7 +146,6 @@ export default {
         name: null,
         code: null
       },
-      paramVisible: false
     };
   },
   created() {
@@ -203,17 +193,14 @@ 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()
           }
-        })
-      }else {// 编辑&查看
-        this.paramVisible = true
-        this.$nextTick(() => {
-          this.$refs.workerEditParam.init(params)
+        }).catch((res)=>{
+          this.getList()
         })
       }
     },

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

@@ -1,478 +1,520 @@
+<!--
+ * @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-form :inline="true" class="demo-form-inline">
-        <span class="blue-block"></span>
-        <el-form-item label="月份选择">
-          <el-date-picker
-            v-model="startDay"
-            type="month"
-            placeholder="选择月"
-            size="small"
-            :disabled="showSetting"
-            @change="selectMonth"
-            :clearable="false"
-            style="width: 120px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
-        </el-form-item>
-        <el-form-item>
-          <span class="separateStyle" v-show="showSetting"></span>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" v-show="showSetting" @click="confirmSetting">确认</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" plain v-show="showSetting" @click="cancelSetting">取消</el-button>
-        </el-form-item>
-        <el-form-item label="请先选择查询的班组" class="rightItem">
-          <!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button> -->
-          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button>
-          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('3')">班组检测查询</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <!-- 日历区域 -->
-    <div class="calenderArea">
-      <div style="font-size: 24px;font-weight: 500">{{ this.month }} {{ this.year }}</div>
-      <el-calendar v-model="startDay">
-        <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-        <template
-          slot="dateCell"
-          slot-scope="{date, data}">
-          <div v-if="data.type === 'current-month'">
-            <!-- 日期 -->
-            <div class="dateStyle">
-              {{ Number(data.day.split('-')[2]) }}
-            </div>
-            <!-- 班次班组 -->
-            <!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-            <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'>
-              <el-col :span="12">
-                <div class="selectDiv">
-                  <!-- 选择班组图标 -->
-                  <div class="toggle-icon" v-show="showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true)">
-                    <svg-icon icon-class="toggle"/>
-                  </div>
-                  <!-- 不能选择班组 -->
-                  <div class="toggle-icon-hide" 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>
-                  </el-select>
-              </div>
-              </el-col>
-              <el-col :span="12">
-                <el-button class="labelClass" @click="chooseTeam(item)">{{ item.classesName }}</el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-      </el-calendar>
-    </div>
-  </div>
+	<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="月份选择">
+					<el-date-picker
+						v-model="startDay"
+						type="month"
+						placeholder="选择月"
+						size="small"
+						:disabled="showSetting"
+						@change="selectMonth"
+						:clearable="false"
+						style="width: 120px"></el-date-picker>
+				</el-form-item>
+				<el-form-item>
+					<span
+						class="separateStyle"
+						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"
+						: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
+						type="primary"
+						size="small"
+						v-show="showSetting"
+						@click="confirmSetting">
+						确认
+					</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						plain
+						v-show="showSetting"
+						@click="cancelSetting">
+						取消
+					</el-button>
+				</el-form-item>
+			</el-form>
+		</div>
+		<!-- 日历区域 -->
+		<div class="calenderArea">
+			<div style="font-size: 24px; font-weight: 500">
+				{{ this.month }} {{ this.year }}
+			</div>
+			<el-calendar v-model="startDay">
+				<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
+				<template slot="dateCell" slot-scope="{ date, data }">
+					<div v-if="data.type === 'current-month'">
+						<!-- 日期 -->
+						<div class="dateStyle">
+							{{ Number(data.day.split('-')[2]) }}
+						</div>
+						<!-- 班次班组 -->
+						<!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
+						<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">
+							<el-col :span="12">
+								<div class="selectDiv">
+									<!-- 选择班组图标 -->
+									<div
+										class="toggle-icon"
+										v-show="
+											showSetting &&
+											(new Date(data.day).valueOf() < new Date().valueOf()
+												? false
+												: true)
+										">
+										<svg-icon icon-class="toggle" />
+									</div>
+									<!-- 不能选择班组 -->
+									<div
+										class="toggle-icon-hide"
+										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>
+									</el-select>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<el-button class="labelClass" @click="chooseTeam(item)">
+									{{ item.classesName }}
+								</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</template>
+			</el-calendar>
+		</div>
+	</div>
 </template>
 
 <script>
-import { getPreset, createOrUpdateList, autoSet } from "@/api/base/groupTeamScheduling";
-import { listEnabled } from "@/api/base/groupTeam";
+import {
+	getScheduling,
+	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",
-  data() {
-    return {
-      startDay: '',// 查询参数
-      year: '',// 2023
-      month: '',// 九月
-      monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
-      list: {},
-      teamList: [],// 班组下拉
-      showSetting: false,// 设置模式。自动排班，确认，取消按钮显示
-      settingBtnDis: false,
-      jumpDisabled: true,// 操作按钮控制
-      chooseObj: {}, //当前选中的数据，查询按钮用
-      chooseTip: '',// 当前选中数据的唯一值，显示红框
-      autoScheduling: false // 只有在当前日期后的月份才生效
-    };
-  },
-  created() {
-    this.startDay = new Date()
-    // 设置按钮是否置灰
-    this.settingBtn()
-    this.getTeamList()
-    this.toggleMonth()
-    this.getList()
-  },
-  methods: {
-    // 切换月份
-    selectMonth() {
-      if (this.startDay) {
-        this.settingBtn() // 设置按钮状态,需在getlist前面
-        this.toggleMonth()
-        this.getList()
-        this.clearChoose()
-        if ( moment(this.startDay).valueOf() > moment().endOf('month').valueOf()) {
-          this.autoScheduling = true
-        } else {
-          this.autoScheduling = false
-        }
-      }
-    },
-    // 获取班组列表
-    getTeamList() {
-      listEnabled().then(res => {
-        this.teamList = res.data || []
-      })
-    },
-    // 获取日历数据
-    getList() {
-      let year = moment(this.startDay).format('YYYY')
-      let month = moment(this.startDay).format('M')
-      getPreset({
-        year: year,
-        month: month
-      }).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 = ''
-              }
-            }
-          }
-        }
-        this.list = obj
-      }).catch(() => {
-        this.list = {}
-        this.settingBtnDis = true // 禁用设置按钮
-      })
-    },
-    // 设置
-    settingMsg() {
-      this.showSetting = !this.showSetting
-      this.clearChoose()
-    },
-    // 取消
-    cancelSetting() {
-      this.showSetting = !this.showSetting
-      this.getList() // 数据还原
-    },
-    // 确认
-    confirmSetting() {
-      let num = 0
-      // 当月数据的话，今天及今天之前的不传
-      if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
-        num = Number(moment().format('DD'))
-      } else {
-        num = 0
-      }
-      // 下月数据全部都传
-      // 打平数据
-      let tempArr = Object.values(this.list)
-      let arr = []
-      for (let i = num; i < tempArr.length; i++) {
-        for (let j = 0; j < tempArr[i].length; j++) {
-          arr.push(tempArr[i][j])
-        }
-      }
-      createOrUpdateList(arr).then(res => {
-        if (res.code === 0) {
-          this.showSetting = !this.showSetting
-          this.$modal.msgSuccess("操作成功")
-          this.getList() // 数据更新
-        }
-      })
-    },
-    // 点击班次红框选中当前数据
-    chooseTeam(value) {
-      if (this.showSetting) {
-        this.$modal.msgWarning("当前处于设置模式")
-        return false
-      }
-      this.chooseObj = value
-      this.chooseTip = value.startDay + value.classesId // 匹配当前的样式
-      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 startMonth = moment(this.startDay).valueOf()
-      let nowDate = moment(new Date()).date()
-      let sumDate = moment().daysInMonth()
-      if (nowMonth > startMonth) { // 之前月
-        this.settingBtnDis = true
-      } else {
-        if (nowDate < sumDate) {
-          this.settingBtnDis = false
-        } else {
-          this.settingBtnDis = true
-        }
-      }
-    },
-    // 清除红框选中数据
-    clearChoose() {
-      this.chooseObj = {}
-      this.chooseTip = ""
-      this.jumpDisabled = true
-    },
-    // 切换月份显示
-    toggleMonth() {
-      this.year = moment(this.startDay).format("YYYY")
-      let month = Number(moment(this.startDay).format("MM"))
-      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 }
-          })
-      }
-    }
-    }
-  }
+	name: 'GroupTeamScheduling',
+	data() {
+		return {
+			startDay: '', // 查询参数
+			year: '', // 2023
+			month: '', // 九月
+			monthList: [
+				'一月',
+				'二月',
+				'三月',
+				'四月',
+				'五月',
+				'六月',
+				'七月',
+				'八月',
+				'九月',
+				'十月',
+				'十一月',
+				'十二月',
+			],
+			planId: undefined, //计划id
+			list: {},
+			planArr: [], //排班计划数组
+			teamList: [], // 班组下拉
+			showSetting: false, // 设置模式。自动排班，确认，取消按钮显示
+			settingBtnDis: false,
+			jumpDisabled: true, // 操作按钮控制
+			chooseObj: {}, //当前选中的数据，查询按钮用
+			chooseTip: '', // 当前选中数据的唯一值，显示红框
+			autoScheduling: false, // 只有在当前日期后的月份才生效
+		};
+	},
+	created() {
+		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.toggleMonth();
+	},
+	methods: {
+		setPlan() {
+			this.getList();
+			this.getTeamList();
+		},
+		// 切换月份
+		selectMonth() {
+			if (this.startDay) {
+				this.settingBtn(); // 设置按钮状态,需在getlist前面
+				this.toggleMonth();
+				this.getList();
+				this.clearChoose();
+				if (
+					moment(this.startDay).valueOf() > moment().endOf('month').valueOf()
+				) {
+					this.autoScheduling = true;
+				} else {
+					this.autoScheduling = false;
+				}
+			}
+		},
+		// 获取计划对应班组列表
+		getTeamList() {
+			groupPlanTeamList(this.planId).then((res) => {
+				this.teamList = res.data || [];
+			});
+		},
+		// 获取日历数据
+		getList() {
+			let year = moment(this.startDay).format('YYYY');
+			let month = moment(this.startDay).format('M');
+			getScheduling({
+				year: year,
+				month: month,
+				planId: this.planId,
+			})
+				.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 = '';
+								}
+							}
+						}
+					}
+					this.list = obj;
+				})
+				.catch(() => {
+					this.list = {};
+					this.settingBtnDis = true; // 禁用设置按钮
+				});
+		},
+		// 设置
+		settingMsg() {
+			this.showSetting = !this.showSetting;
+			this.clearChoose();
+		},
+		// 取消
+		cancelSetting() {
+			this.showSetting = !this.showSetting;
+			this.getList(); // 数据还原
+		},
+		// 确认
+		confirmSetting() {
+			let num = 0;
+			// 当月数据的话，今天及今天之前的不传
+			if (
+				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
+			) {
+				num = Number(moment().format('DD'));
+			} else {
+				num = 0;
+			}
+			// 下月数据全部都传
+			// 打平数据
+			let tempArr = Object.values(this.list);
+			let arr = [];
+			for (let i = num; i < tempArr.length; i++) {
+				for (let j = 0; j < tempArr[i].length; j++) {
+					arr.push(tempArr[i][j]);
+				}
+			}
+			createOrUpdateList(arr).then((res) => {
+				if (res.code === 0) {
+					this.showSetting = !this.showSetting;
+					this.$modal.msgSuccess('操作成功');
+					this.getList(); // 数据更新
+				}
+			});
+		},
+		// 点击班次红框选中当前数据
+		chooseTeam(value) {
+			// if (this.showSetting) {
+			// 	this.$modal.msgWarning('当前处于设置模式');
+			// 	return false;
+			// }
+			this.chooseObj = value;
+			this.chooseTip = value.startDay + value.classesId; // 匹配当前的样式
+			this.jumpDisabled = false; //查询按钮不禁用
+		},
+		// 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
+		settingBtn() {
+			let nowMonth = moment().startOf('month').valueOf();
+			let startMonth = moment(this.startDay).valueOf();
+			let nowDate = moment(new Date()).date();
+			let sumDate = moment().daysInMonth();
+			if (nowMonth > startMonth) {
+				// 之前月
+				this.settingBtnDis = true;
+			} else {
+				if (nowDate < sumDate) {
+					this.settingBtnDis = false;
+				} else {
+					this.settingBtnDis = true;
+				}
+			}
+		},
+		// 清除红框选中数据
+		clearChoose() {
+			this.chooseObj = {};
+			this.chooseTip = '';
+			this.jumpDisabled = true;
+		},
+		// 切换月份显示
+		toggleMonth() {
+			this.year = moment(this.startDay).format('YYYY');
+			let month = Number(moment(this.startDay).format('MM'));
+			this.month = this.monthList[month - 1];
+		},
+	},
+};
 </script>
-<style lang='scss'>
+<style lang="scss">
 .demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
+	.el-date-editor .el-range__icon {
+		font-size: 16px;
+		color: #0b58ff;
+	}
+	.el-input__prefix .el-icon-date {
+		font-size: 16px;
+		color: #0b58ff;
+	}
 }
 .groupTeamScheduling {
-  background-color: #F2F4F9;
-  .operationArea {
-    padding: 14px 10px 0 16px;
-    margin-bottom: 8px;
-    background-color: #fff;
-    border-radius: 8px;
-    .blue-block {
-      display: inline-block;
-      width: 4px;
-      height: 16px;
-      background-color: #0B58FF;
-      border-radius: 1px;
-      margin-right: 8px;
-      margin-top: 10px;
-    }
-    .separateStyle {
-      display: inline-block;
-      width: 1px;
-      height: 24px;
-      background: #E8E8E8;
-      vertical-align: middle;
-    }
-    .el-form-item {
-      margin-bottom: 10px;
-    }
-    .rightItem {
-      float: right;
-    }
-  }
-  // 日历
-  .calenderArea {
-    padding: 14px 10px 0 20px;
-    background-color: #fff;
-    border-radius: 8px;
-    .el-calendar__body {
-      padding: 10px 16px 16px 0;
-    }
-    .el-calendar__header {
-      display: none;
-    }
-    .el-calendar-table > thead {
-      height: 48px;
-      font-size: 20px;
-      font-weight: 500;
-      color: #000000;
-      background-color: rgba(242, 244, 249, 1);
-    }
-    .el-calendar-table__row {
-      height: 133px;
-      .prev, .next {
-        pointer-events: none;
-      }
-      .el-calendar-day {
-        padding: 0 10px;
-        height: 100%;
-        .dateStyle {
-          font-size: 20px;
-          font-weight: 500;
-          color: #000000;
-          text-align: right;
-          height: 32px;
-          line-height: 28px;
-          padding-right: 10px;
-        }
-      }
-    }
-    .team-active {// 选中班组
-      border:2px solid red
-    }
-    .class1, .class2, .class3 {
-      padding: 0;
-      font-weight: 600;
-      margin-bottom: 2px;
-      .selectDiv {
-        position: relative;
-        .toggle-icon {
-          position: absolute;
-          width: 26px;
-          height: 26px;
-          line-height: 26px;
-          font-size: 14px;
-          z-index: 1;
-          text-align: center;
-        }
-        .toggle-icon-hide {
-          position: absolute;
-          width: 2px;
-          height: 28px;
-          z-index: 1;
-        }
-        .el-input__suffix {
-          display: none;
-        }
-        .el-input--suffix .el-input__inner {
-          padding: 0 4px 0 28px;
-        }
-        .el-input--small .el-input__inner {
-          height: 28px;
-          border: none;
-          font-weight: 600;
-        }
-      }
-      .labelClass {
-        width: 100%;
-        height: 28px;
-        border: none;
-        padding: 0;
-        font-weight: 600;
-        text-align: center;
-      }
-    }
-    .class1 {
-      .selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #FACE00;
-        }
-        .el-input--small .el-input__inner {
-          color: #E7A200;
-          background-color: #FFEFC0;
-        }
-      }
-      .labelClass {
-        color: #E7A200;
-        background-color: #FFEFC0;
-      }
-    }
-    .class2 {
-      .selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #3984FF;
-        }
-        .el-input--small .el-input__inner {
-          color: #2D7BFF;
-          background-color: #BEEAFF;
-        }
-      }
-      .labelClass {
-        color: #2D7BFF;
-        background-color: #BEEAFF;
-      }
-    }
-    .class3 {
-      .selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #37D97F;
-        }
-        .el-input--small .el-input__inner {
-          color: #129F51;
-          background-color: #E0FFEE;
-        }
-      }
-      .labelClass {
-        color: #129F51;
-        background-color: #E0FFEE;
-      }
-    }
-  }
+	background-color: #f2f4f9;
+	.operationArea {
+		padding: 14px 10px 0 16px;
+		margin-bottom: 8px;
+		background-color: #fff;
+		border-radius: 8px;
+		.blue-block {
+			display: inline-block;
+			width: 4px;
+			height: 16px;
+			background-color: #0b58ff;
+			border-radius: 1px;
+			margin-right: 8px;
+			margin-top: 10px;
+		}
+		.separateStyle {
+			display: inline-block;
+			width: 1px;
+			height: 24px;
+			background: #e8e8e8;
+			vertical-align: middle;
+		}
+		.el-form-item {
+			margin-bottom: 10px;
+		}
+		.rightItem {
+			float: right;
+		}
+	}
+	// 日历
+	.calenderArea {
+		padding: 14px 10px 0 20px;
+		background-color: #fff;
+		border-radius: 8px;
+		.el-calendar__body {
+			padding: 10px 16px 16px 0;
+		}
+		.el-calendar__header {
+			display: none;
+		}
+		.el-calendar-table > thead {
+			height: 48px;
+			font-size: 20px;
+			font-weight: 500;
+			color: #000000;
+			background-color: rgba(242, 244, 249, 1);
+		}
+		.el-calendar-table__row {
+			height: 133px;
+			.prev,
+			.next {
+				pointer-events: none;
+			}
+			.el-calendar-day {
+				padding: 0 10px;
+				height: 100%;
+				.dateStyle {
+					font-size: 20px;
+					font-weight: 500;
+					color: #000000;
+					text-align: right;
+					height: 32px;
+					line-height: 28px;
+					padding-right: 10px;
+				}
+			}
+		}
+		.team-active {
+			// 选中班组
+			border: 2px solid #409eff;
+		}
+		.class1,
+		.class2,
+		.class3 {
+			padding: 0;
+			font-weight: 600;
+			margin-bottom: 2px;
+			.selectDiv {
+				position: relative;
+				.toggle-icon {
+					position: absolute;
+					width: 26px;
+					height: 26px;
+					line-height: 26px;
+					font-size: 14px;
+					z-index: 1;
+					text-align: center;
+				}
+				.toggle-icon-hide {
+					position: absolute;
+					width: 2px;
+					height: 28px;
+					z-index: 1;
+				}
+				.el-input__suffix {
+					display: none;
+				}
+				.el-input--suffix .el-input__inner {
+					padding: 0 4px 0 28px;
+				}
+				.el-input--small .el-input__inner {
+					height: 28px;
+					border: none;
+					font-weight: 600;
+				}
+			}
+			.labelClass {
+				width: 100%;
+				height: 28px;
+				border: none;
+				padding: 0;
+				font-weight: 600;
+				text-align: center;
+			}
+		}
+		.class1 {
+			.selectDiv {
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #face00;
+				}
+				.el-input--small .el-input__inner {
+					color: #e7a200;
+					background-color: #ffefc0;
+				}
+			}
+			.labelClass {
+				color: #e7a200;
+				background-color: #ffefc0;
+			}
+		}
+		.class2 {
+			.selectDiv {
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #3984ff;
+				}
+				.el-input--small .el-input__inner {
+					color: #2d7bff;
+					background-color: #beeaff;
+				}
+			}
+			.labelClass {
+				color: #2d7bff;
+				background-color: #beeaff;
+			}
+		}
+		.class3 {
+			.selectDiv {
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #37d97f;
+				}
+				.el-input--small .el-input__inner {
+					color: #129f51;
+					background-color: #e0ffee;
+				}
+			}
+			.labelClass {
+				color: #129f51;
+				background-color: #e0ffee;
+			}
+		}
+	}
 }
 </style>

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

@@ -0,0 +1,260 @@
+<!--
+ * @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

@@ -0,0 +1,233 @@
+<!--
+ * @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

@@ -0,0 +1,280 @@
+<!--
+ * @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

@@ -0,0 +1,44 @@
+<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

@@ -0,0 +1,261 @@
+<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: 'workOrderList',
-          label: '生产工单'
+          prop: 'specifications',
+          label: '产品规格'
         }
       ],
       tableData: [],
@@ -147,8 +147,8 @@ export default {
           minWidth: 150
         },
         {
-          prop: 'workOrderList',
-          label: '生产工单'
+          prop: 'specifications',
+          label: '产品规格'
         }
       ]
     }

src/views/oldBase/coreWorkOrder/allocation.vue

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

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

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

src/views/oldBase/material/index.vue

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

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

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

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

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

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

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

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

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

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

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

@@ -1,93 +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";
-
-// 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/qualityScrapLog/add-or-updata.vue

@@ -1,209 +0,0 @@
-<!--
- * @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

@@ -1,222 +0,0 @@
-<!--
- * @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

@@ -1,213 +0,0 @@
-<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

@@ -1,86 +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">
-          <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/currentData/baseChart.vue

@@ -0,0 +1,128 @@
+<template>
+	<div
+		:id="'currentDataChart' + chartN"
+		style="width: 100%; height: 300px"></div>
+</template>
+<script>
+import * as echarts from 'echarts';
+import resize from '@/utils/chartMixins/resize';
+export default {
+	name: 'BaseChart',
+	mixins: [resize],
+	data() {
+		return {
+			chartDom: '',
+			chart: '',
+		};
+	},
+	props: {
+		chartData: {
+			type: Array,
+			required: true,
+			default: () => {
+				return [];
+			},
+		},
+		lineName: {
+			type: Array,
+			required: true,
+			default: () => {
+				return [];
+			},
+		},
+		chartN: {
+			type: Number,
+			required: true,
+			default: () => {
+				return 0;
+			},
+		},
+	},
+	watch: {
+		chartData: function () {
+			this.getChart();
+		},
+	},
+	mounted() {
+		this.getChart();
+	},
+	methods: {
+		getChart() {
+			if (
+				this.chart !== null &&
+				this.chart !== '' &&
+				this.chart !== undefined
+			) {
+				this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+			}
+			this.chartDom = document.getElementById('currentDataChart' + this.chartN);
+			this.chart = echarts.init(this.chartDom);
+			if (this.chartData.length === 0) {
+				return false;
+			}
+			console.log('chartData:', this.chartData);
+			console.log('lineName:', this.lineName);
+			let xData = this.chartData.map((item) => {
+				return item.inspectionContent;
+			});
+			console.log('xData:', xData);
+			let series = [];
+			this.lineName.map((item) => {
+				let obj = {
+					data: [],
+					type: 'bar',
+					stack: 'a',
+					barWidth: 20,
+					name: item.prop,
+				};
+				this.chartData.forEach((ele) => {
+					obj.data.push(ele[item.prop]);
+				});
+				series.push(obj);
+			});
+			console.log('series:', series);
+			var option = {
+				color: [
+					'#288AFF',
+					'#73DE93',
+					'#FFCE6A',
+					'#63BDFF',
+					'#7164FF',
+					'#FF6860',
+					'#FF9747',
+					'#B0EB42',
+					'#D680FF',
+					'#0043D2',
+				],
+				legend: {
+					itemWidth: 10,
+					itemHeight: 10,
+					textStyle: {
+						color: '#8c8c8c',
+					},
+					right: 0,
+				},
+				tooltip: {
+					trigger: 'axis',
+				},
+				grid: {
+					left: 20,
+					right: 0,
+					bottom: '3%',
+					containLabel: true,
+				},
+				xAxis: {
+					type: 'category',
+					data: xData,
+				},
+				yAxis: {
+					type: 'value',
+				},
+				series: series,
+			};
+
+			option && this.chart.setOption(option);
+		},
+	},
+};
+</script>

src/views/quality/currentData/currentTest.vue

@@ -0,0 +1,232 @@
+<template>
+	<div>
+		<base-table
+			:table-props="tableProps"
+			:page="1"
+			:limit="1000"
+			:table-data="list" />
+		<div class="orderBox" v-for="(item, index) in downList" :key="index">
+			<div class="title">
+				<span>工单：{{ item.workOrderName }}</span>
+				<span>产品名称：{{ item.productionName }}</span>
+				<span>规格：{{ item.productionSize }}</span>
+			</div>
+			<div class="custom-tabs">
+				<el-tabs v-model="item.activeName" :stretch="true">
+					<el-tab-pane :label="'\u2002表格\u2002'" name="table"></el-tab-pane>
+					<el-tab-pane
+						:label="'\u3000图表\u3000'"
+						name="chart"
+						style="overflow: inherit"></el-tab-pane>
+				</el-tabs>
+				<!-- 列表 -->
+				<base-table
+					v-if="item.activeName === 'table'"
+					:table-props="item.tableProps"
+					:page="1"
+					:limit="1000"
+					:table-data="item.list"
+					:height="300" />
+				<baseChart
+					v-else
+					:chartN="index"
+					:chartData="item.list"
+					:lineName="item.downProps" />
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+import BaseChart from './baseChart.vue';
+import { getInspectionData } from '@/api/monitoring/statisticalData';
+export default {
+	name: 'CurrentTest',
+	components: { BaseChart },
+	computed: {
+		tableProps() {
+			return [
+				{
+					prop: 'workOrderName',
+					label: '工单名称',
+					showOverflowtooltip: true,
+				},
+				...this.dynamicProps,
+				{
+					prop: 'sumInput',
+					label: '上片总数',
+				},
+				{
+					prop: 'sumOutput',
+					label: '下片总数',
+				},
+			];
+		},
+	},
+	data() {
+		return {
+			dynamicProps: [],
+			list: [],
+			downList: [],
+		};
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		/** 查询列表 */
+		async getList() {
+			const res = await getInspectionData();
+			// const res = {
+			// 	data: [],
+			// };
+			if (res.data && res.data.length > 0) {
+				this.dynamicProps = this.filterNameData(res.data[0].upPart.nameData);
+				this.list = this.filterData(res.data[0].upPart.data);
+				// 工单明细
+				res.data.forEach((item) => {
+					let downProps = this.filterNameData(item.downPart[0].nameData);
+					console.log('downProps:', downProps);
+					let obj = this.downPartData(item.downPart[0].data, downProps);
+					obj.tableProps = [
+						{
+							prop: 'inspectionContent',
+							label: '检测内容',
+							showOverflowtooltip: true,
+						},
+						{
+							prop: 'sumInput',
+							label: '原片总数',
+							showOverflowtooltip: true,
+						},
+						...downProps,
+						{
+							prop: 'sumScrap',
+							label: '未通过检测总数',
+						},
+						{
+							prop: 'scrapRatio',
+							label: '报废比例',
+						},
+					];
+					this.downList.push(obj);
+				});
+				console.log(this.downList);
+			} else {
+				this.list = [];
+				this.dynamicProps = [];
+			}
+		},
+		filterNameData(nameData) {
+			const ndSet = new Set();
+			nameData.forEach((nd) => {
+				ndSet.add(nd.name);
+			});
+			return Array.from(ndSet.values())
+				.sort()
+				.map((name) => ({
+					prop: name,
+					label: name,
+				}));
+		},
+		filterData(data) {
+			return data.map((item) => {
+				const { data: innerData } = item;
+				const keyValuePairs = {};
+				console.log('innerData:', innerData);
+				this.dynamicProps.map((item) => {
+					keyValuePairs[item.prop] = '-';
+				});
+				innerData.forEach((d) => {
+					keyValuePairs[d.dynamicName] = d.dynamicValue;
+				});
+				return {
+					inspectionContent: item.inspectionContent,
+					workOrderName: item.workOrderName,
+					...keyValuePairs,
+					sumInput: item.sumInput,
+					sumOutput: item.sumOutput,
+				};
+			});
+		},
+		downPartData(data, downProps) {
+			let obj = {
+				workOrderName: '',
+				productionName: '',
+				productionSize: '',
+				activeName: 'table',
+				tableProps: [],
+				downProps: downProps,
+				list: [],
+			};
+			obj.workOrderName = data[0].workOrderName;
+			obj.productionName = data[0].productionName;
+			obj.productionSize = data[0].productionSize;
+			obj.list = data.map((item) => {
+				const { data: innerData } = item;
+				const keyValuePairs = {};
+				downProps.map((item) => {
+					keyValuePairs[item.prop] = '-';
+				});
+				innerData.map((d) => {
+					keyValuePairs[d.dynamicName] = d.dynamicValue;
+				});
+				return {
+					inspectionContent: item.inspectionContent,
+					sumInput: item.sumInput,
+					...keyValuePairs,
+					sumScrap: item.sumScrap,
+					scrapRatio: item.scrapRatio,
+				};
+			});
+			return obj;
+		},
+	},
+};
+</script>
+<style scoped lang="scss">
+.orderBox {
+	padding-top: 16px;
+}
+.title {
+	position: relative;
+	padding: 4px 0;
+	padding-left: 12px;
+	font-size: 14px;
+	color: #606266;
+	font-weight: 700;
+	margin-bottom: 12px;
+
+	&::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 6px;
+		height: 16px;
+		width: 4px;
+		border-radius: 1px;
+		background: #0b58ff;
+	}
+	span {
+		display: inline-block;
+		width: 300px;
+	}
+}
+:deep(.custom-tabs) {
+	.el-tabs__header {
+		margin-bottom: 8px;
+		display: inline-block;
+		transform: translateY(-12px);
+	}
+
+	.el-tabs__content {
+		overflow: visible;
+	}
+
+	.el-tabs__item {
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+		line-height: 36px !important;
+		height: 36px;
+	}
+}
+</style>

src/views/quality/currentData/hourData.vue

@@ -0,0 +1,86 @@
+<template>
+	<base-table
+		:table-props="tableProps"
+		:table-data="list"
+		:max-height="tableH" />
+</template>
+<script>
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { getRecordInOneDay } from '@/api/monitoring/statisticalData';
+import moment from 'moment';
+export default {
+	name: 'HourData',
+	mixins: [tableHeightMixin],
+	computed: {
+		tableProps() {
+			return [
+				{
+					prop: 'inspectionDetContent',
+					label: '检测内容',
+				},
+				...this.nameData,
+			];
+		},
+	},
+	data() {
+		return {
+			heightNum: 200,
+			nameData: [],
+			list: [],
+		};
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		async getList() {
+			const res = await getRecordInOneDay();
+			if (res.data) {
+				this.nameData = this.filterNameData(res.data.nameData);
+				this.list = this.filterData(res.data.data);
+			} else {
+				this.nameData = [];
+				this.list = [];
+			}
+		},
+		filterNameData(nameData) {
+			let arr = [];
+			nameData.forEach((ele) => {
+				if (ele.tree === 1) {
+					arr.push({
+						prop: ele.id,
+						label: moment(ele.name).format('yyyy-MM-DD HH:mm:ss'),
+					});
+				}
+			});
+			nameData.forEach((ele) => {
+				arr.forEach((inner) => {
+					if (ele.parentId === inner.prop) {
+						inner.children = [
+							{
+								prop: ele.parentId + ele.name,
+								label: ele.name,
+							},
+						];
+					}
+				});
+			});
+			return arr;
+		},
+		filterData(data) {
+			let list = [];
+			data.forEach((ele) => {
+				let obj = {};
+				obj.inspectionDetContent = ele.inspectionDetContent;
+				ele.data.forEach((inner) => {
+					inner.children.forEach((item) => {
+						obj[item.parentId + item.dynamicName] = item.dynamicValue;
+					});
+				});
+				list.push(obj);
+			});
+			return list;
+		},
+	},
+};
+</script>

src/views/quality/currentData/index.vue

@@ -0,0 +1,88 @@
+<template>
+	<div class="currentDataContainer">
+		<div class="topBox">
+			<el-menu
+				:default-active="activeName"
+				mode="horizontal"
+				@select="handleSelect">
+				<el-menu-item index="currentTest">当前检测数据</el-menu-item>
+				<el-menu-item index="24hour">24小时检测数据</el-menu-item>
+			</el-menu>
+		</div>
+		<div class="bottomBox">
+			<!-- 当前检测数据 -->
+			<div v-if="activeName === 'currentTest'">
+				<CurrentTest />
+			</div>
+			<!-- 24小时检测数据 -->
+			<div v-if="activeName === '24hour'">
+				<HourData />
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+import CurrentTest from './currentTest.vue';
+import HourData from './hourData.vue';
+export default {
+	name: 'currentData',
+	data() {
+		return {
+			activeName: 'currentTest',
+		};
+	},
+	components: {
+		CurrentTest,
+		HourData,
+	},
+	methods: {
+		handleSelect(name) {
+			this.activeName = name;
+		},
+	},
+};
+</script>
+<style scoped lang="scss">
+.currentDataContainer {
+	width: 100%;
+	min-height: calc(100vh - 120px - 8px);
+	background: rgba(242, 244, 249, 1);
+	.topBox {
+		.el-menu {
+			background-color: #f2f4f9;
+			margin-bottom: 8px;
+		}
+		.el-menu.el-menu--horizontal {
+			border-bottom: none;
+			width: 100%;
+			.el-menu-item {
+				height: 48px;
+				line-height: 48px;
+				width: calc((100% / 2) - 4px);
+				border-radius: 8px;
+				background-color: #fff;
+				font-size: 16px;
+				font-weight: 500;
+				color: rgba(22, 22, 22, 0.65);
+				text-align: center;
+			}
+			:first-child {
+				margin-right: 8px;
+			}
+			.el-menu-item.is-active {
+				border-width: 4px;
+				color: #161616;
+			}
+		}
+		.el-tabs__active-bar {
+			display: none;
+		}
+	}
+	.bottomBox {
+		min-height: calc(100vh - 184px);
+		background: #fff;
+		padding: 16px;
+		border-radius: 8px;
+	}
+}
+</style>

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

@@ -1,622 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <!-- 列表 -->
-    <el-row>
-      <el-col class="custom-tabs">
-        <el-tabs v-model="activeName" :stretch="true" @tab-click="handleTabClick">
-          <el-tab-pane :label="'\u2002表格数据\u2002'" name="table">
-            <!-- 列表 -->
-            <div class="blue-title">产品名：{{ productDetail.name }} 产品规格：{{ productDetail.specifications }}</div>
-            <base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list">
-            </base-table>
-            <div v-for="(item,index) in downProps" :key="index">
-              <div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
-              <base-table class="base-table__margin" :table-props="item" :page="1" :limit="10"
-                :table-data="downList[index]">
-              </base-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane :label="'\u3000图形数据\u3000'" name="chart" style="overflow: inherit">
-            <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
-            <div id="main" style="height: 500px;width: 1000px;"></div>
-          </el-tab-pane>
-        </el-tabs>
-      </el-col>
-    </el-row>
-    <!-- 分页组件 -->
-    <!-- <pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" /> -->
-
-    <!-- 对话框(添加 / 修改) -->
-    <!-- <base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="50%"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" />
-		</base-dialog> -->
-  </div>
-</template>
-
-<script>
-import {
-  getInspectionData,
-  getProductList,
-  getWorkOrderList
-} from '@/api/monitoring/statisticalData';
-// import Editor from '@/components/Editor';
-import moment from 'moment';
-// import DialogForm from './dialogForm.vue';
-import * as echarts from 'echarts';
-// import basicPageMixin from '@/mixins/lb/basicPageMixin';
-export default {
-  name: 'statisticalData',
-	// components: {
-	// 	DialogForm,
-	// },
-	// mixins: [basicPageMixin],
-	data() {
-    return {
-      list: [],
-      dynamicProps: [],
-      downProps: [],
-      downList: [],
-      productDetail: {
-        name: null,
-        specifications:null,
-      },
-      activeName: 'table',
-      searchBarFormConfig: [
-        {
-          type: 'label',
-          label: '当前检测数据柱状图',
-          // placeholder: '请选择工单号',
-          // param: 'workOrderId',
-          // selectOptions: [],
-        },
-				// {
-				// 	type: 'select',
-				// 	label: '产品',
-        //   placeholder: '请选择产品',
-        //   param: 'productionId',
-				// 	selectOptions: [],
-				// },
-				// {
-				// 	type: 'input',
-				// 	label: '检测内容',
-				// 	placeholder: '请输入检测内容',
-				// 	param: 'inspectionDetContent',
-				// },
-				// {
-				// 	type: 'datePicker',
-				// 	label: '时间段',
-				// 	dateType: 'daterange', // datetimerange
-				// 	// format: 'yyyy-MM-dd HH:mm:ss',
-				// 	format: 'yyyy-MM-dd',
-        //   valueFormat: 'timestamp',
-				// 	rangeSeparator: '-',
-				// 	startPlaceholder: '开始日期',
-				// 	endPlaceholder: '结束日期',
-				// 	defaultTime: ['00:00:00', '23:59:59'],
-				// 	param: 'checkTime',
-				// 	// width: 350,
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '查询',
-				// 	name: 'search',
-				// 	color: 'primary',
-				// },
-				// {
-				// 	type: 'separate',
-				// },
-				// // {
-				// // 	type: this.$auth.hasPermi(
-				// // 		'base:quality-inspection-record:create'
-				// // 	)
-				// // 		? 'button'
-				// // 		: '',
-				// // 	btnName: '新增',
-				// // 	name: 'add',
-				// // 	plain: true,
-				// // 	color: 'success',
-				// // },
-			],
-			// tableBtn: [
-			// 	this.$auth.hasPermi('base:quality-inspection-record:update')
-			// 		? {
-			// 				type: 'edit',
-			// 				btnName: '修改',
-			// 		  }
-			// 		: undefined,
-      //   this.$auth.hasPermi('base:quality-inspection-record:delete')
-			// 		? {
-			// 				type: 'delete',
-			// 				btnName: '删除',
-			// 		  }
-			// 		: undefined,
-			// ].filter((v) => v),
-			// tableProps: [
-			// 	{
-			// 		prop: 'createTime',
-			// 		label: '添加时间',
-			// 		fixed: true,
-			// 		width: 180,
-			// 		filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-			// 	},
-			// 	{
-			// 		// width: 128,
-			// 		prop: 'inspectionDetContent',
-			// 		label: '检测内容',
-			// 	},
-			// 	{
-			// 		// width: 128,
-			// 		prop: 'lineName',
-			// 		label: '产线',
-			// 	},
-			// 	{
-			// 		// width: 128,
-			// 		prop: 'checkPerson',
-			// 		label: '检测人员',
-			// 	},
-			// 	{
-			// 		// width: 160,
-			// 		prop: 'checkTime',
-			// 		label: '检测时间',
-			// 		filter: (val) =>
-			// 			val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '-',
-			// 	},
-			// 	{
-			// 		width: 90,
-			// 		prop: 'source',
-			// 		label: '来源',
-			// 		filter: (val) => ['未知', '手动', '自动'][val],
-			// 	},
-			// ],
-      // 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-
-			// searchBarKeys: ['inspectionDetContent', 'checkTime', 'productionLineId'],
-			// form: {
-			// 	id: undefined,
-			// 	inspectionDetId: undefined,
-			// 	inspectionDetContent: undefined,
-			// 	productionLineId: undefined,
-			// 	sectionId: undefined,
-			// 	checkPerson: undefined,
-			// 	checkTime: undefined,
-			// 	source: undefined,
-			// 	explainText: undefined,
-			// 	remark: undefined,
-			// },
-			// 查询参数
-			queryParams: {
-        workOrderId: undefined,
-        productId: undefined,
-        startTime: undefined,
-        endTime: undefined,
-				// productionLineId: null,
-			},
-		};
-  },
-	created() {
-		// this.getProductLineList();
-  },
-  computed: {
-    productProps() {
-      return [
-        {
-          // width: 160,
-          prop: 'workOrderName',
-          label: '工单名称',
-        },
-        ...this.dynamicProps,
-        {
-          // width: 128,
-          prop: 'sumInput',
-          label: '上片总数',
-        },
-        {
-          // width: 128,
-          prop: 'sumOutput',
-          label: '下片总数',
-          // subcomponent: {
-          // 	name: 'TextOnly',
-          // 	props: {
-          // 		injectData: {
-          // 			type: Object,
-          // 			default: () => ({}),
-          // 		},
-          // 	},
-          // 	data() {
-          // 		return {
-          // 			text: '比例',
-          // 		};
-          // 	},
-          // 	methods: {
-          // 		handleEmit(payload) {
-          // 			console.log('handleEmit', payload);
-          // 		},
-          // 	},
-          // 	render(h) {
-          // 		return h('el-button', { props: { type: 'text' } }, this.text);
-          // 	},
-          // },
-        },
-      ];
-    },
-  },
-  mounted() {
-    if (this.$route.params.startTime && this.$route.params.endTime) {
-      this.searchBarFormConfig[0].defaultSelect = [
-        this.$route.params.startTime,
-        this.$route.params.endTime,
-      ];
-      this.queryParams.param = {};
-      this.$set(
-        this.queryParams.param,
-        'startTime',
-        this.$route.params.startTime
-      );
-      this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
-    } else {
-      this.searchBarFormConfig[0].defaultSelect = [];
-    }
-    this.getList()
-  },
-  methods: {
-    handleTabClick() {
-      if (this.activeName === 'chart') {
-        var chartDom = document.getElementById('main');
-        var myChart = echarts.init(chartDom);
-        var option;
-        let arrXAxis = []
-        this.list.forEach((ele) => {
-          arrXAxis.push(ele.workOrderName)
-        })
-        this.downList.forEach((ele) => {
-          ele.forEach((item) => {
-            if (ele.length !==0 && item.productionline) {
-              arrXAxis.push('产线' + item.productionline)
-
-            }
-          })
-        })
-        let arrYAxis = []
-        this.list.forEach((ele) => {
-          // console.log(ele);
-          arrYAxis.push(ele.sumInput)
-        })
-        this.downList.forEach((ele) => {
-          ele.forEach((item) => {
-            console.log(item);
-            // if (ele.length !== 0 && item.productionline) {
-            arrYAxis.push(item.sumInput)
-            // }
-          })
-        })
-        // console.log(arrXAxis);
-        option = {
-          xAxis: {
-            type: 'category',
-            data: arrXAxis
-          },
-          yAxis: {
-            type: 'value'
-          },
-          series: [
-            {
-              data: arrYAxis,
-              type: 'bar',
-              showBackground: true,
-              barWidth: '20',
-              label: {
-                show: true,
-                position: 'top'
-              },
-              backgroundStyle: {
-                color: 'rgba(180, 180, 180, 0.2)'
-              }
-            }
-          ]
-        };
-
-        option && myChart.setOption(option);
-      }
-    },
-    /** 获取搜索栏的产线列表 */
-    // async getDict() {
-    //   const res = await getProductList()
-    //   const result = await getWorkOrderList()
-    //   console.log(res);
-    //   this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
-    //     return {
-    //       name: item.name,
-    //       id:item.id
-    //     }
-    //   })
-    //   this.searchBarFormConfig[0].selectOptions = result.data.map((item) => {
-    //     return {
-    //       name: item.name,
-    //       id: item.id
-    //     }
-    //   })
-    // },
-		// getProductLineList() {
-		// 	this.$axios('/base/production-line/listAll').then((response) => {
-		// 		this.searchBarFormConfig[0].selectOptions = response.data.map(
-		// 			(item) => {
-		// 				return {
-		// 					name: item.name,
-		// 					id: item.id,
-		// 				};
-		// 			}
-		// 		);
-		// 	});
-    // },
-    getList() {
-      this.getDataList()
-      // this.getDict()
-    },
-		/** 查询列表 */
-		async getDataList() {
-			this.loading = true;
-      // 执行查询
-      this.downProps= []
-      const res = await getInspectionData(this.queryParams)
-      console.log(res);
-      this.productDetail.name = res.data[0].productName
-      this.productDetail.specifications = res.data[0].specifications
-      // this.productName = res.data[0].productName
-      this.dynamicProps = this.filterNameData(res.data[0].upPart.nameData)
-      console.log(this.dynamicProps)
-      this.list = this.filterData(res.data[0].upPart.data)
-      console.log(this.list)
-      res.data[0].downPart.forEach((ele) => {
-        // console.log(ele.data);
-        let arr = this.downFilterNameData(ele.nameData)
-        if (arr.length !== 0) {
-          let propArr = [{
-            // width: 160,
-            prop: 'inspectionContent',
-            label: '检测内容',
-          },
-          ...arr,
-          {
-            // width: 128,
-            prop: 'sumInput',
-            label: '原片总数',
-            },
-            {
-              // width: 128,
-              prop: 'sumScrap',
-              label: '未通过检测总数',
-            },
-          {
-            // width: 128,
-            prop: 'scrapRatio',
-            label: '报废比例',
-          }]
-          this.downProps.push(propArr)
-        }
-        // this.downProps = []
-      })
-      res.data[0].downPart.forEach((ele) => {
-        // console.log(ele.data);
-        let arr =this.downFilterData(ele.data)
-        if (arr.length !== 0) {
-          this.downList.push(arr)
-        }
-        // this.downProps = []
-      })
-
-      // console.log(this.downList);
-    },
-    downFilterNameData(nameData) {
-      const ndSet = new Set();
-      nameData.forEach((nd) => {
-        ndSet.add(nd.name);
-      });
-      return Array.from(ndSet.values())
-        .sort()
-        .map((name) => ({
-          prop: name,
-          label: name,
-        }));
-      // })
-    },
-    downFilterData(data) {
-      return data.map((item) => {
-        const { data: innerData } = item;
-        const keyValuePairs = {};
-        innerData.map((d) => {
-          keyValuePairs[d.dynamicName] = d.dynamicValue;
-        });
-        return {
-          inspectionContent: item.inspectionContent,
-          ...keyValuePairs,
-          sumInput: item.sumInput,
-          scrapRatio: item.scrapRatio,
-          sumScrap: item.sumScrap
-        };
-      });
-    },
-    filterNameData(nameData) {
-      // console.log(upData);
-      // upData.forEach((ele) => {
-      const ndSet = new Set();
-
-      nameData.forEach((nd) => {
-          ndSet.add(nd.name);
-      });
-        return Array.from(ndSet.values())
-          .sort()
-          .map((name) => ({
-            prop: name,
-            label: name,
-          }));
-      // })
-    },
-    filterData(data) {
-      return data.map((item) => {
-        const { data: innerData } = item;
-        const keyValuePairs = {};
-        innerData.map((d) => {
-          keyValuePairs[d.dynamicName] = d.dynamicValue;
-        });
-        return {
-          inspectionContent: item.inspectionContent,
-          workOrderName: item.workOrderName,
-          ...keyValuePairs,
-          sumInput: item.sumInput,
-          sumOutput: item.sumOutput,
-        };
-      });
-    },
-		/** 取消按钮 */
-    handleSearchBarBtnClick(val) {
-      if (val.btnName === 'search') {
-        this.queryParams.workOrderId = val.workOrderId ? val.workOrderId : undefined
-        this.queryParams.productId = val.productId ? val.productId : undefined
-        this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
-        this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
-
-        this.getList()
-      }
-     console.log(val);
-    }
-		/** 搜索按钮操作 */
-		// handleQuery() {
-		// 	this.queryParams.pageNo = 1;
-		// 	this.getList();
-		// },
-		// /** 重置按钮操作 */
-		// resetQuery() {
-		// 	this.resetForm('queryForm');
-		// 	this.handleQuery();
-		// },
-		// /** 新增按钮操作 */
-		// handleAdd() {
-		// 	this.reset();
-		// 	this.open = true;
-		// 	this.title = '添加质量检查信息记录表';
-		// },
-		// /** 修改按钮操作 */
-		// handleUpdate(row) {
-		// 	this.reset();
-		// 	const id = row.id;
-		// 	getQualityInspectionRecord(id).then((response) => {
-		// 		/** 因为后端返回的时间是时间戳格式，需转换 */
-		// 		const info = {}
-		// 		Object.keys(this.form).forEach(key => {
-		// 			info[key] = response.data[key]
-		// 		});
-		// 		this.form = info;
-		// 		this.open = true;
-		// 		this.title = '修改质量检查信息记录表';
-		// 	});
-		// },
-		// /** 提交按钮 */
-		// submitForm() {
-		// 	this.$refs['form'].validate((valid) => {
-		// 		if (!valid) {
-		// 			return;
-		// 		}
-		// 		// 修改的提交
-		// 		if (this.form.id != null) {
-		// 			updateQualityInspectionRecord(this.form).then((response) => {
-		// 				this.$modal.msgSuccess('修改成功');
-		// 				this.open = false;
-		// 				this.getList();
-		// 			});
-		// 			return;
-		// 		}
-		// 		// 添加的提交
-		// 		createQualityInspectionRecord(this.form).then((response) => {
-		// 			this.$modal.msgSuccess('新增成功');
-		// 			this.open = false;
-		// 			this.getList();
-		// 		});
-		// 	});
-		// },
-		// /** 删除按钮操作 */
-		// handleDelete(row) {
-		// 	const id = row.id;
-		// 	this.$modal
-		// 		.confirm('是否确认删除"' + row.inspectionDetContent + '"?')
-		// 		.then(function () {
-		// 			return deleteQualityInspectionRecord(id);
-		// 		})
-		// 		.then(() => {
-		// 			this.getList();
-		// 			this.$modal.msgSuccess('删除成功');
-		// 		})
-		// 		.catch(() => {});
-		// },
-		// /** 导出按钮操作 */
-		// handleExport() {
-		// 	// 处理查询参数
-		// 	let params = { ...this.queryParams };
-		// 	params.pageNo = undefined;
-		// 	params.pageSize = undefined;
-		// 	this.$modal
-		// 		.confirm('是否确认导出所有质量检查信息记录表数据项?')
-		// 		.then(() => {
-		// 			this.exportLoading = true;
-		// 			return exportQualityInspectionRecordExcel(params);
-		// 		})
-		// 		.then((response) => {
-		// 			this.$download.excel(response, '质量检查信息记录表.xls');
-		// 			this.exportLoading = false;
-		// 		})
-		// 		.catch(() => {});
-		// },
-	},
-};
-</script>
-<style scoped lang="scss">
-:deep(.custom-tabs) {
-  .el-tabs__header {
-    margin-bottom: 8px;
-    display: inline-block;
-    transform: translateY(-12px);
-  }
-
-  .el-tabs__content {
-    overflow: visible;
-  }
-
-  .el-tabs__item {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-    line-height: 36px !important;
-    height: 36px;
-  }
-}
-.blue-title {
-  position: relative;
-  padding: 4px 0;
-  padding-left: 12px;
-  font-size: 14px;
-  color: #606266;
-  font-weight: 700;
-  margin-bottom: 12px;
-
-  &::before {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 6px;
-    height: 16px;
-    width: 4px;
-    border-radius: 1px;
-    background: #0b58ff;
-  }
-}
-</style>

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

@@ -1,10 +1,3 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-09-04 09:34:52
-    description: 设备效率分析
--->
-
 <template>
 	<div class="app-container allow-overflow">
 		<!-- 搜索工作栏 -->
@@ -15,10 +8,7 @@
 
 		<el-row>
 			<el-col class="custom-tabs">
-				<el-tabs
-					v-model="activeName"
-					:stretch="true"
-					@tab-click="handleTabClick">
+				<el-tabs v-model="activeName" :stretch="true">
 					<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
 						<!-- 列表 -->
 						<base-table
@@ -27,7 +17,7 @@
 							:page="1"
 							:limit="10"
 							:table-data="list"
-							@emitFun="handleEmitFun"></base-table>
+							:max-height="tableH"></base-table>
 					</el-tab-pane>
 					<el-tab-pane
 						:label="'\u3000可视化\u3000'"
@@ -74,7 +64,6 @@
 										v-for="item in list"
 										:key="item.id"
 										:value="item" />
-									<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
 								</div>
 							</div>
 						</div>
@@ -86,40 +75,44 @@
 </template>
 
 <script>
-// import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import PieChart from './components/pieChart.vue';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { exportEfficiencyExcel } from '@/api/equipment/analysis/statistics.js';
 
 export default {
 	name: 'EfficiencyAnalysis',
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	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: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备' },
+				{
+					prop: 'factoryName',
+					label: '工厂',
+					minWidth: 120,
+					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: [
@@ -127,12 +120,13 @@ 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(3) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
 					],
 				},
@@ -143,8 +137,14 @@ 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: '百分比[%]' },
 					],
 				},
 				{
@@ -154,14 +154,19 @@ export default {
 							width: 128,
 							prop: 'downTime',
 							label: '故障时长[h]',
-							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
+						},
+						{
+							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(3) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
 					],
 				},
@@ -172,150 +177,67 @@ 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(3) : '-'),
+							filter: (val) => (val != null ? +val.toFixed(2) : '-'),
 						},
 					],
 				},
-				{
-					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: '工单',
-					placeholder: '请选择工单',
-          param: 'workOrderId',
+					label: '工单名称',
+					param: 'workOrderId',
 					selectOptions: [],
+					filterable: true,
+					clearable: false,
+					defaultSelect: '',
+				},
+				{
+					// parent: 'dateFilterType',
+					// 时间段选择
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					defaultTime: ['00:00:00', '00:00:00'],
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'recordTime',
 				},
-				// {
-				// 	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: '时间段',
-							dateType: 'daterange',
-							format: 'yyyy-MM-dd',
-							valueFormat: 'yyyy-MM-dd HH:mm:ss',
-							defaultTime: ['00:00:00', '00:00:00'],
-							rangeSeparator: '-',
-							startPlaceholder: '开始时间',
-							endPlaceholder: '结束时间',
-							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: 'button',
-				// 	btnName: '设备可视化',
-				// 	name: 'visualization',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: 'OEE',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: 'TEEP',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'warning',
-				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'success',
+				},
 			],
-			// 是否显示弹出层
-			open: false,
 			// 查询参数
 			queryParams: {
-				// lineId: null,
-        workOrderId: null,
+				workOrderId: null,
 				recordTime: [],
 			},
 			// 表单参数
@@ -324,54 +246,32 @@ export default {
 		};
 	},
 	created() {
-		this.getWorkOrder()
-		// this.getLine();
-		this.getList();
+		this.getWorkOrder();
 	},
 	methods: {
 		/** 准备工厂数据 */
-    async getWorkOrder() {
-      console.log(1111);
+		async getWorkOrder() {
 			const { code, data } = await this.$axios({
-        url: '/base/core-work-order/listbyfilter',
+				url: '/base/core-work-order/listbyfilter',
 				method: 'get',
 			});
-      if (code == 0) {
-        console.log('1111', data);
+			if (code == 0) {
 				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
 					};
 				});
+				this.searchBarFormConfig[0].defaultSelect =
+					this.searchBarFormConfig[0].selectOptions[0].id;
+				this.queryParams.workOrderId =
+					this.searchBarFormConfig[0].selectOptions[0].id;
+			} else {
+				this.searchBarFormConfig[0].selectOptions = [];
+				this.searchBarFormConfig[0].defaultSelect = '';
+				this.queryParams.workOrderId = '';
 			}
-		},
-
-		// /** 准备产线数据 */
-		// 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;
-			}
+			this.getList();
 		},
 		/** 查询列表 */
 		async getList() {
@@ -385,43 +285,23 @@ export default {
 				this.list = data;
 			}
 		},
-
+		exportExcel() {
+			this.loading = true;
+			exportEfficiencyExcel({ ...this.queryParams }).then((res) => {
+				this.$download.excel(res, '设备状态追溯.xls');
+				this.loading = false;
+			});
+		},
 		handleSearchBarBtnClick({ btnName, ...payload }) {
-			console.log('handleSearchBarBtnClick', btnName, payload);
-			if (btnName == 'visualization') {
-				// 可视化
-				this.visualizationOpen = true;
-				this.open = true;
-			}
+			this.queryParams.workOrderId = payload.workOrderId || null;
+			this.queryParams.recordTime = payload.recordTime || undefined;
 			if (btnName == 'search') {
-        this.queryParams.workOrderId = payload.workOrderId || null;
-				// this.queryParams.lineId = payload.lineId || null;
-				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`,
-					];
-				}
+				this.getList();
 			} else {
-				this.queryParams.recordTime = null;
+				this.exportExcel();
+				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,251 +1,222 @@
-<!--
- * @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 :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-      <!-- <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="getList" />
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="list"
+			:max-height="tableH"></base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="total"
+			@pagination="getList" />
+	</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
+	getMaterialUseLogPage,
+	getWorkOrderList,
+	exportEnergyPlcExcel,
 } from '@/api/quality/materialTraceability';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
-  {
-    prop: 'materialName',
-    label: '物料名称'
-  },
-  {
-    prop: 'materialCode',
-    label: '物料编码'
-  },
-  {
-    prop: 'dateName',
-    label: '物料批次'
-  },
-  {
-    prop: 'equipName',
-    label: '使用设备'
-  },
-  {
-    prop: 'num',
-    label: '使用数量'
-  },
-  {
-    prop: 'useTime',
-    label: '使用时间',
-    filter: parseTime
-  },
-  {
-    prop: 'userName',
-    label: '操作人'
-  },
-  {
-    prop: 'source',
-    label: '数据来源',
-    filter: (val) => val == 1 ? '内部' : '外部'
-  },
-  {
-    prop: 'remark',
-    label: '备注'
-  }
+	{
+		prop: 'materialName',
+		label: '物料名称',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'materialCode',
+		label: '物料编码',
+		showOverflowtooltip: true,
+		minWidth: 120,
+	},
+	{
+		prop: 'dateName',
+		label: '物料批次',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'equipName',
+		label: '使用设备',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'num',
+		label: '使用数量',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'useTime',
+		label: '使用时间',
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'userName',
+		label: '操作人',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'source',
+		label: '数据来源',
+		filter: (val) => (val == 1 ? '内部' : '外部'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+		showOverflowtooltip: true,
+	},
 ];
 
 export default {
-  // 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,
-        this.$auth.hasPermi(`base:packaging-print-log:delete`)
-          ? {
-            type: 'delete',
-            btnName: '删除',
-          }
-          : undefined,
-
-      ].filter((v) => v),
-      list: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        workOrderId: undefined,
-        startTime: undefined,
-        endTime:undefined,
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          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: '搜索',
-          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') ? 'button' : '',
-        	btnName: '导出',
-        	name: 'export',
-        	color: 'warning',
-        },
-      ],
-    };
-  },
-  components: {
-    // AddOrUpdate,
-  },
-  created() {
-    this.getList()
-    this.getDict()
-  },
-  methods: {
-    getList() {
-      getMaterialUseLogPage({ ...this.listQuery }).then(res => {
-        this.list = res.data || []
-        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
-          }
-        })
-        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.workOrderId = val.workOrderId ? val.workOrderId :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) {
-      this.addOrUpdateVisible = true;
-      this.addOrEditTitle = '详情';
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id, true);
-      });
-    },
-  },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			heightNum: 220,
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:packaging-print-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:packaging-print-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				workOrderId: undefined,
+				startTime: undefined,
+				endTime: undefined,
+			},
+			total: 0,
+			formConfig: [
+				{
+					type: 'select',
+					label: '工单名称',
+					selectOptions: [],
+					param: 'workOrderId',
+					defaultSelect: '',
+					filterable: true,
+					clearable: false,
+				},
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'timeVal',
+					defaultSelect: [],
+					width: 250,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('monitoring:materiel-date-from:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'success',
+				},
+			],
+		};
+	},
+	components: {
+		// AddOrUpdate,
+	},
+	created() {
+		this.getDict();
+	},
+	methods: {
+		getList() {
+			getMaterialUseLogPage({ ...this.listQuery }).then((res) => {
+				this.list = res.data || [];
+				this.total = res.data.total || 0;
+			});
+		},
+		getDict() {
+			getWorkOrderList().then((response) => {
+				this.formConfig[0].selectOptions = response.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				console.log(this.formConfig[0].selectOptions);
+				this.formConfig[0].defaultSelect =
+					this.formConfig[0].selectOptions[0].id || '';
+				this.listQuery.workOrderId =
+					this.formConfig[0].selectOptions[0].id || '';
+				this.getList();
+			});
+		},
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.listQuery };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.exportLoading = true;
+			exportEnergyPlcExcel(params)
+				.then((response) => {
+					this.$download.excel(response, '物料信息追溯  ');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+		buttonClick(val) {
+			console.log(val);
+			if (val.btnName === 'search') {
+				this.listQuery.workOrderId = val.workOrderId
+					? val.workOrderId
+					: undefined;
+				if (val.timeVal && val.timeVal.length != 0) {
+					this.listQuery.startTime = val.timeVal[0] + ' 00:00:00';
+					this.listQuery.endTime = val.timeVal[1] + ' 23:59:59';
+				} else {
+					this.listQuery.startTime = undefined;
+					this.listQuery.endTime = undefined;
+				}
+				this.getList();
+			} else {
+				this.handleExport();
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
 };
 </script>

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

@@ -1,279 +1,218 @@
-<!--
- * @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 :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-      <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="getList" />
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="list"
+			:max-height="tableH">
+			<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="getList" />
+	</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
-  // exportEnergyPlcExcel
+	getProcessTraceabilityPage,
+	getWorkOrderList,
+	getCoreProduct,
 } from '@/api/quality/processTraceability';
 import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 const tableProps = [
-  {
-    prop: 'name',
-    label: '工单名称'
-  },
-  {
-    prop: 'code',
-    label: '工单编码'
-  },
-  {
-    prop: 'planProductName',
-    label: '产品名'
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
-  },
-  {
-    prop: 'startProduceTime',
-    label: '开始生产时间',
-    filter: parseTime
-  },
-  {
-    prop: 'finishProduceTime',
-    label: '结束生产时间',
-    filter: parseTime
-  },
-  {
-    prop: 'actualQuantity',
-    label: '生产数量'
-  },
-  {
-    prop: 'planProductUnit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'processFlowName',
-    label: '工艺名称'
-  },
-  {
-    prop: 'yield',
-    label: '合格率'
-  }
+	{
+		prop: 'name',
+		label: '工单名称',
+		showOverflowtooltip: true,
+		minWidth: 120,
+	},
+	{
+		prop: 'code',
+		label: '工单编码',
+		showOverflowtooltip: true,
+		minWidth: 120,
+	},
+	{
+		prop: 'planProductName',
+		label: '产品名',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'status',
+		label: '状态',
+		filter: (val) =>
+			val == 1
+				? '等待'
+				: val == 2
+				? '激活'
+				: val == 3
+				? '暂停'
+				: val == 4
+				? '完成'
+				: '作废',
+	},
+	{
+		prop: 'startProduceTime',
+		label: '开始生产时间',
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'finishProduceTime',
+		label: '结束生产时间',
+		filter: parseTime,
+		width: 160,
+	},
+	{
+		prop: 'actualQuantity',
+		label: '生产数量',
+	},
+	{
+		prop: 'planProductUnit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
+	{
+		prop: 'yield',
+		label: '合格率',
+		filter: (val) => (val ? val.toFixed(2) + '%' : '-'),
+		align: 'center',
+	},
+	{
+		prop: 'processFlowName',
+		label: '工艺名称',
+		showOverflowtooltip: true,
+	},
 ];
 
 export default {
-  // 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: '查看工艺详情',
-          },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			tableProps,
+			tableBtn: [
+				{
+					type: 'processDetail',
+					btnName: '查看工艺详情',
+				},
+			].filter((v) => v),
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+			},
+			formConfig: [
+				{
+					type: 'select',
+					label: '工单名称',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'orderName',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '工单开始时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'timeVal',
+					defaultSelect: [],
+					width: 250,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	created() {
+		this.getList();
+		this.getDict();
+	},
+	methods: {
+		getList() {
+			getProcessTraceabilityPage(this.listQuery).then((res) => {
+				this.list = res.data.list || [];
+				this.listQuery.total = res.data.total || 0;
+			});
+		},
+		handleClick(val) {
+			if (val.type === 'processDetail') {
+				console.log(val);
+				let specificationsData = '';
+				getCoreProduct(val.data.planProductId).then((res) => {
+					console.log(res);
 
-      ].filter((v) => v),
-      list: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        // total: 0,
-        // orderName: '工单',
-        // startTime: undefined,
-        // endTime:undefined,
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'orderName',
-          filterable: true,
-        },
-        {
-          type: 'datePicker',
-          label: '工单开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 250
-        },
-        {
-          type: 'button',
-          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.getDict()
-  },
-  methods: {
-    getList() {
-      getProcessTraceabilityPage(this.listQuery).then(res => {
-        this.list = res.data.list || []
-        this.listQuery.total = res.data.total || 0
-      })
-    },
-    handleClick(val) {
-      if (val.type === "processDetail") {
-        console.log(val);
-        let specificationsData =''
-        getCoreProduct(val.data.planProductId).then((res) => {
-          console.log(res)
-
-          this.$router.push({
-            path: 'process-traceability-detail',
-            query: {
-              id: val.data.processFlowId,
-              orderId: val.data.id,
-              name: val.data.name,
-              specifications: res.data.specifications,
-              productName: val.data.planProductName,
-              processFlowName: val.data.processFlowName,
-              // planProductId: val.data.planProductId
-              // equipmentName,
-            },
-          });
-        })
-
-        // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
-      }
-    },
-    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
-          }
-        })
-        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) {
-      this.addOrUpdateVisible = true;
-      this.addOrEditTitle = '详情';
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id, true);
-      });
-    },
-  },
+					this.$router.push({
+						path: 'process-traceability-detail',
+						query: {
+							id: val.data.processFlowId,
+							orderId: val.data.id,
+							name: val.data.name,
+							specifications: res.data.specifications,
+							productName: val.data.planProductName,
+							processFlowName: val.data.processFlowName,
+						},
+					});
+				});
+			}
+		},
+		getDict() {
+			getWorkOrderList().then((response) => {
+				this.formConfig[0].selectOptions = response.data.map((item) => {
+					return {
+						name: 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();
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
 };
 </script>

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

@@ -1,219 +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>

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

@@ -1,120 +0,0 @@
-<!--
-    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

@@ -1,80 +0,0 @@
-{
-	"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

@@ -1,176 +0,0 @@
-{
-	"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,243 +1,160 @@
-<!--
- * @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 :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-      <!-- <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="getList" />
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="list"
+			:max-height="tableH"></base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="total"
+			@pagination="getList" />
+	</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
+	getRawMaterialPage,
+	getWorkOrderList,
 } from '@/api/quality/rawMaterialTraceability';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
-  {
-    prop: 'createTime',
-    label: '添加时间',
-    filter: parseTime
-  },
-  {
-    prop: 'material',
-    label: '原料名称',
-    filter: publicFormatter('material')
-  },
-  {
-    prop: 'origin',
-    label: '来源',
-    filter: (val)=>val == 1 ? '内部' : '外部'
-  },
-  {
-    prop: 'supplierId',
-    label: '供应商'
-  },
-  {
-    prop: 'batch',
-    label: '批次'
-  },
-  {
-    prop: 'num',
-    label: '数量'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  }
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'material',
+		label: '原料名称',
+		filter: publicFormatter('material'),
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'origin',
+		label: '来源',
+		filter: (val) => (val == 1 ? '内部' : '外部'),
+	},
+	{
+		prop: 'supplierName',
+		label: '供应商',
+	},
+	{
+		prop: 'batch',
+		label: '批次',
+		showOverflowtooltip: true,
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
 ];
 
 export default {
-  // 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,
-        this.$auth.hasPermi(`base:packaging-print-log:delete`)
-          ? {
-            type: 'delete',
-            btnName: '删除',
-          }
-          : undefined,
-
-      ].filter((v) => v),
-      list: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        workOrderId: undefined,
-        startTime: undefined,
-        endTime:undefined,
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          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: '搜索',
-          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.getDict()
-  },
-  methods: {
-    getList() {
-      getRawMaterialPage({ ...this.listQuery }).then(res => {
-        this.list = res.data.list || []
-        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
-          }
-        })
-        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.workOrderId = val.workOrderId ? val.workOrderId :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) {
-      this.addOrUpdateVisible = true;
-      this.addOrEditTitle = '详情';
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id, true);
-      });
-    },
-  },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:packaging-print-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:packaging-print-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				workOrderId: undefined,
+				startTime: undefined,
+				endTime: undefined,
+			},
+			total: 0,
+			formConfig: [
+				{
+					type: 'select',
+					label: '工单名称',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'workOrderId',
+					clearable: false,
+					filterable: true,
+					defaultSelect: '',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	created() {
+		this.getDict();
+	},
+	methods: {
+		getList() {
+			getRawMaterialPage({ ...this.listQuery }).then((res) => {
+				this.list = res.data.records || [];
+				this.total = res.data.total || 0;
+			});
+		},
+		getDict() {
+			getWorkOrderList().then((response) => {
+				this.formConfig[0].selectOptions = response.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				this.formConfig[0].defaultSelect =
+					this.formConfig[0].selectOptions[0].id || '';
+				this.listQuery.workOrderId =
+					this.formConfig[0].selectOptions[0].id || '';
+				this.getList();
+			});
+		},
+		buttonClick(val) {
+			console.log(val);
+			if (val.btnName === 'search') {
+				this.listQuery.workOrderId = val.workOrderId
+					? val.workOrderId
+					: undefined;
+				this.getList();
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
 };
 </script>

src/views/quality/qualityInspectionRecord/dialogForm.vue

@@ -12,11 +12,29 @@
 		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' }]">
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.inspectionDetId"
 						placeholder="请选择检测内容"
@@ -31,12 +49,78 @@
 					</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' }]">
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="innerDataForm.source"
 						placeholder="请选择来源"
@@ -56,81 +140,6 @@
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '产线不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						clearable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: true, message: '工段不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="innerDataForm.sectionId"
-						placeholder="请选择工段"
-						clearable
-						filterable
-						@change="$emit('update', innerDataForm)">
-						<el-option
-							v-for="opt in sectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="检测人员" prop="checkPerson">
-					<el-input
-						v-model="innerDataForm.checkPerson"
-						clearable
-						@change="$emit('update', innerDataForm)"
-						placeholder="请输入检测人员" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="检测时间"
-					prop="checkTime"
-					:rules="[{ required: true, message: '检测时间不能为空', trigger: 'blur' }]">
-					<el-date-picker
-						v-model="innerDataForm.checkTime"
-						type="datetime"
-						placeholder="请选择检测时间"
-						value-format="timestamp"
-						@change="$emit('update', innerDataForm)"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-
-		<el-row :gutter="20">
-			<el-col>
-				<el-form-item label="描述" prop="explainText">
-					<el-input
-						v-model="innerDataForm.explainText"
-						placeholder="请输入描述信息"
-						@change="$emit('update', innerDataForm)"
-						type="textarea"></el-input>
-				</el-form-item>
-			</el-col>
 			<el-col>
 				<el-form-item label="备注" prop="remark">
 					<el-input
@@ -164,16 +173,19 @@ export default {
 			inspectionDetList: [],
 			productionLineList: [],
 			sectionList: [],
+			workOrderList: [],
 			innerDataForm: {},
 			cacheInspectionDetList: null,
 		};
 	},
 	mounted() {
-		Promise.all([this.getProductLineList(), this.getInspectionDetList()]).then(
-			() => {
-				this.formLoading = false;
-			}
-		);
+		Promise.all([
+			this.getProductLineList(),
+			this.getInspectionDetList(),
+			this.getWorkOrderList(),
+		]).then(() => {
+			this.formLoading = false;
+		});
 	},
 	watch: {
 		// 'innerDataForm.productionLineId': {
@@ -224,13 +236,21 @@ export default {
 
 		// 获取产线列表
 		async getProductLineList() {
-      const response = await this.$axios('/base/core-production-line/listAll');
+			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(
@@ -246,7 +266,7 @@ export default {
 		// 获取工段列表
 		async getWorksectionList(plId) {
 			const response = await this.$axios(
-				'/base/workshop-section/listByParentId',
+				'/base/core-workshop-section/listByParentId',
 				{
 					params: {
 						id: plId,