Merge pull request '更新物料、班组、仓库' (#380) from projects/mes-zwq into projects/mes-test

Reviewed-on: #380

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/extend/processEquMaterialBom.js

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

src/api/monitoring/statisticalData.js

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

src/views/base/coreWorkOrder/allocation.vue

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

src/views/base/material/SmallTitle.vue

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

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

@@ -1,22 +1,11 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-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"
@@ -25,435 +14,210 @@
 		label-width="100px"
 		label-position="top">
 		<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="物料编码" prop="code">
+			<el-col :span="8">
+				<el-form-item label="物料产品名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						clearable
+						placeholder="请输入物料产品名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="物料产品编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
 						clearable
-									:disabled="isdetail"
-									placeholder="请输入物料编码" />
+						placeholder="请输入物料产品编码" />
 				</el-form-item>
 			</el-col>
-						<el-col :span="12">
-							<el-form-item label="物料名称" prop="name">
-								<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
+			<el-col :span="8">
+				<el-form-item label="物料产品类型" prop="typeId">
+					<treeselect
+						v-model="dataForm.typeId"
+						:options="deptOptions"
+						:normalizer="normalizer"
+						@select="setShowTime"
+						:show-count="true"
+						:appendToBody="true"
+						z-index="99999"
+						placeholder="选择物料产品类型" />
 				</el-form-item>
 			</el-col>
-					</el-row>
-					<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="英文名称" prop="engName">
-								<el-input
-									v-model="dataForm.engName"
-									clearable
-									:disabled="isdetail"
-									placeholder="请输入英文名称" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="物料类型" prop="type">
+			<el-col :span="8">
+				<el-form-item label="单位" prop="unit">
 					<el-select
-									v-model="dataForm.type"
+						v-model="dataForm.unit"
 						filterable
-									:disabled="isdetail"
 						style="width: 100%"
-									placeholder="请选择物料类型">
+						placeholder="请选择单位">
 						<el-option
-										v-for="dict in materialList"
+							v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
 							:key="dict.value"
 							:label="dict.label"
 							:value="dict.value" />
 					</el-select>
 				</el-form-item>
 			</el-col>
-					</el-row>
-					<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="规格" prop="spec">
+			<el-col :span="8">
+				<el-form-item label="规格" prop="specifications">
 					<el-input
-									v-model="dataForm.spec"
+						v-model="dataForm.specifications"
 						clearable
-									:disabled="isdetail"
 						placeholder="请输入规格" />
 				</el-form-item>
 			</el-col>
-						<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="供应商" prop="supplierId">
 					<el-select
 						v-model="dataForm.supplierId"
 						filterable
 						clearable
-									:disabled="isdetail"
-									style="width: 100%"
+						:style="{ width: '100%' }"
 						placeholder="请选择供应商">
 						<el-option
-										v-for="dict in supplierList"
-										:key="dict.id"
-										:label="dict.name"
-										:value="dict.id" />
+							v-for="item in supplierArr"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
-					</el-row>
-					<el-row :gutter="20">
-						<el-col :span="12">
-							<el-form-item label="单位" prop="unit">
-								<el-select
-									v-model="dataForm.unit"
-									filterable
-									:disabled="isdetail"
-									style="width: 100%"
-									placeholder="请选择物料单位">
-									<el-option
-										v-for="dict in getDictDatas('unit_dict')"
-										:key="dict.value"
-										:label="dict.label"
-										:value="dict.value" />
-								</el-select>
+			<el-col :span="8" v-if="showTime">
+				<el-form-item label="生产单位用时" prop="processTime">
+					<el-input
+						v-model.number="dataForm.processTime"
+						type="number"
+						clearable
+						placeholder="请输入产线生产单位用时" />
 				</el-form-item>
 			</el-col>
-						<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="备注" prop="remark">
-								<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+					<el-input
+						v-model="dataForm.remark"
+						clearable
+						placeholder="请输入备注" />
 				</el-form-item>
 			</el-col>
 		</el-row>
 	</el-form>
-			</div>
-			
-			<div class="attr-list" v-if="idAttrShow">
-				<small-title
-					style="margin: 16px 0; padding-left: 8px"
-					:no-padding="true">
-					物料属性
-				</small-title>
-
-				<div v-if="!isdetail" class="action_btn">
-          <template>
-            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
-            </span>
-          </template>
-        </div>
-				<base-table
-					:table-props="tableProps"
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-data="materialAttrList">
-					<method-btn
-						v-if="!isdetail"
-						slot="handleBtn"
-						:width="120"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-				<pagination
-					v-show="listQuery.total > 0"
-					:total="listQuery.total"
-					:page.sync="listQuery.pageNo"
-					:limit.sync="listQuery.pageSize"
-					:page-sizes="[5, 10, 15]"
-					@pagination="getList" />
-			</div>
-
-			<div v-if="!isdetail" class="drawer-body__footer">
-				<el-button style="" @click="goback()">取消</el-button>
-				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-			</div>
-
-		</div>
-
-		<attr-add
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			:material-id="dataForm.id"
-			@refreshDataList="getList" />
-	</el-drawer>
 </template>
 
 <script>
 import basicAdd from '../../core/mixins/basic-add';
-import { createMaterial, updateMaterial, getMaterial, getCode, getSupplierList, getMaterialAttrList, deleteMaterialAttr } from "@/api/base/material";
-import { listData } from "@/api/system/dict/data";
-import SmallTitle from './SmallTitle';
-import { parseTime } from '../../core/mixins/code-filter';
-import attrAdd from './attr-add';
-import { getDictDatas } from "@/utils/dict";
-
-const tableBtn = [
-	{
-		type: 'edit',
-		btnName: '编辑',
-	},
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime,
-	},
-	{
-		prop: 'attrName',
-		label: '属性名',
-	},
-	{
-		prop: 'attrValue',
-		label: '属性值',
-	},
-];
+import { getTreeArr } from '../mixins/code-filter';
+import {
+	createProductMaterial,
+	updateProductMaterial,
+	getProductMaterial,
+	getProductMaterialCode,
+	getSupplierList,
+	getMaterialTree,
+} from '@/api/base/material';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 
 export default {
 	mixins: [basicAdd],
-	components: { SmallTitle, attrAdd },
+	components: {
+		Treeselect,
+	},
 	data() {
 		return {
-			tableBtn,
-			tableProps,
-			addOrUpdateVisible: false,
 			urlOptions: {
 				isGetCode: true,
-        codeURL: getCode,
-				createURL: createMaterial,
-				updateURL: updateMaterial,
-				infoURL: getMaterial,
-			},
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
+				codeURL: getProductMaterialCode,
+				createURL: createProductMaterial,
+				updateURL: updateProductMaterial,
+				infoURL: getProductMaterial,
 			},
+			deptOptions: undefined,
+			showTime: false,
 			dataForm: {
 				id: undefined,
 				code: undefined,
 				name: '',
-				engName: '',
-				type: '',
-        spec: undefined,
+				typeId: undefined,
+				unit: undefined,
+				specifications: undefined,
 				supplierId: undefined,
+				processTime: 0,
 				remark: undefined,
-				unit: ''
 			},
-			materialList: [],
-			supplierList: [],
-			materialAttrList: [],
-			unitList: [],
-			visible: false,
-			isdetail: false,
-			idAttrShow: false,
+			supplierArr: [],
+			treeArr: [],
 			dataRule: {
-        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
-				type: [{ required: true, message: "物料类型不能为空", trigger: "blur" }]
-      }
+				code: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				typeId: [
+					{
+						required: true,
+						message: '物料产品类型不能为空',
+						trigger: 'blur',
+					},
+				],
+			},
 		};
 	},
-	mounted() {
-		this.getDict()
-	},
+	mounted() {},
 	methods: {
-		async getDict() {
-			// 物料类型列表
-			const res = await listData({
-				pageNo: 1,
-        pageSize: 99,
-        dictType: 'material_type',
-			});
-			this.materialList = res.data.list.map(item => {
-				return {
-					label: item.label,
-					value: Number(item.value)
-				}
-			});
-			// 供应商列表
-			const supplierRes = await getSupplierList();
-			this.supplierList = supplierRes.data;
-			// 物料单位列表
-			// const unitRes = await listData({
-			// 	pageNo: 1,
-      //   pageSize: 99,
-      //   dictType: 'goods_unit',
-			// });
-			// this.unitList = unitRes.data.list.map(item => {
-			// 	return {
-			// 		label: item.label,
-			// 		value: Number(item.value)
-			// 	}
-			// });
-		},
-		initData() {
-			this.materialAttrList.splice(0);
-			this.listQuery.total = 0;
-		},
-		handleClick(raw) {
-			if (raw.type === 'delete') {
-				this.$confirm(
-					`是否确认删除属性名为"${raw.data.attrName}"的数据项?`,
-					'提示',
-					{
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						deleteMaterialAttr(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-		getList() {
-			// 获取物料的属性列表
-			getMaterialAttrList({
-				...this.listQuery,
-				materialId: this.dataForm.id,
-			}).then((response) => {
-				this.materialAttrList = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		init(id, isdetail) {
-			this.initData();
-			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
+		init(id) {
+			this.dataForm.id = id || '';
 			this.visible = true;
-			if (id) {
-				this.idAttrShow = true
-			} else {
-				this.idAttrShow = false
-			}
-
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
-
 				if (this.dataForm.id) {
-					// 获取物料详情
-					this.urlOptions.infoURL(id).then(response => {
+					this.urlOptions.infoURL(id).then((response) => {
 						this.dataForm = response.data;
-						if (this.dataForm.unit) {
-							this.dataForm.unit = String(this.dataForm.unit)
-						}
+						this.setDataForm();
 					});
-					// 获取物料的属性列表
-					this.getList();
 				} else {
 					if (this.urlOptions.isGetCode) {
-            this.getCode()
+						this.getCode();
+						this.setDataForm();
 					}
 				}
 			});
 		},
-		// 表单提交
-    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/base/material/attr-add.vue

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

src/views/base/material/index.vue

@@ -1,5 +1,71 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-01 14:54:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-08 15:12:18
+ * @Description:
+-->
 <template>
-	<div class="app-container">
+	<div style="display: flex; gap: 16px; flex: 1; background: #eff1f6">
+		<div
+			class="app-container"
+			style="background: white; width: 280px; border-radius: 8px">
+			<div class="head-container">
+				<el-input
+					v-model="treeName"
+					placeholder="请输入名称"
+					clearable
+					size="small"
+					prefix-icon="el-icon-search"
+					style="margin-bottom: 20px" />
+			</div>
+			<div class="head-container">
+				<el-tree
+					v-loading="treeLoading"
+					element-loading-text="拼命加载中"
+					element-loading-spinner="el-icon-loading"
+					element-loading-background="rgba(0, 0, 0, 0.8)"
+					:data="deptOptions1"
+					:props="defaultProps"
+					node-key="id"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					ref="tree"
+					default-expand-all
+					highlight-current
+					@node-click="handleNodeClick">
+					<span class="custom-tree-node" slot-scope="{ node, data }">
+						<span>{{ node.label }}</span>
+						<span style="float: right" v-if="data.parentId !== -1">
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-edit"
+								size="mini"
+								v-if="data.parentId !== 0"
+								@click="() => edit(node, data)" />
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-circle-plus-outline"
+								size="mini"
+								@click="() => append(data)" />
+							<el-button
+								class="btnHover"
+								type="text"
+								icon="el-icon-remove-outline"
+								size="mini"
+								v-if="data.parentId !== 0"
+								@click="() => remove(node, data)" />
+						</span>
+					</span>
+				</el-tree>
+			</div>
+		</div>
+
+		<div
+			class="app-container"
+			style="background: #fff; border-radius: 8px; width: 1px; flex: 1">
 			<search-bar
 				:formConfigs="formConfig"
 				ref="searchBarForm"
@@ -13,7 +79,7 @@
 				<method-btn
 					v-if="tableBtn.length"
 					slot="handleBtn"
-				:width="120"
+					:width="80"
 					label="操作"
 					:method-list="tableBtn"
 					@clickBtn="handleClick" />
@@ -23,10 +89,47 @@
 				:page.sync="listQuery.pageNo"
 				:total="listQuery.total"
 				@pagination="getDataList" />
+			<base-dialog
+				:dialogTitle="addOrEditTitle"
+				:dialogVisible="addOrUpdateVisible"
+				@cancel="handleCancel"
+				@confirm="handleConfirm"
+				:before-close="handleCancel"
+				width="50%">
 				<add-or-update
-			v-if="addOrUpdateVisible"
 					ref="addOrUpdate"
-			@refreshDataList="getDataList" />
+					@refreshDataList="successSubmit"></add-or-update>
+			</base-dialog>
+		</div>
+
+		<!-- 添加或修改菜单对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="700px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="父类型">
+							<treeselect
+								v-model="form.parentId"
+								:options="deptOptions"
+								:normalizer="normalizer"
+								:show-count="true"
+								:appendToBody="true"
+								z-index="99999"
+								placeholder="选择父类型" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="名称" prop="name">
+							<el-input v-model="form.name" placeholder="请输入名称" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -34,76 +137,103 @@
 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: '删除',
@@ -111,20 +241,25 @@ export default {
 					: undefined,
 			].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,62 +274,42 @@ 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)
-				}
-			});
-		},
-		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
-						}
+		// 删除
+		deleteHandle(id, name, index) {
+			this.$confirm(`是否确认删除物料产品名称为"${name}"的数据项`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
 			})
-					return item
+				.then(() => {
+					this.urlOptions.deleteURL(id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList();
+							},
 						});
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
 					});
+				})
+				.catch(() => {});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -205,19 +320,13 @@ export default {
 					this.listQuery.code = val.code ? val.code : undefined;
 					this.getDataList();
 					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
 				case 'add':
 					this.addOrEditTitle = '新增';
 					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
+					this.$nextTick(() => {
+						this.$refs.addOrUpdate.init();
+						this.$refs.addOrUpdate.typeId(this.listQuery.typeId,this.listQuery.product);
+					});
 					break;
 				case 'export':
 					this.handleExport();
@@ -226,27 +335,126 @@ export default {
 					console.log(val);
 			}
 		},
-		// 删除
-    deleteHandle(id, name, index) {
-      this.$confirm(`是否删除物料名称为"${name}"的数据项?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+
+		/** 树操作 */
+
+		// 查询下拉树结构
+		getTreeselect() {
+			this.treeLoading = true;
+			getMaterialTree().then((response) => {
+				// treeArr[0].push(...this.handleTree(response.data, 'id'));
+				// 处理 deptOptions 参数
+				this.deptOptions = [];
+				this.treeLoading = false;
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+				const arr = [{ name: '全部', parentId: -1 }];
+				this.deptOptions1 = arr.concat(this.deptOptions);
+			});
+		},
+		// 筛选节点
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.listQuery.typeId = data.id || undefined;
+			this.listQuery.product = data.product;
+			this.$refs.searchBarForm.formInline.type = data.name || undefined;
+		},
+		// 新增节点
+		append(data) {
+			this.open = true;
+			this.title = '新增物料产品类型';
+			this.form.id = undefined;
+			this.form.parentId = data.id;
+		},
+		// 删除节点
+		remove(node, data) {
+			this.$confirm(`是否确认删除名称为"${data.name}"的数据项`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
 			})
 				.then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
+					deleteMaterialTree(data.id).then(({ data }) => {
 						this.$message({
-              message: "操作成功",
-              type: "success",
+							message: '操作成功',
+							type: 'success',
 							duration: 1500,
 							onClose: () => {
-                this.getDataList();
+								this.getTreeselect();
 							},
 						});
 					});
 				})
 				.catch(() => {});
+		},
+		// 编辑节点
+		edit(node, data) {
+			this.open = true;
+			this.title = '编辑物料产品类型';
+			this.form.id = data.id;
+			this.form.name = data.name;
+			this.form.parentId = data.parentId;
+		},
+
+		/** 转换菜单数据结构 */
+		normalizer(node) {
+			if (node.children && !node.children.length) {
+				delete node.children;
 			}
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children,
+			};
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: undefined,
+				parentId: 0,
+				name: undefined,
+				defaultType: false,
+			};
+			this.resetForm('form');
+		},
+		// 表单提交
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.form.id) {
+					updateMaterialTree(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.cancel();
+						this.getTreeselect();
+					});
+					return;
+				}
+				// 添加的提交
+				createMaterialTree(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.cancel();
+					this.getTreeselect();
+				});
+			});
+		},
 	},
 };
 </script>
+
+<style scoped>
+.btnHover:hover {
+	color: #67c23a;
+	transform: scale(1.5);
+}
+</style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: 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/base/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/base/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,7 +158,7 @@ export default {
 			urlOptions: {
 				createURL: createMaterialLog,
 				updateURL: updateMaterialLog,
-				infoURL: getMaterialLog
+				infoURL: getMaterialLog,
 			},
 			dataForm: {
 				id: undefined,
@@ -160,66 +172,77 @@ export default {
 				address: undefined,
 				num: 0,
 				source: undefined,
-        remark: undefined
+				remark: undefined,
 			},
 			dataSourceList: [
 				{
 					id: 1,
-					name: '手动'
+					name: '手动',
 				},
 				{
 					id: 2,
-					name: 'PDA'
-				}
+					name: 'PDA',
+				},
 			],
 			materialList: [],
 			materialDateList: [],
 			eqList: [],
 			workersList: [],
 			dataRule: {
-        materialId: [{ required: true, message: "物料不能为空", trigger: "blur" }],
-        materialDateId: [{ required: true, message: "批次号不能为空", trigger: "blur" }],
-				useTime: [{ required: true, message: "使用时间不能为空", trigger: "blur" }],
-				userNames: [{ required: true, message: "操作员不能为空", trigger: "blur" }],
-				num: [{ required: true, message: "使用数量不能为空", trigger: "blur" }]
-      }
+				materialId: [
+					{ required: true, message: '物料不能为空', trigger: 'blur' },
+				],
+				useTime: [
+					{ required: true, message: '使用时间不能为空', trigger: 'blur' },
+				],
+				userNames: [
+					{ required: true, message: '操作员不能为空', trigger: 'blur' },
+				],
+				num: [{ required: true, message: '使用数量不能为空', trigger: 'blur' }],
+			},
 		};
 	},
 	mounted() {
-		this.getDictData()
+		this.getDictData();
 	},
 	methods: {
 		async getDictData() {
-			const materRes = await getMaterialList()
-			this.materialList = materRes.data
-			const dateRes = await getMaterDateList()
-			this.materialDateList = dateRes.data
-			const eqRes = await getEqListAll()
-			this.eqList = eqRes.data
-			const workerRes = await getworkerAll()
-			this.workersList = workerRes.data
+			const materRes = await getMaterialTree();
+      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      const listQuery= {
+        typeId:typeId
+      }
+			const materData = await getMaterialList(listQuery);
+			this.materialList = [];
+			this.materialList = materData.data;
+			const dateRes = await getMaterDateList();
+			this.materialDateList = dateRes.data;
+			const eqRes = await getEqListAll();
+			this.eqList = eqRes.data;
+			const workerRes = await listSimpleUsers();
+			this.workersList = workerRes.data;
 		},
 		// 表单提交
 		dataFormSubmit() {
-			this.dataForm.userName = this.dataForm.userNames.join(',')
-      this.$refs["dataForm"].validate((valid) => {
+			this.dataForm.userName = this.dataForm.userNames.join(',');
+			this.$refs['dataForm'].validate((valid) => {
 				if (!valid) {
 					return false;
 				}
 				// 修改的提交
 				if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
+					this.urlOptions.updateURL(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
 						this.visible = false;
-            this.$emit("refreshDataList");
+						this.$emit('refreshDataList');
 					});
 					return;
 				}
 				// 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
 					this.visible = false;
-          this.$emit("refreshDataList");
+					this.$emit('refreshDataList');
 				});
 			});
 		},
@@ -228,33 +251,34 @@ export default {
 			this.visible = true;
 
 			this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
+				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
-          this.urlOptions.infoURL(id).then(response => {
-            this.dataForm.id = response.data.id
-						this.dataForm.materialCode = response.data.materialCode
-						this.dataForm.materialId = response.data.materialId
-						this.dataForm.materialDateId = response.data.materialDateId
-						this.dataForm.equipmentId = response.data.equipmentId
-						this.dataForm.useTime = response.data.useTime
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm.id = response.data.id;
+						this.dataForm.materialCode = response.data.materialCode;
+						this.dataForm.materialId = response.data.materialId;
+						this.dataForm.materialDateId = response.data.materialDateId;
+						this.dataForm.equipmentId = response.data.equipmentId;
+						this.dataForm.useTime = response.data.useTime;
 						// this.dataForm.userName = response.data.userName
-						this.dataForm.num = response.data.num
-						this.dataForm.source = response.data.source
-						this.dataForm.remark = response.data.remark
-						this.dataForm.userNames = response.data.userName.split(',')
+						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 {}
+				} 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/base/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/base/mixins/code-filter.js

@@ -1,8 +1,8 @@
 
 /*
  * @Date: 2020-12-29 16:49:28
- * @LastEditors: DY
- * @LastEditTime: 2023-09-12 11:13:34
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-08 16:27:39
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -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/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,11 +94,15 @@ 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() {

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,12 +1,17 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-01 14:53:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-12 16:19:13
+ * @Description:
+-->
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
@@ -14,22 +19,20 @@
 			:table-props="tableProps"
 			:table-data="list"
 			:max-height="tableH"
-    >
+			@emitFun="handleTableEvents">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="120"
 				label="操作"
 				:method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
+				@clickBtn="handleClick" />
 		</base-table>
 		<pagination
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			:total="total"
-      @pagination="getList"
-    />
+			@pagination="getList" />
 		<!-- 新增 -->
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -37,48 +40,47 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-      width='50%'
-    >
+			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: '班次名称'
+		label: '班次名称',
 	},
 	{
 		prop: 'timeStr',
 		label: '班次时间',
-    minWidth: 100
+		minWidth: 100,
 	},
 	{
 		prop: 'code',
 		label: '班次编码',
-    minWidth: 200
+		minWidth: 200,
 	},
 	{
-    prop: 'status',
-    label: '班次状态'
+		prop: 'enabled',
+		label: '班次状态',
+		subcomponent: StatusBtn,
 	},
 	{
 		prop: 'remark',
-    label: '备注'
-  }
-]
+		label: '备注',
+	},
+];
 export default {
-  name: "GroupClass",
+	name: 'GroupClass',
 	components: { GroupClassAdd },
 	data() {
 		return {
@@ -87,55 +89,41 @@ export default {
 					type: 'input',
 					label: '班次名称',
 					placeholder: '班次名称',
-          param: 'name'
+					param: 'name',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:group-classes:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:group-classes:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
-        }
+					plain: true,
+				},
 			],
 			tableProps,
 			tableBtn: [
-      this.$auth.hasPermi('base:group-classes:cancel')
-          ? {
-              type: 'cancel',
-              btnName: '作废',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'unequal',
-                    name: 'status',
-                    value: '不可用'
-                  }
-                ]
-              }
-            }
-          : undefined,
 				this.$auth.hasPermi('base:group-classes:update')
 					? {
 							type: 'edit',
-              btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('base:group-classes:delete')
 					? {
 							type: 'delete',
-              btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
 			tableH: this.tableHeight(260),
 			// 总条数
@@ -143,120 +131,133 @@ export default {
 			// 班次基础信息列表
 			list: [],
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
-        name: null
-      }
+				name: null,
+			},
 		};
 	},
 	created() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList()
+			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
+					this.queryParams.name = val.name;
+					this.getList();
+					break;
 				default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
+					this.addOrEditTitle = '新增';
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.classList.init()
+						this.$refs.classList.init();
+					});
+			}
+		},
+		// 班组状态
+		handleTableEvents(params) {
+			if (params.name === 'state') {
+				// 班组状态
+				updateGroupClasses({ ...params.payload })
+					.then((res) => {
+						if (res.code === 0) {
+							this.$modal.msgSuccess('操作成功');
+							this.getList();
+						}
 					})
+					.catch((res) => {
+						this.getList();
+					});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      getGroupClassesPage(this.queryParams).then(res => {
-        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 ? '可用' : '不可用'
-          })
+			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
+					this.list = [];
+					this.total = 0;
 				}
 			});
 		},
 		handleClick(val) {
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
 					this.$nextTick(() => {
-            this.$refs.classList.init(val.data.id)
-          })
-          this.centervisible = true
-          break
-        case 'cancel':
-          this.discard(val.data)
-          break
+						this.$refs.classList.init(val.data.id);
+					});
+					this.centervisible = true;
+					break;
 				default:
-        this.handleDelete(val.data)
+					this.handleDelete(val.data);
 			}
 		},
 		handleCancel() {
-      this.$refs.classList.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
+			this.$refs.classList.formClear();
+			this.centervisible = false;
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.classList.submitForm()
+			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.handleCancel();
 			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() {
+			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(() => {
+							.then(() => {
 								_this.getList();
-            _this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
-      }
-    }
+								_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,6 +1,20 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-01 14:54:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-15 14:55:35
+ * @Description:
+-->
 <template>
 	<div class="groupTeamScheduling">
 		<div class="operationArea">
+			<el-tabs v-model="planId" @tab-click="setPlan">
+				<el-tab-pane
+					v-for="item in planArr"
+					:key="item.id"
+					:label="item.name"
+					:name="item.id" />
+			</el-tabs>
 			<el-form :inline="true" class="demo-form-inline">
 				<span class="blue-block"></span>
 				<el-form-item label="月份选择">
@@ -12,42 +26,55 @@
 						:disabled="showSetting"
 						@change="selectMonth"
 						:clearable="false"
-            style="width: 120px">
-          </el-date-picker>
+						style="width: 120px"></el-date-picker>
 				</el-form-item>
 				<el-form-item>
-          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
+					<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-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-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-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>
+			<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}">
+				<template slot="dateCell" slot-scope="{ date, data }">
 					<div v-if="data.type === 'current-month'">
 						<!-- 日期 -->
 						<div class="dateStyle">
@@ -55,27 +82,62 @@
 						</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-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)">
+									<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)">
+									<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>
+											: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-button class="labelClass" @click="chooseTeam(item)">
+									{{ item.classesName }}
+								</el-button>
 							</el-col>
 						</el-row>
 					</div>
@@ -86,238 +148,211 @@
 </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",
+	name: 'GroupTeamScheduling',
 	data() {
 		return {
 			startDay: '', // 查询参数
 			year: '', // 2023
 			month: '', // 九月
-      monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
+			monthList: [
+				'一月',
+				'二月',
+				'三月',
+				'四月',
+				'五月',
+				'六月',
+				'七月',
+				'八月',
+				'九月',
+				'十月',
+				'十一月',
+				'十二月',
+			],
+			planId: undefined, //计划id
 			list: {},
+			planArr: [], //排班计划数组
 			teamList: [], // 班组下拉
 			showSetting: false, // 设置模式。自动排班，确认，取消按钮显示
 			settingBtnDis: false,
 			jumpDisabled: true, // 操作按钮控制
 			chooseObj: {}, //当前选中的数据，查询按钮用
 			chooseTip: '', // 当前选中数据的唯一值，显示红框
-      autoScheduling: false // 只有在当前日期后的月份才生效
+			autoScheduling: false, // 只有在当前日期后的月份才生效
 		};
 	},
 	created() {
-    this.startDay = new Date()
+		this.startDay = new Date();
+		groupPlanList().then((res) => {
+			this.planArr = res.data || [];
+			this.planId = this.planArr[0] ? this.planArr[0].id : undefined;
+			if (this.planId) {
+				this.getList();
+				this.getTeamList();
+			}
+		});
 		// 设置按钮是否置灰
-    this.settingBtn()
-    this.getTeamList()
-    this.toggleMonth()
-    this.getList()
+		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
+				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
+					this.autoScheduling = false;
 				}
 			}
 		},
-    // 获取班组列表
+		// 获取计划对应班组列表
 		getTeamList() {
-      listEnabled().then(res => {
-        this.teamList = res.data || []
-      })
+			groupPlanTeamList(this.planId).then((res) => {
+				this.teamList = res.data || [];
+			});
 		},
 		// 获取日历数据
 		getList() {
-      let year = moment(this.startDay).format('YYYY')
-      let month = moment(this.startDay).format('M')
-      getPreset({
+			let year = moment(this.startDay).format('YYYY');
+			let month = moment(this.startDay).format('M');
+			getScheduling({
 				year: year,
-        month: month
-      }).then(res => {
-        let obj = res.data || {}
+				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 = ''
+									obj[item][i].teamId = '';
 								}
 							}
 						}
 					}
-        this.list = obj
-      }).catch(() => {
-        this.list = {}
-        this.settingBtnDis = true // 禁用设置按钮
+					this.list = obj;
 				})
+				.catch(() => {
+					this.list = {};
+					this.settingBtnDis = true; // 禁用设置按钮
+				});
 		},
 		// 设置
 		settingMsg() {
-      this.showSetting = !this.showSetting
-      this.clearChoose()
+			this.showSetting = !this.showSetting;
+			this.clearChoose();
 		},
 		// 取消
 		cancelSetting() {
-      this.showSetting = !this.showSetting
-      this.getList() // 数据还原
+			this.showSetting = !this.showSetting;
+			this.getList(); // 数据还原
 		},
 		// 确认
 		confirmSetting() {
-      let num = 0
+			let num = 0;
 			// 当月数据的话，今天及今天之前的不传
-      if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
-        num = Number(moment().format('DD'))
+			if (
+				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
+			) {
+				num = Number(moment().format('DD'));
 			} else {
-        num = 0
+				num = 0;
 			}
 			// 下月数据全部都传
 			// 打平数据
-      let tempArr = Object.values(this.list)
-      let arr = []
+			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])
+					arr.push(tempArr[i][j]);
 				}
 			}
-      createOrUpdateList(arr).then(res => {
+			createOrUpdateList(arr).then((res) => {
 				if (res.code === 0) {
-          this.showSetting = !this.showSetting
-          this.$modal.msgSuccess("操作成功")
-          this.getList() // 数据更新
+					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 || {}
-        })
-      }
+			// 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
+			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
+					this.settingBtnDis = false;
 				} else {
-          this.settingBtnDis = true
+					this.settingBtnDis = true;
 				}
 			}
 		},
 		// 清除红框选中数据
 		clearChoose() {
-      this.chooseObj = {}
-      this.chooseTip = ""
-      this.jumpDisabled = true
+			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]
+			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 }
-          })
-      }
-    }
-    }
-  }
+	},
+};
 </script>
-<style lang='scss'>
+<style lang="scss">
 .demo-form-inline {
 	.el-date-editor .el-range__icon {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 	.el-input__prefix .el-icon-date {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 }
 .groupTeamScheduling {
-  background-color: #F2F4F9;
+	background-color: #f2f4f9;
 	.operationArea {
 		padding: 14px 10px 0 16px;
 		margin-bottom: 8px;
@@ -327,7 +362,7 @@ export default {
 			display: inline-block;
 			width: 4px;
 			height: 16px;
-      background-color: #0B58FF;
+			background-color: #0b58ff;
 			border-radius: 1px;
 			margin-right: 8px;
 			margin-top: 10px;
@@ -336,7 +371,7 @@ export default {
 			display: inline-block;
 			width: 1px;
 			height: 24px;
-      background: #E8E8E8;
+			background: #e8e8e8;
 			vertical-align: middle;
 		}
 		.el-form-item {
@@ -366,7 +401,8 @@ export default {
 		}
 		.el-calendar-table__row {
 			height: 133px;
-      .prev, .next {
+			.prev,
+			.next {
 				pointer-events: none;
 			}
 			.el-calendar-day {
@@ -383,10 +419,13 @@ export default {
 				}
 			}
 		}
-    .team-active {// 选中班组
-      border:2px solid red
+		.team-active {
+			// 选中班组
+			border: 2px solid #409eff;
 		}
-    .class1, .class2, .class3 {
+		.class1,
+		.class2,
+		.class3 {
 			padding: 0;
 			font-weight: 600;
 			margin-bottom: 2px;
@@ -430,47 +469,50 @@ export default {
 		}
 		.class1 {
 			.selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #FACE00;
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #face00;
 				}
 				.el-input--small .el-input__inner {
-          color: #E7A200;
-          background-color: #FFEFC0;
+					color: #e7a200;
+					background-color: #ffefc0;
 				}
 			}
 			.labelClass {
-        color: #E7A200;
-        background-color: #FFEFC0;
+				color: #e7a200;
+				background-color: #ffefc0;
 			}
 		}
 		.class2 {
 			.selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #3984FF;
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #3984ff;
 				}
 				.el-input--small .el-input__inner {
-          color: #2D7BFF;
-          background-color: #BEEAFF;
+					color: #2d7bff;
+					background-color: #beeaff;
 				}
 			}
 			.labelClass {
-        color: #2D7BFF;
-        background-color: #BEEAFF;
+				color: #2d7bff;
+				background-color: #beeaff;
 			}
 		}
 		.class3 {
 			.selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #37D97F;
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #37d97f;
 				}
 				.el-input--small .el-input__inner {
-          color: #129F51;
-          background-color: #E0FFEE;
+					color: #129f51;
+					background-color: #e0ffee;
 				}
 			}
 			.labelClass {
-        color: #129F51;
-        background-color: #E0FFEE;
+				color: #129f51;
+				background-color: #e0ffee;
 			}
 		}
 	}

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/warehouse/warehouse-info/BarChart.vue

@@ -0,0 +1,131 @@
+<template>
+	<div
+		:class="className"
+		:style="{ height: height, width: width, marginLeft: '10px' }" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from '@/utils/chartMixins/resize';
+
+const animationDuration = 1000;
+
+export default {
+	mixins: [resize],
+	props: {
+		className: {
+			type: String,
+			default: 'chart',
+		},
+		title: {
+			type: String,
+			default: '',
+		},
+		width: {
+			type: String,
+			default: '100%',
+		},
+		height: {
+			type: String,
+			default: '300px',
+		},
+		barData: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	data() {
+		return {
+			chart: null,
+		};
+	},
+	beforeDestroy() {
+		if (!this.chart) {
+			return;
+		}
+		this.chart.dispose();
+		this.chart = null;
+	},
+	methods: {
+		initChart() {
+			this.chart = echarts.init(this.$el, 'macarons');
+
+			this.chart.setOption({
+				title: {
+					text: this.title
+						? '{space|}{tip|}{space|}{value|' + this.title + '}'
+						: '',
+					textStyle: {
+						rich: {
+							tip: {
+								width: 6,
+								height: 6,
+								borderRadius: 50,
+								backgroundColor: '#288AFF',
+							},
+							space: {
+								width: 8,
+							},
+							value: {
+								fontSize: 14,
+								color: 'black',
+							},
+						},
+					},
+				},
+				color: ['#288AFF', '#8EF0AB', '#FFDC94'],
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						// 坐标轴指示器，坐标轴触发有效
+						type: 'shadow', // 默认为直线，可选为：'line' | 'shadow'
+					},
+				},
+				grid: {
+					containLabel: true,
+				},
+				xAxis: {
+					type: 'category',
+					data: this.barData.map((item) => {
+						return item.name;
+					}),
+					axisTick: {
+						alignWithLabel: true,
+					},
+					axisLabel: {
+						color: '#979797',
+					},
+					axisLine: {
+						lineStyle: {
+							color: '#979797',
+						},
+					},
+				},
+				yAxis: {
+					axisTick: {
+						show: false,
+					},
+					splitArea: {
+						show: false,
+					},
+					axisLabel: {
+						color: '#979797',
+					},
+				},
+				series: [
+					{
+						name: '数量',
+						type: 'bar',
+						barWidth: '20',
+						data: this.barData.map((item) => {
+							return item.value;
+						}),
+						animationDuration,
+					},
+				],
+			});
+		},
+	},
+};
+</script>

src/views/warehouse/warehouse-info/index.vue

@@ -1,413 +1,99 @@
+<!--
+ * @Author: zwq
+ * @Date: 2024-07-02 15:56:48
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-07-02 16:55:43
+ * @Description:
+-->
 <template>
 	<div class="app-container">
-		<el-row :gutter="20">
-			<el-col :span="4">
-				<el-button
-					type="primary"
-					v-hasPermi="['warehouse:warehouse-info:create']"
-					plain
-					size="mini"
-					@click="addWare">
-					新增仓库
-				</el-button>
-				<el-divider content-position="left">仓库列表</el-divider>
-				<el-card
-					v-for="item in wareArr"
-					:key="item.id"
-					shadow="hover"
-					@click.native="setWareInfo(item)"
-					:style="{
-						background: item.id === wareInfo.warehouseId ? '#37D97F' : '',
-						color: item.id === wareInfo.warehouseId ? 'white' : '',
-					}"
-					class="ware-card">
-					{{ item.name }}
-					<el-dropdown class="el-dropdown-div">
-						<span class="el-dropdown-link">
-							<i
-								class="el-icon-s-tools"
-								style="color: #409eff; cursor: pointer; font-size: 25px" />
-						</span>
-						<el-dropdown-menu slot="dropdown">
-							<el-dropdown-item
-								v-hasPermi="['warehouse:warehouse-info:update']"
-								@click.native="dropdown(1, item.id)">
-								编辑
-							</el-dropdown-item>
-							<el-dropdown-item @click.native="dropdown(2, item.id)">
-								详情
-							</el-dropdown-item>
-							<el-dropdown-item
-								v-hasPermi="['warehouse:warehouse-info:delete']"
-								@click.native="dropdown(3, item.id, item.name)">
-								删除
-							</el-dropdown-item>
-						</el-dropdown-menu>
-					</el-dropdown>
-				</el-card>
-			</el-col>
-			<el-col :span="20">
-				<!-- 搜索工作栏 -->
-				<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" />
-			</el-col>
-		</el-row>
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			:destroy-on-close="true"
-			width="40%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-			<add-or-update1
-				ref="addOrUpdate1"
-				@refreshDataList="successSubmit1"></add-or-update1>
-		</base-dialog>
+		<div class="flexDiv">
+			<div v-for="i in wareName" :key="i + 'a'" class="divClass up">
+				{{ i }}
+			</div>
+		</div>
+		<div class="flexDiv">
+			<div v-for="i in stockNum" :key="i + 'b'" class="divClass down">
+				<span v-if="i === '库存数量'">{{ i }}</span>
+				<el-link v-else :underline="false" type="primary" @click="toPage(i)">
+					{{ i }}
+				</el-link>
+			</div>
+		</div>
+		<barChart
+			style="margin-top: 50px"
+			ref="barChart"
+			height="600px"
+			:title="'库存数量'"
+			v-if="barData.length"
+			:bar-data="barData" />
+		<!-- 没有数据 -->
+		<div class="no-data-bg" v-else></div>
 	</div>
 </template>
 
 <script>
-import AddOrUpdate from './add-or-updata';
-import AddOrUpdate1 from './add-or-updata1';
-import basicPage from '../mixins/basic-page';
-import { parseTime } from '../mixins/code-filter';
-import codeFilter from '../mixins/code-filter';
-import {
-	deleteWarehouse,
-	getWarehouseList,
-} from '@/api/warehouse/warehouse-info';
-import {
-	deleteWarehouseLocation,
-	getWarehouseLocationPage,
-} from '@/api/warehouse/warehouseLocation';
-import { BackgroundClass } from 'quill';
-
-const tableProps = [
-	{
-		prop: 'warehouseCode',
-		label: '仓库编码',
-	},
-	{
-		prop: 'warehouseName',
-		label: '仓库名称',
-	},
-	{
-		prop: 'code',
-		label: '库位编码',
-    width: 180
-	},
-	{
-		prop: 'name',
-		label: '库位名称',
-	},
-	{
-		prop: 'arrange',
-		label: '排',
-    width: 50
-	},
-	{
-		prop: 'col',
-		label: '列',
-    width: 50
-	},
-	{
-		prop: 'layer',
-		label: '层',
-    width: 50
-	},
-	{
-		prop: 'type',
-		label: '库位类型',
-		filter: codeFilter('wareType'),
-    width: 80
-	},
-	{
-		prop: 'enabled',
-		label: '是否可用',
-		filter: codeFilter('deactivate'),
-    width: 80
-	},
-	{
-		prop: 'remark',
-		label: '备注',
-	},
-];
-
+import barChart from './BarChart.vue';
 export default {
-	mixins: [basicPage],
 	data() {
 		return {
-			urlOptions: {
-				getDataListURL: getWarehouseLocationPage,
-				deleteURL: deleteWarehouseLocation,
-				getWareListURL: getWarehouseList,
-				deleteWareURL: deleteWarehouse,
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`extend:warehouse-location:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-				this.$auth.hasPermi(`extend:warehouse-location:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '库位名称',
-					placeholder: '库位名称',
-					param: 'name',
-				},
-				{
-					type: 'input',
-					label: '库位编码',
-					placeholder: '库位编码',
-					param: 'code',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('extend:warehouse-location:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('extend:warehouse-location:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('extend:warehouse-location:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			wareArr: [],
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 1,
-				warehouseId: '',
-			},
-			wareInfo: {},
+			wareName: ['仓库名称'],
+			stockNum: ['库存数量'],
+			barData: [],
 		};
 	},
 	components: {
-		AddOrUpdate,
-		AddOrUpdate1,
+		barChart,
 	},
 	created() {
-		this.urlOptions.getWareListURL().then((response) => {
-			this.wareArr = response.data;
-			if (this.wareArr) {
-				this.wareInfo.warehouseId = this.wareArr[0].id;
-				this.wareInfo.warehouseName = this.wareArr[0].name;
-				this.wareInfo.warehouseCode = this.wareArr[0].code;
-				this.getDataList();
+		for (let i = 0; i < 5; i++) {
+			this.wareName.push('仓库' + i);
+			this.stockNum.push(i * 100 + i);
 		}
-		});
 	},
 	methods: {
-		// 获取数据列表
-		getDataList() {
-			if (!this.wareInfo.warehouseId) {
-				return;
-			}
-			this.listQuery.warehouseId = this.wareInfo.warehouseId;
-			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.name = val.name;
-					this.listQuery.code = val.code;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
+		toPage(i) {
+			console.log(i);
+			for (let i = 1; i < 6; i++) {
+				const obj = {
+					name: this.wareName[i],
+					value: this.stockNum[i],
 				};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增库位';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
+				this.barData.push(obj);
 			}
-		},
-		getWareArr() {
-			this.urlOptions.getWareListURL().then((response) => {
-				this.wareArr = response.data;
-			});
-		},
-		addWare() {
-			this.addOrEditTitle = '新增仓库';
-			this.addOrUpdateVisible = true;
-			this.addOrUpdate = 'addOrUpdate1';
+			console.log(this.barData);
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate1.init();
+				this.$refs.barChart.initChart();
 			});
 		},
-		//dropdown点击
-		dropdown(val, id, name) {
-			if (val === 1) {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑仓库';
-				this.addOrUpdate = 'addOrUpdate1';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate1.init(id);
-				});
-			} else if (val === 2) {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '仓库详情';
-				this.addOrUpdate = 'addOrUpdate1';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate1.init(id, true);
-				});
-			} else if (val === 3) {
-				this.deleteWare(id, name);
-			} else {
-				console.log(val);
-			}
-		},
-		// 删除仓库
-		deleteWare(id, name) {
-			this.$confirm(`确定对仓库[${name}]进行删除操作?`, '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(() => {
-					this.urlOptions.deleteWareURL(id).then(({ data }) => {
-						this.$message({
-							message: '操作成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getWareArr();
-							},
-						});
-					});
-				})
-				.catch(() => {});
-		},
-		//tableBtn点击
-		handleClick(val) {
-			if (val.type === 'edit') {
-				this.addOrUpdateVisible = true;
-				this.addOrEditTitle = '编辑';
-				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data.id, this.wareInfo);
-				});
-			} else if (val.type === 'delete') {
-				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
-			} else if (val.type === 'change') {
-				this.changeStatus(val.data.id);
-			} else {
-				this.otherMethods(val);
-			}
-		},
-		// 新增 / 修改
-		addOrUpdateHandle(id) {
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, this.wareInfo);
-			});
-		},
-		successSubmit1() {
-			this.handleCancel();
-			this.getWareArr();
-		},
-		setWareInfo(info) {
-			this.wareInfo.warehouseName = info.name;
-			this.wareInfo.warehouseCode = info.code;
-			this.wareInfo.warehouseId = info.id;
-			this.getDataList();
-		},
 	},
 };
 </script>
 
 <style scoped>
-.ware-card {
-	margin-bottom: 10px;
-	cursor: pointer;
+.flexDiv {
+	display: flex;
 }
-.ware-card >>> .el-card__body {
-	padding: 10px;
-	font-size: 16px;
-	line-height: 30px;
+.divClass {
+	width: 120px;
+	height: 50px;
+	line-height: 50px;
+	text-align: center;
+	border: 1px solid #ededed;
+	font-size: 14px;
+	color: #606266;
 }
-.el-dropdown-div {
-	float: right;
-	padding-top: 3px;
+.up:nth-child(n) {
+	border-bottom: none;
+	border-right: none;
+}
+.up:last-child {
+	border-right: 1px solid #ededed;
+}
+.down:nth-child(n) {
+	border-right: none;
+}
+.down:last-child {
+	border-right: 1px solid #ededed;
 }
 </style>

src/views/warehouse/warehouse-info1/index.vue

@@ -0,0 +1,413 @@
+<template>
+	<div class="app-container">
+		<el-row :gutter="20">
+			<el-col :span="4">
+				<el-button
+					type="primary"
+					v-hasPermi="['warehouse:warehouse-info:create']"
+					plain
+					size="mini"
+					@click="addWare">
+					新增仓库
+				</el-button>
+				<el-divider content-position="left">仓库列表</el-divider>
+				<el-card
+					v-for="item in wareArr"
+					:key="item.id"
+					shadow="hover"
+					@click.native="setWareInfo(item)"
+					:style="{
+						background: item.id === wareInfo.warehouseId ? '#37D97F' : '',
+						color: item.id === wareInfo.warehouseId ? 'white' : '',
+					}"
+					class="ware-card">
+					{{ item.name }}
+					<el-dropdown class="el-dropdown-div">
+						<span class="el-dropdown-link">
+							<i
+								class="el-icon-s-tools"
+								style="color: #409eff; cursor: pointer; font-size: 25px" />
+						</span>
+						<el-dropdown-menu slot="dropdown">
+							<el-dropdown-item
+								v-hasPermi="['warehouse:warehouse-info:update']"
+								@click.native="dropdown(1, item.id)">
+								编辑
+							</el-dropdown-item>
+							<el-dropdown-item @click.native="dropdown(2, item.id)">
+								详情
+							</el-dropdown-item>
+							<el-dropdown-item
+								v-hasPermi="['warehouse:warehouse-info:delete']"
+								@click.native="dropdown(3, item.id, item.name)">
+								删除
+							</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
+				</el-card>
+			</el-col>
+			<el-col :span="20">
+				<!-- 搜索工作栏 -->
+				<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" />
+			</el-col>
+		</el-row>
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			:destroy-on-close="true"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+			<add-or-update1
+				ref="addOrUpdate1"
+				@refreshDataList="successSubmit1"></add-or-update1>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import AddOrUpdate1 from './add-or-updata1';
+import basicPage from '../mixins/basic-page';
+import { parseTime } from '../mixins/code-filter';
+import codeFilter from '../mixins/code-filter';
+import {
+	deleteWarehouse,
+	getWarehouseList,
+} from '@/api/warehouse/warehouse-info';
+import {
+	deleteWarehouseLocation,
+	getWarehouseLocationPage,
+} from '@/api/warehouse/warehouseLocation';
+import { BackgroundClass } from 'quill';
+
+const tableProps = [
+	{
+		prop: 'warehouseCode',
+		label: '仓库编码',
+	},
+	{
+		prop: 'warehouseName',
+		label: '仓库名称',
+	},
+	{
+		prop: 'code',
+		label: '库位编码',
+    width: 180
+	},
+	{
+		prop: 'name',
+		label: '库位名称',
+	},
+	{
+		prop: 'arrange',
+		label: '排',
+    width: 50
+	},
+	{
+		prop: 'col',
+		label: '列',
+    width: 50
+	},
+	{
+		prop: 'layer',
+		label: '层',
+    width: 50
+	},
+	{
+		prop: 'type',
+		label: '库位类型',
+		filter: codeFilter('wareType'),
+    width: 80
+	},
+	{
+		prop: 'enabled',
+		label: '是否可用',
+		filter: codeFilter('deactivate'),
+    width: 80
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getWarehouseLocationPage,
+				deleteURL: deleteWarehouseLocation,
+				getWareListURL: getWarehouseList,
+				deleteWareURL: deleteWarehouse,
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`extend:warehouse-location:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`extend:warehouse-location:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '库位名称',
+					placeholder: '库位名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '库位编码',
+					placeholder: '库位编码',
+					param: 'code',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('extend:warehouse-location:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('extend:warehouse-location:create') ? 'separate' : '',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('extend:warehouse-location:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			wareArr: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 1,
+				warehouseId: '',
+			},
+			wareInfo: {},
+		};
+	},
+	components: {
+		AddOrUpdate,
+		AddOrUpdate1,
+	},
+	created() {
+		this.urlOptions.getWareListURL().then((response) => {
+			this.wareArr = response.data;
+			if (this.wareArr) {
+				this.wareInfo.warehouseId = this.wareArr[0].id;
+				this.wareInfo.warehouseName = this.wareArr[0].name;
+				this.wareInfo.warehouseCode = this.wareArr[0].code;
+				this.getDataList();
+			}
+		});
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			if (!this.wareInfo.warehouseId) {
+				return;
+			}
+			this.listQuery.warehouseId = this.wareInfo.warehouseId;
+			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.name = val.name;
+					this.listQuery.code = val.code;
+					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);
+			}
+		},
+		getWareArr() {
+			this.urlOptions.getWareListURL().then((response) => {
+				this.wareArr = response.data;
+			});
+		},
+		addWare() {
+			this.addOrEditTitle = '新增仓库';
+			this.addOrUpdateVisible = true;
+			this.addOrUpdate = 'addOrUpdate1';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate1.init();
+			});
+		},
+		//dropdown点击
+		dropdown(val, id, name) {
+			if (val === 1) {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '编辑仓库';
+				this.addOrUpdate = 'addOrUpdate1';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate1.init(id);
+				});
+			} else if (val === 2) {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '仓库详情';
+				this.addOrUpdate = 'addOrUpdate1';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate1.init(id, true);
+				});
+			} else if (val === 3) {
+				this.deleteWare(id, name);
+			} else {
+				console.log(val);
+			}
+		},
+		// 删除仓库
+		deleteWare(id, name) {
+			this.$confirm(`确定对仓库[${name}]进行删除操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					this.urlOptions.deleteWareURL(id).then(({ data }) => {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getWareArr();
+							},
+						});
+					});
+				})
+				.catch(() => {});
+		},
+		//tableBtn点击
+		handleClick(val) {
+			if (val.type === 'edit') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '编辑';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id, this.wareInfo);
+				});
+			} else if (val.type === 'delete') {
+				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
+			} else if (val.type === 'change') {
+				this.changeStatus(val.data.id);
+			} else {
+				this.otherMethods(val);
+			}
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id, this.wareInfo);
+			});
+		},
+		successSubmit1() {
+			this.handleCancel();
+			this.getWareArr();
+		},
+		setWareInfo(info) {
+			this.wareInfo.warehouseName = info.name;
+			this.wareInfo.warehouseCode = info.code;
+			this.wareInfo.warehouseId = info.id;
+			this.getDataList();
+		},
+	},
+};
+</script>
+
+<style scoped>
+.ware-card {
+	margin-bottom: 10px;
+	cursor: pointer;
+}
+.ware-card >>> .el-card__body {
+	padding: 10px;
+	font-size: 16px;
+	line-height: 30px;
+}
+.el-dropdown-div {
+	float: right;
+	padding-top: 3px;
+}
+</style>