Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wws 1 year ago
parent b9fefacceb 0eb2ba8ce9
commit 7e80cdd0fa
5 changed files with 292 additions and 12 deletions
Show Stats Download Patch File Download Diff File

142
src/views/wms/equipment/index.vue
Unescape Escape View File

@ -229,6 +229,137 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 查询设备管理对话框 -->
<el-dialog :title="title" :visible.sync="queryOpen" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-divider content-position="center">主属性</el-divider>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="设备编码" prop="equipmentCode">
<el-input v-model="form.equipmentCode" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="" disabled/>
</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="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备类型" prop="equipmentTypeCode">
<el-select v-model="form.equipmentTypeCode" placeholder="" style="width:355px" disabled>
<el-option
v-for="dict in dict.type.equ_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="所属工作中心" prop="workshopName">
<el-input v-model="form.workshopName" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作中心编码" prop="workshopCode">
<el-input v-model="form.workshopCode" placeholder="" disabled/>
</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="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工段" prop="workshopSection">
<el-input v-model="form.workshopSection" placeholder="" disabled/>
</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="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工时单价" prop="hourlyUnitPrice">
<el-input v-model="form.hourlyUnitPrice" placeholder="" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="设备状态" prop="status" >
<el-select v-model="form.status" placeholder="" @change="$forceUpdate()" clearable style="width:350px" disabled>
<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
</el-select>
</el-form-item>
<el-divider content-position="center">附属属性</el-divider>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="成型机存料状态" prop="starving">
<el-input v-model="form.starving" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="成型机存放物料" prop="material">
<el-input v-model="form.material" placeholder="" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="烘房是否开门" prop="isOpen">
<el-input v-model="form.isopen" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="烘房湿度" prop="humidity">
<el-input v-model="form.humidity" placeholder="" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="烘房压强" prop="intensityOfPressure">
<el-input v-model="form.intensityOfPressure" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="烘房温度" prop="temperature">
<el-input v-model="form.temperature" placeholder="" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="烘房前小车数量" prop="dollyNumber">
<el-input v-model="form.dollyNumber" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="烘房状态" prop="state">
<el-input v-model="form.state" placeholder="" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="queryCancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -261,6 +392,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
queryOpen: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -330,6 +462,11 @@ export default {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
// 取消按钮
queryCancel() {
this.queryOpen = false;
this.reset();
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
@ -406,9 +543,12 @@ export default {
handleView(row){ handleView(row){
this.reset(); this.reset();
const equipmentId = row.equipmentId || this.ids; const equipmentId = row.equipmentId || this.ids;
getWorkCenterList().then(response =>{
console.log(this.options1);
});
getEquipment(equipmentId).then(response => { getEquipment(equipmentId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.queryOpen = true;
this.title = "查看设备信息"; this.title = "查看设备信息";
this.optType = "view"; this.optType = "view";
}); });

136
src/views/wms/product/index.vue
Unescape Escape View File

@ -73,7 +73,15 @@
<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="productList" @selection-change="handleSelectionChange">
<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" width="200"/> <el-table-column label="产品/物料编码" align="center" prop="productCode" width="200">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['wms:equipment:query']"
>{{scope.row.productCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="产品/物料名称" align="center" prop="productDescZh" width="400"/> <el-table-column label="产品/物料名称" align="center" prop="productDescZh" width="400"/>
<el-table-column label="物料组编码" align="center" prop="productGroup" width="150"/> <el-table-column label="物料组编码" align="center" prop="productGroup" width="150"/>
<el-table-column label="物料组名称" align="center" prop="productGroupName" width="200"/> <el-table-column label="物料组名称" align="center" prop="productGroupName" width="200"/>
@ -286,6 +294,116 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 查看物料附属信息 -->
<el-dialog :title="title" :visible.sync="openAttached" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="品类" prop="category">
<el-input v-model="form.category" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="每PC单圈" prop="pc">
<el-input v-model="form.pc" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准效率" prop="iei">
<el-input v-model="form.iei" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="标准用人" prop="manStandar">
<el-input v-model="form.manStandar" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="喷药方式" prop="sprayWay">
<el-input v-model="form.sprayWay" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="白坯直径" prop="blankDiameter">
<el-input v-model="form.blankDiameter" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="白坯物料号" prop="blankNo">
<el-input v-model="form.blankNo" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="标准喷药量" prop="sprayVolume">
<el-input v-model="form.sprayVolume" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="药液料号" prop="liquidNo">
<el-input v-model="form.liquidNo" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="标准内膜用量" prop="endometrialDosage">
<el-input v-model="form.endometrialDosage" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准外模用量(KG/PC)" prop="outerFilmDosage">
<el-input v-model="form.outerFilmDosage" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="支架" prop="support">
<el-input v-model="form.support" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支架物料号" prop="supportNo">
<el-input v-model="form.supportNo" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="吸塑" prop="pvc">
<el-input v-model="form.pvc" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支架盘" prop="supportPlate">
<el-input v-model="form.supportPlate" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="其它" prop="other">
<el-input v-model="form.other" placeholder="" disabled style="width:320px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancelAttached">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -315,6 +433,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
openAttached: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -395,6 +514,11 @@ export default {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
// 取消按钮
cancelAttached() {
this.openAttached = false;
this.reset();
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
@ -475,6 +599,16 @@ export default {
this.title = "修改产品信息"; this.title = "修改产品信息";
}); });
}, },
// 查询明细按钮操作
handleView(row){
this.reset();
const productId = row.productId || this.ids
getProduct(productId).then(response => {
this.form = response.data;
this.openAttached = true;
this.title = "查看产品信息";
});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {

8
src/views/wms/shifts/index.vue
Unescape Escape View File

@ -219,7 +219,13 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
} shiftCode: [
{ required: true, message: "班次编码", trigger: "blur" }
],
shiftDesc: [
{ required: true, message: "班次名称", trigger: "blur" }
]
}
}; };
}, },
created() { created() {

4
src/views/wms/supplier/index.vue
Unescape Escape View File

@ -211,12 +211,12 @@
<el-table-column label="联系人电话" align="center" prop="contactPhone" width="120"/> <el-table-column label="联系人电话" align="center" prop="contactPhone" width="120"/>
<el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/> <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/> <el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/>
<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 ? "是" : "否" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="税号" align="center" prop="userDefined2" /> <el-table-column label="税号" align="center" prop="userDefined2" width="200"/>
<!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" /> <!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
<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">

14
src/views/wms/team/index.vue
Unescape Escape View File

@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="班组名称" prop="teamDescGlobal"> <el-form-item label="班组名称" prop="teamDesc">
<el-input <el-input
v-model="queryParams.teamDescGlobal" v-model="queryParams.teamDesc"
placeholder="请输入班组名称" placeholder="请输入班组名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -80,7 +80,7 @@
label="序号"> label="序号">
</el-table-column> </el-table-column>
<el-table-column label="班组编码" align="center" prop="teamCode" /> <el-table-column label="班组编码" align="center" prop="teamCode" />
<el-table-column label="班组名称" align="center" prop="teamDescGlobal" /> <el-table-column label="班组名称" align="center" prop="teamDesc" />
<el-table-column prop="teamType" label="班组类别" align="center" > <el-table-column prop="teamType" label="班组类别" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.teamType == "team_type1" ? "生产班组" : "检验班组" }} {{ scope.row.teamType == "team_type1" ? "生产班组" : "检验班组" }}
@ -134,8 +134,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班组名称" prop="teamDescGlobal" style="width:450px"> <el-form-item label="班组名称" prop="teamDesc" style="width:450px">
<el-input v-model="form.teamDescGlobal" placeholder="请输入班组通用名称" /> <el-input v-model="form.teamDesc" placeholder="请输入班组" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -168,7 +168,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属产线" prop="productionLineCode" style="width:450px"> <el-form-item label="所属产线" prop="productionLineCode" style="width:450px">
<el-input v-model="form.productionLineCode" placeholder="请输入线体编码" /> <el-input v-model="form.productionLineCode" placeholder="请输入所属产线" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -313,7 +313,7 @@ export default {
teamCode: [ teamCode: [
{ required: true, message: "班组编码不能为空", trigger: "blur" } { required: true, message: "班组编码不能为空", trigger: "blur" }
], ],
teamDescGlobal: [ teamDesc: [
{ required: true, message: "班组名称不能为空", trigger: "blur" } { required: true, message: "班组名称不能为空", trigger: "blur" }
], ],
active: [ active: [

Write Preview
Loading…
Cancel
Save