diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue index 429d11c5..a9892b0d 100644 --- a/src/components/CostEntry/actionBar.vue +++ b/src/components/CostEntry/actionBar.vue @@ -12,17 +12,17 @@ 提交审核 {{ tbType == 'receive' ? '应收提交' : '应付提交' }} - 整票提交 + 整票提交 撤销提交 撤销整票提交 - 申请开票 + 查看工作流 - 批量更改费用对象 + @@ -93,7 +93,7 @@ 添加 - 取消 - + --> @@ -425,6 +426,10 @@ } } emits('submit', arr) + } + // 整票提交 + const submitRP = () => { + } // 提交全部 const submitAll = () => { diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue index 2a1b149e..fb940586 100644 --- a/src/components/CostEntry/feeTable.vue +++ b/src/components/CostEntry/feeTable.vue @@ -187,20 +187,6 @@ process(dict) }, }, - { - title: '费用英文名称', - width: 130, - data: 'feeEnName', - type: 'dropdown', - source: async (query, process) => { - const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data - if (!feeDict.value.length) feeDict.value = res - const dict = res.map((res) => { - return res.enName - }) - process(dict) - }, - }, { title: '客户类别', width: 130, @@ -256,20 +242,14 @@ }, }, { - title: '税率', - width: 60, - data: 'taxRate', + title: '单价', + width: 70, + data: 'taxUnitPrice', type: 'numeric', numericFormat: { pattern: '0,0.00' } }, - { - title: '单价', - width: 70, - data: 'taxUnitPrice', - type: 'numeric' - }, { title: '数量', width: 60, @@ -283,6 +263,9 @@ data: 'unitPrice', type: 'numeric', readOnly: true, + numericFormat: { + pattern: '0,0.00' + } }, { title: '不含税金额', @@ -327,13 +310,58 @@ data: 'exchangeRate', type: 'numeric', }, + { + title: '结算金额', + width: 100, + data: 'settlementAmount', + readOnly: true, + numericFormat: { + pattern: '0,0.00' + } + }, + { + title: '已开票金额', + width: 100, + data: 'invoiceAmount', + readOnly: true, + numericFormat: { + pattern: '0,0.00' + } + }, + { + title: '发票申请金额', + width: 100, + data: 'orderInvoiceAmount', + readOnly: true, + numericFormat: { + pattern: '0,0.00' + } + }, + { + title: '未开票金额', + width: 100, + data: 'invoiceAmountRest', + readOnly: true, + numericFormat: { + pattern: '0,0.00' + } + }, { title: '备注', width: 120, data: 'note', }, { - title: '销项税率', + title: '税率', + width: 60, + data: 'taxRate', + type: 'numeric', + numericFormat: { + pattern: '0,0.00' + } + }, + { + title: props.tbType == 'receive' ? '销项税率' : '进项税率', width: 100, data: 'accTaxRate', type: 'numeric', @@ -342,13 +370,13 @@ } }, { - title: '销项税额', + title: props.tbType == 'receive' ? '销项税额' : '进项税额', width: 100, data: 'accTaxAmount', readOnly: true, }, { - title: '销项金额', + title: props.tbType == 'receive' ? '销项税率' : '进项金额', width: 100, data: 'accAmount', readOnly: true, @@ -393,24 +421,6 @@ data: 'createTime', readOnly: true, }, - { - title: '结算金额', - width: 100, - data: 'settlementAmount', - readOnly: true, - numericFormat: { - pattern: '0,0.00' - } - }, - { - title: '已开票金额', - width: 100, - data: 'invoiceAmount', - readOnly: true, - numericFormat: { - pattern: '0,0.00' - } - }, { title: '对账编号', width: 140, @@ -430,22 +440,18 @@ readOnly: true, }, { - title: '发票申请金额', - width: 100, - data: 'orderInvoiceAmount', - readOnly: true, - numericFormat: { - pattern: '0,0.00' - } - }, - { - title: '未开票金额', - width: 100, - data: 'invoiceAmountRest', - readOnly: true, - numericFormat: { - pattern: '0,0.00' - } + title: '费用英文名称', + width: 130, + data: 'feeEnName', + type: 'dropdown', + source: async (query, process) => { + const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data + if (!feeDict.value.length) feeDict.value = res + const dict = res.map((res) => { + return res.enName + }) + process(dict) + }, }, { title: '审核人', @@ -647,10 +653,12 @@ exchangeRateList.forEach(res => { if (res.currencyCode == changes[0][3]) { if (props.tbType == 'receive') { - list.value[changes[0][0]].exchangeRate = res.drValue + list.value[changes[0][0]].exchangeRate = res.drValue || 1 } else { - list.value[changes[0][0]].exchangeRate = res.crValue + list.value[changes[0][0]].exchangeRate = res.crValue || 1 } + } else { + list.value[changes[0][0]].exchangeRate = 1 } }) } diff --git a/src/components/CostEntry/mainInfo.vue b/src/components/CostEntry/mainInfo.vue index e93423d5..1efd21a2 100644 --- a/src/components/CostEntry/mainInfo.vue +++ b/src/components/CostEntry/mainInfo.vue @@ -28,7 +28,7 @@ { label: '委托编号', field: 'customerNo', span: 4, value: '' }, { label: '主提单号', field: 'mblno', span: 4, value: '' }, { label: '箱型箱量', field: 'cntrTotal', span: 4, value: '' }, - { label: '件数', field: 'pkgs', span: 4, value: '' }, + { label: '件数/毛重/尺码', field: 'pkgs', span: 4, value: '' }, { label: '毛重', field: 'kgs', span: 4, value: '' }, { label: '尺码', field: 'cbm', span: 4, value: '' }, { label: '委托单位', field: 'customerName', span: 8, value: '' }, @@ -56,13 +56,16 @@ if (item.field === key) { if (key == 'etd' && val[key]) { val[key] = val[key].split(' ')[0] + } else if (key == 'pkgs') { + // val[key] = `${val['pkgs'] || '-'}/${val['kgs'] || '-'}/${val['cbm'] || '-'}` } + item.value = val[key] } } }) }, - { immediate: true, deep: true } + { immediate: true } ) diff --git a/src/components/File/index.vue b/src/components/File/index.vue index f7ad43ed..7a106f19 100644 --- a/src/components/File/index.vue +++ b/src/components/File/index.vue @@ -137,6 +137,7 @@ // 初始化数据 const init = () => { let code = props.fileType ? `${props.fileType}_file_type` : 'file_type' + console.log(code) getDictOption(code).then((res) => { console.log(res) fileTypeList.value = res diff --git a/src/components/Print/index.vue b/src/components/Print/index.vue index fba9a8f6..c0322423 100644 --- a/src/components/Print/index.vue +++ b/src/components/Print/index.vue @@ -172,7 +172,7 @@ } // 费用打印:paramJsonStr 需要传窜中的费用的id集合 if (item.templateCode == 'fee') { - postData.paramJsonStr = JSON.stringify({ id: ids.value}) + postData.paramJsonStr = JSON.stringify({ ids: ids.value}) } loading.value = true GetOpenSqlPrintInfo(postData).then(res => { diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.vue b/src/views/operation/seaexport/detail/components/ladingInfo.vue index c3fef621..ba3fed99 100644 --- a/src/views/operation/seaexport/detail/components/ladingInfo.vue +++ b/src/views/operation/seaexport/detail/components/ladingInfo.vue @@ -166,7 +166,7 @@ :reload="init" ref="ladHistory" /> - +