diff --git a/vue/src/components/ImportTxt/index.vue b/vue/src/components/ImportTxt/index.vue
index a15ccfe3..9843353d 100644
--- a/vue/src/components/ImportTxt/index.vue
+++ b/vue/src/components/ImportTxt/index.vue
@@ -346,6 +346,7 @@ export default {
fis: "FIS发运数据",
settleAccount: "R3数据",
AssemblyCfgERP:"总成SAP数据",
+ PartCfg:"物料数据",
}[this.crmType] || ""
);
},
@@ -355,6 +356,7 @@ export default {
fis: "/api/settleaccount/fis/ExcelImport",
settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
+ PartCfg:"/api/newjit/part-cfg/import",
}[this.crmType] || ""
);
},
@@ -365,6 +367,7 @@ export default {
fis: "FIS发运数据导入模板.xlsx",
settleAccount: "R3数据模板.xlsx",
AssemblyCfgERP:"BOM-批量导入模板.txt",
+ PartCfg:"BOM-批量导入模板.txt",
}[this.crmType] || ""
);
},
@@ -564,7 +567,7 @@ export default {
.posts(webapi, fd)
.then(async (res) => {
console.log("导入条件:" + JSON.stringify(res));
- if(this.crmType !== "AssemblyCfgERP"){
+ if(this.crmType !== "AssemblyCfgERP" && this.crmType !== "PartCfg"){
if (res === "Success") {
if (this.isLt2M === "1" && this.isFileType === "1") {
this.$notify({
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 3ce12370..193627af 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -64,7 +64,8 @@ export const constantRoutes = [
},
{
path: '/login',
- component: () => import('@/views/login/index'),
+ // component: () => import('@/views/login/index'),
+ component: () => import('@/views/pg-fis/basedate/customerPartCfg'),
//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
//component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
index a6525a4d..33c4b649 100644
--- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
@@ -182,7 +182,7 @@
-
+
@@ -197,8 +197,8 @@
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
- import importExcel from "@/components/ImportTxt";
- //import importExcel from "@/components/ImportExcel";
+ import importExcelCtrl from "@/components/ImportTxt";
+ //import importExcelCtrl from "@/components/ImportExcel";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
@@ -230,7 +230,7 @@
components: {
Pagination,
CRMTableHead,
- importExcel,
+ importExcelCtrl,
Detail
},
directives: {
@@ -566,7 +566,7 @@
selectOptionsChange(item) {
this.getList();
},
- importExcelData() {
+ onImportExcelDlgClosed() {
//关闭导入窗体时调用
this.listLoading = false;
this.showExcelImport = false;
diff --git a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
index a9e2710a..ae4f20e6 100644
--- a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
@@ -117,6 +117,11 @@
>导出Excel
+
+ 导入零件
+
+
+
-
+
+
@@ -201,7 +201,8 @@
diff --git a/vue/static/config.js b/vue/static/config.js
index 7bdc818a..ded7695f 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -2,8 +2,6 @@ let configJSON
if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
- // ip: 'http://192.168.7.21',//new
- // ip: 'http://192.168.0.140',//old
ip: 'http://127.0.0.1', //?? two
auth_port: '8066',
public_port: '8092',
@@ -38,17 +36,16 @@ if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
- //ip: 'http://192.168.0.67',
- //ip: 'http://192.168.0.140',
- //ip: 'http://192.168.0.63',
- ip: 'http://192.168.7.21',
+ //ip: 'http://192.168.7.21',
+ ip: "http://222.169.228.163",
- //ip: 'http://149.223.116.5',
- //ip: 'http://114.116.225.148',
- //ip: 'http://10.123.148.162',
- auth_port: '8066',
- public_port: '8092',
- backend_port: '8092'
+ // auth_port: '8066',
+ // public_port: '8092',
+ // backend_port: '8092',
+
+ auth_port: "7696",
+ public_port: "7692",
+ backend_port: "7692",
},
basic: {},