BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
姜旭之 1 year ago
parent
444a1228a3
commit
51ae23d2a4
4 changed files with 64 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js
  2. 28
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
  3. 22
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js
  4. 39
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js
View File

@ -91,6 +91,7 @@ async function getLocalizationAsync() {
remove: "移除", remove: "移除",
restore: "还原", restore: "还原",
delete: "删除", delete: "删除",
compare: "对比",
authenticate: "验证", authenticate: "验证",
loginModel: "登录", loginModel: "登录",
login: "登录", login: "登录",

28
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
View File

@ -226,7 +226,7 @@ export default {
style="height:100%;" style="height:100%;"
/> />
</template> </template>
<template v-else-if="editFormMode==='export'"> <template v-else-if="editFormMode==='compare'">
<el-form :model="exportModel" style="height:100%;"> <el-form :model="exportModel" style="height:100%;">
<el-form-item label="选择期间" label-width="100px"> <el-form-item label="选择期间" label-width="100px">
<el-select v-model="exportModel.version"> <el-select v-model="exportModel.version">
@ -235,14 +235,14 @@ export default {
</el-form-item> </el-form-item>
<template v-if="isNotJit"> <template v-if="isNotJit">
<el-form-item label="发运日期" label-width="100px"> <el-form-item label="发运日期" label-width="100px">
<el-date-picker v-model="exportModel.date1" value-format="YYYY-MM-DD" /> <el-date-picker v-model="exportModel.seStartDateTime" value-format="YYYY-MM-DD" />
<span style="margin:0 .5em;">-</span> <span style="margin:0 .5em;">-</span>
<el-date-picker v-model="exportModel.date2" value-format="YYYY-MM-DD" /> <el-date-picker v-model="exportModel.seEndDateTime" value-format="YYYY-MM-DD" />
</el-form-item> </el-form-item>
<el-form-item label="下线日期" label-width="100px"> <el-form-item label="下线日期" label-width="100px">
<el-date-picker v-model="exportModel.date3" value-format="YYYY-MM-DD" /> <el-date-picker v-model="exportModel.downLineStartDateTime" value-format="YYYY-MM-DD" />
<span style="margin:0 .5em;">-</span> <span style="margin:0 .5em;">-</span>
<el-date-picker v-model="exportModel.date4" value-format="YYYY-MM-DD" /> <el-date-picker v-model="exportModel.downLineEndDateTime" value-format="YYYY-MM-DD" />
</el-form-item> </el-form-item>
</template> </template>
<el-form-item label="通用码" label-width="100px"> <el-form-item label="通用码" label-width="100px">
@ -410,10 +410,10 @@ export default {
const editFormModel = ref(null); const editFormModel = ref(null);
const defaultExportModel = { const defaultExportModel = {
version: "", version: "",
date1: "", seStartDateTime: "",
date2: "", seEndDateTime: "",
date3: "", downLineStartDateTime: "",
date4: "", downLineEndDateTime: "",
ln: "", ln: "",
pn: "", pn: "",
enumBusinessType: route.meta.enumBusinessType, enumBusinessType: route.meta.enumBusinessType,
@ -581,7 +581,8 @@ export default {
if (!response.errors) { if (!response.errors) {
window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`)); window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`));
} }
} else if (item.meta.isTop) { }
} else if (item.path === "compare") {
exportModel.value = defaultExportModel; exportModel.value = defaultExportModel;
versions.value = ( versions.value = (
await request("settleaccount/centralized-control/get-all", null, { method: "POST" }) await request("settleaccount/centralized-control/get-all", null, { method: "POST" })
@ -591,7 +592,6 @@ export default {
})); }));
editFormTitle.value = `${t(item.path)}${config.query.schema.title}`; editFormTitle.value = `${t(item.path)}${config.query.schema.title}`;
dialogVisible.value = true; dialogVisible.value = true;
}
} else if (item.path === "import") { } else if (item.path === "import") {
//import //import
try { try {
@ -654,7 +654,7 @@ export default {
} else if (editFormMode.value === "details") { } else if (editFormMode.value === "details") {
dialogVisible.value = false; dialogVisible.value = false;
editFormMode.value = null; editFormMode.value = null;
} else if (editFormMode.value === "export") { } else if (editFormMode.value === "compare") {
// const postData = JSON.parse(JSON.stringify(queryModel.value)); // const postData = JSON.parse(JSON.stringify(queryModel.value));
// postData.filters = filterList.value.filter((o) => o.property && o.value); // postData.filters = filterList.value.filter((o) => o.property && o.value);
// delete postData.query["items"]; // delete postData.query["items"];
@ -662,8 +662,8 @@ export default {
// const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`; // const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`;
// const response = await post(url, postData); // const response = await post(url, postData);
// download(response); // download(response);
const url = config.edit.exportUrl; const url = config.edit.compareUrl;
await request(url, exportModel.value, { method: config.edit.exportMethod }); await request(url, exportModel.value, { method: config.edit.compareMethod });
dialogVisible.value = false; dialogVisible.value = false;
} else if (editFormMode.value === "import") { } else if (editFormMode.value === "import") {
editFormloading.value = true; editFormloading.value = true;

22
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js
View File

@ -1,3 +1,5 @@
import version from "../../../models/version.js";
const schema = { const schema = {
title: "期间设置", title: "期间设置",
type: "object", type: "object",
@ -75,6 +77,12 @@ export default function () {
title: "期间设置", title: "期间设置",
type: "object", type: "object",
properties: { properties: {
type: version,
name: {
type: "string",
default: null,
hidden: true,
},
filters: { filters: {
type: "array", type: "array",
hidden: true, hidden: true,
@ -96,13 +104,13 @@ export default function () {
}, },
}, },
default: [ default: [
{ // {
logic: "and", // logic: "and",
column: "year", // column: "year",
action: "like", // action: "like",
value: null, // value: null,
readOnly: true, // readOnly: true,
}, // },
], ],
}, },
skipCount: { skipCount: {

39
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
View File

@ -183,6 +183,7 @@ export default [
type: "page", type: "page",
title: "EDI与发运数据对比", title: "EDI与发运数据对比",
icon: "file", icon: "file",
enumBusinessType: "BBAC",
}, },
children: [ children: [
{ {
@ -195,7 +196,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -228,6 +229,7 @@ export default [
type: "page", type: "page",
title: "EDI、发运与结算比对", title: "EDI、发运与结算比对",
icon: "file", icon: "file",
enumBusinessType: "BBAC",
}, },
children: [ children: [
{ {
@ -240,7 +242,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -273,6 +275,7 @@ export default [
type: "page", type: "page",
title: "发运与结算数据二次比对", title: "发运与结算数据二次比对",
icon: "file", icon: "file",
enumBusinessType: "BBAC",
}, },
children: [ children: [
{ {
@ -285,7 +288,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -318,6 +321,7 @@ export default [
type: "page", type: "page",
title: "买单件发运与结算数据三次比对", title: "买单件发运与结算数据三次比对",
icon: "file", icon: "file",
enumBusinessType: "BBAC",
}, },
children: [ children: [
{ {
@ -330,7 +334,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -749,6 +753,7 @@ export default [
type: "page", type: "page",
title: "EDI与发运数据对比", title: "EDI与发运数据对比",
icon: "file", icon: "file",
enumBusinessType: "HBPO",
}, },
children: [ children: [
{ {
@ -761,7 +766,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -794,6 +799,7 @@ export default [
type: "page", type: "page",
title: "EDI、发运与结算比对", title: "EDI、发运与结算比对",
icon: "file", icon: "file",
enumBusinessType: "HBPO",
}, },
children: [ children: [
{ {
@ -806,7 +812,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -839,6 +845,7 @@ export default [
type: "page", type: "page",
title: "发运与结算数据二次比对", title: "发运与结算数据二次比对",
icon: "file", icon: "file",
enumBusinessType: "HBPO",
}, },
children: [ children: [
{ {
@ -851,7 +858,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -1242,6 +1249,7 @@ export default [
type: "page", type: "page",
title: "发运与结算比对", title: "发运与结算比对",
icon: "file", icon: "file",
enumBusinessType: "ZhiGongJian",
}, },
children: [ children: [
{ {
@ -1254,7 +1262,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -1287,6 +1295,7 @@ export default [
type: "page", type: "page",
title: "发运与结算二次比对", title: "发运与结算二次比对",
icon: "file", icon: "file",
enumBusinessType: "ZhiGongJian",
}, },
children: [ children: [
{ {
@ -1299,7 +1308,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -1670,6 +1679,7 @@ export default [
type: "page", type: "page",
title: "发运与结算比对", title: "发运与结算比对",
icon: "file", icon: "file",
enumBusinessType: "BeiJian",
}, },
children: [ children: [
{ {
@ -1682,7 +1692,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -1715,6 +1725,7 @@ export default [
type: "page", type: "page",
title: "发运与结算二次比对", title: "发运与结算二次比对",
icon: "file", icon: "file",
enumBusinessType: "BeiJian",
}, },
children: [ children: [
{ {
@ -1727,7 +1738,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -2098,6 +2109,7 @@ export default [
type: "page", type: "page",
title: "发运与结算比对", title: "发运与结算比对",
icon: "file", icon: "file",
enumBusinessType: "YingDuJian",
}, },
children: [ children: [
{ {
@ -2110,7 +2122,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",
@ -2143,6 +2155,7 @@ export default [
type: "page", type: "page",
title: "发运与结算二次比对", title: "发运与结算二次比对",
icon: "file", icon: "file",
enumBusinessType: "YingDuJian",
}, },
children: [ children: [
{ {
@ -2155,7 +2168,7 @@ export default [
}, },
}, },
{ {
path: "export", path: "compare",
meta: { meta: {
type: "button", type: "button",
title: "生成对比", title: "生成对比",

Write Preview
Loading…
Cancel
Save