Skip to content

M
mes-ui
Commit 006fbe8a authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents b40a73e5 3ef40bd6
Hide whitespace changes
Inline Side-by-side
Showing with 668 additions and 747 deletions
pages/import/baseColums.js 0 → 100644
View file @ 006fbe8a
//基础导入列表表头
import VueI18n from 'vue-i18n';
import Languages from '@/i18n/locale';
import ViewUI from 'view-design'
var i18n = new VueI18n({
locale: 'zh-CN',
messages: Languages
})
export default {
columns0() {
let col0 = [{
key: "userName",
title: this.l("userName"),
align: "left",
easy: true,
},
{
key: "cardNo",
title: this.l("cardNo"),
align: "left",
easy: true,
high: true,
},
{
key: "gender",
title: this.l("gender"),
align: "center",
high: true,
code: "User.base.gender",
},
{
key: "birthday",
title: this.l("birthday"),
align: "center",
high: true,
type: "date",
},
{
key: "degreeId",
title: this.l("degreeId"),
align: "left",
high: true,
code: "User.base.degree",
},
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
code: "User.base.status",
},
{
key: "departmentId",
title: this.l("departmentId"),
align: "right",
easy: true,
high: true,
},
{
key: "departmentTitle",
title: this.l("departmentTitle"),
align: "left",
easy: true,
high: true,
},
{
key: "accountId",
title: this.l("accountId"),
hide: true,
align: "left",
},
{
key: "phone",
title: this.l("phone"),
align: "left",
easy: true,
high: true,
},
{
key: "email",
title: this.l("email"),
align: "left",
easy: true,
high: true,
},
{
key: "licensedToWork",
title: this.l("licensedToWork"),
align: "left",
},
{
key: "positionId",
title: this.l("positionId"),
align: "left",
high: true,
code: "User.base.position",
},
{
key: "titleId",
title: this.l("titleId"),
align: "left",
high: true,
code: "User.base.jobtitle",
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
import: true,
hide: true,
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
import: true,
hide: true,
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
align: "left",
import: true,
hide: true,
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left",
import: true,
hide: true,
},
]
return col0
},
columns1() {
let col1 = [{
key: "userName",
title: this.l("userName"),
align: "left",
},
{
key: "status",
title: this.l("status"),
align: "center",
code: "User.base.status",
},
]
return col1
},
columns2() {
let col2 = [{
key: "resourceCode",
title: this.l2("resourceId"),
align: "left",
easy: true,
},
{
key: "nameOfResource",
title: this.l2("nameOfResource"),
align: "left",
easy: true,
tooltip: true,
},
{
key: "code",
title: "编码",
align: "left",
},
{
key: "creatorUserId",
title: this.l2("creatorUserId"),
hide: false,
type: "user",
align: "left",
},
{
key: "lastModificationTime",
title: this.l2("lastModificationTime"),
hide: true,
align: "left",
},
{
key: "lastModifierUserId",
title: this.l2("lastModifierUserId"),
hide: true,
align: "left",
},
{
key: "isDeleted",
title: this.l2("isDeleted"),
hide: true,
align: "left",
},
{
key: "deletionTime",
title: this.l2("deletionTime"),
hide: true,
align: "left",
},
{
key: "deleterUserId",
title: this.l2("deleterUserId"),
hide: true,
align: "left",
},
{
key: "totalNum",
title: this.l2("totalNum"),
align: "right",
easy: true,
},
{
key: "numberAvailable",
title: this.l2("numberAvailable"),
align: "right",
easy: true,
},
{
key: "measuringUnit",
title: this.l2("measuringUnit"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "qualityCharacteristics",
title: this.l2("qualityCharacteristics"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "batchNo",
title: this.l2("batchNo"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "storeId",
title: this.l2("storeId"),
align: "left",
high: true,
hide: true,
},
{
key: "storeTitle",
title: this.l2("storeTitle"),
align: "left",
},
{
key: "state",
title: this.l2("state"),
align: "center",
code: "mes_xingchi_resource.resource.state",
}
]
return col2
},
columns3() {
let col3 = [{
key: "codeRuleType",
title: "类型",
align: "center",
code: "material.code.type"
},
{
key: "codeRuleId",
title: "编码名称",
materialKey: '3',
},
{
key: "rootCategoryId",
title: "大类",
align: "right",
materialKey: '1',
},
{
key: "categoryId",
title: "子类",
align: "right",
materialKey: '2',
},
{
key: "code",
title: "编码",
align: "left",
render: (h, params) => {
return h(
"span", {},
!params.row.code || params.row.code == 0 ? "未分配" : params.row.code
);
}
},
{
key: "name",
title: "名称",
align: "left"
},
{
key: "status",
title: "状态",
align: "center",
code: "material.main.status",
},
{
key: "version",
title: "版本",
align: "left",
code: "material.main.version"
},
{
key: "drawing",
title: "图号",
align: "left"
},
{
key: "creationTime",
title: "创建时间",
hide: true,
align: "left",
type: "date"
},
{
key: "creatorUserId",
title: "创建人",
hide: true,
align: "left",
type: "user"
}
]
return col3
},
columns4() {
let col4 = [{
key: "code",
title: this.l4("code"),
align: "left",
width: 200,
easy: true,
high: true
},
{
key: "name",
title: this.l4("name"),
align: "left",
easy: true,
high: true,
tooltip: true,
},
{
key: "phase",
title: this.l4("phase"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.phase"
},
{
key: "versionid",
title: this.l4("version"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.version"
},
{
title: this.l4("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
code: "process.RoutingStatus"
},
{
key: "routingType",
title: this.l4("routingType"),
align: "center",
width: 100,
high: true,
code: "Process.Routing.routingType"
},
{
key: "drawingNo",
title: this.l4("drawingNo"),
align: "left",
high: true
},
{
key: "productName",
title: this.l4("productName"),
align: "left",
high: true,
tooltip: true,
},
{
key: "productId",
title: this.l4("productId"),
align: "left",
import: true,
hide: true,
},
{
key: "productBomId",
title: this.l4("productBomId"),
align: "left",
import: true,
hide: true,
},
{
key: "departmentName",
title: this.l4("departmentName"),
width: 100,
align: "left",
high: true,
tooltip: true,
},
{
key: "departmentId",
title: this.l4("departmentId"),
align: "left",
import: true,
hide: true,
},
{
key: "isEffect",
title: this.l4("isEffect"),
align: "center",
width: 80,
high: true,
code: "Process.Status"
}
]
return col4
},
columns5() {
let col5 = [{
key: "routingDetailNo",
title: this.l5("routingDetailNo"),
align: "left",
high: true,
width: 100,
sortable: true
},
{
key: "routingHeaderId",
title: this.l5("routingHeaderName"),
hide: true,
import: true,
techKey: '1',
},
{
key: "routingDetailName",
title: this.l5("routingDetailName"),
align: "left",
high: true
},
{
key: "routingDetailId",
title: this.l5("routingDetailId"),
hide: true,
import: true,
},
{
key: "quantity",
title: this.l5("quantity"),
align: "right",
high: true,
width: 80,
},
{
key: "materialType",
title: this.l5("materialType"),
align: "center",
easy: true,
high: true,
code: "mes_xingchi_resource.material.materialReType",
width: 100,
},
{
key: "materialNumber",
title: this.l5("materialNumber"),
align: "left",
easy: true,
high: true
},
{
key: "materialId",
title: this.l5("materialId"),
align: "left",
hide: true,
import: true
},
{
key: "nameMaterial",
title: this.l5("nameMaterial"),
align: "left",
easy: true,
high: true,
},
{
key: "brand",
title: this.l5("brand"),
align: "left",
easy: true,
high: true
},
{
key: "specifications",
title: this.l5("specifications"),
align: "left",
easy: true,
high: true
},
{
key: "xhgg",
title: this.l5("xhgg"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "texture",
title: this.l5("texture"),
align: "left",
easy: true,
high: true
},
{
key: "procurementStandards",
title: this.l5("procurementStandards"),
align: "left",
easy: true,
high: true
},
{
key: "qualityGrade",
title: this.l5("qualityGrade"),
align: "left",
easy: true,
high: true
},
{
key: "drawNum",
title: this.l5("drawNum"),
align: "left",
easy: true,
high: true
},
]
return col5
},
columns6() {
let col6 = [{
title: this.l6("name"),
key: "name",
align: "left",
},
{
key: "mmcode",
title: this.l6("mmcode"),
align: "center",
high: true,
},
{
key: "levelTitle",
title: this.l6("levelTitle"),
align: "left",
high: true,
},
{
key: "levelId",
title: this.l6("levelId"),
align: "left",
high: true,
hide: true,
import: true,
},
{
key: "drawingNo",
title: this.l6("drawingNo"),
align: "right",
high: true,
},
{
key: "madeCompanyTitle",
title: this.l6("madeCompanyTitle"),
align: "center",
width: 260,
high: true,
},
{
key: "madeCompany",
title: this.l6("madeCompany"),
align: "center",
width: 260,
high: true,
hide: true,
import: true,
},
{
key: "version",
title: this.l6("version"),
align: "center",
width: 260,
high: true,
hide: true,
import: true,
},
{
key: "materialId",
title: this.l6("materialId"),
align: "center",
width: 260,
high: true,
hide: true,
import: true,
},
]
return col6
},
l(key) {
key = "user" + "." + key;
return i18n.t(key);
},
l2(key) {
key = "resource" + "." + key;
return i18n.t(key);
},
l4(key) {
key = "routingHeader" + "." + key;
return i18n.t(key);
},
l5(key) {
key = "routingsupporting" + "." + key;
return i18n.t(key);
},
l6(key) {
key = "product_info" + "." + key;
return i18n.t(key);
},
test()
{
ViewUI.Message.error("terterer")
}
}
\ No newline at end of file
pages/import/process.vue
View file @ 006fbe8a
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
<FormItem> <FormItem>
<dictionary code="import.im.page" style="width:160px" @on-change="pageChange" v-model="pageType"></dictionary> <dictionary code="import.im.page" style="width:160px" @on-change="pageChange" v-model="pageType"></dictionary>
</FormItem> </FormItem>
<!--
<FormItem>
<div class="tip mr20">共{{listLength}}条数据</div>
</FormItem>
-->
<FormItem> <FormItem>
<Button type="primary" @click="openInfoModal" :disabled="btnIm">导入</Button> <Button type="primary" @click="openInfoModal" :disabled="btnIm">导入</Button>
</FormItem> </FormItem>
...@@ -84,6 +79,7 @@ ...@@ -84,6 +79,7 @@
<script> <script>
import Api from "./api"; import Api from "./api";
import BaseColums from "./baseColums";
import XLSX from "xlsx"; import XLSX from "xlsx";
import { import {
Switch Switch
...@@ -101,709 +97,6 @@ export default { ...@@ -101,709 +97,6 @@ export default {
disabled: false, disabled: false,
detailExcel: null, detailExcel: null,
tableImport: true, tableImport: true,
columns0: [{
key: "userName",
title: this.l("userName"),
align: "left",
easy: true,
},
{
key: "cardNo",
title: this.l("cardNo"),
align: "left",
easy: true,
high: true,
},
{
key: "gender",
title: this.l("gender"),
align: "center",
high: true,
code: "User.base.gender",
},
{
key: "birthday",
title: this.l("birthday"),
align: "center",
high: true,
type: "date",
},
{
key: "degreeId",
title: this.l("degreeId"),
align: "left",
high: true,
code: "User.base.degree",
},
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
code: "User.base.status",
},
{
key: "departmentId",
title: this.l("departmentId"),
align: "right",
easy: true,
high: true,
},
{
key: "departmentTitle",
title: this.l("departmentTitle"),
align: "left",
easy: true,
high: true,
},
{
key: "roleTitles",
title: this.l("roleTitles"),
align: "left",
easy: true,
high: true,
hide: true,
render: (h, params) => {
return h(
"div", {
class: "action",
},
[
h(
"op", {
attrs: {
oprate: "detail",
class: params.row.roleTitles == null ||
params.row.roleTitles == "" ?
"empower" : "detail",
},
on: {
click: () => this.authorize(params.row.id),
},
},
params.row.roleTitles == null || params.row.roleTitles == "" ?
"授权" :
params.row.roleTitles
),
]
);
},
},
{
key: "accountId",
title: this.l("accountId"),
hide: true,
align: "left",
},
{
key: "phone",
title: this.l("phone"),
align: "left",
easy: true,
high: true,
},
{
key: "email",
title: this.l("email"),
align: "left",
easy: true,
high: true,
},
{
key: "licensedToWork",
title: this.l("licensedToWork"),
align: "left",
},
{
key: "positionId",
title: this.l("positionId"),
align: "left",
high: true,
code: "User.base.position",
},
{
key: "titleId",
title: this.l("titleId"),
align: "left",
high: true,
code: "User.base.jobtitle",
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
import: true,
hide: true,
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
import: true,
hide: true,
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
align: "left",
import: true,
hide: true,
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left",
import: true,
hide: true,
},
{
title: "操作",
key: "action",
width: 180,
align: "right",
render: (h, params) => {
return h(
"div", {
class: "action",
},
[
h(
"op", {
attrs: {
oprate: "detail",
class: "empower",
},
on: {
click: () => this.syncAccount(params.row),
},
},
params.row.accountId == 0 ? "同步" : ""
),
h(
"op", {
attrs: {
oprate: "edit",
},
on: {
click: () => this.edit(params.row.id),
},
},
"编辑"
),
h(
"op", {
attrs: {
oprate: "remove",
},
on: {
click: () => this.remove(params.row),
},
},
"删除"
),
h(
"op", {
attrs: {
oprate: "detail",
},
on: {
click: () => this.openReset(params.row),
},
},
"重置密码"
),
]
);
},
},
],
columns1: [{
key: "userName",
title: this.l("userName"),
align: "left",
},
{
key: "status",
title: this.l("status"),
align: "center",
code: "User.base.status",
},
],
columns2: [{
key: "resourceCode",
title: this.l2("resourceId"),
align: "left",
easy: true,
},
{
key: "nameOfResource",
title: this.l2("nameOfResource"),
align: "left",
easy: true,
tooltip: true,
},
{
key: "code",
title: "编码",
align: "left",
},
{
key: "creatorUserId",
title: this.l2("creatorUserId"),
hide: false,
type: "user",
align: "left",
},
{
key: "lastModificationTime",
title: this.l2("lastModificationTime"),
hide: true,
align: "left",
},
{
key: "lastModifierUserId",
title: this.l2("lastModifierUserId"),
hide: true,
align: "left",
},
{
key: "isDeleted",
title: this.l2("isDeleted"),
hide: true,
align: "left",
},
{
key: "deletionTime",
title: this.l2("deletionTime"),
hide: true,
align: "left",
},
{
key: "deleterUserId",
title: this.l2("deleterUserId"),
hide: true,
align: "left",
},
{
key: "totalNum",
title: this.l2("totalNum"),
align: "right",
easy: true,
},
{
key: "numberAvailable",
title: this.l2("numberAvailable"),
align: "right",
easy: true,
},
{
key: "measuringUnit",
title: this.l2("measuringUnit"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "qualityCharacteristics",
title: this.l2("qualityCharacteristics"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "batchNo",
title: this.l2("batchNo"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "storeId",
title: this.l2("storeId"),
align: "left",
high: true,
hide: true,
},
{
key: "storeTitle",
title: this.l2("storeTitle"),
align: "left",
},
{
key: "state",
title: this.l2("state"),
align: "center",
code: "mes_xingchi_resource.resource.state",
}
],
columns3: [{
key: "codeRuleType",
title: "类型",
align: "center",
code: "material.code.type"
},
{
key: "codeRuleId",
title: "编码名称",
materialKey: '3',
},
{
key: "rootCategoryId",
title: "大类",
align: "right",
materialKey: '1',
},
{
key: "categoryId",
title: "子类",
align: "right",
materialKey: '2',
},
{
key: "code",
title: "编码",
align: "left",
render: (h, params) => {
return h(
"a", {
props: {},
on: {
click: () => this.details(params.row)
}
},
!params.row.code || params.row.code == 0 ? "未分配" : params.row.code
);
}
},
{
key: "name",
title: "名称",
align: "left"
},
{
key: "status",
title: "状态",
align: "center",
code: "material.main.status",
},
{
key: "version",
title: "版本",
align: "left",
code: "material.main.version"
},
{
key: "drawing",
title: "图号",
align: "left"
},
{
key: "creationTime",
title: "创建时间",
hide: true,
align: "left",
type: "date"
},
{
key: "creatorUserId",
title: "创建人",
hide: true,
align: "left",
type: "user"
}
],
columns4: [{
key: "code",
title: this.l4("code"),
align: "left",
width: 200,
easy: true,
high: true
},
{
key: "name",
title: this.l4("name"),
align: "left",
easy: true,
high: true,
tooltip: true,
},
{
key: "phase",
title: this.l4("phase"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.phase"
},
{
key: "versionid",
title: this.l4("version"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.version"
},
{
title: this.l4("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
code: "process.RoutingStatus"
},
{
key: "routingType",
title: this.l4("routingType"),
align: "center",
width: 100,
high: true,
code: "Process.Routing.routingType"
},
{
key: "drawingNo",
title: this.l4("drawingNo"),
align: "left",
high: true
},
{
key: "productName",
title: this.l4("productName"),
align: "left",
high: true,
tooltip: true,
},
{
key: "productId",
title: this.l4("productId"),
align: "left",
import: true,
hide: true,
},
{
key: "productBomId",
title: this.l4("productBomId"),
align: "left",
import: true,
hide: true,
},
{
key: "departmentName",
title: this.l4("departmentName"),
width: 100,
align: "left",
high: true,
tooltip: true,
},
{
key: "departmentId",
title: this.l4("departmentId"),
align: "left",
import: true,
hide: true,
},
{
key: "isEffect",
title: this.l4("isEffect"),
align: "center",
width: 80,
high: true,
code: "Process.Status"
}
],
columns5: [{
key: "routingDetailNo",
title: this.l5("routingDetailNo"),
align: "left",
high: true,
width: 100,
sortable: true
},
{
key: "routingHeaderId",
title: this.l5("routingHeaderName"),
hide: true,
import: true,
techKey: '1',
// render: (h, params) => {
// return h(
// "span", {},
// this.getRoutingHeaderName(params.row.routingHeaderId)
// );
// }
},
{
key: "routingDetailName",
title: this.l5("routingDetailName"),
align: "left",
high: true
},
{
key: "routingDetailId",
title: this.l5("routingDetailId"),
hide: true,
import: true,
},
{
key: "quantity",
title: this.l5("quantity"),
align: "right",
high: true,
width: 80,
},
{
key: "materialType",
title: this.l5("materialType"),
align: "center",
easy: true,
high: true,
code: "mes_xingchi_resource.material.materialReType",
width: 100,
},
{
key: "materialNumber",
title: this.l5("materialNumber"),
align: "left",
easy: true,
high: true
},
{
key: "materialId",
title: this.l5("materialId"),
align: "left",
hide: true,
import: true
},
{
key: "nameMaterial",
title: this.l5("nameMaterial"),
align: "left",
easy: true,
high: true,
},
{
key: "brand",
title: this.l5("brand"),
align: "left",
easy: true,
high: true
},
{
key: "specifications",
title: this.l5("specifications"),
align: "left",
easy: true,
high: true
},
{
key: "xhgg",
title: this.l5("xhgg"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "texture",
title: this.l5("texture"),
align: "left",
easy: true,
high: true
},
{
key: "procurementStandards",
title: this.l5("procurementStandards"),
align: "left",
easy: true,
high: true
},
{
key: "qualityGrade",
title: this.l5("qualityGrade"),
align: "left",
easy: true,
high: true
},
{
key: "drawNum",
title: this.l5("drawNum"),
align: "left",
easy: true,
high: true
},
],
columns6: [{
title: this.l6("name"),
key: "name",
align: "left",
},
{
key: "mmcode",
title: this.l6("mmcode"),
align: "center",
high: true,
},
{
key: "levelTitle",
title: this.l6("levelTitle"),
align: "left",
high: true,
},
{
key: "levelId",
title: this.l6("levelId"),
align: "left",
high: true,
hide: true,
import: true,
},
{
key: "drawingNo",
title: this.l6("drawingNo"),
align: "right",
high: true,
},
{
key: "madeCompanyTitle",
title: this.l6("madeCompanyTitle"),
align: "center",
width: 260,
high: true,
},
{
key: "madeCompany",
title: this.l6("madeCompany"),
align: "center",
width: 260,
high: true,
hide: true,
import: true,
},
{
key: "version",
title: this.l6("version"),
align: "center",
width: 260,
high: true,
hide: true,
import: true,
},
{
key: "materialId",
title: this.l6("materialId"),
align: "center",
width: 260,
high: true,
hide: true,
import: true,
},
],
tdHeightExcel: "", tdHeightExcel: "",
excelData: [], excelData: [],
excelDataBack: [], //临时存储原始数据 excelDataBack: [], //临时存储原始数据
...@@ -937,8 +230,8 @@ export default { ...@@ -937,8 +230,8 @@ export default {
} else { } else {
temData = this.$u.clone(this.$refs.comExcel.excelData) temData = this.$u.clone(this.$refs.comExcel.excelData)
} }
let arrTitleUse = []; ////使用数据字典的字段 let arrTitleUse = []; //使用数据字典的字段
let arrTitleUse1 = []; ////使用物料编码的字段 let arrTitleUse1 = []; //使用物料编码的字段
temColPage.forEach((elCode) => { temColPage.forEach((elCode) => {
if (elCode.code) { if (elCode.code) {
arrTitleUse.push({ arrTitleUse.push({
...@@ -1135,28 +428,28 @@ export default { ...@@ -1135,28 +428,28 @@ export default {
this.imBtn = true; this.imBtn = true;
switch (this.pageType) { switch (this.pageType) {
case 0: case 0:
this.loadColum(this.columns0); this.loadColum(BaseColums.columns0());
break; break;
case 1: case 1:
this.loadColum(this.columns1); this.loadColum(BaseColums.columns1());
break; break;
case 2: case 2:
this.loadColum(this.columns2); this.loadColum(BaseColums.columns2());
break; break;
case 3: case 3:
this.loadColum(this.columns3); this.loadColum(BaseColums.columns3());
break; break;
case 4: case 4:
this.loadColum(this.columns4); this.loadColum(BaseColums.columns4());
break; break;
case 5: case 5:
this.loadColum(this.columns5); this.loadColum(BaseColums.columns5());
break; break;
case 6: case 6:
this.loadColum(this.columns6); this.loadColum(BaseColums.columns6());
break; break;
default: default:
this.loadColum(this.columns0); this.loadColum(BaseColums.columns0());
} }
this.titleInfo = "批量导入到 【" + this.$u.dirName( this.titleInfo = "批量导入到 【" + this.$u.dirName(
this.$store.getters.dictionaryByKey("import.im.page"), this.$store.getters.dictionaryByKey("import.im.page"),
...@@ -1228,7 +521,8 @@ export default { ...@@ -1228,7 +521,8 @@ export default {
let parms = { let parms = {
list: tempList, list: tempList,
}; };
Api.importUser(parms).then((res) => { let url = `${systemUrl}/userimportservice/import`
this.$api.post(url, parms).then((res) => {
if (res.success) { if (res.success) {
this.$Message.success("成功批量导入用户管理成功模块 " + tempList.length + " 条数据"); this.$Message.success("成功批量导入用户管理成功模块 " + tempList.length + " 条数据");
this.imBtn = false; this.imBtn = false;
...@@ -1595,26 +889,6 @@ export default { ...@@ -1595,26 +889,6 @@ export default {
datalength(val) { datalength(val) {
this.listLength = val this.listLength = val
}, },
l(key) {
key = "user" + "." + key;
return this.$t(key);
},
l2(key) {
key = "resource" + "." + key;
return this.$t(key);
},
l4(key) {
key = "routingHeader" + "." + key;
return this.$t(key);
},
l5(key) {
key = "routingsupporting" + "." + key;
return this.$t(key);
},
l6(key) {
key = "product_info" + "." + key;
return this.$t(key);
},
}, },
watch: { watch: {
eid(v) { eid(v) {
...@@ -1682,8 +956,8 @@ export default { ...@@ -1682,8 +956,8 @@ export default {
.ivu-footer-toolbar { .ivu-footer-toolbar {
text-align: left; text-align: left;
// background: #f5f5f5;
// background: #f5f5f5;
.ivu-footer-toolbar-right { .ivu-footer-toolbar-right {
float: left; float: left;
} }
......
pages/technology/productMix/product/index.vue
View file @ 006fbe8a
...@@ -119,13 +119,11 @@ export default { ...@@ -119,13 +119,11 @@ export default {
{ {
title: this.l("name"), title: this.l("name"),
key: "name", key: "name",
align: "left", align: "left",
}, },
{ {
key: "mmcode", key: "mmcode",
title: this.l("mmcode"), title: this.l("mmcode"),
align: "center",
high: true, high: true,
}, },
{ {
...@@ -170,20 +168,18 @@ export default { ...@@ -170,20 +168,18 @@ export default {
{ {
key: "drawingNo", key: "drawingNo",
title: this.l("drawingNo"), title: this.l("drawingNo"),
align: "right",
high: true, high: true,
}, },
{ {
key: "madeCompanyTitle", key: "madeCompanyTitle",
title: this.l("madeCompanyTitle"), title: this.l("madeCompanyTitle"),
align: "center",
width: 260, width: 260,
high: true, high: true,
}, },
{ {
key: "madeCompany", key: "madeCompany",
title: this.l("madeCompany"), title: this.l("madeCompany"),
align: "center", align: "right",
width: 260, width: 260,
high: true, high: true,
hide: true, hide: true,
...@@ -192,7 +188,6 @@ export default { ...@@ -192,7 +188,6 @@ export default {
{ {
key: "version", key: "version",
title: this.l("version"), title: this.l("version"),
align: "center",
width: 260, width: 260,
high: true, high: true,
hide: true, hide: true,
...@@ -201,7 +196,7 @@ export default { ...@@ -201,7 +196,7 @@ export default {
{ {
key: "materialId", key: "materialId",
title: this.l("materialId"), title: this.l("materialId"),
align: "center", align: "right",
width: 260, width: 260,
high: true, high: true,
hide: true, hide: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment