Browse Source

【长春派格1.5】总成模块功能需求开发

HQ
安虹睿 11 months ago
parent
commit
cc319f4be9
  1. 2
      vue/src/components/ImportExcel-normal/index.vue
  2. 89
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  3. 2
      vue/src/views/pg-fis/basedate/planControl/index.vue

2
vue/src/components/ImportExcel-normal/index.vue

@ -150,7 +150,7 @@ export default {
message: "导入成功!",
type: "success",
});
this.$parent.importCallback()
this.$parent.importNormalCallback()
} else {
this.$message({
message: res.message,

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

@ -4,6 +4,16 @@
<div ref="box">
<flexbox class="content-header">
<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
<el-form-item label="规格说明" prop="specExplain" class="forimitem">
<el-input v-model="listQuery.specExplain" placeholder="请输入规格说明" clearable size="small" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="颜色说明" prop="colorExplain" class="forimitem">
<el-input v-model="listQuery.colorExplain" placeholder="请输入颜色说明" clearable size="small" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="总成编码" prop="erpAssemblyCode" class="forimitem">
<el-input v-model="listQuery.erpAssemblyCode" placeholder="请输入总成编码" clearable size="small" style="width: 240px"
@keyup.enter.native="handleQuery" />
@ -19,12 +29,12 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="车型:" prop="vehicleModelCode" class="forimitem">
<!-- <el-form-item label="车型:" prop="vehicleModelCode" class="forimitem">
<el-select v-model="listQuery.vehicleModelCode" clearable placeholder="请选择" size="medium" style="margin-right: 15px"
@change="valueselectChange">
<el-option v-for="item in vehicleModelList" :key="item.id" :label="item.dicItemName" :value="item.dicItemCode" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="创建时间">
<el-date-picker v-model="listQuery.createTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
@ -35,11 +45,18 @@
<el-form-item class="formitem">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" style="margin-left: 15px" @click="handleDownload()">导出(Excel)
<el-button type="warning" plain icon="el-icon-download" size="mini" style="margin-left: 15px" @click="handleDownload()">导出(Excel)</el-button>
<el-button
class="filter-item"
size="mini"
type="success"
icon="el-icon-plus"
@click="handleImportNormal"
>导入
</el-button>
</el-form-item>
<!-- <el-divider class="divider1" ></el-divider> -->
<el-form-item style="margin-bottom: 0px; ">
<!-- <el-form-item style="margin-bottom: 0px; ">
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate" disabled>新增
</el-button>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate" disabled>修改
@ -48,7 +65,7 @@
</el-button>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" disabled>导入SAP对接
</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</flexbox>
</div>
@ -58,15 +75,13 @@
class="cr-table" :data="list" :height="tableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
size="small" stripe border highlight-current-row style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick">
<el-table-column type="selection" width="44px"></el-table-column>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column label="ERP总成编码" prop="erpAssemblyCode" sortable="custom" align="center" width="180px">
<!-- <el-table-column label="ERP总成编码" prop="erpAssemblyCode" sortable="custom" align="center" width="180px">
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.erpAssemblyCode
}}</span>
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{scope.row.erpAssemblyCode}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
:min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
<template slot="header" slot-scope="scope">
@ -190,6 +205,13 @@
<Detail v-bind:customerInfos="customerInfos" style="margin-top: -35px"></Detail>
</div>
</el-drawer>
<!-- 导入Excel组件 -->
<importExcelNormal
ref="importexcelNormal"
:show="showExcelNormal"
:importURL="'/api/newjit/assembly-cfg-erp/import-erp-assembly-group'"
@close="importCloseNormal"
/>
</div>
</template>
@ -198,6 +220,7 @@
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportTxt";
import importExcelNormal from "@/components/ImportExcel-normal";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
@ -230,7 +253,8 @@
Pagination,
CRMTableHead,
importExcel,
Detail
Detail,
importExcelNormal
},
directives: {
permission
@ -268,7 +292,8 @@
dialogOptions: [],
versionValue: "",
searchContent: "", //
showExcelImport: false,
showExcelImport:false,
showExcelNormal: false,
drawer: false,
list: null,
totalCount: 0,
@ -336,6 +361,21 @@
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "规格说明",
prop: "specExplain",
width: 140,
});
tempsTabs.push({
label: "颜色说明",
prop: "colorExplain",
width: 140,
});
tempsTabs.push({
label: "ERP总成编码",
prop: "erpAssemblyCode",
width: 140,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
@ -346,11 +386,11 @@
prop: "groupCode",
width: 240,
});
tempsTabs.push({
label: "车型代码",
prop: "vehicleModel",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "vehicleModel",
// width: 120,
// });
tempsTabs.push({
label: "创建时间",
prop: "creationTime",
@ -361,6 +401,19 @@
},
},
methods: {
handleImportNormal() {
//
this.showExcelNormal = true;
},
//
importCloseNormal() {
this.showExcelNormal = false;
},
//
importNormalCallback(){
this.importCloseNormal()
this.getList();
},
//
handleDrawerOpen(param) {
this.drawer = true;

2
vue/src/views/pg-fis/basedate/planControl/index.vue

@ -406,7 +406,7 @@
this.showExcelImport = false;
},
//
importCallback(){
importNormalCallback(){
this.importClose()
this.getList();
},

Loading…
Cancel
Save