Browse Source

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

FoShanPG
liuyunfeng 11 months ago
parent
commit
f53b954d6d
  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. 39
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  5. 21
      vue/static/config.js

5
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({

3
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

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

@ -182,7 +182,7 @@
<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.maxResultCount"
@pagination="getList" />
<!-- 导入Excel组件 -->
<importExcel ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="importExcelData" />
<importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
</div>
<!-- 抽屉控件 -->
<el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose">
@ -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;

39
vue/src/views/pg-fis/basedate/customerPartCfg/index.vue

@ -117,6 +117,11 @@
>导出Excel
</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>
<!--表格头组件filter查询-->
<!-- <c-r-m-table-head
ref="crmTableHead"
@ -187,13 +192,8 @@
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
<!-- 导入Excel组件 -->
<importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
</div>
</div>
</template>
@ -201,7 +201,8 @@
<script>
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 importExcelCtrl from "@/components/ImportExcel-invoice";
import importExcelCtrl from "@/components/ImportTxt";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
import Lockr from "lockr";
@ -210,7 +211,7 @@ import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default {
name: "CustomerPartCfg",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
components: { Pagination, CRMTableHead, importExcelCtrl, XhJSSelect },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
@ -310,6 +311,7 @@ export default {
formTitle: "",
drawer: false,
showExcelImport: false,
crmType: "PartCfg",
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
sortState:false, //
@ -481,12 +483,12 @@ export default {
}
return row[column.property] || "--";
},
importExcelData() {
//this.getVersionInfo();
this.listLoading = false;
//
this.showExcelImport = false;
},
onImportExcelDlgClosed() {
//
this.listLoading = false;
this.showExcelImport = false;
this.getList();
},
//
async handleDownload() {
this.listLoading = true;
@ -753,7 +755,12 @@ export default {
.catch(() => {
});
},
},
handleImportSAP() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
}, //method
};
</script>

21
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: {},

Loading…
Cancel
Save