PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

总成导入，零件导入测试通过

FoShanPG
liuyunfeng 11 months ago
parent
f1069ce7f7
commit
f53b954d6d
5 changed files with 43 additions and 35 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. 5
      vue/src/components/ImportTxt/index.vue
  2. 3
      vue/src/router/index.js
  3. 10
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  4. 29
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  5. 21
      vue/static/config.js

5
vue/src/components/ImportTxt/index.vue
View File

@ -346,6 +346,7 @@ export default {
fis: "FIS发运数据", fis: "FIS发运数据",
settleAccount: "R3数据", settleAccount: "R3数据",
AssemblyCfgERP:"总成SAP数据", AssemblyCfgERP:"总成SAP数据",
PartCfg:"物料数据",
}[this.crmType] || "" }[this.crmType] || ""
); );
}, },
@ -355,6 +356,7 @@ export default {
fis: "/api/settleaccount/fis/ExcelImport", fis: "/api/settleaccount/fis/ExcelImport",
settleAccount: "/api/settleaccount/SettleAccount/ExcelImport", settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import", AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
PartCfg:"/api/newjit/part-cfg/import",
}[this.crmType] || "" }[this.crmType] || ""
); );
}, },
@ -365,6 +367,7 @@ export default {
fis: "FIS发运数据导入模板.xlsx", fis: "FIS发运数据导入模板.xlsx",
settleAccount: "R3数据模板.xlsx", settleAccount: "R3数据模板.xlsx",
AssemblyCfgERP:"BOM-批量导入模板.txt", AssemblyCfgERP:"BOM-批量导入模板.txt",
PartCfg:"BOM-批量导入模板.txt",
}[this.crmType] || "" }[this.crmType] || ""
); );
}, },
@ -564,7 +567,7 @@ export default {
.posts(webapi, fd) .posts(webapi, fd)
.then(async (res) => { .then(async (res) => {
console.log("导入条件：" + JSON.stringify(res)); console.log("导入条件：" + JSON.stringify(res));
if(this.crmType !== "AssemblyCfgERP"){ if(this.crmType !== "AssemblyCfgERP" && this.crmType !== "PartCfg"){
if (res === "Success") { if (res === "Success") {
if (this.isLt2M === "1" && this.isFileType === "1") { if (this.isLt2M === "1" && this.isFileType === "1") {
this.$notify({ this.$notify({

3
vue/src/router/index.js
View File

@ -64,7 +64,8 @@ export const constantRoutes = [
}, },
{ {
path: '/login', 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/partSwitch'), //?? one
//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
//component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one //component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one

10
vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
View File

@ -182,7 +182,7 @@
<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.maxResultCount" <pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.maxResultCount"
@pagination="getList" /> @pagination="getList" />
<!-- 导入Excel组件 --> <!-- 导入Excel组件 -->
<importExcel ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="importExcelData" /> <importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
</div> </div>
<!-- 抽屉控件 --> <!-- 抽屉控件 -->
<el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose"> <el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose">
@ -197,8 +197,8 @@
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js"; import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportTxt"; import importExcelCtrl from "@/components/ImportTxt";
//import importExcel from "@/components/ImportExcel"; //import importExcelCtrl from "@/components/ImportExcel";
import Lockr from "lockr"; import Lockr from "lockr";
import moment from "moment"; import moment from "moment";
import Detail from "./detail.vue"; import Detail from "./detail.vue";
@ -230,7 +230,7 @@
components: { components: {
Pagination, Pagination,
CRMTableHead, CRMTableHead,
importExcel, importExcelCtrl,
Detail Detail
}, },
directives: { directives: {
@ -566,7 +566,7 @@
selectOptionsChange(item) { selectOptionsChange(item) {
this.getList(); this.getList();
}, },
importExcelData() { onImportExcelDlgClosed() {
//关闭导入窗体时调用 //关闭导入窗体时调用
this.listLoading = false; this.listLoading = false;
this.showExcelImport = false; this.showExcelImport = false;

29
vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
View File

@ -116,6 +116,11 @@
@click="handleDownload()" @click="handleDownload()"
>导出Excel >导出Excel
</el-button> </el-button>
</el-form-item>
<el-form-item>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" >导入零件
</el-button>
</el-form-item> </el-form-item>
<!--表格头组件，filter查询--> <!--表格头组件，filter查询-->
<!-- <c-r-m-table-head <!-- <c-r-m-table-head
@ -188,12 +193,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 导入Excel组件 --> <!-- 导入Excel组件 -->
<importExcel <importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div> </div>
</div> </div>
</template> </template>
@ -201,7 +201,8 @@
<script> <script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js"; import permission from "@/directive/permission/index.js";
import importExcel from "@/components/ImportExcel-invoice"; //import importExcelCtrl from "@/components/ImportExcel-invoice";
import importExcelCtrl from "@/components/ImportTxt";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment"; import moment from "moment";
import Lockr from "lockr"; import Lockr from "lockr";
@ -210,7 +211,7 @@ import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default { export default {
name: "CustomerPartCfg", name: "CustomerPartCfg",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect }, components: { Pagination, CRMTableHead, importExcelCtrl, XhJSSelect },
directives: { permission }, directives: { permission },
filters: { filters: {
IsCustomerSignFilter(status) { IsCustomerSignFilter(status) {
@ -310,6 +311,7 @@ export default {
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
crmType: "PartCfg",
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 260,
isEdit: false, isEdit: false,
sortState:false, //标记刷新是否是排序调用 sortState:false, //标记刷新是否是排序调用
@ -481,11 +483,11 @@ export default {
} }
return row[column.property] || "--"; return row[column.property] || "--";
}, },
importExcelData() { onImportExcelDlgClosed() {
//this.getVersionInfo();
this.listLoading = false;
//关闭导入窗体时调用 //关闭导入窗体时调用
this.listLoading = false;
this.showExcelImport = false; this.showExcelImport = false;
this.getList();
}, },
//导出功能 //导出功能
async handleDownload() { async handleDownload() {
@ -753,7 +755,12 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
handleImportSAP() {
//导入
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
}, },
}, //method
}; };
</script> </script>

21
vue/static/config.js
View File

@ -2,8 +2,6 @@ let configJSON
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
configJSON = { configJSON = {
base: { base: {
// ip: 'http://192.168.7.21',//new
// ip: 'http://192.168.0.140',//old
ip: 'http://127.0.0.1', //?? two ip: 'http://127.0.0.1', //?? two
auth_port: '8066', auth_port: '8066',
public_port: '8092', public_port: '8092',
@ -38,17 +36,16 @@ if (process.env.NODE_ENV === 'development') {
configJSON = { configJSON = {
base: { base: {
//ip: 'http://192.168.0.67', //ip: 'http://192.168.7.21',
//ip: 'http://192.168.0.140', ip: "http://222.169.228.163",
//ip: 'http://192.168.0.63',
ip: 'http://192.168.7.21',
//ip: 'http://149.223.116.5', // auth_port: '8066',
//ip: 'http://114.116.225.148', // public_port: '8092',
//ip: 'http://10.123.148.162', // backend_port: '8092',
auth_port: '8066',
public_port: '8092', auth_port: "7696",
backend_port: '8092' public_port: "7692",
backend_port: "7692",
}, },
basic: {}, basic: {},

Write Preview
Loading…
Cancel
Save