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

wujianwei

6 天以前 89fd2cf7202c321512c2ea699a3a220a7138ed44

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

@@ -29,9 +29,11 @@
                <span class="text-danger">{{ billInfo.pendingAmount }}</span>
            </el-descriptions-item>

            <el-descriptions-item label="周期类型">
            <!-- <el-descriptions-item label="周期类型">
                {{ billInfo.periodType }}
            </el-descriptions-item>
            </el-descriptions-item> -->
                    <el-descriptions-item label="周期类型">{{ dictFormat(sys_period_type,billInfo.periodType)  }}</el-descriptions-item>

            <el-descriptions-item label="业务期间">
                <span v-if="billInfo.businessEndDate !== null">{{ billInfo.businessEndDate + '-' }}</span>
                <span v-if="billInfo.businessStartDate !== null">
@@ -200,10 +202,13 @@
const { proxy } = useCurrentInstance();
// 获取所需字典数据
const {
    sys_clearing_form
    sys_clearing_form,sys_period_type
} = proxy.useDict(
    'sys_clearing_form'
    'sys_clearing_form','sys_period_type'
);
const dictFormat = (dict: any, value: any) => {
    return proxy.selectDictLabel(dict, value);
}
const emit = defineEmits(['success'])

const visible = ref(false)