src/api/base/coreProduct.js

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

src/api/base/groupClasses.js

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

src/api/base/groupSchedulingPlan.js

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

src/api/base/groupSchedulingRule.js

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

src/api/base/groupTeamScheduling.js

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

src/api/base/material.js

@@ -1,9 +1,9 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2024-07-05 10:09:18
+ * @LastEditTime: 2023-10-24 11:22:28
- * @LastEditors: zwq
+ * @LastEditors: DY
- * @Description:
+ * @Description: 
  */
 import request from '@/utils/request'
 
@@ -61,7 +61,7 @@ export function getMaterialPage(query) {
 // 获得物料列表
 export function getMaterialList(query) {
   return request({
-    url: '/base/core-product-material/listAll',
+    url: '/base/material/listbyfilter',
     method: 'get',
     params: query
   })
@@ -118,85 +118,4 @@ export function getMaterialAttr(query) {
     method: 'get',
     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

@@ -3,7 +3,7 @@
  * @Date: 2023-10-21 11:50:46
  * @LastEditTime: 2023-11-27 17:54:28
  * @LastEditors: DY
- * @Description:
+ * @Description: 
  */
 import request from '@/utils/request'
 
@@ -70,7 +70,7 @@ export function getMaterialPBList(query) {
 // 获得产品列表
 export function getProList(query) {
   return request({
-    url: '/base/core-product-material/listAll',
+    url: '/base/core-product/listAll',
     method: 'get',
     params: query
   })

src/api/base/product.js

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

src/api/extend/processEquMaterialBom.js

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

src/api/monitoring/statisticalData.js

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

src/views/base/coreWorkOrder/allocation.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: zwq
+ * @LastEditors: DY
- * @LastEditTime: 2024-07-03 14:19:01
+ * @LastEditTime: 2023-11-16 09:14:35
  * @Description:
 -->
 <template>
@@ -62,7 +62,7 @@
 									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="edit" />
 								</el-button>
 							</el-tooltip> -->
-
+							
 							<!-- <el-tooltip placement="top" content="删除">
 								<el-button
 									type="text"
@@ -105,7 +105,7 @@
 <script>
 import basicAdd from '../../core/mixins/basic-add';
 import { getConOrderList, createConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
-import SmallTitle from '../coreWorkOrder/SmallTitle';
+import SmallTitle from '../material/SmallTitle';
 // import { parseTime } from '../../core/mixins/code-filter';
 // import attrAdd from './attr-add';
 

src/views/base/material/SmallTitle.vue

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

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

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

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

src/views/base/material/index.vue

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-<!--
+<!-- 
     filename: index.vue
     author: liubin
     date: 2023-09-04 09:34:52
@@ -280,7 +280,7 @@ export default {
 
 		async fillProductOptions() {
 			const { data } = await this.$axios({
-				url: '/base/core-product-material/listAll',
+				url: '/base/core-product/listAll',
 				method: 'get',
 			});
 			const cfg = this.searchBarFormConfig.find(

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

@@ -1,8 +1,8 @@
-<!--
+<!-- 
     filename: EquipmentDrawer.vue
     author: liubin
     date: 2023-08-22 14:38:56
-    description:
+    description: 
 -->
 
 <template>
@@ -383,7 +383,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,

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

@@ -1,8 +1,8 @@
-<!--
+<!-- 
     filename: EquipmentDrawer.vue
     author: liubin
     date: 2023-08-22 14:38:56
-    description:
+    description: 
 -->
 
 <template>
@@ -382,7 +382,7 @@ export default {
 
 		// 新增属性
 		handleAddAttr() {
-			if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
+			if (!this.dataId) return this.$message.error('请先创建设备分组信息');
 			this.attrForm = {
 				id: null,
 				equipmentGroupId: this.dataId,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -193,7 +193,7 @@ export default {
     },
     getList() {
       groupTeamPage({ ...this.queryParams }).then(res => {
-				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
+        if (res.code === 0 && res.data.list.length > 0) {
           let arr = []
           res.data.list.map(item => {
             let obj = {}
@@ -307,4 +307,4 @@ export default {
     padding-top: 30px;
   }
 }
-</style>
+</style>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -36,8 +36,8 @@ export default {
           minWidth: 150
         },
         {
-          prop: 'specifications',
+          prop: 'workOrderList',
-          label: '产品规格'
+          label: '生产工单'
         }
       ],
       tableData: [],
@@ -147,8 +147,8 @@ export default {
           minWidth: 150
         },
         {
-          prop: 'specifications',
+          prop: 'workOrderList',
-          label: '产品规格'
+          label: '生产工单'
         }
       ]
     }
@@ -159,4 +159,4 @@ export default {
 .box {
   padding: 0 32px;
 }
-</style>
+</style>

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

@@ -1,131 +0,0 @@
-<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,99 +1,413 @@
-<!--
- * @Author: zwq
- * @Date: 2024-07-02 15:56:48
- * @LastEditors: zwq
- * @LastEditTime: 2024-07-02 16:55:43
- * @Description:
--->
 <template>
 	<div class="app-container">
-		<div class="flexDiv">
+		<el-row :gutter="20">
-			<div v-for="i in wareName" :key="i + 'a'" class="divClass up">
+			<el-col :span="4">
-				{{ i }}
+				<el-button
-			</div>
+					type="primary"
-		</div>
+					v-hasPermi="['warehouse:warehouse-info:create']"
-		<div class="flexDiv">
+					plain
-			<div v-for="i in stockNum" :key="i + 'b'" class="divClass down">
+					size="mini"
-				<span v-if="i === '库存数量'">{{ i }}</span>
+					@click="addWare">
-				<el-link v-else :underline="false" type="primary" @click="toPage(i)">
+					新增仓库
-					{{ i }}
+				</el-button>
-				</el-link>
+				<el-divider content-position="left">仓库列表</el-divider>
-			</div>
+				<el-card
-		</div>
+					v-for="item in wareArr"
-		<barChart
+					:key="item.id"
-			style="margin-top: 50px"
+					shadow="hover"
-			ref="barChart"
+					@click.native="setWareInfo(item)"
-			height="600px"
+					:style="{
-			:title="'库存数量'"
+						background: item.id === wareInfo.warehouseId ? '#37D97F' : '',
-			v-if="barData.length"
+						color: item.id === wareInfo.warehouseId ? 'white' : '',
-			:bar-data="barData" />
+					}"
-		<!-- 没有数据 -->
+					class="ware-card">
-		<div class="no-data-bg" v-else></div>
+					{{ 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 barChart from './BarChart.vue';
+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 {
-			wareName: ['仓库名称'],
+			urlOptions: {
-			stockNum: ['库存数量'],
+				getDataListURL: getWarehouseLocationPage,
-			barData: [],
+				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: {
-		barChart,
+		AddOrUpdate,
+		AddOrUpdate1,
 	},
 	created() {
-		for (let i = 0; i < 5; i++) {
+		this.urlOptions.getWareListURL().then((response) => {
-			this.wareName.push('仓库' + i);
+			this.wareArr = response.data;
-			this.stockNum.push(i * 100 + i);
+			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: {
-		toPage(i) {
+		// 获取数据列表
-			console.log(i);
+		getDataList() {
-			for (let i = 1; i < 6; i++) {
+			if (!this.wareInfo.warehouseId) {
-				const obj = {
+				return;
-					name: this.wareName[i],
-					value: this.stockNum[i],
-				};
-				this.barData.push(obj);
 			}
-			console.log(this.barData);
+			this.listQuery.warehouseId = this.wareInfo.warehouseId;
-			this.$nextTick(() => {
+			this.dataListLoading = true;
-				this.$refs.barChart.initChart();
+			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>
-.flexDiv {
+.ware-card {
-	display: flex;
+	margin-bottom: 10px;
+	cursor: pointer;
 }
-.divClass {
+.ware-card >>> .el-card__body {
-	width: 120px;
+	padding: 10px;
-	height: 50px;
+	font-size: 16px;
-	line-height: 50px;
+	line-height: 30px;
-	text-align: center;
-	border: 1px solid #ededed;
-	font-size: 14px;
-	color: #606266;
 }
-.up:nth-child(n) {
+.el-dropdown-div {
-	border-bottom: none;
+	float: right;
-	border-right: none;
+	padding-top: 3px;
-}
-.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

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