mahao 1 year ago
parent
commit
d5f81e4e4f
  1. 8
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
  2. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js
  3. 106
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
  4. 104
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
  5. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
  6. 10
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js
  7. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
  8. 13
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
  9. 85
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js
  10. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
  11. 9
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
  12. 44
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
  13. 9
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js
  14. 24
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
  15. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js
  16. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js
  17. 108
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
  18. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js
  19. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js

8
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@ -261,7 +261,6 @@ export default {
</el-form-item>
</el-form>
</template>
<template v-else-if="editFormMode==='import'">
<app-form
mode="import"
@ -427,7 +426,6 @@ export default {
const exportModel = ref(defaultExportModel);
const defaultImportModel = config.import?.schema ? schemaToModel(config.import.schema) : {};
const importModel = ref(defaultImportModel);
const factories = ref([]);
const versions = ref([]);
const fileList = ref([]);
@ -535,9 +533,8 @@ export default {
if (item.meta.isTop) {
// 批量删除
try {
await ElMessageBox.confirm("删除", "提示", {
await ElMessageBox.confirm(format("确认删除选中的%s行数据吗?", rows.length), "提示", {
type: "warning",
message: format("确认删除选中的%s行数据吗?", rows.length),
});
const response = await request(
url,
@ -561,9 +558,8 @@ export default {
} else {
// 单个删除
try {
await ElMessageBox.confirm("删除", "提示", {
await ElMessageBox.confirm(format("确认删除当前行数据吗?", rows[0]), "提示", {
type: "warning",
message: format("确认删除当前行数据吗?", rows[0]),
});
await request(url, null, { method: config.edit.deleteMethod });
ElMessage({

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js

@ -122,7 +122,6 @@ export default function () {
table: {
schema: schema,
},
edit: {
detailsUrl,
createUrl,

106
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js

@ -1,51 +1,111 @@
import version from "../../version.js";
const schema = {
title: "JIS发运数据",
type: "object",
properties: {
version,
shippingDate: {
wmsBillNum: {
title: "发货单号",
type: "string",
},
num: {
title: "单据编号",
type: "string",
},
billTime: {
title: "发货时间",
type: "string",
input: "datetime",
},
wmsBillNum: {
title: "发运单号",
oper: {
title: "发货人",
type: "string",
},
orderNum: {
title: "排序单号",
type: "string",
},
seq: {
title: "订单序号",
type: "string",
},
realCode: {
title: "实际生产码",
type: "string",
},
vinCode: {
title: "订单生产码",
type: "string",
},
codeType: {
title: "生产码类型",
type: "string",
},
realPartCode: {
title: "实际零件号",
type: "string",
},
lu: {
partCode: {
title: "零件号",
type: "string",
},
pn: {
title: "生产号",
batch: {
title: "批次",
type: "string",
},
keyCode: {
title: "组合键值(LU+PN)",
mesConfigCode: {
title: "MES配置码",
type: "string",
},
qty: {
title: "数量",
type: "number",
fromLoc: {
title: "来源库位",
type: "string",
},
seqNumber: {
title: "日顺序号",
toLoc: {
title: "目标库位",
type: "string",
},
assemblyCode: {
title: "小总成号",
refVinCode: {
title: "参照订单生产码",
type: "string",
},
injectionCode: {
title: "注塑码",
billCharacter: {
title: "单据性质",
type: "string",
},
beginDate: {
title: "订单时间",
refBillNum: {
title: "发货关联单号",
type: "string",
},
erpToLoc: {
title: "Erp目标库位",
type: "string",
},
origiCode: {
title: "原生产码",
type: "string",
},
remark: {
title: "备注",
type: "string",
},
uniqueCode: {
title: "塑件唯一码",
type: "string",
},
pjsNum: {
title: "PJS顺序号",
type: "string",
},
matchNumber: {
title: "虚拟小总成",
type: "string",
},
deliverCode: {
title: "发货条码",
type: "string",
},
position: {
title: "客户位置",
type: "string",
input: "datetime",
},
},
};

104
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js

@ -4,48 +4,110 @@ const schema = {
title: "JIS发运数据",
type: "object",
properties: {
version,
shippingDate: {
wmsBillNum: {
title: "发货单号",
type: "string",
},
num: {
title: "单据编号",
type: "string",
},
billTime: {
title: "发货时间",
type: "string",
input: "datetime",
},
wmsBillNum: {
title: "发运单号",
oper: {
title: "发货人",
type: "string",
},
orderNum: {
title: "排序单号",
type: "string",
},
seq: {
title: "订单序号",
type: "string",
},
realCode: {
title: "实际生产码",
type: "string",
},
vinCode: {
title: "订单生产码",
type: "string",
},
codeType: {
title: "生产码类型",
type: "string",
},
realPartCode: {
title: "实际零件号",
type: "string",
},
lu: {
partCode: {
title: "零件号",
type: "string",
},
pn: {
title: "生产号",
batch: {
title: "批次",
type: "string",
},
keyCode: {
title: "组合键值(LU+PN)",
mesConfigCode: {
title: "MES配置码",
type: "string",
},
qty: {
title: "数量",
type: "number",
fromLoc: {
title: "来源库位",
type: "string",
},
seqNumber: {
title: "日顺序号",
toLoc: {
title: "目标库位",
type: "string",
},
assemblyCode: {
title: "小总成号",
refVinCode: {
title: "参照订单生产码",
type: "string",
},
injectionCode: {
title: "注塑码",
billCharacter: {
title: "单据性质",
type: "string",
},
beginDate: {
title: "订单时间",
refBillNum: {
title: "发货关联单号",
type: "string",
},
erpToLoc: {
title: "Erp目标库位",
type: "string",
},
origiCode: {
title: "原生产码",
type: "string",
},
remark: {
title: "备注",
type: "string",
},
uniqueCode: {
title: "塑件唯一码",
type: "string",
},
pjsNum: {
title: "PJS顺序号",
type: "string",
},
matchNumber: {
title: "虚拟小总成",
type: "string",
},
deliverCode: {
title: "发货条码",
type: "string",
},
position: {
title: "客户位置",
type: "string",
input: "datetime",
},
},
};

6
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js

@ -3,15 +3,15 @@ const schema = {
type: "object",
properties: {
erpMaterialCode: {
title: "厂内零件号",
title: "厂内物料号",
type: "string",
},
settleMaterialCode: {
title: "客户零件号",
title: "客户物料号",
type: "string",
},
materialDesc: {
title: "物料描述",
title: "厂内物料描述",
type: "string",
},
},

10
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js

@ -3,11 +3,11 @@ const schema = {
type: "object",
properties: {
factory: {
title: "客户物料号",
title: "工厂",
type: "string",
},
materialCode: {
title: "厂内物料号",
title: "物料号",
type: "string",
},
materialDesc: {
@ -19,7 +19,11 @@ const schema = {
type: "string",
},
estimateType: {
title: "产品类型",
title: "估价类",
type: "string",
},
estimateTypeDesc: {
title: "估价类描述",
type: "string",
},
},

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js

@ -15,7 +15,7 @@ const schema = {
type: "DateTime",
},
endDate: {
title: "结时间",
title: "结时间",
type: "DateTime",
},
clientCode: {

13
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@ -18,7 +18,7 @@ const schema = {
input: "datetime",
},
endTime: {
title: "结时间",
title: "结时间",
type: "string",
input: "datetime",
},
@ -26,14 +26,13 @@ const schema = {
title: "客户编码",
type: "string",
},
businessType: {
title: "业务类别",
date: {
title: "合同签订时间",
type: "string",
input: "select",
options: businessTypes,
input: "datetime",
},
version: {
title: "版本",
contractNo: {
title: "合同号",
type: "string",
},
},

85
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js

@ -1,51 +1,80 @@
import version from "./version.js";
import state from "./state.js";
const schema = {
title: "结算数据",
type: "object",
properties: {
version,
state,
shippingDate: {
title: "发货时间",
type: "DateTime",
},
wmsBillNum: {
title: "发运单号",
type: "string",
},
lu: {
billTime: {
title: "发货时间",
type: "string",
input: "datetime",
},
partCode: {
title: "零件号",
type: "string",
},
pn: {
title: "生产号",
batch: {
title: "批次",
type: "string",
},
oper: {
title: "发货人",
type: "string",
},
keyCode: {
title: "组合键值(LU+PN)",
dnBillNum: {
title: "DN单据号",
type: "string",
},
qty: {
title: "数量",
type: "decimal",
dnBillTime: {
title: "DN单据时间",
type: "string",
input: "datetime",
},
seqNumber: {
title: "日顺序号",
dnOper: {
title: "DN单添加人",
type: "string",
},
assemblyCode: {
title: "小总成号",
deliveryIndex: {
title: "交付索引",
type: "string",
},
injectionCode: {
title: "注塑码",
custId: {
title: "客户",
type: "string",
},
beginDate: {
title: "订单时间",
type: "DateTime",
deliveryHose: {
title: "发货仓库",
type: "string",
},
fromLocCode: {
title: "来源库位",
type: "string",
},
fromHose: {
title: "来源仓库",
type: "string",
},
fromErpLocCode: {
title: "来源ERP库存",
type: "string",
},
toLocCode: {
title: "目标库位",
type: "string",
},
toErpLocCode: {
title: "目标Erp库位",
type: "string",
},
toHose: {
title: "目标仓库",
type: "string",
},
remark: {
title: "备注",
type: "string",
},
},
};
@ -107,6 +136,10 @@ export default function () {
sorting: {
hidden: true,
},
businessType: {
hidden: true,
default: 0,
},
},
},
},

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js

@ -78,7 +78,6 @@ export default function () {
table: {
schema: schema,
},
edit: {
importUrl,
exportUrl,

9
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js

@ -1,3 +1,5 @@
import businessTypes from "./business-type.js";
const schema = {
title: "客户替换件关系",
type: "object",
@ -10,13 +12,10 @@ const schema = {
title: "替换客户零件号",
type: "string",
},
clientCode: {
title: "客户编码",
type: "string",
},
businessType: {
title: "业务类型",
type: "EnumBusinessType",
input: "select",
options: businessTypes,
},
},
};

44
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js

@ -108,15 +108,6 @@ export default [
isTop: true,
},
},
// {
// path: "delete",
// meta: {
// type: "button",
// title: "删除",
// icon: "file",
// isTop: true,
// },
// },
{
path: "synchronous",
meta: {
@ -192,7 +183,6 @@ export default [
type: "page",
title: "EDI与发运数据对比",
icon: "file",
enumBusinessType: "BBAC",
},
children: [
{
@ -238,7 +228,6 @@ export default [
type: "page",
title: "EDI、发运与结算比对",
icon: "file",
enumBusinessType: "BBAC",
},
children: [
{
@ -644,15 +633,6 @@ export default [
isTop: true,
},
},
// {
// path: "delete",
// meta: {
// type: "button",
// title: "删除",
// icon: "file",
// isTop: true,
// },
// },
{
path: "synchronous",
meta: {
@ -728,7 +708,6 @@ export default [
type: "page",
title: "EDI与发运数据对比",
icon: "file",
enumBusinessType: "HBPO",
},
children: [
{
@ -774,7 +753,6 @@ export default [
type: "page",
title: "EDI、发运与结算比对",
icon: "file",
enumBusinessType: "HBPO",
},
children: [
{
@ -1071,7 +1049,6 @@ export default [
},
],
},
{
path: "jit",
meta: {
@ -1646,7 +1623,6 @@ export default [
},
],
},
{
path: "bj",
meta: {
@ -1756,15 +1732,6 @@ export default [
isTop: true,
},
},
// {
// path: "delete",
// meta: {
// type: "button",
// title: "删除",
// icon: "file",
// isTop: true,
// },
// },
{
path: "synchronous",
meta: {
@ -2079,7 +2046,6 @@ export default [
},
],
},
{
path: "in",
meta: {
@ -2189,15 +2155,6 @@ export default [
isTop: true,
},
},
// {
// path: "delete",
// meta: {
// type: "button",
// title: "删除",
// icon: "file",
// isTop: true,
// },
// },
{
path: "synchronous",
meta: {
@ -2512,7 +2469,6 @@ export default [
},
],
},
{
path: "invoice",
meta: {

9
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js

@ -15,10 +15,13 @@ export default {
const onCommand = async (item, rows, load) => {
if (item.path === "open-version" || item.path === "closed-version") {
try {
await ElMessageBox.confirm("删除", "提示", {
await ElMessageBox.confirm(
format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗?`, rows.length),
"提示",
{
type: "warning",
message: format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗?`, rows.length),
});
}
);
const url = `${config.baseUrl}/${item.path}`;
await request(
url,

24
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js

@ -3,7 +3,7 @@ import html from "html";
import useConfig from "../../models/user.js";
import request from "../../request/index.js";
import { format } from "../../utils/index.js";
import { ElMessage } from "element-plus";
import { ElMessage, ElMessageBox } from "element-plus";
export default {
components: { AppList },
@ -17,11 +17,31 @@ export default {
if (item.path === "%s/reset-password") {
const url = format(item.path, rows[0].id);
await request(`base/user/${url}`, null, { method: item.meta.method });
try {
await ElMessageBox.confirm(format("是否重置用户%s密码", rows[0].userName), "提示", {
type: "warning",
});
await ElMessage({
type: "info",
message: "密码已经成功重置为123456",
});
const url = `${config.baseUrl}/${item.path}`;
await request(
url,
rows.map((o) => o.id),
{ method: "POST" }
);
console.log(context);
await load();
} catch (error) {
if (error === "cancel") {
ElMessage({
type: "info",
message: format("用户%s的密码已经成功重置为123456", rows[0].userName),
message: "操作取消",
});
}
}
}
};
return { config, onCommand };
},

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
config.query.schema.properties.businessType.default = 7;
return { config, onCommand };
},
};

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
config.query.schema.properties.businessType.default = 8;
return { config, onCommand };
},
};

108
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js

@ -16,46 +16,27 @@ export default {
<el-tab-pane label="invoicE_WAIT_DETAIL" v-if="model.invoicE_WAIT_DETAIL.length">
<el-auto-resizer>
<template #default="{ height, width }">
<el-table-v2
fixed
:data="model.invoicE_WAIT_DETAIL"
:columns="columns1"
:width="width"
:height="height"
/>
<el-table-v2 :data="model.invoicE_WAIT_DETAIL" :columns="columns1" :width="width" :height="height" />
</template>
</el-auto-resizer>
</el-tab-pane>
<el-tab-pane label="invoicE_MAP_GROUP" v-if="model.invoicE_MAP_GROUP.length">
<el-auto-resizer>
<template #default="{ height, width }">
<el-table-v2
fixed
:data="model.invoicE_MAP_GROUP"
:columns="columns2"
:width="width"
:height="height"
/>
<el-table-v2 :data="model.invoicE_MAP_GROUP" :columns="columns2" :width="width" :height="height" />
</template>
</el-auto-resizer>
</el-tab-pane>
<el-tab-pane label="invoicE_NOT_SETTLE" v-if="model.invoicE_NOT_SETTLE.length">
<el-auto-resizer>
<template #default="{ height, width }">
<el-table-v2
fixed
:data="model.invoicE_NOT_SETTLE"
:columns="columns3"
:width="width"
:height="height"
/>
<el-table-v2 :data="model.invoicE_NOT_SETTLE" :columns="columns3" :width="width" :height="height" />
</template>
</el-auto-resizer>
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="drawer=false"> {{$t('confirm')}} </el-button>
@ -76,7 +57,28 @@ export default {
const drawer = ref(false);
const loading = ref(false);
const model = ref({
invoicE_WAIT_DETAIL: [{ version: "version" }],
invoicE_WAIT_DETAIL: [
{
version: 11111,
invbillNum: "INV230725142640-001",
inGroupNum: "INV2023",
lu: "lu",
price: 11111,
qty: 11111,
amt: 11111,
bussiessType: "bussiessType",
},
{
version: 22222,
invbillNum: "INV230725142640-002",
inGroupNum: "INV2023",
lu: "lu",
price: 22222,
qty: 22222,
amt: 22222,
bussiessType: "bussiessType",
},
],
invoicE_MAP_GROUP: [{ version: "version" }],
invoicE_NOT_SETTLE: [{ version: "version" }],
});
@ -96,18 +98,78 @@ export default {
dataKey: "version",
title: "期间",
},
{
dataKey: "invbillNum",
title: "发票号",
},
{
dataKey: "invGroupNum",
title: "发票分组号",
},
{
dataKey: "lu",
title: "零件号",
},
{
dataKey: "price",
title: "单价",
},
{
dataKey: "qty",
title: "数量",
},
{
dataKey: "amt",
title: "金额",
},
{
dataKey: "bussiessType",
title: "业务分类",
},
];
const columns2 = [
{
dataKey: "version",
title: "期间",
},
{
dataKey: "invbillNum",
title: "发票号",
},
{
dataKey: "inGroupNum",
title: "发票分组号",
},
{
dataKey: "settleGroupNum",
title: "结算分组号",
},
{
dataKey: "amt",
title: "金额",
},
];
const columns3 = [
{
dataKey: "version",
title: "期间",
},
{
dataKey: "invGroupNum",
title: "发票分组号",
},
{
dataKey: "settleGroupNum",
title: "结算分组号",
},
{
dataKey: "lu",
title: "可结算分组号",
},
{
dataKey: "lu1",
title: "不可结算分组号",
},
];
return { config, onCommand, drawer, loading, model, columns1, columns2, columns3 };
},

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
config.query.schema.properties.businessType.default = 3;
return { config, onCommand };
},
};

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
config.query.schema.properties.businessType.default = 4;
return { config, onCommand };
},
};

Loading…
Cancel
Save