Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/components/DepTree/index.vue

@@ -191,6 +191,8 @@ defineExpose({
 		padding-top: 10px;
 		box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.1);
 		z-index: 10;
+		position: sticky;
+		bottom: 0;
 	}
 }
 </style>

src/views/admin/system/user/index.vue

@@ -5,7 +5,7 @@
 				<div class="layout-padding-auto layout-padding-view">
 					<el-scrollbar>
 						<dep-tree
-							ref="queryTreeRef"
+							ref="depTreeRef"
 							:placeholder="$t('common.queryDeptTip')"
 							:query="deptData.queryList"
 							:show-expand="true"
@@ -250,7 +250,7 @@ const excelUploadRef = ref()
 const queryRef = ref()
 const showSearch = ref(true)
 const inputPassword = ref()
-const queryTreeRef = ref() // 树组件ref引用
+const depTreeRef = ref() // 树组件ref引用
 
 // 多选rows
 const selectObjs = ref([]) as any
@@ -287,7 +287,7 @@ const treeDeepSearch = (isDeep: boolean) => {
 const resetQuery = () => {
 	queryRef.value?.resetFields()
 	state.queryForm.deptId = ""
-	queryTreeRef.value.getdeptTree()
+	depTreeRef.value.getTreeData()
 	getDataList()
 }
 

src/views/hard/hard-order/index.vue

@@ -361,65 +361,36 @@ const getSummaries = (param: SummaryMethodProps) => {
 			return
 		}
 		if (column.property === "paymentInformation") {
-			const totalPriceValues = data.map((item) => Number(item.totalPrice))
-			const extraPriceValues = data.map((item) => Number(item.extraPrice))
-			const payPriceValues = data.map((item) => Number(item.payPrice))
-			if (
-				!totalPriceValues.every((value) => Number.isNaN(value)) &&
-				!extraPriceValues.every((value) => Number.isNaN(value)) &&
-				!payPriceValues.every((value) => Number.isNaN(value))
-			) {
-				// h("div", { style: { textDecoration: "underline" } }, ["Total Cost"])
-				sums[index] = h("div", { style: {} }, [
-					h("div", {}, [
-						h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["商品总价"]),
-						h("span", { style: { color: "#67C260" } }, [
-							`${displayPrice(
-								totalPriceValues.reduce((prev, curr) => {
-									const value = Number(curr)
-									if (!Number.isNaN(value)) {
-										return prev + curr
-									} else {
-										return prev
-									}
-								}, 0),
-							)}`,
+			const priceVNode: VNode[] & string[] = []
+			;[
+				{ column: "totalPrice", columnName: "商品总价", color: "#67C260" },
+				{ column: "extraPrice", columnName: "额外支付", color: "#F56E9B" },
+				{ column: "payPrice", columnName: "实际支付", color: "#355CF6" },
+			].forEach(({ column, columnName, color }: any, index: number) => {
+				const values = data.map((item) => Number(item[column]))
+				if (!values.every((value) => Number.isNaN(value))) {
+					priceVNode.push(
+						h("div", {}, [
+							h("span", { style: { marginRight: "40px", minWidth: "60px", fontWeight: "bold" } }, [columnName]),
+							h("span", { style: { color, minWidth: "50px", flex: 1 } }, [
+								displayPrice(
+									values.reduce((prev, curr) => {
+										const value = Number(curr)
+										if (!Number.isNaN(value)) {
+											return prev + curr
+										} else {
+											return prev
+										}
+									}, 0),
+								),
+							]),
 						]),
-					]),
-					h("div", { style: {} }, [
-						h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["额外支付"]),
-						h("span", { style: { color: "#F56E9B" } }, [
-							`${displayPrice(
-								extraPriceValues.reduce((prev, curr) => {
-									const value = Number(curr)
-									if (!Number.isNaN(value)) {
-										return prev + curr
-									} else {
-										return prev
-									}
-								}, 0),
-							)}`,
-						]),
-					]),
-					h("div", { style: {} }, [
-						h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["实际支付"]),
-						h("span", { style: { color: "#355CF6" } }, [
-							`${displayPrice(
-								payPriceValues.reduce((prev, curr) => {
-									const value = Number(curr)
-									if (!Number.isNaN(value)) {
-										return prev + curr
-									} else {
-										return prev
-									}
-								}, 0),
-							)}`,
-						]),
-					]),
-				])
-			} else {
-				sums[index] = "N/A"
-			}
+					)
+				} else {
+					priceVNode.push("NaN")
+				}
+			})
+			sums[index] = h("div", { style: {} }, [...priceVNode])
 		} else {
 			sums[index] = ""
 		}