From 43ed84f95669dbff13df5dbe47c716b2c3c0a627 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Wed, 17 Nov 2021 16:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=BC=E5=85=A5=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/src/components/ImportExcel-base/index.vue | 16 +-
vue/src/components/ImportExcel-vw/index.vue | 19 -
vue/src/router/modules/vwFisData.js | 28 +-
vue/src/views/login/index.vue | 8 +-
vue/src/views/ux/basedata/Invoice/index.vue | 213 +++---
.../ux/vw/dataInput/ScrapClaims/index.vue | 591 ++++++++++++++++
.../views/ux/vw/dataInput/SparePart/index.vue | 641 ++++++++++++++++++
.../views/ux/vw/dataInput/r3-open/index.vue | 2 +-
.../views/ux/vw/dataInput/vwKanBan/index.vue | 610 +++++++++++++++++
vue/static/tableFieldForSearch.json | 191 ++++++
10 files changed, 2200 insertions(+), 119 deletions(-)
create mode 100644 vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue
create mode 100644 vue/src/views/ux/vw/dataInput/SparePart/index.vue
create mode 100644 vue/src/views/ux/vw/dataInput/vwKanBan/index.vue
diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 5c7abefc..1f30a212 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -53,7 +53,6 @@
:value="item.value"
>
-
@@ -290,7 +289,7 @@ export default {
this.isEditYearMont = true;
this.isEditFactory = true;
this.isState = false;
- } else {
+ } else {
this.isEditYearMont = false;
this.isEditFactory = false;
}
@@ -298,11 +297,16 @@ export default {
crmTypeName() {
return (
{
+ invoice: "大众发票汇总",
+ vWKanBan: "大众看板结算明细",
+ scrapClaims: "CP7报废和索赔",
+ sparePart: "大众备件结算明细",
+
bomdatabase: "产品结构BOM",
prebatch: "预批量",
secondaryPriceRatio: "二配结算价格比例",
factory: "工厂设置",
- // materialRelation: "零件匹配关系",
+ // materialRelation: "零件匹配关系",
carMaterialConfig: "车型代码与零件匹配",
materialRelationSupplier: "供应商零件设置表",
material: "物料主数据",
@@ -319,6 +323,11 @@ export default {
getWebApi() {
return (
{
+ invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入
+ vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入
+ scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入
+ sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入
+
bomdatabase: "/api/settleaccount/bom/ExcelImport",
prebatch: "/api/settleaccount/Prebatch/ExcelImport",
secondaryPriceRatio:
@@ -347,6 +356,7 @@ export default {
//模板名称
return (
{
+ invoice: "大众发票汇总导入.xlsx",
bomdatabase: "产品结构Bom导入模板.xlsx",
secondaryPriceRatio: "二配价格比例导入模板.xlsx",
factory: "工厂设置模板.xlsx",
diff --git a/vue/src/components/ImportExcel-vw/index.vue b/vue/src/components/ImportExcel-vw/index.vue
index 1947ba66..d1e8b5a6 100644
--- a/vue/src/components/ImportExcel-vw/index.vue
+++ b/vue/src/components/ImportExcel-vw/index.vue
@@ -545,25 +545,6 @@ export default {
",请在后台作业监控界面中查看进度!";
this.stepsActive = 4;
}
- // if (res === "Success") {
- // if (this.isLt2M === "1" && this.isFileType === "1") {
- // this.$notify({
- // title: "成功",
- // message: "数据导入成功!",
- // type: "success",
- // duration: 2000,
- // });
- // this.stepList[1].status = "finish";
- // this.resultData.successMessage = "数据导入成功!";
- // this.stepsActive = 4;
- // }
- // } else {
- // this.stepList[0].status = "wait";
- // this.resultData.errTemplate = res; //指定错误模板名称,作为参数,用于错误模板下载
- // this.resultData.errSize = 1; //保持大于0,用于控制错误数据下载按钮的可不可见
- // this.resultData.successMessage = "数据导入失败!";
- // this.stepsActive = 3;
- // }
console.log(this.stepsActive);
this.$emit("status", "finish");
// this.$nextTick(() => {
diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js
index f7b2dd1f..213c3609 100644
--- a/vue/src/router/modules/vwFisData.js
+++ b/vue/src/router/modules/vwFisData.js
@@ -2,9 +2,9 @@
import Layout from '@/layout'
const vwFisDataRouter = {
- path: '/jskp',
+ path: '/pg',
component: Layout,
- redirect: 'jskp',
+ redirect: 'pg',
name: '业务数据',
//hidden: true,
meta: {
@@ -18,7 +18,7 @@ const vwFisDataRouter = {
children: [
{
path: '/settleAccount',
- component: () => import('@/views/ux/vw/dataInput/r3'),
+ component: () => import('@/views/ux/vw/dataInput/r3-open'),
name: 'SettleAccount',//命名路由
meta: {
title: 'FIS未结算数据导入',
@@ -28,7 +28,7 @@ const vwFisDataRouter = {
},
{
path: '/settleAccount-finish',
- component: () => import('@/views/ux/vw/dataInput/r3-open'),
+ component: () => import('@/views/ux/vw/dataInput/r3'),
name: 'SettleAccount',//命名路由
meta: {
title: 'FIS已结算数据导入',
@@ -47,19 +47,19 @@ const vwFisDataRouter = {
}
},
{
- path: 'itemInvoicePrice',
- component: () => import('@/views/ux/vw/dataInput/itemInvoicePrice/index'),
- name: 'ItemInvoicePrice',//命名路由
+ path: 'kanBan',
+ component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'),
+ name: 'VWKanBan',//命名路由
meta: {
title: '看板结算明细导入',
- roles: ['SettleAccount.ItemInvoicePrices'],
+ //roles: ['SettleAccount.ItemInvoicePrices'],
icon: '发运'
}
},
{
- path: '/fis',
- component: () => import('@/views/ux/vw/dataInput/fis'),
- name: 'FIS',
+ path: '/scrapClaims',
+ component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
+ name: 'ScrapClaims',
meta: {
title: 'CP7报废和索赔导入',
roles: ['SettleAccount.FISs'],
@@ -68,9 +68,9 @@ const vwFisDataRouter = {
},
{
- path: '/SettlementCrossReference',
- component: () => import('@/views/ux/vw/dataInput/SettlementCrossReference'),
- name: 'SettlementCrossReference',//命名路由
+ path: '/SparePart',
+ component: () => import('@/views/ux/vw/dataInput/SparePart'),
+ name: 'SparePart',//命名路由
meta: {
title: '大众备件结算明细导入',
roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
diff --git a/vue/src/views/login/index.vue b/vue/src/views/login/index.vue
index 5a82dc2c..bcf29743 100644
--- a/vue/src/views/login/index.vue
+++ b/vue/src/views/login/index.vue
@@ -1,11 +1,11 @@
-<<<<<<< .mine
+
SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统
-=======
-
闻荫科技-长春派格结算管理系统
->>>>>>> .theirs
+
+
+
diff --git a/vue/src/views/ux/basedata/Invoice/index.vue b/vue/src/views/ux/basedata/Invoice/index.vue
index 26330db6..412f62e5 100644
--- a/vue/src/views/ux/basedata/Invoice/index.vue
+++ b/vue/src/views/ux/basedata/Invoice/index.vue
@@ -16,14 +16,32 @@
@click="handleImportExcel()"
>导入文件(Excel)
-
导出Excel
-
+ -->
+
+
+ 导出数据
+
+
+ 导出Excel
+ 导出Csv
+
+
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
+import importExcel from "@/components/ImportExcel-base";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
import Lockr from "lockr";
@@ -247,30 +265,14 @@ export default {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
- tempsTabs.push({ label: "物料凭证", prop: "textCode", width: 150 });
tempsTabs.push({ label: "物料号", prop: "materialCode", width: 150 });
tempsTabs.push({
- label: "物料描述",
+ label: "零件名称",
prop: "materialDesc",
width: 280,
});
-
- tempsTabs.push({
- label: "入库日期",
- prop: "date",
- width: 150,
- formType: "datetime",
- });
tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 120 });
- tempsTabs.push({ label: "货币", prop: "number", width: 120 });
- tempsTabs.push({ label: "工厂名称", prop: "accounting", width: 120 });
- tempsTabs.push({
- label: "过账日期",
- prop: "accountDate",
- width: 150,
- formType: "datetime",
- });
return tempsTabs;
},
MoreTypes() {
@@ -281,6 +283,116 @@ export default {
},
},
methods: {
+ handleCommand(command) {
+ if (this.versionValue === "") {
+ this.$message.error("请先选择版本!");
+ return;
+ }
+ switch (command) {
+ case "excel":
+ this.listQuery.fileType = 1; //0是csv,1是excel
+ break;
+ case "csv":
+ this.listQuery.fileType = 0; //0是csv,1是excel
+ break;
+ default:
+ //这里是没有找到对应的值处理
+ break;
+ }
+ this.listLoading = true;
+ if (this.versionValue === "") {
+ this.$message.error("必需选择版本!");
+ this.listLoading = false;
+ return;
+ }
+ if (this.versionValue != "") {
+ this.listQuery.version = this.versionValue;
+ }
+ console.log("发票导出:" + JSON.stringify(this.listQuery));
+ this.$axios
+ .posts("/api/settleaccount/Invoices/Export", this.listQuery)
+ .then((res) => {
+ let fileNameOfProject = res;
+ this.$axios
+ .BolbGets(
+ "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+ )
+ .then((response) => {
+ if (fileNameOfProject.indexOf("_") != -1) {
+ let downName =
+ fileNameOfProject.slice(
+ 0,
+ fileNameOfProject.lastIndexOf("_")
+ ) +
+ fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+ downloadFile(response, downName);
+ this.$notify({
+ title: "成功",
+ message: "数据-导出成功!",
+ type: "success",
+ duration: 2000,
+ });
+ } else {
+ downloadFile(response, fileNameOfProject);
+ this.$notify({
+ title: "成功",
+ message: "数据-导出成功!",
+ type: "success",
+ duration: 2000,
+ });
+ }
+ this.listLoading = false;
+ });
+ });
+ },
+ //导出功能
+ // async handleDownload() {
+ // this.listLoading = true;
+ // if (this.versionValue === "") {
+ // this.$message.error("必需选择版本!");
+ // this.listLoading = false;
+ // return;
+ // }
+ // if (this.versionValue != "") {
+ // this.listQuery.version = this.versionValue;
+ // }
+ // console.log("发票导出:" + JSON.stringify(this.listQuery));
+ // this.$axios
+ // .posts("/api/settleaccount/Invoices/Export", this.listQuery)
+ // .then((res) => {
+ // let fileNameOfProject = res;
+ // this.$axios
+ // .BolbGets(
+ // "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+ // )
+ // .then((response) => {
+ // if (fileNameOfProject.indexOf("_") != -1) {
+ // let downName =
+ // fileNameOfProject.slice(
+ // 0,
+ // fileNameOfProject.lastIndexOf("_")
+ // ) +
+ // fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+ // downloadFile(response, downName);
+ // this.$notify({
+ // title: "成功",
+ // message: "数据-导出成功!",
+ // type: "success",
+ // duration: 2000,
+ // });
+ // } else {
+ // downloadFile(response, fileNameOfProject);
+ // this.$notify({
+ // title: "成功",
+ // message: "数据-导出成功!",
+ // type: "success",
+ // duration: 2000,
+ // });
+ // }
+ // this.listLoading = false;
+ // });
+ // });
+ // },
selectValue(params) {
//版本下拉选择
this.versionValue = params.value;
@@ -310,7 +422,7 @@ export default {
}
})
.catch(() => {
- //this.listLoading = false;
+ this.listLoading = false;
});
},
handleImportExcel() {
@@ -329,14 +441,6 @@ export default {
if (column.property === "state") {
return { 0: "其他", 2: "已结" }[row[column.property]];
}
- if (column.property == "accountDate" || column.property == "date") {
- var date = row[column.property];
- if (date == undefined) {
- return "";
- }
- //return moment(date).format("YYYY-MM-DD HH:mm:ss");
- return moment(date).format("YYYY-MM-DD");
- }
return row[column.property] || "--";
},
importExcelData() {
@@ -345,54 +449,7 @@ export default {
//关闭导入窗体时调用
this.showExcelImport = false;
},
- //导出功能
- async handleDownload() {
- this.listLoading = true;
- if (this.versionValue === "") {
- this.$message.error("必需选择版本!");
- this.listLoading = false;
- return;
- }
- if (this.versionValue != "") {
- this.listQuery.version = this.versionValue;
- }
- console.log("发票导出:" + JSON.stringify(this.listQuery));
- this.$axios
- .posts("/api/settleaccount/Invoices/Export", this.listQuery)
- .then((res) => {
- let fileNameOfProject = res;
- this.$axios
- .BolbGets(
- "/api/settleaccount/getblobfile/download/" + fileNameOfProject
- )
- .then((response) => {
- if (fileNameOfProject.indexOf("_") != -1) {
- let downName =
- fileNameOfProject.slice(
- 0,
- fileNameOfProject.lastIndexOf("_")
- ) +
- fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
- downloadFile(response, downName);
- this.$notify({
- title: "成功",
- message: "数据-导出成功!",
- type: "success",
- duration: 2000,
- });
- } else {
- downloadFile(response, fileNameOfProject);
- this.$notify({
- title: "成功",
- message: "数据-导出成功!",
- type: "success",
- duration: 2000,
- });
- }
- this.listLoading = false;
- });
- });
- },
+
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
diff --git a/vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue b/vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue
new file mode 100644
index 00000000..b839c795
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.version }}
+
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue/src/views/ux/vw/dataInput/SparePart/index.vue b/vue/src/views/ux/vw/dataInput/SparePart/index.vue
new file mode 100644
index 00000000..a94ed914
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/SparePart/index.vue
@@ -0,0 +1,641 @@
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.version }}
+
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue/src/views/ux/vw/dataInput/r3-open/index.vue b/vue/src/views/ux/vw/dataInput/r3-open/index.vue
index a96294ae..49e10a41 100644
--- a/vue/src/views/ux/vw/dataInput/r3-open/index.vue
+++ b/vue/src/views/ux/vw/dataInput/r3-open/index.vue
@@ -183,7 +183,7 @@ export default {
},
data() {
return {
- crmType: "UnSettleAccount",
+ crmType: "unSettleAccount",
versionValue: "",
versionValueVerson: "",
versionList: [], //版本列表
diff --git a/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue b/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue
new file mode 100644
index 00000000..acfd7488
--- /dev/null
+++ b/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue
@@ -0,0 +1,610 @@
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.version }}
+
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index 2a145548..f7e2ddd1 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -2461,5 +2461,196 @@
"setting": []
}
]
+ },
+ "vWKanBan": {
+ "id": "36",
+ "data": [
+ {
+ "fieldId": 1,
+ "formType": "text",
+ "name": "看板条码号",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "kanban",
+ "setting": []
+ },
+ {
+ "fieldId": 2,
+ "formType": "text",
+ "name": "工厂",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "factory",
+ "setting": []
+ },
+ {
+ "fieldId": 3,
+ "formType": "text",
+ "name": "零件号",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "materialCode",
+ "setting": []
+ },
+ {
+ "fieldId": 4,
+ "formType": "text",
+ "name": "零件类型",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "partType",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "供应商编码",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "supplierCode",
+ "setting": []
+ },
+ {
+ "fieldId": 6,
+ "formType": "text",
+ "name": "入库结算标识",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "flag",
+ "setting": []
+ },
+
+ {
+ "fieldId": 15,
+ "formType": "text",
+ "name": "结算状态",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "state",
+ "setting": []
+ }
+ ]
+ },
+ "scrapClaims": {
+ "id": "36",
+ "data": [
+ {
+ "fieldId": 2,
+ "formType": "select",
+ "isNull": 0,
+ "name": "类型(报废和索赔)",
+ "options": "",
+ "type": 3,
+ "value": "",
+ "fieldType": 0,
+ "fieldName": "type",
+ "setting": [
+ "CP7报废,CP7报废",
+ "索赔,索赔"
+ ]
+ },
+ {
+ "fieldId": 3,
+ "formType": "text",
+ "name": "零件号",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "materialCode",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "零件名称",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "materialDesc",
+ "setting": []
+ }
+ ]
+ },
+ "sparePart": {
+ "id": "36",
+ "data": [
+ {
+ "fieldId": 3,
+ "formType": "text",
+ "name": "采购类型",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "purchaseType",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "采购订单号",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "purchaseOrderNo",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "物料代码",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "materialCode",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "交货单号",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "deliveryOrderNo",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "批次号",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "batchNo",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "工厂",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "factory",
+ "setting": []
+ },
+ {
+ "fieldId": 5,
+ "formType": "text",
+ "name": "工厂名称",
+ "type": 1,
+ "value": "",
+ "fieldType": 1,
+ "fieldName": "factoryName",
+ "setting": []
+ }
+ ]
}
}
\ No newline at end of file