新增MES模块，包含供应商、客户、车辆和地磅数据记录管理功能，支持免密接口和数据同步。更新相关控制器、实体、服务和数据库配置，优化权限管理和数据字典支持，确保系统的灵活性和可扩展性。
This commit is contained in:
geht
@@ -0,0 +1,65 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" title="选择车辆" :width="920" @register="registerModal" @ok="handleOk">
|
||||
<BasicTable @register="registerTable" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref } from 'vue';
|
||||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||||
import { BasicTable, useTable } from '/@/components/Table';
|
||||
import { list as vehicleList } from '/@/views/xslmes/mesXslVehicle/MesXslVehicle.api';
|
||||
|
||||
const emit = defineEmits(['register', 'select']);
|
||||
|
||||
const selectedRow = ref<Recordable | null>(null);
|
||||
const currentVehicleBelong = ref<string>('');
|
||||
|
||||
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
|
||||
api: (params) => vehicleList({ ...params, vehicleBelong: currentVehicleBelong.value, status: '0' }),
|
||||
columns: [
|
||||
{ title: '车牌号', dataIndex: 'plateNumber', width: 120 },
|
||||
{ title: '皮重(KG)', dataIndex: 'tareWeightKg', width: 100 },
|
||||
{ title: '供应商名称', dataIndex: 'supplierName', width: 160, ellipsis: true },
|
||||
{ title: '供应商简称', dataIndex: 'supplierShortName', width: 120 },
|
||||
{ title: '客户简称', dataIndex: 'customerShortName', width: 140, ellipsis: true },
|
||||
{ title: '司机', dataIndex: 'driverName', width: 90 },
|
||||
{ title: '手机号', dataIndex: 'driverPhone', width: 120 },
|
||||
],
|
||||
rowKey: 'id',
|
||||
useSearchForm: true,
|
||||
formConfig: {
|
||||
labelWidth: 80,
|
||||
schemas: [
|
||||
{ label: '车牌号', field: 'plateNumber', component: 'Input', colProps: { span: 8 } },
|
||||
],
|
||||
},
|
||||
pagination: { pageSize: 10 },
|
||||
canResize: false,
|
||||
showIndexColumn: false,
|
||||
immediate: false,
|
||||
rowSelection: {
|
||||
type: 'radio',
|
||||
columnWidth: 48,
|
||||
onChange: (_keys, rows) => {
|
||||
selectedRow.value = rows?.[0] ?? null;
|
||||
},
|
||||
},
|
||||
clickToRowSelect: true,
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps }] = useModalInner((data) => {
|
||||
selectedRow.value = null;
|
||||
currentVehicleBelong.value = data?.vehicleBelong ?? '';
|
||||
clearSelectedRowKeys();
|
||||
reload();
|
||||
});
|
||||
|
||||
function handleOk() {
|
||||
if (!selectedRow.value) {
|
||||
return;
|
||||
}
|
||||
emit('select', { ...selectedRow.value });
|
||||
setModalProps({ open: false });
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,192 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="900" @ok="handleSubmit">
|
||||
<BasicForm @register="registerForm" name="MesXslWeightRecordForm">
|
||||
|
||||
<!-- 进出方向：JDictSelectTag 带切换联动 -->
|
||||
<template #directionPicker="{ model, field }">
|
||||
<JDictSelectTag
|
||||
v-model:value="model[field]"
|
||||
dictCode="xslmes_inout_direction"
|
||||
placeholder="请选择进出方向"
|
||||
:disabled="isDetail"
|
||||
@update:value="(v) => onDirectionChange(model, v)"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<!-- 车号：弹出选择车辆，带出相关字段 -->
|
||||
<template #vehiclePicker="{ model, field }">
|
||||
<a-input-group compact style="display: flex; width: 100%">
|
||||
<a-input v-model:value="model[field]" read-only placeholder="请先选择进出方向，再选择车辆" style="flex: 1" :disabled="isDetail" />
|
||||
<a-button type="primary" :disabled="isDetail" @click="openVehicleSelect(model)">选择车辆</a-button>
|
||||
<a-button v-if="model.vehicleId" :disabled="isDetail" @click="clearVehicle(model)">清除</a-button>
|
||||
</a-input-group>
|
||||
</template>
|
||||
|
||||
<!-- 毛重输入：变化时自动更新净重 -->
|
||||
<template #grossWeightInput="{ model, field }">
|
||||
<a-input-number
|
||||
v-model:value="model[field]"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
:disabled="isDetail"
|
||||
placeholder="请输入毛重"
|
||||
style="width: 100%"
|
||||
@change="(val) => onGrossWeightChange(val, model)"
|
||||
/>
|
||||
</template>
|
||||
|
||||
</BasicForm>
|
||||
|
||||
<MesXslVehicleSelectModal @register="registerVehicleModal" @select="onVehicleSelect" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, computed, unref } from 'vue';
|
||||
import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
|
||||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { formSchema } from '../MesXslWeightRecord.data';
|
||||
import { saveOrUpdate } from '../MesXslWeightRecord.api';
|
||||
import MesXslVehicleSelectModal from './MesXslVehicleSelectModal.vue';
|
||||
|
||||
const { createMessage } = useMessage();
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
const isUpdate = ref(true);
|
||||
const isDetail = ref(false);
|
||||
|
||||
const [registerVehicleModal, { openModal: openVehicleModal }] = useModal();
|
||||
|
||||
const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField, getFieldsValue }] = useForm({
|
||||
labelWidth: 120,
|
||||
schemas: formSchema,
|
||||
showActionButtonGroup: false,
|
||||
baseColProps: { span: 12 },
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
await resetFields();
|
||||
setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter });
|
||||
isUpdate.value = !!data?.isUpdate;
|
||||
isDetail.value = !data?.showFooter;
|
||||
if (unref(isUpdate)) {
|
||||
await setFieldsValue({ ...data.record });
|
||||
}
|
||||
setProps({ disabled: !data?.showFooter });
|
||||
});
|
||||
|
||||
const title = computed(() => (!unref(isUpdate) ? '新增' : unref(isDetail) ? '详情' : '编辑'));
|
||||
|
||||
/** 进出方向切换：清空车辆及关联字段 */
|
||||
function onDirectionChange(model: Recordable, val: unknown) {
|
||||
const v = val != null ? String(val) : '';
|
||||
if (!v) return;
|
||||
clearVehicleFields(model);
|
||||
}
|
||||
|
||||
/** 选择车辆弹窗：vehicleBelong=2(供应商)对应进厂，=1(客户)对应出厂 */
|
||||
function openVehicleSelect(model: Recordable) {
|
||||
const direction = model.inoutDirection;
|
||||
if (!direction) {
|
||||
createMessage.warning('请先选择进出方向');
|
||||
return;
|
||||
}
|
||||
// 进厂(1)→供应商车辆(vehicleBelong=2)；出厂(2)→客户车辆(vehicleBelong=1)
|
||||
const vehicleBelong = direction === '1' ? '2' : '1';
|
||||
openVehicleModal(true, { vehicleBelong });
|
||||
}
|
||||
|
||||
/** 车辆选中回调：填充相关字段 */
|
||||
function onVehicleSelect(vehicle: Recordable) {
|
||||
const values = getFieldsValue() as Recordable;
|
||||
const direction = values.inoutDirection;
|
||||
|
||||
const patch: Recordable = {
|
||||
vehicleId: vehicle.id,
|
||||
plateNumber: vehicle.plateNumber ?? '',
|
||||
tareWeight: vehicle.tareWeightKg ?? null,
|
||||
driverName: vehicle.driverName ?? '',
|
||||
driverPhone: vehicle.driverPhone ?? '',
|
||||
};
|
||||
|
||||
// 进厂(1)→发货单位=供应商；出厂(2)→收货单位=客户
|
||||
if (direction === '1') {
|
||||
patch.senderUnit = vehicle.supplierName ?? vehicle.supplierShortName ?? '';
|
||||
patch.receiverUnit = '';
|
||||
} else if (direction === '2') {
|
||||
patch.receiverUnit = vehicle.customerShortName ?? '';
|
||||
patch.senderUnit = '';
|
||||
}
|
||||
|
||||
// 重新计算净重
|
||||
const gross = values.grossWeight ?? null;
|
||||
const tare = patch.tareWeight;
|
||||
if (gross != null && tare != null) {
|
||||
const net = Number(gross) - Number(tare);
|
||||
patch.netWeight = net >= 0 ? net : 0;
|
||||
}
|
||||
|
||||
setFieldsValue(patch);
|
||||
}
|
||||
|
||||
/** 清除车辆信息 */
|
||||
function clearVehicle(model: Recordable) {
|
||||
clearVehicleFields(model);
|
||||
setFieldsValue({
|
||||
vehicleId: '',
|
||||
plateNumber: '',
|
||||
senderUnit: '',
|
||||
receiverUnit: '',
|
||||
tareWeight: null,
|
||||
netWeight: null,
|
||||
driverName: '',
|
||||
driverPhone: '',
|
||||
});
|
||||
}
|
||||
|
||||
function clearVehicleFields(model: Recordable) {
|
||||
model.vehicleId = '';
|
||||
model.plateNumber = '';
|
||||
model.senderUnit = '';
|
||||
model.receiverUnit = '';
|
||||
model.tareWeight = null;
|
||||
model.netWeight = null;
|
||||
model.driverName = '';
|
||||
model.driverPhone = '';
|
||||
}
|
||||
|
||||
/** 毛重变化：重新计算净重 */
|
||||
function onGrossWeightChange(val: number | null, model: Recordable) {
|
||||
const gross = val ?? 0;
|
||||
const tare = model.tareWeight ?? 0;
|
||||
const net = gross - tare;
|
||||
setFieldsValue({ netWeight: net >= 0 ? net : 0 });
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
try {
|
||||
const values = await validate();
|
||||
setModalProps({ confirmLoading: true });
|
||||
await saveOrUpdate(values, unref(isUpdate));
|
||||
closeModal();
|
||||
emit('success');
|
||||
} catch (e: any) {
|
||||
if (e?.errorFields) {
|
||||
const firstField = e.errorFields[0];
|
||||
if (firstField) {
|
||||
scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
|
||||
}
|
||||
}
|
||||
return Promise.reject(e);
|
||||
} finally {
|
||||
setModalProps({ confirmLoading: false });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
:deep(.ant-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user