mes/mes-lqqt-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"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="AGV站点编码"
width="120"
align="center"
key="siteCode"
prop="siteCode"
v-if="1"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:dv:route']"
>{{ scope.row.siteCode }}</el-button
>
</template>
</el-table-column>
<el-table-column label="AGV站点编码" align="center" prop="siteCode" />
<!-- <el-table-column-->
<!-- label="AGV站点编码11"-->
<!-- width="120"-->
<!-- align="center"-->
<!-- key="siteCode"-->
<!-- prop="siteCode"-->
<!-- v-if="1"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row)"-->
<!-- v-hasPermi="['mes:dv:route']"-->
<!-- >{{ scope.row.siteCode }}</el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="AGV站点名称" align="center" prop="siteName" />
<el-table-column label="所属线路" align="center" prop="agvlineName" />
<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-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-upload
ref="codeName"
@ -470,7 +471,7 @@ export default {
lineName: "",
pointName: "",
TypeId: false,
Typefile: false,
// Typefile: false,
// 表单参数
form: {
originalName: "",
@ -567,12 +568,12 @@ export default {
handleNodeClick(data) {
if (data.machineryTypeId == 229) {
this.TypeId = true;
this.Typefile = false;
// this.Typefile = false;
this.form.originalName = "";
this.form.url = "";
} else {
this.TypeId = false;
this.Typefile = true;
// this.Typefile = true;
this.form.lineId = "";
this.form.pointId = "";
}
@ -692,7 +693,7 @@ export default {
this.reset();
if (this.form.machineryTypeId == null) {
this.TypeId = false;
this.Typefile = false;
// this.Typefile = false;
}
this.open = true;
this.title = "添加工艺组成";
@ -712,14 +713,14 @@ export default {
});
if (row.machineryTypeId == null) {
this.TypeId = false;
this.Typefile = false;
// this.Typefile = false;
} else {
if (row.machineryTypeId == 229) {
this.TypeId = true;
this.Typefile = false;
// this.Typefile = false;
} else {
this.TypeId = false;
this.Typefile = true;
// this.Typefile = true;
}
}
var name = {};

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

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

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

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