基础信息管理+工艺管理

yangwl
A0010407 1 year ago
parent cba2b65118
commit 8f8ea2fc75

@ -42,3 +42,13 @@ export function delProroute(routeId) {
method: 'delete' method: 'delete'
}) })
} }
// 批量新增附件
export function importProroute(data) {
return request({
url: '/mes/pro/proroute/import',
method: 'post',
data: data
})
}

@ -1,52 +1,52 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询工艺线体关联列表 // 查询工艺线体关联列表
export function listLine(query) { export function listProduct(query) {
return request({ return request({
url: '/mes/pro/routeprodline/list', url: '/mes/pro/routeprodproduct/list',
method: 'get', method: 'get',
params: query params: query
}); });
} }
// 查询工艺线体关联详细 // 查询工艺线体关联详细
export function getLine(recordId) { export function getProduct(recordId) {
return request({ return request({
url: '/mes/pro/routeprodline/' + recordId, url: '/mes/pro/routeprodproduct/' + recordId,
method: 'get' method: 'get'
}); });
} }
// 新增工艺线体关联 // 新增工艺线体关联
export function addLine(data) { export function addProduct(data) {
return request({ return request({
url: '/mes/pro/routeprodline', url: '/mes/pro/routeprodproduct',
method: 'post', method: 'post',
data: data data: data
}); });
} }
// 修改工艺线体关联 // 修改工艺线体关联
export function updateLine(data) { export function updateProduct(data) {
return request({ return request({
url: '/mes/pro/routeprodline', url: '/mes/pro/routeprodproduct',
method: 'put', method: 'put',
data: data data: data
}); });
} }
// 删除工艺线体关联 // 删除工艺线体关联
export function delLine(recordId) { export function delProduct(recordId) {
return request({ return request({
url: '/mes/pro/routeprodline/' + recordId, url: '/mes/pro/routeprodproduct/' + recordId,
method: 'delete' method: 'delete'
}); });
} }
// 查询工艺线体关联列表 // 查询工艺线体关联列表
export function getListLine(query) { export function getListProduct(query) {
return request({ return request({
url: '/mes/pro/routeprodline/getList', url: '/mes/pro/routeprodproduct/getList',
method: 'get', method: 'get',
params: query params: query
}); });

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询设备管理列表
export function listEquipment(query) {
return request({
url: '/wms/equipment/list',
method: 'get',
params: query
});
}
// 查询设备管理详细
export function getEquipment(equipmentId) {
return request({
url: '/wms/equipment/' + equipmentId,
method: 'get'
});
}
// 新增设备管理
export function addEquipment(data) {
return request({
url: '/wms/equipment',
method: 'post',
data: data
});
}
// 修改设备管理
export function updateEquipment(data) {
return request({
url: '/wms/equipment',
method: 'put',
data: data
});
}
// 删除设备管理
export function delEquipment(equipmentId) {
return request({
url: '/wms/equipment/' + equipmentId,
method: 'delete'
});
}

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询设备绑定产品列表
export function listEquipmentBoundMaterials(query) {
return request({
url: '/wms/equipmentBoundMaterials/list',
method: 'get',
params: query
});
}
// 查询设备绑定产品详细
export function getEquipmentBoundMaterials(equipmentId) {
return request({
url: '/wms/equipmentBoundMaterials/' + equipmentId,
method: 'get'
});
}
// 新增设备绑定产品
export function addEquipmentBoundMaterials(data) {
return request({
url: '/wms/equipmentBoundMaterials',
method: 'post',
data: data
});
}
// 修改设备绑定产品
export function updateEquipmentBoundMaterials(data) {
return request({
url: '/wms/equipmentBoundMaterials',
method: 'put',
data: data
});
}
// 删除设备绑定产品
export function delEquipmentBoundMaterials(equipmentId) {
return request({
url: '/wms/equipmentBoundMaterials/' + equipmentId,
method: 'delete'
});
}

@ -84,6 +84,16 @@
v-hasPermi="['mes:pro:proroute:add']" v-hasPermi="['mes:pro:proroute:add']"
>SAP同步</el-button> >SAP同步</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['mes:pro:proroute:import']"
>上传附件</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -106,6 +116,14 @@
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件名称" align="center" prop="fileName">
<template slot-scope="scope">
<el-button
type="text"
@click="handleFileView(scope.row)"
>附件名称</el-button>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@ -203,7 +221,7 @@
<Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess> <Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="关联线体"> <el-tab-pane label="关联线体">
<Routeprodline v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprodline> <Routeprodproduct v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprodproduct>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -212,17 +230,48 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 上传附件对话框 -->
<el-dialog :title="this.title1" :visible.sync="openImport" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="工艺SOP" prop="fileList">
<FileUpload v-model="form.fileList"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'"></el-button>
<el-button type="primary" @click="submitForm1" v-else> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 上传附件对话框 -->
<el-dialog :title="title2" :visible.sync="openFileView" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="工艺SOP" prop="fileList">
<FileUpload v-model="form.fileList"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute"; import { listProroute, getProroute, delProroute, addProroute, updateProroute,importProroute} from "@/api/mes/pro/proroute";
import Routeprocess from "./routeprocess"; import Routeprocess from "./routeprocess";
import Routeprodline from "./routeprodline"; import Routeprodproduct from "./routeprodproduct";
export default { export default {
name: "Proroute", name: "Proroute",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
components: {Routeprocess,Routeprodline}, components: {Routeprocess,Routeprodproduct},
data() { data() {
return { return {
optType: undefined, optType: undefined,
@ -242,8 +291,14 @@ export default {
prorouteList: [], prorouteList: [],
// //
title: "", title: "",
title1: "",
title2: "",
// //
open: false, open: false,
//
openImport: false,
//
openFileView: false,
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -267,7 +322,8 @@ export default {
{ required: true, message: "是否启用不能为空", trigger: "blur" } { required: true, message: "是否启用不能为空", trigger: "blur" }
], ],
}, },
fileList:'' fileList:'',
idList:''
}; };
}, },
created() { created() {
@ -301,7 +357,8 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
fileList:'' fileList:'',
idList:''
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -328,6 +385,17 @@ export default {
this.title = "添加工艺路线"; this.title = "添加工艺路线";
this.optType = "add"; this.optType = "add";
}, },
/** 上传附件按钮操作 */
handleImport(row) {
this.reset();
this.openImport = true;
this.title1 = "上传附件";
this.optType = "import";
const routeIds = row.routeId || this.ids;
console.log(routeIds);
this.form.idList = routeIds;
},
// //
handleView(row){ handleView(row){
this.reset(); this.reset();
@ -339,6 +407,29 @@ export default {
this.optType = "view"; this.optType = "view";
}); });
}, },
//
handleFileView(row){
this.reset();
const routeId = row.routeId || this.ids
getProroute(routeId).then(response => {
this.form = response.data;
if(response.data.files != null){
var newFiles = [];
response.data.files.forEach(item =>{
var newfile = {};
newfile.name = item.fileName;
newfile.url = item.fileAddress;
newFiles.push(newfile);
})
this.form.fileList = newFiles;
}
this.title2 = "附件列表";
this.openFileView = true;
this.optType = "fileView";
});
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
@ -366,7 +457,7 @@ export default {
if(Array.isArray(this.form.fileList)){ if(Array.isArray(this.form.fileList)){
this.form.fileList = this.listToString(this.form.fileList); this.form.fileList = this.listToString(this.form.fileList);
} }
//this.form.idList = this.listToString(this.form.idList);
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.routeId != null) { if (this.form.routeId != null) {
@ -386,6 +477,23 @@ export default {
} }
}); });
}, },
/** 批量上传附件 */
submitForm1() {
if(Array.isArray(this.form.fileList)){
this.form.fileList = this.listToString(this.form.fileList);
}
this.$refs["form"].validate(valid => {
if (valid) {
importProroute(this.form).then(response => {
this.$modal.msgSuccess("批量上传附件成功");
this.openImport = false;
this.getList();
});
}
});
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const routeIds = row.routeId || this.ids; const routeIds = row.routeId || this.ids;

@ -5,10 +5,10 @@
</template> </template>
<script> <script>
import { getListLine, addLine , updateLine, getLine, delLine} from "@/api/mes/pro/routeprodline"; import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/mes/pro/routeprodproduct";
export default { export default {
name: "Routeprodline", name: "Routeprodproduct",
data() { data() {
return { return {
@ -52,7 +52,7 @@ export default {
//---------------------> //--------------------->
leftList: [], leftList: [],
rightList: [], rightList: [],
titles:['未关联线体','已关联线体'] titles:['未关联产品','已关联产品']
}; };
}, },
props :{ props :{
@ -67,19 +67,14 @@ export default {
getList() { getList() {
debugger debugger
this.loading = true; this.loading = true;
getListProduct(this.queryParams).then(response => {
getListLine(this.queryParams).then(response => {
this.leftList = response.unSelect; this.leftList = response.unSelect;
const dataright = []; const dataright = [];
for(let i in response.selected){ for(let i in response.selected){
// 穿 // 穿
dataright.push(response.selected[i].key) dataright.push(response.selected[i].key)
} }
this.rightList = dataright; this.rightList = dataright;
this.loading = false; this.loading = false;
}); });
}, },
@ -112,8 +107,8 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
handleChange(value, direction, movedKeys) { handleChange(value, direction, movedKeys) {
if (this.queryParams.routeId != null) { if (this.queryParams.routeId != null) {
this.queryParams.selectedValues= value; this.queryParams.selectedValues = value;
addLine(this.queryParams).then(response => { addProduct(this.queryParams).then(response => {
this.$modal.msgSuccess("关联成功"); this.$modal.msgSuccess("关联成功");
}); });
} }

@ -140,6 +140,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Bom", name: "Bom",
dicts: ['sys_normal_disable', 'material_type'],
components: { components: {
Treeselect Treeselect
}, },

@ -75,21 +75,21 @@
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column label="客户简称" align="center" prop="clientNick" /> <el-table-column label="客户简称" align="center" prop="clientNick" />
<el-table-column label="客户英文名称" align="center" prop="clientEn" /> <el-table-column label="客户英文名称" align="center" prop="clientEn" width="100"/>
<el-table-column label="客户简介" align="center" prop="clientDes" /> <el-table-column label="客户简介" align="center" prop="clientDes" />
<el-table-column label="客户LOGO地址" align="center" prop="clientLogo" /> <el-table-column label="客户LOGO地址" align="center" prop="clientLogo" width="120"/>
<el-table-column label="客户类型" align="center" prop="clientType" /> <el-table-column label="客户类型" align="center" prop="clientType" />
<el-table-column label="客户地址" align="center" prop="address" /> <el-table-column label="客户地址" align="center" prop="address" />
<el-table-column label="客户官网地址" align="center" prop="website" /> <el-table-column label="客户官网地址" align="center" prop="website" width="100"/>
<el-table-column label="客户邮箱地址" align="center" prop="email" /> <el-table-column label="客户邮箱地址" align="center" prop="email" width="100"/>
<el-table-column label="客户电话" align="center" prop="tel" /> <el-table-column label="客户电话" align="center" prop="tel" />
<el-table-column label="联系人1" align="center" prop="contact1" /> <el-table-column label="联系人1" align="center" prop="contact1" />
<el-table-column label="联系人1-电话" align="center" prop="contact1Tel" /> <el-table-column label="联系人1-电话" align="center" prop="contact1Tel" width="120"/>
<el-table-column label="联系人1-邮箱" align="center" prop="contact1Email" /> <el-table-column label="联系人1-邮箱" align="center" prop="contact1Email" width="120"/>
<el-table-column label="联系人2" align="center" prop="contact2" /> <el-table-column label="联系人2" align="center" prop="contact2" />
<el-table-column label="联系人2-电话" align="center" prop="contact2Tel" /> <el-table-column label="联系人2-电话" align="center" prop="contact2Tel" width="120"/>
<el-table-column label="联系人2-邮箱" align="center" prop="contact2Email" /> <el-table-column label="联系人2-邮箱" align="center" prop="contact2Email" width="120"/>
<el-table-column label="统一社会信用代码" align="center" prop="creditCode" /> <el-table-column label="统一社会信用代码" align="center" prop="creditCode" width="130"/>
<el-table-column label="是否启用" align="center" prop="enableFlag" /> <el-table-column label="是否启用" align="center" prop="enableFlag" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

@ -0,0 +1,427 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="设备编码" prop="equipmentCode">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备名称" prop="equipmentName">
<el-input
v-model="queryParams.equipmentName"
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="productDescZh">
<el-input
v-model="queryParams.productDescZh"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['wms:product:list']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['wms:equipmentBoundMaterials:edit']"
>修改</el-button> -->
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['wms:equipmentBoundMaterials:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wms:equipmentBoundMaterials:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="equipmentBoundMaterialsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料名称" align="center" prop="productDescZh" />
<el-table-column label="物料型号" align="center" prop="productModel" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:equipmentBoundMaterials:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:equipmentBoundMaterials:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改设备绑定产品对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionProductChange">
<el-table-column type="selection" width="55" align="center" /> -->
<!-- 序号 -->
<!-- <el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号"> -->
<!-- </el-table-column>
<el-table-column label="物料编码" align="center" prop="form.productCode" />
<el-table-column label="物料名称" align="center" prop="form.productDescZh" />
<el-table-column label="物料型号" align="center" prop="form.productModel" />
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
<el-button
type="primary"
plain
size="mini"
@click="handleProductQuery"
v-hasPermi="['wms:product:list']"
></el-button>
</div>
</el-form> -->
<el-form :model="form" :rules="rules" ref="form" label-width="110px">
<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionProductChange" >
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
<el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料型号" align="center" prop="form.productModel" />
</el-table>
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
<el-button
type="primary"
plain
size="mini"
@click="handleProductQuery"
v-hasPermi="['wms:product:list']"
></el-button>
</el-form>
</el-dialog>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryProductParams.pageNum"
:limit.sync="queryProductParams.pageSize"
@pagination="getProductList"
/>
</div>
</template>
<script>
import { listEquipmentBoundMaterials, getEquipmentBoundMaterials, delEquipmentBoundMaterials, addEquipmentBoundMaterials, updatEquipmentBoundMaterials } from "@/api/wms/equipmentBoundMaterials";
import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "@/api/wms/product";
export default {
name: "EquipmentBoundMaterials",
data() {
return {
//
loading: true,
//
// productLoading: true,
//
// productIds: [],
//
ids: [],
//
single: true,
//
// productSingle: true,
//
// productMultiple: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
// total: 0,
//
productList: [],
//
equipmentBoundMaterialsList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
equipmentCode: null,
equipmentName: null,
productCode: null,
productDescZh: null,
equipmentTypeId: null,
equipmentTypeCode: null,
equipmentTypeName: null,
workshopId: null,
workshopCode: null,
workshopName: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
},
queryProductParams: {
pageNum: 1,
pageSize: 10,
productId: null,
productCode: null,
productDescZh: null,
productModel:null,
},
//
form: {},
//
rules: {
equipmentCode: [
{ required: true, message: "设备编码不能为空", trigger: "blur" }
],
productCode: [
{ required: true, message: "产品编码不能为空", trigger: "blur" }
],
productDescZh: [
{ required: true, message: "产品名称不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getProductList();
},
methods: {
//
indexMethod(index){
return index+1 ;
},
/** 查询设备绑定产品列表 */
getList() {
this.loading = true;
listEquipmentBoundMaterials(this.queryParams).then(response => {
this. equipmentBoundMaterialsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 查询物料信息列表 */
getProductList() {
this.loading = true;
listProduct(this.queryProductParams).then(response => {
this.productList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
productId: null,
productCode: null,
productDescZh: null,
productModel:null,
equipmentId: null,
equipmentCode: null,
equipmentName: null,
productCode: null,
productDescZh: null,
equipmentTypeId: null,
equipmentTypeCode: null,
equipmentTypeName: null,
workshopId: null,
workshopCode: null,
workshopName: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 搜索按钮操作 */
handleProductQuery() {
this.queryProductParams.pageNum = 1;
this.getProductList();
console.log(this.form);
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionProductChange(selection) {
this.ids = selection.map(item => item.productId)
this.single = selection.length!==1
this.multiple = !selection.length
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.equipmentId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
// this.queryProductParams.pageNum = 1;
// this.getProductList();
this.reset();
this.open = true;
this.title = "添加设备绑定产品";
},
/** 修改按钮操作 */
// handleUpdate(row) {
// this.reset();
// const equipmentId = row.equipmentId || this.ids
// getEquipmentBoundMaterials(equipmentId).then(response => {
// this.form = response.data;
// this.open = true;
// this.title = "";
// });
// },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
console.log(this.form.equipmentId);
if (this.form.equipmentId != null) {
// updateEquipmentBoundMaterials(this.form).then(response => {
// this.$modal.msgSuccess("");
// this.open = false;
// this.getList();
// });
// } else
// if(this.form.productId != null){
addEquipmentBoundMaterials(this.form).then(response => {
this.$modal.msgSuccess("绑定成功");
this.open = false;
this.getProductList();
});
}
// else {
// addEquipmentBoundMaterials(this.form).then(response => {
// this.$modal.msgSuccess("");
// this.open = false;
// this.getList();
// });
// }
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const equipmentIds = row.equipmentId || this.ids;
this.$modal.confirm('是否确认删除设备绑定产品编号为"' + equipmentIds + '"的数据项?').then(function() {
return delEquipmentBoundMaterials(equipmentIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/equipmentBoundMaterials/export', {
...this.queryParams
}, ` equipmentBoundMaterials_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -0,0 +1,428 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
<el-form-item label="设备编码" prop="equipmentCode">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备名称" prop="equipmentName">
<el-input
v-model="queryParams.equipmentName"
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['wms:equipment:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['wms:equipment:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['wms:equipment:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wms:equipment:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-table-column label="设备编码" align="center" prop="equipmentCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['wms:equipment:query']"
>{{scope.row.equipmentCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" prop="equipmentName" />
<el-table-column label="规格型号" align="center" prop="equipmentSpec" />
<el-table-column label="设备类型ID" align="center" prop="equipmentTypeId" width="100"/>
<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="100" />
<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="100"/>
<el-table-column label="所属车间ID" align="center" prop="workshopId" width="100"/>
<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="100"/>
<el-table-column label="所属车间名称" align="center" prop="workshopName" width="100"/>
<el-table-column label="设备状态" align="center" prop="status" />
<el-table-column label="单台能力工时" align="center" prop="unitWorkingHours" width="100"/>
<el-table-column label="工段" align="center" prop="workshopSection" />
<el-table-column label="设备位置" align="center" prop="equipmentLocation" />
<el-table-column label="工时单价" align="center" prop="hourlyUnitPrice" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:equipment:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:equipment:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改设备管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="设备编码" prop="equipmentCode">
<el-input v-model="form.equipmentCode" placeholder="请输入设备类型编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="请输入设备类型名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="规格型号" prop="equipmentSpec">
<el-input v-model="form.equipmentSpec" placeholder="请输入规格型号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备类型名称" prop="equipmentTypeName">
<el-input v-model="form.equipmentTypeName" placeholder="请输入设备类型名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="所属车间编码" prop="workshopCode">
<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属车间名称" prop="workshopName">
<el-input v-model="form.workshopName" placeholder="请输入所属车间名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="单台能力工时" prop="unitWorkingHours">
<el-input v-model="form.unitWorkingHours" placeholder="请输入单台能力工时" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工段" prop="workshopSection">
<el-input v-model="form.workshopSection" placeholder="请输入工段" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="设备位置" prop="equipmentLocation">
<el-input v-model="form.equipmentLocation" placeholder="请输入设备位置" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工时单价" prop="hourlyUnitPrice">
<el-input v-model="form.hourlyUnitPrice" placeholder="请输入工时单价" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-if="form.equipmentCode != null">
<el-tab-pane label="设备绑定物料">
<EquipmentBoundMaterials v-if="form.equipmentCode != null" :optType="optType" :equipmentCode="form.equipmentCode"></EquipmentBoundMaterials>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
import EquipmentBoundMaterials from "./equipmentBoundMaterials";
export default {
name: "Equipment",
components: {EquipmentBoundMaterials},
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
equipmentList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
equipmentCode: null,
equipmentName: null,
equipmentBrand: null,
equipmentSpec: null,
equipmentTypeId: null,
equipmentTypeCode: null,
equipmentTypeName: null,
workshopId: null,
workshopCode: null,
workshopName: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
unitWorkingHours: null,
workshopSection: null,
equipmentLocation: null,
hourlyUnitPrice: null
},
//
form: {},
//
rules: {
equipmentCode: [
{ required: true, message: "设备类型编码不能为空", trigger: "blur" }
],
equipmentName: [
{ required: true, message: "设备类型名称不能为空", trigger: "blur" }
],
equipmentTypeId: [
{ required: true, message: "设备类型ID不能为空", trigger: "blur" }
],
workshopId: [
{ required: true, message: "所属车间ID不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "设备状态不能为空", trigger: "change" }
],
unitWorkingHours: [
{ required: true, message: "单台能力工时不能为空", trigger: "blur" }
],
workshopSection: [
{ required: true, message: "工段不能为空", trigger: "blur" }
],
equipmentLocation: [
{ required: true, message: "设备位置不能为空", trigger: "blur" }
],
hourlyUnitPrice: [
{ required: true, message: "工时单价不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
//
indexMethod(index){
return index+1 ;
},
/** 查询设备管理列表 */
getList() {
this.loading = true;
listEquipment(this.queryParams).then(response => {
this.equipmentList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
equipmentId: null,
equipmentCode: null,
equipmentName: null,
equipmentBrand: null,
equipmentSpec: null,
equipmentTypeId: null,
equipmentTypeCode: null,
equipmentTypeName: null,
workshopId: null,
workshopCode: null,
workshopName: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
unitWorkingHours: null,
workshopSection: null,
equipmentLocation: null,
hourlyUnitPrice: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.equipmentId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加设备管理";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const equipmentId = row.equipmentId || this.ids
getEquipment(equipmentId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改设备管理";
});
},
//
//
handleView(row){
this.reset();
const equipmentId = row.equipmentId || this.ids;
getEquipment(equipmentId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看设备绑定信息";
this.optType = "view";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.equipmentId != null) {
updateEquipment(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addEquipment(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const equipmentIds = row.equipmentId || this.ids;
this.$modal.confirm('是否确认删除设备管理编号为"' + equipmentIds + '"的数据项?').then(function() {
return delEquipment(equipmentIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/equipment/export', {
...this.queryParams
}, `equipment_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -1,18 +1,18 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="设备类型编码" prop="machineryCode" label-width="108px"> <el-form-item label="机台类型编码" prop="machineryCode" label-width="108px">
<el-input <el-input
v-model="queryParams.machineryCode" v-model="queryParams.machineryCode"
placeholder="请输入设备类型编码" placeholder="请输入机台类型编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备类型名称" prop="machineryName" label-width="108px"> <el-form-item label="机台类型名称" prop="machineryName" label-width="108px">
<el-input <el-input
v-model="queryParams.machineryName" v-model="queryParams.machineryName"
placeholder="请输入设备类型名称" placeholder="请输入机台类型名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -73,10 +73,8 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
<el-table-column label="设备编码" align="center" prop="machineryCode" /> <el-table-column label="机台编码" align="center" prop="machineryCode" />
<el-table-column label="设备名称" align="center" prop="machineryName" /> <el-table-column label="机台名称" align="center" prop="machineryName" />
<el-table-column label="所属线体ID" align="center" prop="workshopCode" />
<el-table-column label="所属线体名称" align="center" prop="workshopName" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column prop="status" label="是否启用" align="center" > <el-table-column prop="status" label="是否启用" align="center" >
@ -112,14 +110,14 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改设备管理对话框 --> <!-- 添加或修改机台管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="设备编码" prop="machineryCode">np <el-form-item label="机台编码" prop="machineryCode">
<el-input v-model="form.machineryCode" placeholder="请输入设备类型编码" /> <el-input v-model="form.machineryCode" placeholder="请输入机台类型编码" />
</el-form-item> </el-form-item>
<el-form-item label="设备名称" prop="machineryName"> <el-form-item label="机台名称" prop="machineryName">
<el-input v-model="form.machineryName" placeholder="请输入设备类型名称" /> <el-input v-model="form.machineryName" placeholder="请输入机台类型名称" />
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="machineryBrand"> <el-form-item label="品牌" prop="machineryBrand">
<el-input v-model="form.machineryBrand" placeholder="请输入品牌" /> <el-input v-model="form.machineryBrand" placeholder="请输入品牌" />
@ -127,14 +125,14 @@
<el-form-item label="规格型号" prop="machinerySpec"> <el-form-item label="规格型号" prop="machinerySpec">
<el-input v-model="form.machinerySpec" placeholder="请输入规格型号" /> <el-input v-model="form.machinerySpec" placeholder="请输入规格型号" />
</el-form-item> </el-form-item>
<el-form-item label="设备类型ID" prop="machineryTypeId"> <el-form-item label="机台类型ID" prop="machineryTypeId">
<el-input v-model="form.machineryTypeId" placeholder="请输入设备类型ID" /> <el-input v-model="form.machineryTypeId" placeholder="请输入机台类型ID" />
</el-form-item> </el-form-item>
<el-form-item label="设备类型编码" prop="machineryTypeCode"> <el-form-item label="机台类型编码" prop="machineryTypeCode">
<el-input v-model="form.machineryTypeCode" placeholder="请输入设备类型编码" /> <el-input v-model="form.machineryTypeCode" placeholder="请输入机台类型编码" />
</el-form-item> </el-form-item>
<el-form-item label="设备类型名称" prop="machineryTypeName"> <el-form-item label="机台类型名称" prop="machineryTypeName">
<el-input v-model="form.machineryTypeName" placeholder="请输入设备类型名称" /> <el-input v-model="form.machineryTypeName" placeholder="请输入机台类型名称" />
</el-form-item> </el-form-item>
<el-form-item label="所属线体ID" prop="workshopId"> <el-form-item label="所属线体ID" prop="workshopId">
<el-input v-model="form.workshopId" placeholder="请输入所属车间ID" /> <el-input v-model="form.workshopId" placeholder="请输入所属车间ID" />
@ -142,7 +140,7 @@
<el-form-item label="所属线体编码" prop="workshopCode"> <el-form-item label="所属线体编码" prop="workshopCode">
<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" /> <el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
</el-form-item> </el-form-item>
<el-form-item label="设备产能" prop=""> <el-form-item label="机台产能" prop="">
<el-input v-model="form.workshopCode" placeholder="" /> <el-input v-model="form.workshopCode" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="所属车间名称" prop="workshopName"> <el-form-item label="所属车间名称" prop="workshopName">
@ -182,7 +180,7 @@ export default {
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
// //
machineryList: [], machineryList: [],
// //
title: "", title: "",
@ -220,19 +218,19 @@ export default {
// //
rules: { rules: {
machineryCode: [ machineryCode: [
{ required: true, message: "设备类型编码不能为空", trigger: "blur" } { required: true, message: "机台类型编码不能为空", trigger: "blur" }
], ],
machineryName: [ machineryName: [
{ required: true, message: "设备类型名称不能为空", trigger: "blur" } { required: true, message: "机台类型名称不能为空", trigger: "blur" }
], ],
machineryTypeId: [ machineryTypeId: [
{ required: true, message: "设备类型ID不能为空", trigger: "blur" } { required: true, message: "机台类型ID不能为空", trigger: "blur" }
], ],
workshopId: [ workshopId: [
{ required: true, message: "所属车间ID不能为空", trigger: "blur" } { required: true, message: "所属车间ID不能为空", trigger: "blur" }
], ],
status: [ status: [
{ required: true, message: "设备状态不能为空", trigger: "change" } { required: true, message: "机台状态不能为空", trigger: "change" }
], ],
} }
}; };
@ -241,7 +239,7 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询设备管理列表 */ /** 查询机台管理列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listMachinery(this.queryParams).then(response => { listMachinery(this.queryParams).then(response => {
@ -302,7 +300,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加设备管理"; this.title = "添加机台管理";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -311,7 +309,7 @@ export default {
getMachinery(machineryId).then(response => { getMachinery(machineryId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改设备管理"; this.title = "修改机台管理";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -337,7 +335,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const machineryIds = row.machineryId || this.ids; const machineryIds = row.machineryId || this.ids;
this.$modal.confirm('是否确认删除设备管理编号为"' + machineryIds + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除机台管理编号为"' + machineryIds + '"的数据项?').then(function() {
return delMachinery(machineryIds); return delMachinery(machineryIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -74,9 +74,14 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键ID" align="center" prop="productId" /> --> <!-- <el-table-column label="主键ID" align="center" prop="productId" /> -->
<el-table-column label="物料编码" align="center" prop="productCode" /> <el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料类别" align="center" prop="productCode" /> <el-table-column label="物料类别" align="center" prop="productGroup">
<template slot-scope="scope">
{{ scope.row.productGroup == "material_type1" ? "物料类别1" : "物料类别2" }}
</template>
</el-table-column>
<!-- 中文描述也就是物料名称 --> <!-- 中文描述也就是物料名称 -->
<el-table-column label="物料名称" align="center" prop="productDescZh" /> <el-table-column label="物料名称" align="center" prop="productDescZh" />
<el-table-column label="物料型号" align="center" prop="productModel" />
<!-- <el-table-column label="英文描述" align="center" prop="productDescEn" /> <!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
<el-table-column label="序列号规则代码" align="center" prop="ruleCode" /> <el-table-column label="序列号规则代码" align="center" prop="ruleCode" />
<el-table-column label="旧物料号" align="center" prop="oldProductCode" /> <el-table-column label="旧物料号" align="center" prop="oldProductCode" />
@ -99,7 +104,11 @@
<el-table-column label="${comment}" align="center" prop="userDefined5" /> <el-table-column label="${comment}" align="center" prop="userDefined5" />
<el-table-column label="${comment}" align="center" prop="userDefined6" /> <el-table-column label="${comment}" align="center" prop="userDefined6" />
<el-table-column label="工厂编码" align="center" prop="factoryCode" /> --> <el-table-column label="工厂编码" align="center" prop="factoryCode" /> -->
<el-table-column label="激活标记" align="center" prop="activeFlag" /> <el-table-column label="是否启用" align="center" prop="activeFlag">
<template slot-scope="scope">
{{ scope.row.activeFlag == 1 ? "是" : "否" }}
</template>
</el-table-column>
<!-- <el-table-column label="${comment}" align="center" prop="syncFlag" /> <!-- <el-table-column label="${comment}" align="center" prop="syncFlag" />
<el-table-column label="${comment}" align="center" prop="primaryUom" /> <el-table-column label="${comment}" align="center" prop="primaryUom" />
<el-table-column label="订单单位" align="center" prop="bstme" /> <el-table-column label="订单单位" align="center" prop="bstme" />
@ -149,8 +158,18 @@
<el-form-item label="物料名称" prop="productDescZh"> <el-form-item label="物料名称" prop="productDescZh">
<el-input v-model="form.productDescZh" placeholder="请输入物料名称" /> <el-input v-model="form.productDescZh" placeholder="请输入物料名称" />
</el-form-item> </el-form-item>
<el-form-item label="物料类别" prop="productDescZh"> <el-form-item label="物料型号" prop="productModel">
<el-input v-model="form.productDescZh" placeholder="请输入物料名称" /> <el-input v-model="form.productModel" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="物料类别" prop="productGroup">
<el-select v-model="form.productGroup" placeholder="请选择物料类别">
<el-option
v-for="dict in dict.type.material_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="英文描述" prop="productDescEn"> <!-- <el-form-item label="英文描述" prop="productDescEn">
<el-input v-model="form.productDescEn" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.productDescEn" type="textarea" placeholder="请输入内容" />
@ -270,6 +289,7 @@ import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "
export default { export default {
name: "Product", name: "Product",
dicts: ['sys_normal_disable', 'material_type'],
data() { data() {
return { return {
// //
@ -296,6 +316,7 @@ export default {
pageSize: 10, pageSize: 10,
productCode: null, productCode: null,
productDescZh: null, productDescZh: null,
productModel:null,
productDescEn: null, productDescEn: null,
ruleCode: null, ruleCode: null,
oldProductCode: null, oldProductCode: null,
@ -375,6 +396,7 @@ export default {
productId: null, productId: null,
productCode: null, productCode: null,
productDescZh: null, productDescZh: null,
productModel:null,
productDescEn: null, productDescEn: null,
ruleCode: null, ruleCode: null,
oldProductCode: null, oldProductCode: null,

@ -9,70 +9,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="产品分组简称" prop="pgDesc">
<el-input
v-model="queryParams.pgDesc"
placeholder="请输入产品分组简称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="物料类别名称" prop="pgDescGlobal">
<el-input
v-model="queryParams.pgDescGlobal"
placeholder="请输入物料类别名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="产品分组扩展名称" prop="pgDescExtended">
<el-input
v-model="queryParams.pgDescExtended"
placeholder="请输入产品分组扩展名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="可用标识" prop="Active">
<el-input
v-model="queryParams.Active"
placeholder="请输入可用标识"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="企业主键" prop="enterpriseId">
<el-input
v-model="queryParams.enterpriseId"
placeholder="请输入企业主键"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="企业编码" prop="enterpriseCode">
<el-input
v-model="queryParams.enterpriseCode"
placeholder="请输入企业编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工厂主键" prop="siteId">
<el-input
v-model="queryParams.siteId"
placeholder="请输入工厂主键"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工厂编码" prop="siteCode">
<el-input
v-model="queryParams.siteCode"
placeholder="请输入工厂编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -129,11 +65,12 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
<!-- <el-table-column label="产品分组主键" align="center" prop="pgId" /> -->
<el-table-column label="物料类别编码" align="center" prop="pgCode" /> <el-table-column label="物料类别编码" align="center" prop="pgCode" />
<!-- <el-table-column label="产品分组简称" align="center" prop="pgDesc" /> --> <el-table-column label="物料类别名称" align="center" prop="pgDescGlobal">
<el-table-column label="物料类别名称" align="center" prop="pgDescGlobal" /> <template slot-scope="scope">
<!-- <el-table-column label="产品分组扩展名称" align="center" prop="pgDescExtended" /> --> {{ scope.row.pgDescGlobal == "material_type1" ? "物料类别1" : "物料类别2" }}
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="可用标识" align="center" prop="Active"> <el-table-column label="可用标识" align="center" prop="Active">
@ -183,7 +120,14 @@
<el-input v-model="form.pgDesc" placeholder="请输入产品分组简称" /> <el-input v-model="form.pgDesc" placeholder="请输入产品分组简称" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="物料类别名称" prop="pgDescGlobal"> <el-form-item label="物料类别名称" prop="pgDescGlobal">
<el-input v-model="form.pgDescGlobal" placeholder="请输入物料类别名称" /> <el-select v-model="form.pgDescGlobal" placeholder="请选择物料类别名称">
<el-option
v-for="dict in dict.type.material_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="产品分组扩展名称" prop="pgDescExtended"> <!-- <el-form-item label="产品分组扩展名称" prop="pgDescExtended">
<el-input v-model="form.pgDescExtended" placeholder="请输入产品分组扩展名称" /> <el-input v-model="form.pgDescExtended" placeholder="请输入产品分组扩展名称" />
@ -219,6 +163,7 @@ import { listProductGroups, getProductGroups, delProductGroups, addProductGroups
export default { export default {
name: "ProductGroups", name: "ProductGroups",
dicts: ['sys_normal_disable', 'material_type'],
data() { data() {
return { return {
// //

@ -194,10 +194,10 @@
<!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> --> <!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> -->
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
<el-table-column label="供应商代码" align="center" prop="supplierCode" /> <el-table-column label="供应商代码" align="center" prop="supplierCode" width="100"/>
<el-table-column label="供应商名字" align="center" prop="zhDesc" /> <el-table-column label="供应商名字" align="center" prop="zhDesc" width="100"/>
<el-table-column label="英文描述" align="center" prop="enDesc" /> <el-table-column label="英文描述" align="center" prop="enDesc" />
<el-table-column label="供应商类型" align="center" prop="supplierType" /> <el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
<el-table-column label="账号" align="center" prop="accountNumber" /> <el-table-column label="账号" align="center" prop="accountNumber" />
<el-table-column label="证照编码" align="center" prop="licenceNumber" /> <el-table-column label="证照编码" align="center" prop="licenceNumber" />
<el-table-column label="经营范围" align="center" prop="businessScope" /> <el-table-column label="经营范围" align="center" prop="businessScope" />
@ -207,9 +207,9 @@
<el-table-column label="详细地址" align="center" prop="address" /> <el-table-column label="详细地址" align="center" prop="address" />
<el-table-column label="邮编" align="center" prop="postcode" /> <el-table-column label="邮编" align="center" prop="postcode" />
<el-table-column label="联系人" align="center" prop="contact" /> <el-table-column label="联系人" align="center" prop="contact" />
<el-table-column label="联系人电话" align="center" prop="contactPhone" /> <el-table-column label="联系人电话" align="center" prop="contactPhone" width="100"/>
<el-table-column label="联系人职务" align="center" prop="contactPosition" /> <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" /> <el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="120"/>
<el-table-column label="激活标记" align="center" prop="activeFlag"> <el-table-column label="激活标记" align="center" prop="activeFlag">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.activeFlag == 1 ? "是" : "否" }} {{ scope.row.activeFlag == 1 ? "是" : "否" }}

Loading…
Cancel
Save