From dd8054b2f131280056f151ce4ee46a4574039662 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Mon, 17 Mar 2025 10:06:25 +0800
Subject: [PATCH] =?UTF-8?q?YT-2107=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF?=
=?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=97=B6=E9=80=89=E6=8B=A9=E5=8F=97=E5=85=A5=E5=8F=B7?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=94=BE=E5=A4=A7=E9=95=9C=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/modelDeliTime/index.ts | 11 +++-
.../supplierManage/modelDeliTime/index.vue | 36 ++++++-----
.../modelDeliTime/modelDeliTime.data.ts | 62 ++++++++++++++++---
3 files changed, 82 insertions(+), 27 deletions(-)
diff --git a/src/api/wms/modelDeliTime/index.ts b/src/api/wms/modelDeliTime/index.ts
index 2ac1092b1..5a9558258 100644
--- a/src/api/wms/modelDeliTime/index.ts
+++ b/src/api/wms/modelDeliTime/index.ts
@@ -52,6 +52,13 @@ export const importTemplate = () => {
return request.download({ url: '/wms/model-deli-time-detail/get-import-template' })
}
// 查询受入号
-export const getSupplierAddrList = async () => {
- return await request.get({ url: `/wms/itembasic/getModel` })
+export const getSupplierAddrList = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/itembasic/getModelSenior', data })
+ } else {
+ return await request.get({ url: `/wms/itembasic/getModel`, params})
+ }
+
}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
index c90fec274..b98ce454c 100644
--- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
@@ -119,7 +119,7 @@ routeName.value = route.name
const tableColumns = ref(ModelDeliTime.allSchemas.tableColumns)
const detailAllSchemas = ref(ModelDeliTimeDetail.allSchemas)
// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(async() => {
if (formField == 'code') {
let codes = val.filter((item) =>
@@ -146,24 +146,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
tableData.value.push(tfk)
})
}
-
const setV = {}
setV[formField] = val[0][searchField]
- if (formField == 'supplierCode') {
+ if (formField == 'modelShow') {
+ setV['modelShow'] = val.map(item=>item.model).join(',')
+ }
+
+ if (formField == 'supplierCode') {
setV['supplierCode'] = val[0].code
setV['supplierName'] = val[0].name
console.log(ModelDeliTime.allSchemas.formSchema)
- const options = await ModelDeliTimeDetailApi.getSupplierAddrList(val[0].code)
- ModelDeliTime.allSchemas.formSchema.forEach(item => {
- if(item.field == 'modelShow'){
- item.componentProps.options = options.map(item=> {
- return {
- label: item,
- value:item
- }
- })
- }
- })
+ // const options = await ModelDeliTimeDetailApi.getSupplierAddrList(val[0].code)
+ // ModelDeliTime.allSchemas.formSchema.forEach(item => {
+ // if(item.field == 'modelShow'){
+ // item.componentProps.options = options.map(item=> {
+ // return {
+ // label: item,
+ // value:item
+ // }
+ // })
+ // }
+ // })
}
formRef.setValues(setV)
})
@@ -179,7 +182,8 @@ const submitForm = async (formType, submitData) => {
if (data.masterId) {
data.id = data.masterId
}
- data.model =data.modelShow.join(',')
+ data.model =data.modelShow
+ // data.model =data.modelShow.join(',')
data.yearAndMonth =data.yearAndMonthShow.join(',')
data.subList = tableData.value // 拼接子表数据参数
data.subList.forEach((item) => {
@@ -265,7 +269,7 @@ const HeadButttondata = [
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增
- getModelCode()
+ // getModelCode()
openForm('create')
} else if (val == 'import') { // 导入
handleImport()
diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
index eb4193732..6de2912ad 100644
--- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
@@ -6,6 +6,8 @@ import { Supplier } from '../supplier/supplier.data'
import { DeliTimeWms } from '../DeliTimeWms/deliTimeWms.data'
import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms'
import { fa } from 'element-plus/es/locale'
+import * as modelDeliTimeApi from '@/api/wms/modelDeliTime'
+
// 表单校验
export const ModelDeliTimeDetailRules = reactive({
@@ -48,6 +50,15 @@ function getMonthArr() {
return dateArr;
}
+export const ModelList = useCrudSchemas(reactive<CrudSchema[]>([
+ {
+ label: '受入号',
+ field: 'model',
+ sort: 'custom',
+ isSearch: true,
+ },
+]))
+
export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
// {
// label: '供应商代码',
@@ -100,17 +111,48 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
isTable: false,
isDetail: false,
+ // form: {
+ // component: 'Select',
+ // componentProps: {
+ // multiple: true,
+ // collapseTags: true,
+ // collapseTagsTooltip: true,
+ // maxCollapseTags: "2",
+ // optionsAlias: {
+ // labelField: 'label',
+ // valueField: 'value'
+ // }
+ // }
+ // }
form: {
- component: 'Select',
+ // labelMessage: '信息提示说明！！！',
componentProps: {
- multiple: true,
- collapseTags: true,
- collapseTagsTooltip: true,
- maxCollapseTags: "2",
- optionsAlias: {
- labelField: 'label',
- valueField: 'value'
- }
+ multiple:true,
+ disabled:true,
+ enterSearch: false,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择受入号', // 输入框占位文本
+ searchField: 'model', // 查询弹窗赋值字段
+ searchTitle: '受入号', // 查询弹窗标题
+ searchAllSchemas: ModelList.allSchemas, // 查询弹窗所需类
+ searchPage: modelDeliTimeApi.getSupplierAddrList, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ ],
+ verificationParams: [
+ {
+ key: 'itemCode',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
}
}
},
@@ -216,6 +258,8 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
}
]))
+
+
export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '编号',