Browse Source

update

master
wanggang 1 year ago
parent
commit
310c00ea27
  1. 20
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
  2. 8
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js

20
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js

@ -11,7 +11,7 @@ import businessTypes from "../../models/_options.js";
export default {
components: { AppForm, AppTable },
template: html`<el-drawer v-if="refreshRef" v-model="show" destroy-on-close size="50%" class="page-drawer" :close-on-click-modal="false">
template: html`<el-drawer v-if="refreshRef" v-model="show" destroy-on-close size="50%" class="page-drawer" :close-on-click-modal="false" @closed="drawerClosed">
<template #header> <span class="el-dialog__title"> 结算明细 </span> </template>
<el-tabs style="height:100%;">
<el-tab-pane :label="columns1.title" v-if="model.invoicE_MAP_GROUP?.length">
@ -54,7 +54,7 @@ export default {
</span>
</template>
</el-drawer>
<el-dialog class="re-open" v-model="setupDialogVisable" :close-on-click-modal="false" align-center destroy-on-close style="width:100%;height:100%">
<el-dialog class="re-open" v-model="setupDialogVisable" :close-on-click-modal="false" align-center destroy-on-close style="width:100%;height:100%" @closed="drawerClosed">
<template #header>发票重开</template>
<el-steps :active="setupRef" align-center style="height:60px;">
<el-step title="调整明细列表" />
@ -121,7 +121,7 @@ export default {
<el-scrollbar>
<el-result icon="success" title="重开完成">
<template #extra>
<el-button type="primary" @click="next">返回</el-button>
<el-button type="primary" @click="drawerClosed">返回</el-button>
</template>
</el-result>
</el-scrollbar>
@ -137,7 +137,7 @@ export default {
</span>
</template>
</el-dialog>
<el-dialog v-model="addDialogVisible" align-center destroy-on-close :close-on-click-modal="false" style="width:380px;height:480px;">
<el-dialog v-model="addDialogVisible" align-center destroy-on-close :close-on-click-modal="false" style="width:360px;height:440px;">
<template #header>添加调整明细</template>
<el-scrollbar>
<el-row>
@ -193,7 +193,7 @@ export default {
}
</style>`,
props: ["modelValue", "row", "data", "isBusiness", "businessType"],
emit: ["update:modelValue"],
emit: ["update:modelValue", "complete"],
setup(props, context) {
const show = ref(props.modelValue);
watch(show, (value) => context.emit("update:modelValue", value));
@ -266,13 +266,13 @@ export default {
},
};
const columns22 = Object.assign({}, columns2);
const columns22 = JSON.parse(JSON.stringify(columns2));
columns22.properties.extend1 = {
type: "number",
title: "SA号",
};
const columns23 = Object.assign({}, columns2);
const columns23 = JSON.parse(JSON.stringify(columns2));
columns23.properties.extend1 = {
type: "number",
title: "凭证号",
@ -631,7 +631,7 @@ export default {
} else if (result.data?.code === 400 && result.data.fileName) {
window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
}
} else {
} else if (setupRef.value === 4) {
setupDialogVisable.value = false;
refreshRef.value = false;
nextTick(() => {
@ -639,6 +639,9 @@ export default {
});
}
};
const drawerClosed = () => {
context.emit("complete");
};
//
onMounted(async () => {
loading.value = true;
@ -694,6 +697,7 @@ export default {
refreshRef,
setup3Model,
businessTypes,
drawerClosed,
};
},
};

8
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js

@ -9,7 +9,7 @@ import AppCheck from "./_check.js";
export default {
components: { AppList, AppCheck },
template: html`<app-list ref="appListRef" :config="config" @command="onCommand" />
<app-check v-if="visable" v-model="visable" :businessType="businessType" :row="row" :data="data" :isBusiness="true" />`,
<app-check v-if="visable" v-model="visable" :businessType="businessType" :row="row" :data="data" :isBusiness="true" @complete="complete" />`,
setup() {
const appListRef = ref(null);
const visable = ref(false);
@ -57,6 +57,10 @@ export default {
}
console.log(item.path, item, rows);
};
return { appListRef, config, onCommand, visable, row, data, businessType };
const complete = async () => {
visable.value = false;
await appListRef.value.reload();
};
return { appListRef, config, onCommand, visable, row, data, businessType, complete };
},
};

Loading…
Cancel
Save