供应商优化

snowy-admin-web/src/views/biz/bizorder/form.vue

@@ -125,7 +125,7 @@
 		})
 
 		//查询供货商信息
-		bizSupplierApi.getList().then((res)=>{
+		bizSupplierApi.getList({transportType:'1'}).then((res)=>{
 			supplierIds.value = res.map((item)=>{
 				return{
 					value:item.id,

snowy-admin-web/src/views/biz/bizsupplier/form.vue

@@ -10,6 +10,13 @@
 			<a-form-item label="供货商名称：" name="supplierName">
 				<a-input v-model:value="formData.supplierName" placeholder="请输入供货商名称" allow-clear />
 			</a-form-item>
+			<a-form-item label="运输类型：" name="transportType">
+				<a-radio-group button-style="solid" v-model:value="formData.transportType">
+					<a-radio-button v-for="transportItem in transportTypeOptions" :key="transportItem.value" :value="transportItem.value" >
+						{{ transportItem.label }}
+					</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
 			<a-form-item label="供货商地址：" name="supplierAddress">
 				<a-input v-model:value="formData.supplierAddress" placeholder="请输入供货商地址" allow-clear />
 			</a-form-item>
@@ -23,7 +30,7 @@
 				<a-textarea
 					v-model:value="formData.supplierRemark"
 					placeholder="请输入备注"
-					allow-clear 
+					allow-clear
 					:auto-size="{ minRows: 3, maxRows: 6 }"
 				/>
 			</a-form-item>
@@ -39,6 +46,7 @@
 	import { cloneDeep } from 'lodash-es'
 	import { required } from '@/utils/formRules'
 	import bizSupplierApi from '@/api/biz/bizSupplierApi'
+	import tool from '@/utils/tool'
 	// 抽屉状态
 	const open = ref(false)
 	const emit = defineEmits({ successful: null })
@@ -51,6 +59,9 @@
 	const labelCol = ref({ span: 4})
 	const wrapperCol = ref({ span: 16})
 
+	// 运输方式
+	const transportTypeOptions = tool.dictList('transport_type')
+
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true
@@ -70,6 +81,7 @@
 		supplierName: [required('请输入供货商名称')],
 		supplierContactName:[required('请输入联系人')],
 		supplierPhone:[required('请输入手机号')],
+		transportType:[required('请选择运输类型')],
 	}
 	// 验证并提交数据
 	const onSubmit = () => {

snowy-admin-web/src/views/biz/bizsupplier/index.vue

@@ -50,6 +50,19 @@
 
 					</a-space>
 				</template>
+				<template v-if="column.dataIndex === 'transportType'">
+					<a-tag
+						:color="
+							record.transportType === '1'
+								? 'orange'
+								: record.transportType === '2'
+								  ? 'green'
+								  : 'cyan'
+						"
+					>
+						{{ $TOOL.dictTypeData('transport_type', record.transportType) }}
+					</a-tag>
+				</template>
 			</template>
 		</s-table>
 	</a-card>
@@ -89,6 +102,12 @@
 			dataIndex: 'supplierName',
 			align:'center'
 		},
+		{
+			title: '运输类型',
+			width: 100,
+			dataIndex: 'transportType',
+			align: 'center',
+		},
 		{
 			title: '供货商地址',
 			dataIndex: 'supplierAddress',
@@ -97,13 +116,13 @@
 		},
 		{
 			title: '联系人',
-			width: 180,
+			width: 150,
 			dataIndex: 'supplierContactName',
 			align:'center'
 		},
 		{
 			title: '手机号',
-			width: 180,
+			width: 150,
 			dataIndex: 'supplierPhone',
 			align:'center'
 		},

snowy-admin-web/src/views/biz/bizsupplier/transportForm.vue

@@ -7,13 +7,13 @@
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
-			<a-form-item label="运输类型：" name="transportType">
+<!--			<a-form-item label="运输类型：" name="transportType">
 				<a-radio-group button-style="solid" v-model:value="formData.transportType">
 					<a-radio-button v-for="transportItem in transportTypeOptions" :key="transportItem.value" :value="transportItem.value" >
 						{{ transportItem.label }}
 					</a-radio-button>
 				</a-radio-group>
-			</a-form-item>
+			</a-form-item>-->
 			<a-form-item label="运输号：" name="transportNo">
 				<a-input v-model:value="formData.transportNo" placeholder="请输入车牌号或者船舶号" allow-clear />
 			</a-form-item>
@@ -42,7 +42,7 @@
 	//设置表单样式
 	const labelCol = ref({ span: 4})
 	const wrapperCol = ref({ span: 16})
-	
+
 	// 运输方式
 	const transportTypeOptions = tool.dictList('transport_type')
 

snowy-admin-web/src/views/biz/bizsupplier/transportIndex.vue

@@ -73,11 +73,11 @@
 			dataIndex: 'serial',
 			align:'center'
 		},
-		{
+		/*{
 			title: '运输类型',
 			dataIndex: 'transportType',
 			align: 'center',
-		},
+		},*/
 		{
 			title: '运输号',
 			dataIndex: 'transportNo',

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/entity/BizSupplier.java

@@ -53,4 +53,7 @@ public class BizSupplier extends CommonEntity {
     /** 备注 */
     @Schema(description = "备注")
     private String supplierRemark;
+
+    /** 运输类型*/
+    private String transportType;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAddParam.java

@@ -49,4 +49,7 @@ public class BizSupplierAddParam {
     @Schema(description = "备注")
     private String supplierRemark;
 
+    /** 运输类型*/
+    private String transportType;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierEditParam.java

@@ -54,4 +54,7 @@ public class BizSupplierEditParam {
     @Schema(description = "备注")
     private String supplierRemark;
 
+    /** 运输类型*/
+    private String transportType;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierPageParam.java

@@ -50,4 +50,7 @@ public class BizSupplierPageParam {
     @Schema(description = "联系人")
     private String supplierContactName;
 
+    /**运输类型*/
+    private String transportType;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierServiceImpl.java

@@ -236,6 +236,14 @@ public class BizSupplierServiceImpl extends ServiceImpl<BizSupplierMapper, BizSu
         if(ObjectUtil.isNotEmpty(bizSupplierPageParam.getSupplierContactName())){
             queryWrapper.lambda().like(BizSupplier::getSupplierContactName,bizSupplierPageParam.getSupplierContactName());
         }
+        if(ObjectUtil.isNotEmpty(bizSupplierPageParam.getTransportType())){
+            if(StringUtils.equals(bizSupplierPageParam.getTransportType(),"1")){
+                queryWrapper.lambda().in(BizSupplier::getTransportType,"1","3");
+            }
+            if(StringUtils.equals(bizSupplierPageParam.getTransportType(),"2")){
+                queryWrapper.lambda().in(BizSupplier::getTransportType,"2","3");
+            }
+        }
         queryWrapper.lambda().eq(BizSupplier::getDeleteFlag, "NOT_DELETE");
         queryWrapper.lambda().orderByDesc(BizSupplier::getCreateTime);
         return this.list(queryWrapper);

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierTransportServiceImpl.java

@@ -19,6 +19,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +28,7 @@ import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
 import vip.xiaonuo.biz.modular.bizsupplier.enums.BizSupplierTransportEnum;
 import vip.xiaonuo.biz.modular.bizsupplier.enums.BizSupplierTransportEnum;
 import vip.xiaonuo.biz.modular.bizsupplier.param.*;
+import vip.xiaonuo.biz.modular.bizsupplier.service.BizSupplierService;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -45,6 +47,9 @@ import java.util.List;
 @Service
 public class BizSupplierTransportServiceImpl extends ServiceImpl<BizSupplierTransportMapper, BizSupplierTransport> implements BizSupplierTransportService {
 
+    @Resource
+    private BizSupplierService bizSupplierService;
+
     @Override
     public Page<BizSupplierTransport> page(BizSupplierTransportPageParam bizSupplierTransportPageParam) {
         QueryWrapper<BizSupplierTransport> queryWrapper = new QueryWrapper<BizSupplierTransport>().checkSqlInjection();