From 2b4ae267edf06f4ce81fbd81a3b6eba8a9b63ca0 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 7 Aug 2025 11:38:00 +0800 Subject: [PATCH 1/8] =?UTF-8?q?YT-2391SCP=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 559 ++++++++++-------- 1 file changed, 314 insertions(+), 245 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index e74877fb8..0fb855217 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import { accountantFormart } from '@/utils/formatter' import * as SupplierApi from '@/api/wms/supplier' @@ -19,14 +19,14 @@ const queryParams = { const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData = data?.list[0] || {} - // 获取当前操作人的部门 - import { useUserStore } from '@/store/modules/user' - import { TableColumn } from '@/types/table' - const userStore = useUserStore() - const userDept = userStore.userSelfInfo.dept - // id 转str 否则form回显匹配不到 - userDept.id = userDept.id.toString() - const userDeptArray:any = [userDept] +// 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +import { TableColumn } from '@/types/table' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase', pageSize: 1000, pageNo: 1, sort: '', by: 'ASC' }) const purchasingPriceApprover = procurementCreators.list.filter(item => item.id != 1) @@ -69,11 +69,11 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive( isSearch: true, isForm: false }, - + { label: '供应商代码', field: 'supplierCode', @@ -168,12 +168,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( width: 150, fixed: 'left' }, - sortTableDefault:1, + sortTableDefault: 1, isSearch: true, form: { // labelMessage: '信息提示说明！！！', - componentProps: {     - enterSearch:true, + componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -206,11 +206,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '供应商名称', field: 'supplierName', sort: 'custom', - isSearch:true, + isSearch: true, table: { width: 180, }, - sortTableDefault:2, + sortTableDefault: 2, isForm: false }, { @@ -219,12 +219,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, dictClass: 'string', isTable: true, - isForm:false, + isForm: false, sort: 'custom', table: { width: 150 }, - sortTableDefault:9, + sortTableDefault: 9, isSearch: true, search: { componentProps: { @@ -249,13 +249,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( width: 180, fixed: 'left' }, - isTableForm:false, - isTable:false, - isDetail:false, + isTableForm: false, + isTable: false, + isDetail: false, isSearch: true, isForm: false, }, - + { label: '材料款未税金额', // 供应商维护未税金额 field: 'amount', @@ -263,7 +263,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', componentProps: { @@ -303,7 +303,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', componentProps: { @@ -323,7 +323,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', componentProps: { @@ -343,7 +343,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', componentProps: { @@ -361,7 +361,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( field: 'taxRate', dictType: DICT_TYPE.TAX_RATE_DICT, dictClass: 'string', - sortTableDefault:3, + sortTableDefault: 3, isTable: true, sort: 'custom', table: { @@ -421,7 +421,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:6, + sortTableDefault: 6, form: { component: 'InputNumber', componentProps: { @@ -441,7 +441,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:7, + sortTableDefault: 7, form: { component: 'InputNumber', componentProps: { @@ -456,7 +456,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - + // { // label: '调整价差', // field: 'discountAmount', @@ -503,7 +503,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:4, + sortTableDefault: 4, form: { component: 'InputNumber', componentProps: { @@ -523,7 +523,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:3, + sortTableDefault: 3, form: { component: 'InputNumber', componentProps: { @@ -531,7 +531,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '返利税额', @@ -540,7 +540,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:4, + sortTableDefault: 4, form: { component: 'InputNumber', componentProps: { @@ -548,7 +548,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '返利价税合计', @@ -557,7 +557,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:4, + sortTableDefault: 4, form: { component: 'InputNumber', componentProps: { @@ -565,7 +565,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '发票税额', @@ -574,7 +574,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:4, + sortTableDefault: 4, form: { component: 'InputNumber', componentProps: { @@ -582,7 +582,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '发票价税合计', @@ -591,7 +591,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:5, + sortTableDefault: 5, form: { component: 'InputNumber', componentProps: { @@ -599,7 +599,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '是否有价差', @@ -607,25 +607,25 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS, dictClass: 'string', isTable: true, - isForm:false, - isSearch:false, + isForm: false, + isSearch: false, sort: 'custom', table: { width: 150 }, - sortTableDefault:5, + sortTableDefault: 5, }, { label: '价差说明', field: 'balanceStatement', isTable: false, - isForm:false, - isSearch:false, + isForm: false, + isSearch: false, sort: 'custom', table: { width: 150 }, - sortTableDefault:5, + sortTableDefault: 5, }, { label: '未税尾差', @@ -634,7 +634,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:5, + sortTableDefault: 5, form: { component: 'InputNumber', componentProps: { @@ -642,7 +642,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '税额尾差', @@ -651,7 +651,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:5, + sortTableDefault: 5, form: { component: 'InputNumber', componentProps: { @@ -659,7 +659,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( disabled: true, } }, - isTableForm:false, + isTableForm: false, }, { label: '价税合计尾差', @@ -668,8 +668,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:5, - isTableForm:false, + sortTableDefault: 5, + isTableForm: false, form: { component: 'InputNumber', componentProps: { @@ -678,7 +678,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } } }, - + // { // label: '总差额', // field: 'totalDifference', @@ -702,24 +702,24 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( { label: '金税票号', field: 'goldenTaxInvoiceNumber', - isTable:true, - isDetail:true, + isTable: true, + isDetail: true, table: { width: 200, }, - sortTableDefault:10, - form:{ + sortTableDefault: 10, + form: { componentProps: { - maxlength:20, - showWordLimit:true + maxlength: 20, + showWordLimit: true } } }, { label: '快递单号', field: 'expressTrackingNumber', - isTable:false, - isForm:false, + isTable: false, + isForm: false, table: { width: 150 }, @@ -735,11 +735,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, - sortTableDefault:11, + sortTableDefault: 11, form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -771,20 +771,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable:false, - isDetail:false, + isTable: false, + isDetail: false, form: { component: 'DatePicker', componentProps: { disabled: true, - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, }, - + { label: '申请时间', field: 'requestTime', @@ -796,8 +796,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable:false, - isForm:false, + isTable: false, + isForm: false, form: { component: 'DatePicker', componentProps: { @@ -814,9 +814,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, - isTableForm:false, - isForm:false, + isTable: false, + isTableForm: false, + isForm: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -839,8 +839,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, - sortTableDefault:1001, + isTable: false, + sortTableDefault: 1001, isForm: false, }, { @@ -871,9 +871,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( { label: '供应商创建时间', field: 'requestTime', - isTable:true, + isTable: true, formatter: dateFormatter, - sortTableDefault:1000, + sortTableDefault: 1000, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -890,7 +890,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, + isTable: false, isForm: false, }, { @@ -922,16 +922,16 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:14, + sortTableDefault: 14, isForm: true, - isTable:false, - isDetail:false, - isSearch:true, + isTable: false, + isDetail: false, + isSearch: true, form: { component: 'Select', api: () => purchasingPriceApprover, componentProps: { - options:[], + options: [], optionsAlias: { labelField: 'nickname', valueField: 'id' @@ -958,7 +958,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( component: 'Select', api: () => purchasingPriceApprover, componentProps: { - options:[], + options: [], optionsAlias: { labelField: 'nickname', valueField: 'id' @@ -972,10 +972,10 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:14, + sortTableDefault: 14, isForm: false, - isTable:true, - isDetail:false, + isTable: true, + isDetail: false, form: { component: 'Select', api: () => purchasingPriceApprover, @@ -994,11 +994,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable:true, + isTable: true, isDetail: true, isTableForm: false, isForm: true, - isSearch:false, + isSearch: false, sortTableDefault: 12, form: { component: 'InputNumber', @@ -1016,7 +1016,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', componentProps: { @@ -1036,7 +1036,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', componentProps: { @@ -1053,15 +1053,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '采购审批时间', field: 'procurementCreateTime', isTable: true, - sortTableDefault:13, + sortTableDefault: 13, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 @@ -1080,7 +1080,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - sortTableDefault:14, + sortTableDefault: 14, isForm: false, }, { @@ -1089,11 +1089,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, - sortTableDefault:16, + sortTableDefault: 16, isTable: true, isSearch: false, isForm: false, - isDetail:false, + isDetail: false, }, { label: '财务驳回原因', @@ -1101,25 +1101,25 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, - sortTableDefault:17, + sortTableDefault: 17, isTable: true, isSearch: false, isForm: false, - isDetail:false, + isDetail: false, }, { label: '财务审批时间', field: 'financialCreateTime', isTable: true, - sortTableDefault:15, + sortTableDefault: 15, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 @@ -1135,9 +1135,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '供应商审批人', field: 'supplierCreator', sort: 'custom', - isTable:false, - isDetail:false, - sortTableDefault:1006, + isTable: false, + isDetail: false, + sortTableDefault: 1006, table: { width: 180 }, @@ -1147,9 +1147,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '供应商审批人', field: 'supplierCreatorName', sort: 'custom', - isTable:false, - isDetail:true, - sortTableDefault:1006, + isTable: false, + isDetail: true, + sortTableDefault: 1006, table: { width: 180 }, @@ -1158,15 +1158,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( { label: '供应商审批时间', field: 'supplierCreateTime', - isTable:false, + isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 @@ -1185,7 +1185,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm:false, + isForm: false, isTable: false, }, { @@ -1194,9 +1194,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: false, - isForm:false, - isTableForm:false, - isDetail:false, + isForm: false, + isTableForm: false, + isDetail: false, sort: 'custom', table: { width: 150 @@ -1217,9 +1217,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: false, - isForm:false, - isTableForm:false, - isDetail:false, + isForm: false, + isTableForm: false, + isDetail: false, sort: 'custom', table: { width: 150 @@ -1240,9 +1240,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: false, - isForm:false, - isTableForm:false, - isDetail:false, + isForm: false, + isTableForm: false, + isDetail: false, sort: 'custom', table: { width: 150 @@ -1263,9 +1263,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: false, - isForm:false, - isTableForm:false, - isDetail:false, + isForm: false, + isTableForm: false, + isDetail: false, sort: 'custom', table: { width: 150 @@ -1291,23 +1291,23 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, } ])) -export const accountantFormartDetail = ( cellValue) => { - if(cellValue == 0){ +export const accountantFormartDetail = (row, column, cellValue) => { + if (cellValue == 0) { return cellValue } - if(!cellValue){ - return '' + if (!cellValue) { + return 0 } cellValue = cellValue + '' || '' cellValue = String(Math.round(Number(cellValue) * 100) / 100) let x = cellValue.split('.') let x1 = x[0] - let x2 = x.length > 1 ? '.' + x[1] : '' + let x2 = x.length > 1 ? '.' + x[1] : '' const reg = /(\d+)(\d{3})/ - while(reg.test(x1)){ + while (reg.test(x1)) { x1 = x1.replace(reg, '$1,$2') } - return x1+x2 + return x1 + x2 } /** * @returns {Array} 供应商发票在详情展示的主表字段 @@ -1349,12 +1349,12 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive { + if (cellValue == 0) { + return cellValue + } + if (!cellValue) { + return 0 + } cellValue = String(Math.round(Number(cellValue) * 100000) / 100000) cellValue = cellValue + '' || '' let x = cellValue.split('.') let x1 = x[0] - let x2 = x.length > 1 ? '.' + x[1] : '' + let x2 = x.length > 1 ? '.' + x[1] : '' const reg = /(\d+)(\d{3})/ - while(reg.test(x1)){ + while (reg.test(x1)) { x1 = x1.replace(reg, '$1,$2') } - return x1+x2 + return x1 + x2 } function validateTaxRate(rule, value, callback) { - if (value>0) { + if (value > 0) { callback() - }else{ + } else { callback(new Error('税率必须大于0')) } } const validateGoldenTaxInvoiceNumber = (rule, value, callback) => { const reg = /^[0-9]*$/ - if (value==null||value==''||reg.test(value)) { + if (value == null || value == '' || reg.test(value)) { callback() - }else{ + } else { callback(new Error('只能是数字')) } } @@ -1982,10 +1988,10 @@ export const SupplierinvoiceRequestMainRules = reactive({ supplierCode: [ { required: true, message: '请选择供应商代码', trigger: 'change' } ], - invoiceTime:[ + invoiceTime: [ { required: false, message: '请选择发票日期', trigger: 'blur' } ], - goldenTaxInvoiceNumber:[ + goldenTaxInvoiceNumber: [ { required: false, message: '请输入金税票号', trigger: 'blur' }, // { validator:validateGoldenTaxInvoiceNumber, message: '金税票号只能是数字', trigger: 'blur'} ], @@ -2007,7 +2013,7 @@ export const SupplierinvoiceRequestMainRules = reactive({ businessType: [ { required: true, message: '请输入业务类型', trigger: 'blur' } ], - remark: [ + remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], procurementCreator: [ @@ -2033,11 +2039,11 @@ export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive { - if (Number(value)>0) { - callback(); + if (Number(value) > 0) { + callback(); } else { callback(new Error('请输入合同价格')); } @@ -2630,10 +2699,10 @@ export const PurchasePass = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable: false, form: { - componentProps:{ - type:'textarea' + componentProps: { + type: 'textarea' } }, }, @@ -2641,8 +2710,8 @@ export const PurchasePass = useCrudSchemas(reactive([ //表单校验 export const PurchasePassRules = reactive({ balanceStatement: [ - { required: true, message: '请输入价差通过说明', trigger: 'blur'}, - { max: 100, message: '最多100字符', trigger: 'blur'} + { required: true, message: '请输入价差通过说明', trigger: 'blur' }, + { max: 100, message: '最多100字符', trigger: 'blur' } ], }) /** @@ -2656,7 +2725,7 @@ export const ClaimDetails = useCrudSchemas(reactive([ width: 150 }, tableForm: { - disabled:true + disabled: true } }, { @@ -2699,5 +2768,5 @@ export const ClaimDetails = useCrudSchemas(reactive([ disabled: true } }, - + ])) From c34adbea7897f44a20cb996b13ac3515cf75a233 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 7 Aug 2025 11:43:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?YT-2391SCP=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 467 ++++++++++-------- 1 file changed, 268 insertions(+), 199 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 268dfd5a4..f26424a63 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import { accountantFormart } from '@/utils/formatter' /** @@ -8,7 +8,7 @@ import { accountantFormart } from '@/utils/formatter' export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '单据号', - field:'number', + field: 'number', sort: 'custom', table: { width: 180, @@ -16,16 +16,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isSearch: false }, - + { label: '发票申请单号', - field:'requestNumber', + field: 'requestNumber', sort: 'custom', table: { width: 180, }, - sortSearchDefault:1, - sortTableDefault:1, + sortSearchDefault: 1, + sortTableDefault: 1, isSearch: true }, { @@ -35,7 +35,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:1, + sortTableDefault: 1, isSearch: true }, { @@ -45,9 +45,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 180, }, - sortTableDefault:2, + sortTableDefault: 2, isForm: false, - isSearch:true + isSearch: true }, { label: '税率', @@ -56,12 +56,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:3, + sortTableDefault: 3, form: { component: 'InputNumber', } }, - + { label: '价差合计', field: 'differencePriceTotalMain', @@ -81,8 +81,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, dictClass: 'string', isTable: true, - sortTableDefault:7, - isForm:false, + sortTableDefault: 7, + isForm: false, sort: 'custom', table: { width: 150 @@ -102,7 +102,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ } } }, - + // { // label: '申请单号', // field: 'requestNumber', @@ -117,7 +117,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '订单号', field: 'poNumber', sort: 'custom', - isTable:false, + isTable: false, table: { width: 150 }, @@ -129,7 +129,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 200 }, - sortTableDefault:5, + sortTableDefault: 5, isSearch: true }, { @@ -139,9 +139,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:5, - isForm:false, - isTableForm:false + sortTableDefault: 5, + isForm: false, + isTableForm: false }, { label: '税额尾差', @@ -150,9 +150,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:5, - isForm:false, - isTableForm:false + sortTableDefault: 5, + isForm: false, + isTableForm: false }, { label: '价税合计尾差', @@ -161,11 +161,11 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:5, - isForm:false, - isTableForm:false + sortTableDefault: 5, + isForm: false, + isTableForm: false }, - + { label: '供应商维护税额', field: 'taxAmount', @@ -174,7 +174,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', } @@ -186,9 +186,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:3, - isForm:false, - isTableForm:false + sortTableDefault: 3, + isForm: false, + isTableForm: false }, { label: '发票税额', @@ -197,9 +197,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:3, - isForm:false, - isTableForm:false + sortTableDefault: 3, + isForm: false, + isTableForm: false }, { label: '发票价税合计', @@ -208,9 +208,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:3, - isForm:false, - isTableForm:false + sortTableDefault: 3, + isForm: false, + isTableForm: false }, { label: '是否有价差', @@ -218,26 +218,26 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS, dictClass: 'string', isTable: true, - isForm:false, - isSearch:false, + isForm: false, + isSearch: false, sort: 'custom', table: { width: 150 }, - sortTableDefault:3, + sortTableDefault: 3, }, { label: '价差说明', field: 'balanceStatement', isTable: false, - isForm:false, - isSearch:false, + isForm: false, + isSearch: false, sort: 'custom', table: { width: 150 }, - sortTableDefault:5, + sortTableDefault: 5, }, { label: '供应商维护价税合计',//税后金额 @@ -247,12 +247,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 160 }, - sortTableDefault:9, + sortTableDefault: 9, form: { component: 'InputNumber', } }, - + { label: '价差',//总差额 field: 'totalDifference', @@ -282,7 +282,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 160 }, - sortTableDefault:8, + sortTableDefault: 8, form: { component: 'InputNumber', } @@ -308,7 +308,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isDetail:false, + isDetail: false, isTable: false, form: { component: 'InputNumber', @@ -319,7 +319,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'adjustingTaxAmount', formatter: accountantFormart, sort: 'custom', - isDetail:false, + isDetail: false, table: { width: 150 }, @@ -375,9 +375,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '快递单号', field: 'expressTrackingNumber', sort: 'custom', - isTable:false, - isForm:false, - isSearch:false, + isTable: false, + isForm: false, + isSearch: false, table: { width: 150 }, @@ -390,16 +390,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 } }, - sortTableDefault:4, + sortTableDefault: 4, sort: 'custom', table: { width: 180 @@ -426,24 +426,24 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 } }, isTable: true, - sortTableDefault:6, + sortTableDefault: 6, sort: 'custom', table: { width: 180 }, isSearch: true, search: { - value:[], + value: [], component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -462,9 +462,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ width: 180, fixed: 'left' }, - isTableForm:false, - isTable:false, - isDetail:false, + isTableForm: false, + isTable: false, + isDetail: false, isSearch: true, isForm: false, }, @@ -475,18 +475,18 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 200, }, - isTable:true, - sortTableDefault:6, + isTable: true, + sortTableDefault: 6, isForm: false }, - + { label: '业务类型', - field:'businessType', + field: 'businessType', sort: 'custom', - isTable:false, - isTableForm:false, - isDetail:false, + isTable: false, + isTableForm: false, + isDetail: false, table: { width: 150 }, @@ -495,9 +495,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '出库事务类型', field: 'outTransactionType', sort: 'custom', - isTable:false, - isTableForm:false, - isDetail:false, + isTable: false, + isTableForm: false, + isDetail: false, table: { width: 150 }, @@ -505,9 +505,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '入库事务类型', field: 'inTransactionType', - isTable:false, - isTableForm:false, - isDetail:false, + isTable: false, + isTableForm: false, + isDetail: false, sort: 'custom', table: { width: 150 @@ -516,8 +516,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '执行时间', field: 'executeTime', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -530,8 +530,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD' @@ -544,8 +544,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '申请时间', field: 'requestTime', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -558,8 +558,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '截止时间', field: 'dueTime', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -572,8 +572,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '部门', field: 'departmentCode', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, sort: 'custom', table: { width: 150 @@ -582,9 +582,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '代码', field: 'code', - isTable:false, - isTableForm:false, - isDetail:false, + isTable: false, + isTableForm: false, + isDetail: false, sort: 'custom', table: { width: 150 @@ -595,9 +595,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable:false, - isDetail:false, - isTableForm:false, + isTable: false, + isDetail: false, + isTableForm: false, sort: 'custom', table: { width: 150 @@ -607,15 +607,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, dictClass: 'string', }, { label: '创建者', field: 'creator', sort: 'custom', - sortTableDefault:1000, + sortTableDefault: 1000, isTable: false, table: { width: 150 @@ -650,7 +650,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '供应商创建时间', field: 'requestTime', isTable: true, - sortTableDefault:1001, + sortTableDefault: 1001, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -685,7 +685,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ // isTable: false, // isForm: false, // }, - + { label: '回转日期', field: 'reversepostingdate', @@ -697,12 +697,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:11, + sortTableDefault: 11, }, { label: '发票说明',//回转说明 field: 'tcCInvoiceRemark', - sortTableDefault:11, + sortTableDefault: 11, table: { width: 150 }, @@ -714,8 +714,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 200, }, - sortTableDefault:11, - isTable:true, + sortTableDefault: 11, + isTable: true, isForm: false }, { @@ -725,8 +725,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 200, }, - sortTableDefault:11, - isTable:true, + sortTableDefault: 11, + isTable: true, isForm: false }, // { @@ -761,11 +761,11 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:true, + isTable: true, isDetail: true, isTableForm: false, isForm: true, - isSearch:false, + isSearch: false, sortTableDefault: 12, form: { component: 'InputNumber', @@ -779,16 +779,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '采购审批时间', field: 'procurementCreateTime', - sortTableDefault:11, + sortTableDefault: 11, isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 @@ -807,7 +807,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:12, + sortTableDefault: 12, isForm: false, }, { @@ -817,23 +817,23 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:12, + sortTableDefault: 12, isForm: false, }, - + { label: '财务审批时间', field: 'financialCreateTime', - sortTableDefault:13, + sortTableDefault: 13, isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form:{ + form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD valueFormat: 'x',//数据转成时间戳 @@ -873,8 +873,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '供应商审批人', field: 'supplierCreatorName', sort: 'custom', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, table: { width: 150 }, @@ -883,8 +883,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '供应商审批时间', field: 'supplierCreateTime', - isTable:false, - isTableForm:false, + isTable: false, + isTableForm: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -898,8 +898,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '凭证描述', field: 'voucherNumberRemark', - isTable:true, - isTableForm:false, + isTable: true, + isTableForm: false, sort: 'custom', table: { width: 180 @@ -917,23 +917,23 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, } ])) -export const accountantFormartDetail = ( cellValue) => { - if(cellValue == 0){ +export const accountantFormartDetail = (row, column, cellValue) => { + if (cellValue == 0) { return cellValue } - if(!cellValue){ - return '' + if (!cellValue) { + return 0 } cellValue = cellValue + '' || '' cellValue = Number(cellValue).toFixed(2) let x = cellValue.split('.') let x1 = x[0] - let x2 = x.length > 1 ? '.' + x[1] : '' + let x2 = x.length > 1 ? '.' + x[1] : '' const reg = /(\d+)(\d{3})/ - while(reg.test(x1)){ + while (reg.test(x1)) { x1 = x1.replace(reg, '$1,$2') } - return x1+x2 + return x1 + x2 } /** * @returns {Array} 供应商发票在详情展示的主表字段 @@ -978,12 +978,12 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive { - cellValue= Number(cellValue).toFixed(5) + if (cellValue == 0) { + return cellValue + } + if (!cellValue) { + return 0 + } + cellValue = String(Math.round(Number(cellValue) * 100000) / 100000) cellValue = cellValue + '' || '' let x = cellValue.split('.') let x1 = x[0] - let x2 = x.length > 1 ? '.' + x[1] : '' + let x2 = x.length > 1 ? '.' + x[1] : '' const reg = /(\d+)(\d{3})/ - while(reg.test(x1)){ + while (reg.test(x1)) { x1 = x1.replace(reg, '$1,$2') } - return x1+x2 + return x1 + x2 } //表单校验 @@ -1573,7 +1579,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive { label: '项目编号', field: 'projectCode', - isTable:false, + isTable: false, sort: 'custom', table: { width: 150 @@ -1604,7 +1610,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - sortTableDefault:7, + sortTableDefault: 7, }, { label: '订单行', @@ -1620,20 +1626,20 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - sortTableDefault:9, + sortTableDefault: 9, form: { componentProps: { disabled: true } }, - tableForm:{ + tableForm: { disabled: true } }, { label: '单据号', field: 'number', - hiddenInMain:true, + hiddenInMain: true, sort: 'custom', table: { width: 180 @@ -1646,7 +1652,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 180 }, - sortTableDefault:8, + sortTableDefault: 8, }, { label: '供应商代码', @@ -1660,7 +1666,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive label: '品番', field: 'itemCode', sort: 'custom', - sortTableDefault:3, + sortTableDefault: 3, table: { width: 150 }, @@ -1670,12 +1676,12 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive field: 'backNumber', sort: 'custom', isSearch: false, - hiddenSearchHigh:true, + hiddenSearchHigh: true, table: { width: 150 }, - sortTableDefault:4, - isTableForm:false, + sortTableDefault: 4, + isTableForm: false, isDetail: false, isTable: true, }, @@ -1685,9 +1691,9 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - sortTableDefault:4, - isForm:false, - isTableForm:false, + sortTableDefault: 4, + isForm: false, + isTableForm: false, isDetail: false, isTable: true, }, @@ -1698,9 +1704,9 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive width: 150 }, formatter: dateFormatter2, - sortTableDefault:5, - isForm:false, - isTableForm:false, + sortTableDefault: 5, + isForm: false, + isTableForm: false, isDetail: false, isTable: true, }, @@ -1710,9 +1716,9 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - sortTableDefault:6, - isForm:false, - isTableForm:false, + sortTableDefault: 6, + isForm: false, + isTableForm: false, isDetail: false, isTable: true, }, @@ -1721,16 +1727,16 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive field: 'purchaseStdUom', dictType: DICT_TYPE.UOM, dictClass: 'string', - sortTableDefault:6, + sortTableDefault: 6, table: { width: 150 }, - isForm:false, - isTableForm:true, + isForm: false, + isTableForm: true, isDetail: false, isTable: true, - tableForm:{ - disabled:true + tableForm: { + disabled: true } }, { @@ -1750,8 +1756,8 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ - type:'Select', + tableForm: { + type: 'Select', disabled: true } }, @@ -1783,8 +1789,8 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - isForm:false, - tableForm:{ + isForm: false, + tableForm: { disabled: true } }, @@ -1794,19 +1800,40 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - isForm:false, - tableForm:{ + isForm: false, + tableForm: { disabled: true } }, + { + label: '金额（含模具费）', + field: 'singleAndAllocateAmount', + formatter: accountantFormartDetail, + table: { + width: 150 + }, + isForm: false, + form: { + componentProps: { + disabled: true, + precision: 2, + } + }, + isTableForm: false, + tableForm: { + disabled: true, + type: 'InputNumber', + precision: 2, + } + }, { label: '总差额', field: 'differencePriceTotal', table: { width: 150 }, - isForm:false, - tableForm:{ + isForm: false, + tableForm: { disabled: true } }, @@ -1821,11 +1848,32 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive disabled: true } }, - tableForm:{ + tableForm: { type: 'slot', disabled: true } }, + { + label: '金额（模具费）', + field: 'allocationAmount', + formatter: accountantFormartDetail, + table: { + width: 150 + }, + isForm: false, + form: { + componentProps: { + disabled: true, + precision: 2, + } + }, + isTableForm: false, + tableForm: { + disabled: true, + type: 'InputNumber', + precision: 2, + } + }, { label: '模具分摊单价', field: 'allocationPrice', @@ -1833,7 +1881,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - isForm:false, + isForm: false, form: { componentProps: { disabled: true, @@ -1846,6 +1894,27 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive precision: 2, } }, + { + label: '含模具费单价', + field: 'singleAndAllocatePrice', + formatter: singlePriceFormart, + table: { + width: 150 + }, + isForm: false, + form: { + componentProps: { + disabled: true, + precision: 5, + } + }, + isTableForm: false, + tableForm: { + disabled: true, + type: 'InputNumber', + precision: 5, + } + }, // { // label: '未税差额', // field: 'untaxedDifference', @@ -1901,7 +1970,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -1982,7 +2051,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive Date: Thu, 7 Aug 2025 13:58:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?YT-2401=E3=80=8A=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E3=80=8B=E3=80=8A=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95=E3=80=8B?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 75 ++++++++++++++++++ .../supplierinvoiceRequestMain.data.ts | 79 ++++++++++++++++++- 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index f26424a63..859b24aa0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1697,6 +1697,39 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive isDetail: false, isTable: true, }, + { + label: '受入号', + field: 'receivedNumber', + table: { + width: 150 + }, + isForm: false, + isTableForm: false, + isDetail: false, + isTable: true, + }, + { + label: '车型', + field: 'project', + table: { + width: 150 + }, + isForm: false, + isTableForm: false, + isDetail: false, + isTable: true, + }, + { + label: '税率(%)', + field: 'taxRate', + dictType: DICT_TYPE.TAX_RATE_DICT, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '到货时间', field: 'planArriveTime', @@ -1874,6 +1907,48 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive precision: 2, } }, + { + label: '金额（税额）', + field: 'singleAndAllocateTaxAmount', + formatter: accountantFormartDetail, + table: { + width: 150 + }, + isForm: false, + form: { + componentProps: { + disabled: true, + precision: 2, + } + }, + isTableForm: false, + tableForm: { + disabled: true, + type: 'InputNumber', + precision: 2, + } + }, + { + label: '金额（合计金额） ', + field: 'singleAndAllocateTotal', + formatter: accountantFormartDetail, + table: { + width: 150 + }, + isForm: false, + form: { + componentProps: { + disabled: true, + precision: 2, + } + }, + isTableForm: false, + tableForm: { + disabled: true, + type: 'InputNumber', + precision: 2, + } + }, { label: '模具分摊单价', field: 'allocationPrice', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 0fb855217..2ae52982c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1003,7 +1003,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( form: { component: 'InputNumber', componentProps: { - precision: 5, + precision: 2, disabled: true, } }, @@ -2135,7 +2135,39 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Thu, 7 Aug 2025 15:59:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?YT-2932=E7=82=B9=E5=87=BB=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E7=9C=8B=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=8E=E7=BB=86=EF=BC=8C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=8E=E5=8D=95=E6=8D=AE=E5=8F=B7=E5=AF=B9=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 0a0844360..1ba93df32 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -76,6 +76,7 @@ :buttondataTable="buttondataTable" @tableFormButton="tableFormButton" :isShowPackNumber="true" + :tabsExtend="true" /> From 4b700a6fa432687f66d846139c374f3c13071ad6 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 7 Aug 2025 16:15:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?YT-2957WMS=E7=89=A9=E6=96=99=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itempackage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 46535cd3b..b435b8f05 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -139,7 +139,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackage:create' }), // 新增 - defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入 + // defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入 defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackage:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From 313a4cbe6477e5c8e5ee03c60ece1c8add576415 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Thu, 7 Aug 2025 16:25:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?YT-2959=EF=BC=9A=E7=89=A9=E6=96=99=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=95=B0=E9=87=8F=E4=B8=BA?= =?UTF-8?q?=E6=AD=A3=E6=95=B0=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMainOKHOLD/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index c222d6d06..377240059 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -749,7 +749,7 @@ const submitForm = async (formType, submitData) => { parseFloat(filter.inventoryQty) > 0 && parseFloat(filter.inventoryQty) < parseFloat(filter.qty) ); if(cmdExists){ - message.warning("库存数量为正式，则数量不能大于库存数量") + message.warning("库存数量为正时，数量不能大于库存数量") return } // 1. 筛选出 inventoryQty <= 0 的记录，并提取它们的 itemCode From 52f04f17915c4af5fa768a45b82fdd8ee833c9c2 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 8 Aug 2025 10:38:59 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itempackage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index b435b8f05..46535cd3b 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -139,7 +139,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackage:create' }), // 新增 - // defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入 + defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入 defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackage:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From a5b3b441c5d14595b415ff58a647e00e53d812ee Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 8 Aug 2025 15:14:09 +0800 Subject: [PATCH 8/8] =?UTF-8?q?YT-2960=EF=BC=9A=E7=89=A9=E6=96=99=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=EF=BC=8C=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=AD=E6=9C=892=E4=B8=AA=E5=A4=87=E6=B3=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=BA=94=E5=8E=BB=E6=8E=89=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveJobMain.data.ts | 20 +++++++++---------- .../inventorymoveRecordMainOKHOLD.data.ts | 18 ++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index fb194318a..efb1f04f5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -204,16 +204,16 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ // }, // isTable: false, // }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: true, - sortTableDefault:1000, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: true, + // sortTableDefault:1000, + // }, // { // label: '自动完成', // field: 'autoComplete', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts index b7100c73e..21dcf9de5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts @@ -289,15 +289,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:32, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:32, + // }, { label: '创建时间', field: 'createTime',