From 49ff777511a42b0c3c84eb3202e53df589666df0 Mon Sep 17 00:00:00 2001 From: zhangli <2235006734@qq.com> Date: Mon, 23 Oct 2023 16:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E7=B4=A2?= =?UTF-8?q?=E8=B5=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 6 -- src/components/Detail/src/Detail.vue | 2 - src/components/ImportForm/src/ImportForm.vue | 6 -- src/components/Search/src/Search.vue | 7 -- src/utils/disposition/tableColumns.ts | 92 ++++++++++++++++++-- 5 files changed, 85 insertions(+), 28 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 1f2ed6bea..685595369 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -338,20 +338,14 @@ const handleTableSelect = (row, column, event) => { // 删除数据 const handleDeleteTable = (row, index) => { - console.log(row); - console.log(index); emit('handleDeleteTable', row) } // 添加数据 const handleAddTable = () => { - console.log(2); - emit('handleAddTable') } // 输入框聚焦 const inpuFocus = (headerItem) => { - console.log(11); - opensearchTable() } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index eac945517..b868140a6 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -175,7 +175,6 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: detailLoading.value = true try { detailData.value = row - console.log(detailData.value); getRemarkList() getChangeRecordList() @@ -205,7 +204,6 @@ const remarksSubmitScuess = async (remark) => { const getChangeRecordList = async () => { // remarksData.data.tableId = '1679654720693248010' changeRecordData.changeRecordList = await DetailApi.getChangeRecordPage(remarksData.data) - console.log(changeRecordData.changeRecordList); } diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue index dbf6f2f1d..d3339a6b3 100644 --- a/src/components/ImportForm/src/ImportForm.vue +++ b/src/components/ImportForm/src/ImportForm.vue @@ -132,7 +132,6 @@ const updatePart = ref(props.updatePart)//是否部门保存 const importUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url -console.log(135, importUrl) /** 打开弹窗 */ const open = () => { dialogVisible.value = true @@ -231,11 +230,6 @@ const handleExceed = (): void => { /** 下载模板操作 */ const importTemplate = () => { const res = importTemplateData.value.templateUrl - console.log(266,importTemplateData.value.templateUrl) - console.log(1); - console.log(res); - console.log(1); - download.excel(res, importTemplateData.value.templateTitle) } diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 9964d4b32..eef62c159 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -102,13 +102,6 @@ const setVisible = () => { } const Search = ref() onMounted(() => { - // nextTick(() => { - // console.log(4) - // console.log(Search.value.offsetHeight) - // wsCache.set('SearchoffsetHeight', Search.value.offsetHeight) - // console.log(wsCache.get('SearchoffsetHeight')) - // console.log(4) - // }) }) diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts index f19fbec51..c7af9304c 100644 --- a/src/utils/disposition/tableColumns.ts +++ b/src/utils/disposition/tableColumns.ts @@ -1,5 +1,20 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import * as getRequestsettingApi from '@/api/wms/requestsetting/index.ts' +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept + +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize:10, + pageNo:1, + code:'PurchaseClaimRequest' +} + const data = await getRequestsettingApi.getRequestsettingPage(queryParams) + const requestsetting = data[0] + + /** * @returns {Array} 基础物料信息 */ @@ -10556,16 +10571,30 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ }, { label: '单据号', - field: 'number' + field: 'number', + isForm:false, }, { label: '业务类型', - field: 'businessType' + field: 'businessType', + form:{ + value:'PurchaseClaim', + componentProps:{ + disabled:true, + } + } }, { label: '申请时间', field: 'requestTime', formatter: dateFormatter, + form: { + value: new Date(), + component: 'DatePicker', + componentProps: { + type: 'datetime', + } + }, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' } @@ -10574,13 +10603,25 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ label: '截止时间', field: 'dueTime', formatter: dateFormatter, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + } + }, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' } }, { label: '部门', - field: 'departmentCode' + field: 'departmentCode', + form: { + value:userDept.name, + componentProps:{ + disabled:true, + } + }, }, { label: '状态', @@ -10588,7 +10629,13 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', isSearch: true, - isTable: true + isTable: true, + form: { + value:'NEW', + componentProps:{ + disabled:true, + } + }, }, { label: '备注', @@ -10597,12 +10644,14 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ { label: '创建者', field: 'creator', + isForm:false }, { label: '创建时间', field: 'createTime', isTable: true, formatter: dateFormatter, + isForm:false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' } @@ -10610,12 +10659,14 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ { label: '最后更新者', field: 'updater', + isForm:false }, { label: '最后更新时间', field: 'updateTime', isTable: true, formatter: dateFormatter, + isForm:false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' } @@ -10626,7 +10677,11 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true + isTable: true, + form:{ + component:'Switch', + value:true, + } }, { label: '自动通过', @@ -10649,13 +10704,36 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ field: 'directCreateRecord', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true } ])) - // 表单校验 export const PurchaseclaimRequestMainRules = reactive({ + asnNumber: [ + { required: true, message: '请输入发货单号', trigger: 'blur' } + ], + ppNumber: [ + { required: true, message: '请输入要货计划单号', trigger: 'blur' } + ], + supplierCode: [ + { required: true, message: '请输入供应商代码', trigger: 'change' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'change' } + ], + requestTime: [ + { required: true, message: '请选择申请时间', trigger: 'change' } + ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'change' } + ], + departmentCode: [ + { required: true, message: '请选择部门', trigger: 'change' } + ], + status: [ + { required: true, message: '请选择状态', trigger: 'change' } + ], }) /**