diff --git a/src/components/Approval/ApprovalRecordsDialog.vue b/src/components/Approval/ApprovalRecordsDialog.vue index a4450c2..94889ea 100644 --- a/src/components/Approval/ApprovalRecordsDialog.vue +++ b/src/components/Approval/ApprovalRecordsDialog.vue @@ -1,5 +1,7 @@ + 关闭 + + + + + {{ getLevelText(scope.row.approvalLevel) }} + {{ scope.row.applicantName || scope.row.applicant }} + {{ scope.row.approverName || scope.row.approver }} + {{ getApprovalResultText(scope.row.approvalResult) }} + {{ getProcessStatusText(scope.row.processStatus) }} + {{ scope.row.approvalTime ? formatDate(scope.row.approvalTime) : '-' }} + + + + + 关闭 + + + + diff --git a/src/views/erp/finance/account/index.vue b/src/views/erp/finance/account/index.vue index fee7d2b..0e03bd2 100644 --- a/src/views/erp/finance/account/index.vue +++ b/src/views/erp/finance/account/index.vue @@ -1,71 +1,63 @@ - + + + + + + + + + + 导出 + + + + + {{ item.name }} + + + + 编码{{ item.no || '-' }} + 备注{{ item.remark || '-' }} + 排序{{ item.sort }} + 默认 + + + + + + + + + + + + + 重置 + 确认筛选 + + + - - - - - - - - - - - - - - 搜索 - 重置 - - 新增 - - - 导出 - - - - - - - + + + + + + + + + 搜索 + 重置 + 新增 + 导出 + + + + @@ -115,29 +107,30 @@ - - - + + + + + diff --git a/src/views/erp/finance/bank/BankTransactionForm.vue b/src/views/erp/finance/bank/BankTransactionForm.vue index e89ab08..267fbb6 100644 --- a/src/views/erp/finance/bank/BankTransactionForm.vue +++ b/src/views/erp/finance/bank/BankTransactionForm.vue @@ -1,12 +1,37 @@ - - + + + + + + 银行流水信息 + + + + + + 收入支出 + + + + + + + + + + + + + + + + + + @@ -113,12 +138,17 @@ + + diff --git a/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue b/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue index 8c877d3..1eeeffa 100644 --- a/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue +++ b/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue @@ -1,13 +1,34 @@ - + + + + + + #{{ $index + 1 }} + {{ row.bizNo || '未选择单据' }} + 删除 + + + 应付金额{{ erpPriceInputFormatter(row.totalPrice) }} + 已付金额{{ erpPriceInputFormatter(row.paidPrice) }} + + + + + + 应付合计{{ erpPriceInputFormatter(summaryData.totalPrice) }} + 已付合计{{ erpPriceInputFormatter(summaryData.paidPrice) }} + 本次付款合计{{ erpPriceInputFormatter(summaryData.paymentPrice) }} + + + + 添加采购入库单 + + 添加采购退货单 + + + + + + @@ -69,7 +90,7 @@ - + + 添加采购入库单 + 添加采购退货单 @@ -91,6 +112,7 @@ + + diff --git a/src/views/erp/finance/receipt/FinanceReceiptForm.vue b/src/views/erp/finance/receipt/FinanceReceiptForm.vue index d6d8ed9..02408cc 100644 --- a/src/views/erp/finance/receipt/FinanceReceiptForm.vue +++ b/src/views/erp/finance/receipt/FinanceReceiptForm.vue @@ -1,167 +1,72 @@ - - + + + + + + 基本信息 + + + + + + + + + + 销售出库、退货单 + + + + 结算信息 + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - 选择 - - - - - - - - - - - - - - - - - - - - - + + + + 选择 + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - + + + + - - 确 定 - + 确 定 取 消 - + + + diff --git a/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue b/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue index fc0098f..2fd0e1a 100644 --- a/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue +++ b/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue @@ -1,13 +1,34 @@ - + + + + + + #{{ $index + 1 }} + {{ row.bizNo || '未选择单据' }} + 删除 + + + 应收金额{{ erpPriceInputFormatter(row.totalPrice) }} + 已收金额{{ erpPriceInputFormatter(row.receiptedPrice) }} + + + + + + 应收合计{{ erpPriceInputFormatter(summaryData.totalPrice) }} + 已收合计{{ erpPriceInputFormatter(summaryData.receiptedPrice) }} + 本次收款合计{{ erpPriceInputFormatter(summaryData.receiptPrice) }} + + + + 添加销售出库单 + + 添加销售退货单 + + + + + + @@ -69,7 +90,7 @@ - + + 添加销售出库单 + 添加销售退货单 @@ -85,6 +106,7 @@ + + diff --git a/src/views/erp/finance/receivableorder/ReceivableOrderForm.vue b/src/views/erp/finance/receivableorder/ReceivableOrderForm.vue index d81bdbd..7be90fe 100644 --- a/src/views/erp/finance/receivableorder/ReceivableOrderForm.vue +++ b/src/views/erp/finance/receivableorder/ReceivableOrderForm.vue @@ -1,12 +1,31 @@ - - + + + + + + 应收单信息 + + + + + + + + + + + + + + + + + + @@ -103,15 +122,20 @@ /> + + diff --git a/src/views/erp/purchase/return/index.vue b/src/views/erp/purchase/return/index.vue index 107f9d5..d91b0de 100644 --- a/src/views/erp/purchase/return/index.vue +++ b/src/views/erp/purchase/return/index.vue @@ -1,16 +1,13 @@ - - + + - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + 导出 + + item.id))" + v-hasPermi="['erp:purchase-return:delete']" + :disabled="selectionList.length === 0" + > + 删除 + + + + + + + + + + + + + + + + + 0{{ erpPriceInputFormatter(scope.row.totalPrice - scope.row.refundPrice) }} + + + + 详情 + 编辑 + 审批 + 反审批 + 删除 + + + + + + + + + - diff --git a/src/views/erp/purchase/weigh/index.vue b/src/views/erp/purchase/weigh/index.vue index 55c946a..13551c9 100644 --- a/src/views/erp/purchase/weigh/index.vue +++ b/src/views/erp/purchase/weigh/index.vue @@ -1,5 +1,6 @@ - + + @@ -137,11 +138,7 @@ {{ detailData?.administrator || '-' }} {{ detailData?.weigher || '-' }} {{ detailData?.originCertificateNumber || '-' }} - - - {{ (detailData?.inStatus === 1) ? '已入库' : '未入库' }} - - + {{ (detailData?.inStatus === 1) ? '已入库' : '未入库' }} {{ detailData?.createTime ? formatDateTime(detailData.createTime) : '-' }} {{ detailData?.remark || '-' }} @@ -170,9 +167,229 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + 导出 + + + + + + + + + + + + + + + + + + + + + + + {{ (scope.row.inStatus === 1) ? '已入库' : '未入库' }} + + + + + + {{ formatDateTime(scope.row.createTime) }} + + + + + + 编辑 + + + 详情 + + + 入库 + + + 删除 + + + + + + + + + + + + + + + 原料:{{ currentWeigh?.productName || '-' }} + 入库数量(kg):{{ currentWeigh?.plannedWeight ?? '-' }} + + + + + + + + + + 取消 + 确认 + + + + + + + + + {{ detailData?.no || '-' }} + {{ detailData?.productName || '-' }} + {{ detailData?.grossWeight || '-' }} + {{ detailData?.tareWeight || '-' }} + {{ detailData?.netWeight || '-' }} + {{ detailData?.impurityRate || '-' }} + {{ detailData?.plannedWeight || '-' }} + {{ detailData?.supplierName || '-' }} + {{ detailData?.idCardNumber || '-' }} + {{ detailData?.vehicleNumber || '-' }} + {{ detailData?.driver || '-' }} + {{ detailData?.administrator || '-' }} + {{ detailData?.weigher || '-' }} + {{ detailData?.originCertificateNumber || '-' }} + {{ (detailData?.inStatus === 1) ? '已入库' : '未入库' }} + {{ detailData?.createTime ? formatDateTime(detailData.createTime) : '-' }} + {{ detailData?.remark || '-' }} + + + + + {{ detailData?.sampleDate ? formatDateTime(detailData.sampleDate) : '-' }} + {{ detailData?.sampleLocation || '-' }} + {{ detailData?.representativeWeight || '-' }} + {{ detailData?.sampleWeight || '-' }} + {{ detailData?.impurityWeight || '-' }} + {{ detailData?.sandWeight || '-' }} + {{ detailData?.sensoryEvaluation || '-' }} + {{ detailData?.qualificationRate || '-' }} + {{ detailData?.moistureContent || '-' }} + {{ detailData?.sugarContent || '-' }} + {{ detailData?.raValue || '-' }} + {{ detailData?.stvValue || '-' }} + {{ detailData?.labTechnician || '-' }} + {{ detailData?.inspectionRemark || '-' }} + + + + + 关闭 + + +