ERP_override.git

			@@ -308,10 +308,16 @@
			let flowCardData = ref({
			flowCard: data,
			})
			for (let i = 0; i < flowCardData.value.flowCard.length; i++) {
			const regex = /^[1-9]\d*$/
			if (!regex.test(flowCardData.value.flowCard[i].sort)) {
			ElMessage.warning(t('basicData.msg.greater0'))
			return; // 如果有一个不是整数
			}
			}
			request.post("/processCard/printSort", flowCardData.value).then((res) => {
			if (res.code == 200) {
			ElMessage.success(t('processCard.sortingSuccessful'))
			//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
			router.push({
			path: '/main/processCard/PrintFlowCard',
			query: {orderId: orderId,random: Math.random()}
			@@ -456,8 +462,22 @@
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged
			},
			],//表头按钮
			],
			//表单验证
			editRules: {
			sort: [
			//type: 'number', min: 0, message: '请输入大于等于0的数值' ,
			{
			validator ({ cellValue }) {
			const regex = /^[1-9]\d*$/
			if (!regex.test(cellValue)) {
			return new Error(t('basicData.msg.greater0'))

			}
			}}
			],
			},
			//表头按钮
			toolbarConfig: {
			buttons: [
			{code: 'sort', name: t('processCard.sorting'), status: 'primary'},

			@@ -852,7 +852,7 @@
			})
			}

			//更新金额
			//更新金额重置
			const updateMoney = () => {
			const updateData = {
			order: titleUploadData.value,

			@@ -10,4 +10,6 @@
			public interface OrderOtherMoneyMapper extends BaseMapper<OrderOtherMoney> {

			List<OrderOtherMoney> findById(String orderId);

			Double selectGrossAmount(String orderId);
			}

			@@ -329,7 +329,8 @@
			orderDetail = updateOrderMoneyComputed(orderDetail,order.getCalculateType());
			money+= orderDetail.getGrossAmount();
			}
			order.setMoney(money);

			order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
			orderMapper.updateMoney(order);
			orderDetailMapper.updateOrderMoney(OrderDetails);
			return false;

			@@ -19,5 +19,10 @@
			where a.order_id = #{orderId}
			</select>

			<select id="selectGrossAmount">
			select sum(money) from order_other_money where order_id = #{orderId}

			</select>


			</mapper>

	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderOtherMoneyMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史