Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

wujianwei

6 天以前 89fd2cf7202c321512c2ea699a3a220a7138ed44

 ui/admin-ui3/src/components/makeOutInvoice/index.vue

@@ -16,7 +16,8 @@
      <el-descriptions-item :label="type.includes('应收') ? '待收金额' : '待付金额'">
        <span class="text-danger">{{ billInfo.pendingAmount }}</span>
      </el-descriptions-item>
      <el-descriptions-item label="周期类型">{{ billInfo.periodType }}</el-descriptions-item>

       <el-descriptions-item label="周期类型">{{ dictFormat(sys_period_type,billInfo.periodType)  }}</el-descriptions-item>
      <el-descriptions-item label="业务期间">{{ billInfo.businessStartDate }} ~ {{ billInfo.businessEndDate
        }}</el-descriptions-item>
      <el-descriptions-item label="账单周期">{{ billInfo.billingStartDate }} ~ {{ billInfo.billingEndDate
@@ -135,13 +136,15 @@
import invoiceManagementDialog from "../invoiceManagementDialog/index.vue";

const { proxy } = useCurrentInstance();
const { sys_invoice_type } = proxy.useDict('sys_invoice_type');
const { sys_invoice_type,sys_period_type } = proxy.useDict('sys_invoice_type','sys_period_type');

const props = defineProps<{
  type: string,           // '应收账单开票' 等
  InvoiceDetails: string  // '本次开票信息' 或 '开票明细'
}>()

const dictFormat = (dict: any, value: any) => {
    return proxy.selectDictLabel(dict, value);
}
const visible = ref(false)
const loading = ref(false)
const billInfo = ref<any>({})