From 90ad6fe386d265574002c3b09afe6c3286ce62a4 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 6 Mar 2025 13:26:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=9C=B0=E7=82=B9?= =?UTF-8?q?=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF=E6=AC=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierAddressModelDeli/index.ts | 5 + .../deliveryCalendar/deliveryCalendar.data.ts | 11 +- .../supplierManage/deliveryCalendar/index.vue | 3 + .../supplierAddressModelDeli/index.vue | 26 +++- .../supplierAddressModelDeli.data.ts | 129 +++++++++++------- 5 files changed, 116 insertions(+), 58 deletions(-) diff --git a/src/api/wms/supplierAddressModelDeli/index.ts b/src/api/wms/supplierAddressModelDeli/index.ts index 5b45ab3e5..fc2a472c7 100644 --- a/src/api/wms/supplierAddressModelDeli/index.ts +++ b/src/api/wms/supplierAddressModelDeli/index.ts @@ -53,4 +53,9 @@ export const exportSupplierAddressModelDeli = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplier-address-model-deli/get-import-template' }) +} + +// 查询供应商地点 +export const getSupplierModelList = async (params) => { + return await request.get({ url: `/wms/supplieritem/getSupplierModelList`, params }) } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts index 5176ade05..7883de010 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts @@ -54,8 +54,15 @@ export const DeliveryCalendar = useCrudSchemas( { label: '供应商名称', field: 'supplierName', - sort: 'custom', - isSearch: true + isForm: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 250 + } }, { label: '供应商地点', diff --git a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue index 049912b60..44051e688 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue @@ -81,6 +81,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + if(formField == 'supplierCode'){ + setV['supplierName'] = val[0]['name'] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue index a62e4efeb..477d5ee9d 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue @@ -78,11 +78,29 @@ const tableColumns = ref(SupplierAddressModelDeli.allSchemas.tableColumns) // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { - nextTick(() => { + nextTick(async() => { const setV = {} setV[formField] = val[0][searchField] - if(formField == 'supplierCode'){ - setV['supplierName'] = val[0]['name'] + if (formField == 'supplierCode') { + setV['supplierCode'] = val[0]['supplierCode'] + setV['supplierName'] = val[0]['supplierName'] + setV['supplierAddress'] = val[0]['supplierAddress'] + setV['yearAndMonth'] = val[0]['yearAndMonth'] + const params = { + supplierCode: val[0]['supplierCode'], + supplierAddress: val[0]['supplierAddress'], + } + const options = await SupplierAddressModelDeliApi.getSupplierModelList(params) + SupplierAddressModelDeli.allSchemas.formSchema.forEach(item => { + if(item.field == 'modelShow'){ + item.componentProps.options = options.map(item=> { + return { + label: item, + value:item + } + }) + } + }) } formRef.setValues(setV) }) @@ -104,7 +122,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:supplier-address-model-deli:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'wms:supplier-address-model-deli:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:supplier-address-model-deli:export'}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts index 8dd2a4e6c..6a87b0690 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts @@ -1,7 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -import * as SupplierApi from '@/api/wms/supplier' -import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import * as SupplierAddrDeliTimeApi from '@/api/wms/supplierAddrDeliTime' +import { SupplierAddrDeliTime } from '@/views/wms/basicDataManage/supplierManage/supplierAddrDeliTime/supplierAddrDeliTimeDetail.data' // 表单校验 export const SupplierAddressModelDeliRules = reactive({ @@ -14,57 +14,57 @@ export const SupplierAddressModelDeliRules = reactive({ export const SupplierAddressModelDeli = useCrudSchemas( reactive([ { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - isSearch: true, - table: { - width: 150, - fixed: 'left' - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isSearch: true, + table: { + width: 150, + fixed: 'left' + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: SupplierAddrDeliTime.allSchemas, // 查询弹窗所需类 + searchPage: SupplierAddrDeliTimeApi.getSupplierAddrDeliTimeDetailPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false } - } - }, - { - label: '供应商名称', - field: 'supplierName', - isForm: true, - form: { - componentProps: { - disabled: true + ], + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true } - }, - table: { - width: 250 - } - }, + ] // 失去焦点校验参数 + } + } + }, + { + label: '供应商名称', + field: 'supplierName', + isForm: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 250 + } + }, { label: '供应商地点', field: 'supplierAddress', @@ -77,11 +77,36 @@ export const SupplierAddressModelDeli = useCrudSchemas( sort: 'custom', isSearch: true }, + + + { + label: '受入号', + field: 'modelShow', + sort: 'custom', + isSearch: true, + isTable: false, + isDetail: false, + form: { + component: 'Select', + componentProps: { + multiple: true, + collapseTags: true, + collapseTagsTooltip: true, + maxCollapseTags: "2", + optionsAlias: { + labelField: 'label', + valueField: 'value' + } + } + } + }, { label: '受入号', field: 'model', sort: 'custom', - isSearch: true + isTable: true, + isDetail: true, + isForm: false, }, { label: '班次',