生产变更

master
zhaoxiaolin 1 year ago
parent 5401d44d53
commit c15e1162d7

@ -106,12 +106,12 @@
</el-row>
<el-table
style="width: 100%"
height="480"
v-if="refreshTable"
v-loading="loading"
:data="orderList"
row-key="orderCode"
style="width: 100%"
max-height="480"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>

@ -8,7 +8,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:pro:processcontent:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -19,7 +19,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:pro:processcontent:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -30,7 +30,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:pro:processcontent:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
@ -40,7 +40,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:pro:processcontent:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -60,14 +60,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:processcontent:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:processcontent:remove']"
>删除</el-button>
</template>
</el-table-column>
@ -129,14 +129,16 @@
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</div>
</template>
<script>
import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/processcontent";
import ItemSelect from "@/components/itemSelect/index.vue";
export default {
name: "Processcontent",
components: { ItemSelect },
data() {
return {
//

@ -132,9 +132,6 @@
<!-- 添加或修改生产工序对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body >
<div>
<UseType :key="useTypeKey"/>
</div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" >
<el-row>
<el-col :span="8">
@ -206,10 +203,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="线体设备" prop="workCenter">
<el-input v-model="form.workCenter" placeholder="请选择线体设备" >
<el-button slot="append" @click="handleBoundeEuipment" icon="el-icon-search"></el-button>
</el-input>
<el-form-item label="工作中心" prop="workCenter">
<el-input v-model="form.workCenter" type="input" placeholder="请输入工作中心" />
</el-form-item>
</el-col>
<el-col :span="12">

@ -111,6 +111,11 @@
<el-table-column label="工艺路线名称" align="center" prop="routeName" />
<el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
<el-table-column label="工艺路线版本" align="center" prop="routeVersion" />
<el-table-column label="是否需要首检" align="center" prop="needCheck">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.needCheck"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
@ -193,6 +198,24 @@
<el-input v-model="form.routeVersion" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="需要首检" prop="needCheck">
<el-radio-group v-model="form.needCheck" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.needCheck" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -221,7 +244,7 @@
<Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess>
</el-tab-pane>
<el-tab-pane label="关联产品">
<Routeprodproduct v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprodproduct>
<Routeprodline v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprodline>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
@ -265,7 +288,7 @@
</template>
<script>
import { listProroute, getProroute, delProroute, addProroute, updateProroute,importProroute} from "@/api/mes/pro/proroute";
import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute";
import Routeprocess from "./routeprocess";
import Routeprodproduct from "./routeprodproduct";
export default {
@ -322,8 +345,7 @@ export default {
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],
},
fileList:'',
idList:''
fileList:''
};
},
created() {
@ -457,7 +479,7 @@ export default {
if(Array.isArray(this.form.fileList)){
this.form.fileList = this.listToString(this.form.fileList);
}
//this.form.idList = this.listToString(this.form.idList);
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.routeId != null) {

@ -8,7 +8,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['pro:routeprocess:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -19,7 +19,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['pro:routeprocess:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -30,7 +30,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['pro:routeprocess:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -53,19 +53,19 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:routeprocess:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:routeprocess:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -101,7 +101,7 @@
<el-form-item label="是否关键工序" prop="keyFlag">
<el-tooltip effect="dark" placement="right">
<div slot="content">
关键工序
关键工序
</div>
<el-select v-model="form.keyFlag">
<el-option
@ -155,7 +155,7 @@ export default {
//
routeprocessList: [],
//
processOptions:[],
processOptions:[],
//
title: "",
//

Loading…
Cancel
Save