供应商添加运输调整

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" v-show="isShow">
 				<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" >
+					<a-radio-button v-for="transportItem in transportTypeOptions" :key="transportItem.value" :value="transportItem.value" v-show="transportItem.value != 3" >
 						{{ 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>
@@ -38,6 +38,7 @@
 	// 表单数据
 	const formData = ref({})
 	const submitLoading = ref(false)
+	const isShow = ref(true)
 
 	//设置表单样式
 	const labelCol = ref({ span: 4})
@@ -47,13 +48,21 @@
 	const transportTypeOptions = tool.dictList('transport_type')
 
 	// 打开抽屉
-	const onOpen = (record, supplierId) => {
+	const onOpen = (record, supplierId, transportType) => {
 		open.value = true
 		formData.value.supplierId = supplierId
+		if (transportType == '3') {
+			// 通用：需要选择类型
+			isShow.value = true
+		} else {
+			// 无需选择，类型和供应商一致
+			isShow.value = false
+			formData.value.transportType = transportType
+		}
 		if (record) {
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
-		}
+		} 
 	}
 	// 关闭抽屉
 	const onClose = () => {

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

@@ -10,7 +10,7 @@
 			>
 				<template #operator class="table-operator">
 					<a-space>
-						<a-button type="primary" @click="formRef.onOpen(null, supplierId)" v-if="hasPerm('bizSupplierTransportAdd')">
+						<a-button type="primary" @click="formRef.onOpen(null, supplierId, transportType)" v-if="hasPerm('bizSupplierTransportAdd')">
 							<template #icon><plus-outlined /></template>
 							新增
 						</a-button>
@@ -21,16 +21,34 @@
 						{{ index + 1 }}
 					</template>
 					<template v-if="column.dataIndex === 'transportType'">
-						{{ $TOOL.dictTypeData('transport_type', record.transportType) }}
+						<a-tag
+							:color="
+								record.transportType === '1'
+									? 'orange'
+									: record.transportType === '2'
+									? 'green'
+									: 'cyan'
+							"
+						>
+							{{ $TOOL.dictTypeData('transport_type', record.transportType) }}
+						</a-tag>
 					</template>
 					<template v-if="column.dataIndex === 'auditStatus'">
-						<span v-if="record.auditStatus=='1'">待审核</span>
-						<span v-else-if="record.auditStatus=='2'">审核通过</span>
-						<span v-else>未通过</span>
+						<a-tag
+							:color="
+								record.auditStatus === '1'
+									? 'blue'
+									: record.auditStatus === '2'
+									? 'green'
+									: 'red'
+							"
+						>
+							{{ $TOOL.dictTypeData('AUDIT_STATUS', record.auditStatus) }}
+						</a-tag>
 					</template>
 					<template v-if="column.dataIndex === 'action'">
 						<a-space>
-							<a @click="formRef.onOpen(record, supplierId)" v-if="hasPerm('bizSupplierTransportEdit') && record.auditStatus!='2'">编辑</a>
+							<a @click="formRef.onOpen(record, supplierId, transportType)" v-if="hasPerm('bizSupplierTransportEdit') && record.auditStatus!='2'">编辑</a>
 							<a-divider type="vertical" v-if="hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'], 'and') && record.auditStatus!='2'" />
 							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierTransportDelete')" @click="deleteConfig(record)">删除</a-button>
 							<a-divider type="vertical" v-if="(hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'], 'or') && record.auditStatus!='2') && hasPerm('bizSupplierTransportAudit')" />
@@ -65,6 +83,7 @@
 	const recordData = ref()
 	const title = ref()
 	const supplierId = ref()
+	const transportType = ref()
 
 	const columns = [
 		{
@@ -73,11 +92,11 @@
 			dataIndex: 'serial',
 			align:'center'
 		},
-		/*{
+		{
 			title: '运输类型',
 			dataIndex: 'transportType',
 			align: 'center',
-		},*/
+		},
 		{
 			title: '运输号',
 			dataIndex: 'transportNo',
@@ -111,6 +130,8 @@
 			supplierId: record.id
 		}
 		supplierId.value = record.id
+		transportType.value = record.transportType
+		console.info("supplierIdtransportType---" + transportType.value)
 		visible.value = true
 	}
 	const loadData = (parameter) => {