mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pc-MES-zngc' of gitee.com:tangziqi/ktg-mes-ui into master

Browse Source 
Signed-off-by: 打豆豆 <3346088772@qq.com>
This commit is contained in:
打豆豆 2024-02-21 05:56:16 +00:00 committed by Gitee
commit 05943bc41b
4 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/mes/dv/siteConfiguration/index.vue
View File

@ -107,24 +107,25 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column label="AGV站点编码" align="center" prop="siteCode" />
label="AGV站点编码" <!-- <el-table-column-->
width="120" <!-- label="AGV站点编码11"-->
align="center" <!-- width="120"-->
key="siteCode" <!-- align="center"-->
prop="siteCode" <!-- key="siteCode"-->
v-if="1" <!-- prop="siteCode"-->
> <!-- v-if="1"-->
<template slot-scope="scope"> <!-- >-->
<el-button <!-- <template slot-scope="scope">-->
size="mini" <!-- <el-button-->
type="text" <!-- size="mini"-->
@click="handleView(scope.row)" <!-- type="text"-->
v-hasPermi="['mes:dv:route']" <!-- @click="handleView(scope.row)"-->
>{{ scope.row.siteCode }}</el-button <!-- v-hasPermi="['mes:dv:route']"-->
> <!-- >{{ scope.row.siteCode }}</el-button-->
</template> <!-- >-->
</el-table-column> <!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="AGV站点名称" align="center" prop="siteName" /> <el-table-column label="AGV站点名称" align="center" prop="siteName" />
<el-table-column label="所属线路" align="center" prop="agvlineName" /> <el-table-column label="所属线路" align="center" prop="agvlineName" />
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">

17
src/views/mes/pro/proroute/routeprocess.vue
View File

@ -304,7 +304,8 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="Typefile"> <el-col :span="12">
<!-- <el-col :span="12" v-if="Typefile">-->
<el-form-item label="代码上传" prop=""> <el-form-item label="代码上传" prop="">
<el-upload <el-upload
ref="codeName" ref="codeName"
@ -470,7 +471,7 @@ export default {
lineName: "", lineName: "",
pointName: "", pointName: "",
TypeId: false, TypeId: false,
Typefile: false, // Typefile: false,
// 表单参数 // 表单参数
form: { form: {
originalName: "", originalName: "",
@ -567,12 +568,12 @@ export default {
handleNodeClick(data) { handleNodeClick(data) {
if (data.machineryTypeId == 229) { if (data.machineryTypeId == 229) {
this.TypeId = true; this.TypeId = true;
this.Typefile = false; // this.Typefile = false;
this.form.originalName = ""; this.form.originalName = "";
this.form.url = ""; this.form.url = "";
} else { } else {
this.TypeId = false; this.TypeId = false;
this.Typefile = true; // this.Typefile = true;
this.form.lineId = ""; this.form.lineId = "";
this.form.pointId = ""; this.form.pointId = "";
} }
@ -692,7 +693,7 @@ export default {
this.reset(); this.reset();
if (this.form.machineryTypeId == null) { if (this.form.machineryTypeId == null) {
this.TypeId = false; this.TypeId = false;
this.Typefile = false; // this.Typefile = false;
} }
this.open = true; this.open = true;
this.title = "添加工艺组成"; this.title = "添加工艺组成";
@ -712,14 +713,14 @@ export default {
}); });
if (row.machineryTypeId == null) { if (row.machineryTypeId == null) {
this.TypeId = false; this.TypeId = false;
this.Typefile = false; // this.Typefile = false;
} else { } else {
if (row.machineryTypeId == 229) { if (row.machineryTypeId == 229) {
this.TypeId = true; this.TypeId = true;
this.Typefile = false; // this.Typefile = false;
} else { } else {
this.TypeId = false; this.TypeId = false;
this.Typefile = true; // this.Typefile = true;
} }
} }
var name = {}; var name = {};

1
src/views/mes/pro/workorder/index.vue
View File

@ -652,6 +652,7 @@ export default {
} }
getWorkorder(row.workorderId).then(response => { getWorkorder(row.workorderId).then(response => {
this.form = response.data; this.form = response.data;
this.form.workorderType = 'SELF'
this.open = true; this.open = true;
this.title = "修改生产工单"; this.title = "修改生产工单";
this.optType="edit"; this.optType="edit";

10
src/views/mes/wm/productrecpt/index.vue
View File

@ -58,7 +58,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:wm:productrecpt:edit']" v-hasPermi="['mes:productrecpt:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -69,7 +69,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:wm:productrecpt:remove']" v-hasPermi="['mes:productrecpt:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -110,7 +110,7 @@
icon="el-icon-video-play" icon="el-icon-video-play"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
@click="handleExecute(scope.row)" @click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:productrecpt:edit']" v-hasPermi="['mes:productrecpt:edit']"
>执行入库</el-button> >执行入库</el-button>
<el-button <el-button
size="mini" size="mini"
@ -118,7 +118,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
v-hasPermi="['mes:wm:productrecpt:edit']" v-hasPermi="['mes:productrecpt:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
@ -126,7 +126,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
v-hasPermi="['mes:wm:productrecpt:remove']" v-hasPermi="['mes:productrecpt:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>