From d60c2992f7dd1b427d1c2b80fb2fc4b7ef124261 Mon Sep 17 00:00:00 2001
From: GaoF <gf18734201506@163.com>
Date: Mon, 5 Aug 2024 09:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DynamicTree/index.vue          | 34 +++++++++----------
 src/config/index.js                           |  4 +--
 src/hook/useFormHandler.js                    |  4 +--
 src/layout/components/userbar.vue             | 33 +++++++++---------
 src/router/index.js                           |  4 +--
 .../basicData/brand/index.vue                 |  2 +-
 .../client/detail/CustomerCategoryForm.vue    |  4 +--
 .../basicData/client/detail/index.vue         | 11 ++----
 .../basicData/client/index.vue                |  2 +-
 .../basicData/materiel/detail/index.vue       | 12 +++++++
 .../materiel/detail/materialCategoryForm.vue  |  2 +-
 .../basicData/materiel/index.vue              |  1 -
 .../basicData/publicAccount/index.vue         |  2 +-
 .../basicData/stash/index.vue                 |  5 ++-
 .../basicData/tissue/detail/TissueForm.vue    | 28 ++++++++++++---
 .../basicData/tissue/index.vue                | 26 +++++++++++---
 .../basicData/unit/index.vue                  |  8 ++---
 17 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/src/components/DynamicTree/index.vue b/src/components/DynamicTree/index.vue
index ada435f..de5ad3c 100644
--- a/src/components/DynamicTree/index.vue
+++ b/src/components/DynamicTree/index.vue
@@ -30,12 +30,11 @@
 					</span>
 				</div>
 			</div>
-			<a-directory-tree
+			<a-tree
 				:loading="localLoading"
 				show-line
 				v-model:expandedKeys="expandedKeys"
 				v-model:selectedKeys="selectedKeys"
-				multiple
 				:fieldNames="{
 					children: 'children',
 					title: 'name',
@@ -43,7 +42,7 @@
 				}"
 				:tree-data="treeData"
 				@select="handleTreeClick"
-			></a-directory-tree>
+			></a-tree>
 		</a-spin>
 	</div>
 </template>
@@ -120,18 +119,16 @@
 	const expandedKeys = ref()
 	const selectedKeys = ref([])
 	const localLoading = ref(false)
-	const treeData = ref([
-		{
-			id: 0,
-			parentId: '-1',
-			name: '所有',
-			children: ''
-		}
-	])
+	const treeData = ref([])
 	let treeRow = {}
+	let paramsValue = {}
 
 	const handleTreeClick = (selectedKeys, event) => {
-		treeRow = event.node
+		if (selectedKeys.length > 0) {
+			treeRow = event.node
+		} else {
+			treeRow = {}
+		}
 		emit('selectTree', treeRow)
 	}
 
@@ -150,23 +147,24 @@
 			selectedKeys.value = []
 			treeRow = {}
 			emit('delTree', treeRow)
-			loadTreeData()
+			loadTreeData(paramsValue)
 		})
 	}
 
 	const handleRefresh = () => {
-		loadTreeData()
+		loadTreeData(paramsValue)
 		emit('treeRefresh')
 	}
 
-	const loadTreeData = async () => {
+	const loadTreeData = async (params) => {
 		try {
+			paramsValue = params
 			localLoading.value = true
-			const treeRes = await props.apiModel.getTree()
+			const treeRes = await props.apiModel.getTree(paramsValue)
 			if (Array.isArray(treeRes)) {
-				treeData.value[0].children = treeRes
+				treeData.value = treeRes
 			} else {
-				treeData.value[0].children = []
+				treeData.value = []
 			}
 
 			if (selectedKeys.value.length > 0) {
diff --git a/src/config/index.js b/src/config/index.js
index 83491a0..5e1c9d1 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -31,7 +31,7 @@ const DEFAULT_CONFIG = {
 	REQUEST_CACHE: false,
 
 	// 布局 经典：classical，双排菜单：doublerow, 顶栏菜单：top
-	SNOWY_LAYOUT: 'doublerow',
+	SNOWY_LAYOUT: 'classical',
 
 	// 菜单是否折叠
 	SNOWY_MENU_COLLAPSE: false,
@@ -70,7 +70,7 @@ const DEFAULT_CONFIG = {
 	COLOR: '#1677FF',
 
 	// 默认整体主题
-	SNOWY_THEME: 'dark',
+	SNOWY_THEME: 'light',
 
 	// 整体表单风格
 	SNOWY_FORM_STYLE: 'drawer',
diff --git a/src/hook/useFormHandler.js b/src/hook/useFormHandler.js
index 8471f88..b5d4966 100644
--- a/src/hook/useFormHandler.js
+++ b/src/hook/useFormHandler.js
@@ -93,8 +93,8 @@ export default function useFormHandler(formItems, api) {
 	 * 处理返回操作，返回上一级页面并关闭当前标签页。
 	 */
 	const handleBack = () => {
-		useTabs.close(route)
-		// router.push('/basicData/unit') // 优化为通用的返回上一页操作
+		// useTabs.close(route)
+		router.push('/basicData/publicAccount') // 优化为通用的返回上一页操作
 	}
 
 	/**
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index d9ffec0..9a0c0ab 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -6,6 +6,23 @@
 			<fullscreen-outlined />
 		</div>
 		<!--		<dev-user-message />-->
+<!--		<a-dropdown v-if="!isMobile" class="panel-item">
+			<global-outlined />
+			<template #overlay>
+				<a-menu :selected-keys="lang">
+					<a-menu-item key="zh-cn" @click="handleIn18('zh-cn')">
+						<span>简体中文</span>
+					</a-menu-item>
+					<a-menu-item key="en" @click="handleIn18('en')">
+						<span>English</span>
+					</a-menu-item>
+				</a-menu>
+			</template>
+		</a-dropdown>-->
+		<div class="setting panel-item" @click="openSetting">
+			<layout-outlined />
+		</div>
+
 		<a-dropdown class="user panel-item">
 			<div class="user-avatar">
 				<a-avatar :src="userInfo ? userInfo.avatar : undefined" />
@@ -29,22 +46,6 @@
 				</a-menu>
 			</template>
 		</a-dropdown>
-		<a-dropdown v-if="!isMobile" class="panel-item">
-			<global-outlined />
-			<template #overlay>
-				<a-menu :selected-keys="lang">
-					<a-menu-item key="zh-cn" @click="handleIn18('zh-cn')">
-						<span>简体中文</span>
-					</a-menu-item>
-					<a-menu-item key="en" @click="handleIn18('en')">
-						<span>English</span>
-					</a-menu-item>
-				</a-menu>
-			</template>
-		</a-dropdown>
-		<div class="setting panel-item" @click="openSetting">
-			<layout-outlined />
-		</div>
 	</div>
 
 	<!-- 整体风格设置抽屉 -->
diff --git a/src/router/index.js b/src/router/index.js
index 24596f6..b11228f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,7 +8,7 @@
  *	5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  *	6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
 import { notification } from 'ant-design-vue'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
@@ -37,7 +37,7 @@ const routes_404 = [
 const routes = [...systemRouter, ...whiteListRouters, ...routes_404]
 
 const router = createRouter({
-	history: createWebHistory(),
+	history: createWebHashHistory(),
 	routes
 })
 
diff --git a/src/views/productionBusiness/basicData/brand/index.vue b/src/views/productionBusiness/basicData/brand/index.vue
index 7349319..b490fb6 100644
--- a/src/views/productionBusiness/basicData/brand/index.vue
+++ b/src/views/productionBusiness/basicData/brand/index.vue
@@ -41,7 +41,7 @@
 			:row-selection="options.rowSelection"
 			:scroll="{
 				x: 100,
-				y: 'calc(100vh - 300px)'
+
 			}"
 		>
 			<template #operator>
diff --git a/src/views/productionBusiness/basicData/client/detail/CustomerCategoryForm.vue b/src/views/productionBusiness/basicData/client/detail/CustomerCategoryForm.vue
index 18f4ee9..3d36d20 100644
--- a/src/views/productionBusiness/basicData/client/detail/CustomerCategoryForm.vue
+++ b/src/views/productionBusiness/basicData/client/detail/CustomerCategoryForm.vue
@@ -1,6 +1,6 @@
 <template>
 	<xn-form-container
-		:title="formData.id ? '编辑客户' : '增加客户'"
+		:title="formData.id ? '编辑客户分类' : '增加客户分类'"
 		:width="700"
 		:visible="visible"
 		:destroy-on-close="true"
@@ -85,7 +85,7 @@
 				{
 					id: 0,
 					parentId: '0',
-					name: '所有',
+					name: '顶级',
 					children: res ? res : []
 				}
 			]
diff --git a/src/views/productionBusiness/basicData/client/detail/index.vue b/src/views/productionBusiness/basicData/client/detail/index.vue
index c95d050..2483a9b 100644
--- a/src/views/productionBusiness/basicData/client/detail/index.vue
+++ b/src/views/productionBusiness/basicData/client/detail/index.vue
@@ -202,7 +202,7 @@
 			name: 'brandId',
 			type: 'a-select',
 			span: 8,
-			rules: [required('请选择品牌')],
+			// rules: [required('请选择品牌')],
 			attrs: {
 				placeholder: '请选择品牌',
 				options: tool.dictList('COMMON_STATUS'),
@@ -427,14 +427,7 @@
 			.then((res) => {
 				clientFormItems.forEach((item) => {
 					if (item.name === 'categoryId') {
-						item.attrs.treeData = [
-							{
-								id: 0,
-								parentId: '-1',
-								name: '所有',
-								children: res || []
-							}
-						]
+						item.attrs.treeData = res || []
 					}
 				})
 			})
diff --git a/src/views/productionBusiness/basicData/client/index.vue b/src/views/productionBusiness/basicData/client/index.vue
index 4c7e15d..2b09be6 100644
--- a/src/views/productionBusiness/basicData/client/index.vue
+++ b/src/views/productionBusiness/basicData/client/index.vue
@@ -58,7 +58,7 @@
 					:row-selection="options.rowSelection"
 					:scroll="{
 						x: 100,
-						y: 'calc(100vh - 300px)'
+
 					}"
 				>
 					<template #operator>
diff --git a/src/views/productionBusiness/basicData/materiel/detail/index.vue b/src/views/productionBusiness/basicData/materiel/detail/index.vue
index 2f3e7af..0a87948 100644
--- a/src/views/productionBusiness/basicData/materiel/detail/index.vue
+++ b/src/views/productionBusiness/basicData/materiel/detail/index.vue
@@ -59,6 +59,8 @@
 									label: 'name',
 									value: 'id'
 								}"
+								allowClear
+								@change="onChangeUnit"
 							/>
 						</template>
 						<template v-if="column.dataIndex === 'productQty'">
@@ -172,6 +174,7 @@
 				unitOptions = unitList
 
 				dataSource.value = packageData
+				console.log(dataSource.value, 'dataSource.value')
 			}
 		})
 
@@ -668,6 +671,15 @@
 		}
 	]
 
+	const onChangeUnit = (value) => {
+		const unitIdList = new Set(dataSource.value.map((item) => item.unitId))
+
+		// 更新 unitOptions 的 disabled 属性
+		unitOptions.forEach((item) => {
+			item.disabled = unitIdList.has(item.id)
+		})
+	}
+
 	const { formData, formRefs, inform, extendFormData, onSubmit, handleBack, fetchData, getExtendField } =
 		useFormHandler([...materialFormItems, ...baseFormItems, ...unitFormItems], {
 			submitForm: materialApi.materialSubmitForm,
diff --git a/src/views/productionBusiness/basicData/materiel/detail/materialCategoryForm.vue b/src/views/productionBusiness/basicData/materiel/detail/materialCategoryForm.vue
index 69c73f9..f7d91c7 100644
--- a/src/views/productionBusiness/basicData/materiel/detail/materialCategoryForm.vue
+++ b/src/views/productionBusiness/basicData/materiel/detail/materialCategoryForm.vue
@@ -93,7 +93,7 @@
 				{
 					id: 0,
 					parentId: '0',
-					name: '所有',
+					name: '顶级',
 					children: res ? res : []
 				}
 			]
diff --git a/src/views/productionBusiness/basicData/materiel/index.vue b/src/views/productionBusiness/basicData/materiel/index.vue
index e8f0b04..21b84be 100644
--- a/src/views/productionBusiness/basicData/materiel/index.vue
+++ b/src/views/productionBusiness/basicData/materiel/index.vue
@@ -58,7 +58,6 @@
 					:row-selection="options.rowSelection"
 					:scroll="{
 						x: 100,
-						y: 'calc(100vh - 300px)'
 					}"
 				>
 					<template #operator class="table-operator">
diff --git a/src/views/productionBusiness/basicData/publicAccount/index.vue b/src/views/productionBusiness/basicData/publicAccount/index.vue
index 0587975..071e256 100644
--- a/src/views/productionBusiness/basicData/publicAccount/index.vue
+++ b/src/views/productionBusiness/basicData/publicAccount/index.vue
@@ -36,7 +36,7 @@
 			:row-selection="options.rowSelection"
 			:scroll="{
 				x: 100,
-				y: 'calc(100vh - 300px)'
+
 			}"
 		>
 			<template #operator>
diff --git a/src/views/productionBusiness/basicData/stash/index.vue b/src/views/productionBusiness/basicData/stash/index.vue
index 638c4cd..217b6bb 100644
--- a/src/views/productionBusiness/basicData/stash/index.vue
+++ b/src/views/productionBusiness/basicData/stash/index.vue
@@ -34,7 +34,7 @@
 			<a-col :span="6">
 				<dynamic-tree
 					ref="dynamicTreeRef"
-					treeTitle="生产组织"
+					treeTitle="仓库"
 					:tableRef="tableRef"
 					:apiModel="{
 						getTree: sysStoreApi.sysStoreTree,
@@ -61,8 +61,7 @@
 					:tool-config="options.toolConfig"
 					:row-selection="options.rowSelection"
 					:scroll="{
-						x: 100,
-						y: 'calc(100vh - 300px)'
+						x: 100
 					}"
 				>
 					<template #operator>
diff --git a/src/views/productionBusiness/basicData/tissue/detail/TissueForm.vue b/src/views/productionBusiness/basicData/tissue/detail/TissueForm.vue
index 464e9af..275a52d 100644
--- a/src/views/productionBusiness/basicData/tissue/detail/TissueForm.vue
+++ b/src/views/productionBusiness/basicData/tissue/detail/TissueForm.vue
@@ -25,11 +25,12 @@
 							v-model:value="formData.type"
 							placeholder="请选择组织类型"
 							:options="typeOptions"
+							@change="typeChange"
 						/>
 					</a-form-item>
 				</a-col>
 				<a-col :span="12">
-					<a-form-item label="工厂名称：" name="name">
+					<a-form-item :label="`${factoryName}名称：`" name="name">
 						<a-input
 							:disabled="pageType === 'SEARCH'"
 							v-model:value="formData.name"
@@ -127,6 +128,8 @@
 	const enabledStateOptions = ref([])
 	let pageType = ref('ADD')
 
+	let factoryName = ref('工厂')
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		visible.value = true
@@ -147,14 +150,21 @@
 			treeData.value = res || []
 		})
 
-		productionOrganizationApi.productionOrganizationTree().then((res) => {
-			parentTreeData.value = res
-		})
+		productionOrganizationApi
+			.productionOrganizationTree({
+				type: 'FACTORY,WORKSHOP',
+				extId: record && record.id
+			})
+			.then((res) => {
+				parentTreeData.value = res
+			})
 	}
 	// 关闭抽屉
 	const onClose = () => {
 		formRef.value.resetFields()
 		visible.value = false
+
+		factoryName.value = '工厂'
 	}
 	// 默认要校验的refresh
 	const formRules = {
@@ -179,6 +189,16 @@
 		})
 	}
 
+	const typeChange = () => {
+		if (formData.value.type === 'FACTORY') {
+			factoryName.value = '工厂'
+		} else if (formData.value.type === 'WORKSHOP') {
+			factoryName.value = '车间'
+		} else {
+			factoryName.value = '产线'
+		}
+	}
+
 	let treeData = ref([])
 	let parentTreeData = ref([])
 	// 抛出函数
diff --git a/src/views/productionBusiness/basicData/tissue/index.vue b/src/views/productionBusiness/basicData/tissue/index.vue
index 5dbd280..8b51163 100644
--- a/src/views/productionBusiness/basicData/tissue/index.vue
+++ b/src/views/productionBusiness/basicData/tissue/index.vue
@@ -77,7 +77,7 @@
 					:row-selection="options.rowSelection"
 					:scroll="{
 						x: 100,
-						y: 'calc(100vh - 300px)'
+
 					}"
 				>
 					<template #operator>
@@ -120,7 +120,7 @@
 								</a-tooltip>
 
 								<a-divider type="vertical" v-if="hasPerm(['customerEdit', 'customerDelete'], 'and')" />
-								<a-popconfirm title="确定要删除吗？" @confirm="deleteRecord(record)">
+								<a-popconfirm title="确定要删除吗？" @confirm="handleConfirmDeleteRecord(record)">
 									<a-button type="link" danger size="small" v-if="hasPerm('customerDelete')">
 										<DeleteOutlined />
 									</a-button>
@@ -198,7 +198,7 @@
 		deleteBatchRecords,
 		options,
 		searchFormRef,
-		navigateTo,
+		deleteRecord,
 		toggleAdvanced,
 		advanced
 	} = useTableManagement(
@@ -212,8 +212,10 @@
 
 	const TissueFormRef = ref(null)
 	const dynamicTreeRef = ref(null)
+	let treeValue = ref({})
 
 	const onSelectTree = (value) => {
+		treeValue.value = value
 		searchFormState.value.parentId = value.id
 		tableRef.value.refresh()
 	}
@@ -223,6 +225,16 @@
 		tableRef.value.refresh()
 	}
 
+	const handleConfirmDeleteRecord = (record) => {
+		deleteRecord(record).then((res) => {
+			console.log(res, '删除成功')
+
+			dynamicTreeRef.value.loadTreeData({
+				type: 'FACTORY,WORKSHOP'
+			})
+		})
+	}
+
 	const treeRefresh = () => {
 		searchFormState.value.parentId = null
 		tableRef.value.refresh()
@@ -232,10 +244,14 @@
 		searchFormState.value.parentId = null
 		tableRef.value.refresh()
 
-		dynamicTreeRef.value.loadTreeData()
+		dynamicTreeRef.value.loadTreeData({
+			type: 'FACTORY,WORKSHOP'
+		})
 	}
 
 	onMounted(() => {
-		dynamicTreeRef.value.loadTreeData()
+		dynamicTreeRef.value.loadTreeData({
+			type: 'FACTORY,WORKSHOP'
+		})
 	})
 </script>
diff --git a/src/views/productionBusiness/basicData/unit/index.vue b/src/views/productionBusiness/basicData/unit/index.vue
index 608643c..1a2fb3f 100644
--- a/src/views/productionBusiness/basicData/unit/index.vue
+++ b/src/views/productionBusiness/basicData/unit/index.vue
@@ -50,16 +50,13 @@
 					:columns="unitGroupColumns"
 					:data="loadGroupsData"
 					bordered
+					tableLayout="fixed"
 					:row-key="(record) => record.id"
 					:tool-config="unitGroupToolConfig"
 					@plusRowData="handlePlusRowData"
 					@editRowData="handleEditRowData"
 					@deleteRowData="handleDeleteRowData"
 					:rowSelection="unitGroupRowSelection"
-					:scroll="{
-						x: 100,
-						y: 'calc(100vh - 300px)'
-					}"
 				>
 					<template #operator class="table-operator">
 						<span>单位组</span>
@@ -90,8 +87,7 @@
 					:tool-config="options.toolConfig"
 					:row-selection="options.rowSelection"
 					:scroll="{
-						x: 1500,
-						y: 'calc(100vh - 300px)'
+						x: 100
 					}"
 				>
 					<template #operator>