@bytenew/bn-bus-ui 1.1.462 → 1.1.463

package/packages/BnSmartForm/choosePackage/choosePackage.vue

@@ -0,0 +1,361 @@
+<!--选择包裹，主要用于erp多包裹，属于选择的最上级，选择完多个包裹后，会将包裹的子商品合并然后再让选择erp子单-->
+<template>
+  <el-dialog v-model="show" :title="`选择${columnInfo.name}`" top="18px" width="860" destroy-on-close style="margin-bottom: 0">
+	<div class="choosePackage">
+	  <div class="choosePackage-operate" v-if="tableData.length>0">
+		<el-button @click="changeOpen(false)" type="primary" link v-if="expandAll">全部收起</el-button>
+		<el-button @click="changeOpen(true)" type="primary" link v-else>全部展开</el-button>
+	  </div>
+	  <vxe-table ref="packageTable" border size="small" :data="tableData" class="choosePackage-out"
+				 :row-config="{keyField: dataBack.key}"
+				 :column-config="{resizable: true}"
+				 :max-height="tableMaxHeight" min-height="50"
+				 :expand-config="{expandAll: expandAll}"
+				 :checkbox-config="{ checkRowKeys: selectData}"
+				 @checkbox-change="checkChange"
+				 @checkbox-all="checkAllTask">
+		<vxe-column type="checkbox" width="32" fixed="left"></vxe-column>
+		<vxe-column type="expand" width="0" :visible="false" v-if="childColumns.length>0">
+		  <template #content="{ row }">
+			<div class="choosePackage-inner">
+			  <vxe-table size="small" :column-config="{resizable: true}" :data="row[dataBack.order]" :max-height="200" min-height="50">
+				<vxe-column v-for="(column,index) in childColumns.filter(i => i.extraInfo?.isSelectShow !== 1)" :key="index" :title="column.name" min-width="80" show-header-overflow="title" show-overflow="title">
+				  <template #default="scope">
+					<span v-if="column.behaviorType != 10">{{ getTitle(column, scope.row[column.columnCode]) }}</span>
+					<BnFileView v-if="column.behaviorType == 10 && scope.row[column.columnCode]" :file-list="scope.row[column.columnCode]" :is-mini="true" :no-warp="true"></BnFileView>
+				  </template>
+				</vxe-column>
+			  </vxe-table>
+			</div>
+		  </template>
+		</vxe-column>
+		<vxe-column v-for="(column,index) in packageColumns.filter(i=>i.behaviorType!=13 && i.extraInfo?.isSelectShow !== 1)" :key="index" :title="column.name" min-width="120" show-header-overflow="title" show-overflow="title">
+		  <template #default="scope">
+			<span v-if="column.behaviorType != 10">{{ getTitle(column, scope.row[column.columnCode]) }}</span>
+			<BnFileView v-if="column.behaviorType == 10 && scope.row[column.columnCode]" :file-list="scope.row[column.columnCode]" :is-mini="true" :no-warp="true"></BnFileView>
+		  </template>
+		</vxe-column>
+		<template #empty>
+		  <span>暂无数据</span>
+		</template>
+	  </vxe-table>
+	</div>
+	<template #footer>
+	  <div class="w-flex-right w-flex-center">
+		<span
+		  class="w-font13 w-color-gray w-margin-right8">已选择（{{ selectData.length }}/{{ orderList.length }}）条</span>
+		<el-button @click="show = false">取消</el-button>
+		<el-button type="primary" @click="sure">确认</el-button>
+	  </div>
+	</template>
+  </el-dialog>
+</template>
+<script>
+  import {getColumnValText} from "../BnSmartFormUtil.js";
+  import {cloneDeep} from "lodash";
+  
+  export default {
+	name: 'choosePackage',
+	props: {
+	  orderList: Array,
+	  componentList: Array,
+	  dataBack: Object,
+	},
+	data() {
+	  return {
+		show: false,
+		// 默认展开全部
+		expandAll:true,
+		// 包裹表格的表头
+		packageColumns: [],
+		// 子订单的表头
+		childColumns:[],
+		// 最大高度
+		tableMaxHeight: 400,
+		// 选中数据
+		selectData: [],
+		// 选中的组件的信息
+		columnInfo:{}
+	  }
+	},
+	created() {
+	  this.childColumns = cloneDeep(this.componentList.filter(i => i.columnCode == this.dataBack.order)[0].moduleDefinition);
+	},
+	computed:{
+	  tableData(){
+		return this.orderList.filter(i=>i[this.dataBack.key])
+	  }
+	},
+	methods: {
+	  /**
+	   * 打开选择包裹弹框，处理数据回显
+	   * */
+	  open(column) {
+		this.columnInfo = cloneDeep(column)
+		// 计算表格最大高度：视窗高度 - 对话框头部(约55px) - 对话框底部(约60px) - 边距(36px)
+		this.tableMaxHeight = window.innerHeight - 220
+		if(this.packageColumns.length == 0 && this.orderList.length>0){
+		  this.initPackageColumns(this.orderList[0]);
+		}
+		this.selectData = []
+		if (column.value) {
+		  this.selectData = column.value.split(',')
+		}
+		this.show = true;
+	  },
+	  /**
+	   * 初始化包裹表头
+	   * */
+	  initPackageColumns(orderData) {
+		let columns = [];
+		// 遍历 componentList 保持原有顺序
+		for (let i = 0; i < this.componentList.length; i++) {
+		  const component = this.componentList[i];
+		  if (orderData.hasOwnProperty(component.columnCode)) {
+			columns.push({
+			  columnCode: component.columnCode,
+			  name: component.name,
+			  behaviorType: component.behaviorType,
+			  extraInfo: component.extraInfo,
+			  moduleDefinition: component.moduleDefinition,
+			});
+		  }
+		}
+		this.packageColumns = columns;
+	  },
+	  /**
+	   * 选中任务
+	   * */
+	  checkChange({checked, row}) {
+		this.$refs.packageTable.setCheckboxRow(row, checked);
+		if (checked) {
+		  if (!this.selectData.includes(row[this.dataBack.key])) {
+			this.selectData.push(row[this.dataBack.key]);
+		  }
+		} else {
+		  if (this.selectData.includes(row[this.dataBack.key])) {
+			this.selectData.splice(this.selectData.indexOf(row[this.dataBack.key]), 1);
+		  }
+		}
+	  },
+	  /**
+	   * 全选任务
+	   * */
+	  checkAllTask({records}) {
+		if (records.length != 0) {
+		  records.map((task) => {
+			if (!this.selectData.includes(task[this.dataBack.key])) {
+			  this.selectData.push(task[this.dataBack.key]);
+			}
+		  });
+		} else {
+		  this.selectData = []
+		}
+	  },
+	  /**
+	   * 转义title
+	   * */
+	  getTitle(column, value) {
+		let text = getColumnValText(column, true, value);
+		return text;
+	  },
+	  /**
+	   * 确认包裹
+	   * */
+	  sure() {
+		let orders = this.orderList.filter(i => this.selectData.includes(i[this.dataBack.key]));
+		if (orders.length == 0) {
+		  this.show = false;
+		  return;
+		}
+		if (orders.length == 1) {
+		  this.$emit('checkedPackage', orders[0], orders[0][this.dataBack.order])
+		} else {
+		  // 合并多个包裹
+		  let mergedOrder = this.mergeOrders(orders);
+		  this.$emit('checkedPackage', mergedOrder, mergedOrder[this.dataBack.order])
+		}
+		this.show = false;
+	  },
+	  /**
+	  * 展开表单子级
+	  * */
+	  changeOpen(type) {
+		this.expandAll = type
+		const $table = this.$refs.packageTable;
+		if (!$table) return;
+		// 遍历所有数据行
+		this.orderList.forEach(row => {
+		  $table.toggleRowExpand(row, type);
+		});
+	  },
+	  /**
+	   * 合并多个包裹
+	   * @param orders 需要合并的包裹数组
+	   * @returns 合并后的包裹对象
+	   */
+	  mergeOrders(orders) {
+		let mergedOrder = {};
+		// 处理外层字段
+		this.packageColumns.forEach(column => {
+		  const columnCode = column.columnCode;
+		  const isMerge = column.extraInfo?.isMerge === 1;
+		  if (isMerge || columnCode == this.dataBack.key) {
+			if (column.behaviorType === 1) {
+			  // 字符串合并
+			  mergedOrder[columnCode] = orders.map(order => order[columnCode])
+				.filter(val => val != null && val !== '')
+				.join(',');
+			} else if (column.behaviorType === 2) {
+			  // 数值相加
+			  mergedOrder[columnCode] = orders.reduce((sum, order) => {
+				return this.preciseAdd(sum, order[columnCode]);
+			  }, 0);
+			} else {
+			  // 其他类型，取第一个非空值
+			  mergedOrder[columnCode] = orders.find(order => order[columnCode] != null)?.[columnCode];
+			}
+		  } else {
+			// 不需要合并的字段取第一个值
+			mergedOrder[columnCode] = orders[0]?.[columnCode];
+		  }
+		});
+		
+		// 处理子级结构
+		if (this.dataBack.order && this.childColumns.length > 0) {
+		  const childOrders = orders.reduce((acc, order) => {
+			return acc.concat(order[this.dataBack.order] || []);
+		  }, []);
+		  
+		  if (childOrders.length > 0) {
+			mergedOrder[this.dataBack.order] = this.mergeChildOrders(childOrders);
+		  } else {
+			mergedOrder[this.dataBack.order] = [];
+		  }
+		}
+		
+		return mergedOrder;
+	  },
+	  
+	  /**
+	   * 合并子表单数据
+	   * @param childOrders 子表单数据数组
+	   * @returns 合并后的子表单数组
+	   */
+	  mergeChildOrders(childOrders) {
+		// 按主键分组
+		const groupedOrders = childOrders.reduce((acc, order) => {
+		  const key = order[this.dataBack.orderKey];
+		  if (!acc[key]) {
+			acc[key] = [];
+		  }
+		  acc[key].push(order);
+		  return acc;
+		}, {});
+		
+		// 处理每个分组
+		return Object.values(groupedOrders).map(orders => {
+		  if (orders.length === 1) {
+			// 如果只有一条记录，直接返回
+			return orders[0];
+		  }
+		  
+		  // 合并多条记录
+		  let mergedChild = {};
+		  this.childColumns.forEach(column => {
+			const columnCode = column.columnCode;
+			const isMerge = column.extraInfo?.isMerge === 1;
+			
+			if (isMerge) {
+			  if (column.behaviorType === 1) {
+				// 字符串合并
+				mergedChild[columnCode] = orders.map(order => order[columnCode])
+				  .filter(val => val != null && val !== '')
+				  .join(',');
+			  } else if (column.behaviorType === 2) {
+				// 数值相加
+				mergedChild[columnCode] = orders.reduce((sum, order) => {
+				  return this.preciseAdd(sum, order[columnCode]);
+				}, 0);
+			  } else {
+				// 其他类型，取第一个非空值
+				mergedChild[columnCode] = orders.find(order => order[columnCode] != null)?.[columnCode];
+			  }
+			} else {
+			  // 不需要合并的字段取第一个值
+			  mergedChild[columnCode] = orders[0]?.[columnCode];
+			}
+		  });
+		  
+		  return mergedChild;
+		});
+	  },
+	  /**
+	   * 获取数值的小数位数
+	   * @param {number|string} num 数值
+	   * @returns {number} 小数位数
+	   */
+	  getDecimalPlaces(num) {
+		if (!num && num !== 0) return 0;
+		const str = String(num);
+		const index = str.indexOf('.');
+		return index < 0 ? 0 : str.length - index - 1;
+	  },
+	  /**
+	   * 精确相加
+	   * @param {number|string} num1 数值1
+	   * @param {number|string} num2 数值2
+	   * @returns {string} 相加结果
+	   */
+	  preciseAdd(num1, num2) {
+		const n1 = parseFloat(num1) || 0;
+		const n2 = parseFloat(num2) || 0;
+		// 获取两个数中最大的小数位数
+		const maxDecimalPlaces = Math.max(this.getDecimalPlaces(num1), this.getDecimalPlaces(num2));
+		// 使用toFixed保持精度
+		return (n1 + n2).toFixed(maxDecimalPlaces);
+	  },
+	}
+  }
+</script>
+
+<style scoped lang="scss">
+  .choosePackage {
+	height: 100%;
+	overflow: hidden;
+	
+	&-out {
+	  :deep(.vxe-table--header) {
+		.vxe-header--row {
+		  background-color: #ecf5ff;
+		}
+	  }
+	  
+	  :deep(.vxe-table--body) {
+		.vxe-body--row {
+		  background-color: #f5f7fa;
+		}
+	  }
+	}
+	
+	&-inner {
+	  padding: 10px 20px 10px 32px;
+	  
+	  :deep(.vxe-table--header) {
+		.vxe-header--row {
+		  background-color: #fff;
+		}
+	  }
+	  
+	  :deep(.vxe-table--body) {
+		.vxe-body--row {
+		  background-color: #fff;
+		}
+	  }
+	}
+	
+	&-operate{
+	  margin-bottom: 8px;
+	}
+  }
+</style>

package/packages/BnSmartForm/dateDualForm/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="w-default-wrap">
+	<formItemTop :column="column"/>
+	<div class="w-default-wrap">
+	  <BnDatePicker v-model="column.value" type="datetimerange" :disabled="disabled" @change="changeVal"></BnDatePicker>
+	</div>
+	<formItemFooter :column="column"/>
+  </div>
+</template>
+
+<script>
+  import formItemTop from "../formItemTop/formItemTop.vue";
+  import formItemFooter from "../formItemFooter/formItemFooter.vue";
+  export default {
+	name: "dateDualForm",
+	props: {
+	  column: {
+		type: Object,
+		default() {
+		  return {}
+		}
+	  },
+	  disabled:Boolean
+	},
+	components: {
+	  formItemFooter,
+	  formItemTop,
+	},
+	methods: {
+	  changeVal() {
+		this.column.error = '';
+		this.column.warning = '';
+		this.$emit('onChange', this.column);
+	  },
+	}
+  }
+</script>

package/packages/BnSmartForm/dateForm/index.vue

@@ -0,0 +1,38 @@
+<template>
+  <div class="w-default-wrap">
+	<formItemTop :column="column"/>
+	<div class="w-default-wrap">
+	  <el-date-picker @change="changeVal" style="width: 100%" :disabled="disabled"
+		v-model="column.value" type="datetime" placement="bottom-start"
+		format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+	</div>
+	<formItemFooter :column="column"/>
+  </div>
+</template>
+
+<script>
+  //引入状态分配器
+  import formItemTop from "../formItemTop/formItemTop.vue";
+  import formItemFooter from "../formItemFooter/formItemFooter.vue";
+  
+  export default {
+	name: "dateForm",
+	components: {formItemTop,formItemFooter},
+	props: {
+	  column: {
+		type: Object,
+		default() {
+		  return {}
+		}
+	  },
+	  disabled:Boolean
+	},
+	methods:{
+	  changeVal(){
+		this.column.error = '';
+		this.column.warning = '';
+		this.$emit('onChange', this.column,"change");
+	  },
+	},
+  }
+</script>

package/packages/BnSmartForm/fileForm/fileFormData.js

@@ -0,0 +1,50 @@
+export const fileType=[
+	"gz",
+	"cdr",
+	"csv",
+	"png",
+	"jpg",
+	"jpeg",
+	"gif",
+	"bmp",
+	"rtf",
+	"swf",
+	"avi",
+	"mpeg",
+	"ogg",
+	"ogv",
+	"webm",
+	"mp3",
+	"wav",
+	"mid",
+	"rar",
+	"zip",
+	"tar",
+	"7z",
+	"bz2",
+	"doc",
+	"docx",
+	"xls",
+	"xlsx",
+	"ppt",
+	"pptx",
+	"pdf",
+	"txt",
+	"xml",
+	"xmind",
+	"rp",
+	"graffle",
+	"mp4",
+	"mpg",
+	"mov",
+	"rmvb",
+	"mkv",
+	"pot",
+	"pps",
+	"mpp",
+	"rtf",
+	"psd",
+	"csv",
+	"mmap",
+	"ofd",
+];