|
|
|
|
@ -1,6 +1,13 @@
|
|
|
|
|
<template>
|
|
|
|
|
<div class="app-container">
|
|
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
|
|
|
|
<el-form
|
|
|
|
|
:model="queryParams"
|
|
|
|
|
ref="queryForm"
|
|
|
|
|
size="small"
|
|
|
|
|
:inline="true"
|
|
|
|
|
v-show="showSearch"
|
|
|
|
|
label-width="100px"
|
|
|
|
|
>
|
|
|
|
|
<el-form-item label="工序编码" prop="processCode">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.processCode"
|
|
|
|
|
@ -26,8 +33,16 @@
|
|
|
|
|
/>
|
|
|
|
|
</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-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>
|
|
|
|
|
|
|
|
|
|
@ -40,7 +55,8 @@
|
|
|
|
|
size="mini"
|
|
|
|
|
@click="handleAdd"
|
|
|
|
|
v-hasPermi="['mes:pro:process:add']"
|
|
|
|
|
>新增</el-button>
|
|
|
|
|
>新增</el-button
|
|
|
|
|
>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
@ -51,7 +67,8 @@
|
|
|
|
|
:disabled="single"
|
|
|
|
|
@click="handleUpdate"
|
|
|
|
|
v-hasPermi="['mes:pro:process:edit']"
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
>修改</el-button
|
|
|
|
|
>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
@ -62,7 +79,8 @@
|
|
|
|
|
:disabled="multiple"
|
|
|
|
|
@click="handleDelete"
|
|
|
|
|
v-hasPermi="['mes:pro:process:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
>删除</el-button
|
|
|
|
|
>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
@ -72,38 +90,82 @@
|
|
|
|
|
size="mini"
|
|
|
|
|
@click="handleExport"
|
|
|
|
|
v-hasPermi="['mes:pro:process:export']"
|
|
|
|
|
>导出</el-button>
|
|
|
|
|
>导出</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-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
|
|
|
|
|
<el-table
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
:data="processList"
|
|
|
|
|
@selection-change="handleSelectionChange"
|
|
|
|
|
>
|
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
|
<el-table-column label="工序编码" align="center" prop="processCode" >
|
|
|
|
|
<el-table-column label="工序编码" align="center" prop="processCode">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
type="text"
|
|
|
|
|
@click="handleView(scope.row)"
|
|
|
|
|
v-hasPermi="['mes:pro:process:query']"
|
|
|
|
|
>{{scope.row.processCode}}</el-button>
|
|
|
|
|
>{{ scope.row.processCode }}</el-button
|
|
|
|
|
>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="工序名称" align="center" prop="processName" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="工序名称"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="processName"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column label="拆分&合并" align="center" prop="splitMerge">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<dict-tag :options="dict.type.split_merge" :value="scope.row.splitMerge"/>
|
|
|
|
|
<dict-tag
|
|
|
|
|
:options="dict.type.split_merge"
|
|
|
|
|
:value="scope.row.splitMerge"
|
|
|
|
|
/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="工作中心" align="center" prop="workCenter" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="线体设备" align="center" prop="equipment" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="工作时长" align="center" prop="workTime" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="工作中心"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="workCenter"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="线体设备"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="equipment"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="工作时长"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="workTime"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column label="是否启用" align="center" prop="enableFlag">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<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>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="备注"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="remark"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="操作"
|
|
|
|
|
align="center"
|
|
|
|
|
class-name="small-padding fixed-width"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
@ -111,20 +173,22 @@
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
|
|
v-hasPermi="['pro:process:edit']"
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
>修改</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
v-hasPermi="['pro:process:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
>删除</el-button
|
|
|
|
|
>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
<pagination
|
|
|
|
|
v-show="total>0"
|
|
|
|
|
v-show="total > 0"
|
|
|
|
|
:total="total"
|
|
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
|
|
@ -132,34 +196,46 @@
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
<!-- 添加或修改生产工序对话框 -->
|
|
|
|
|
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body >
|
|
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px" >
|
|
|
|
|
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
|
|
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="工序编码" prop="processCode">
|
|
|
|
|
<el-input v-model="form.processCode" placeholder="请输入工序编码" />
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="form.processCode"
|
|
|
|
|
placeholder="请输入工序编码"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="工序名称" prop="processName">
|
|
|
|
|
<el-input v-model="form.processName" placeholder="请输入工序名称" />
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="form.processName"
|
|
|
|
|
placeholder="请输入工序名称"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="是否启用" prop="enableFlag">
|
|
|
|
|
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
|
|
|
|
|
<el-radio-group
|
|
|
|
|
v-model="form.enableFlag"
|
|
|
|
|
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>
|
|
|
|
|
>{{ dict.label }}</el-radio
|
|
|
|
|
>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
<el-radio-group v-model="form.enableFlag" v-else>
|
|
|
|
|
<el-radio
|
|
|
|
|
v-for="dict in dict.type.sys_yes_no"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.value"
|
|
|
|
|
>{{dict.label}}</el-radio>
|
|
|
|
|
>{{ dict.label }}</el-radio
|
|
|
|
|
>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
@ -185,11 +261,20 @@
|
|
|
|
|
</el-col>-->
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="工作时间" prop="workTime">
|
|
|
|
|
<el-input-number :min="0" :step="1" v-model="form.workTime" placeholder="请输入工作时长" />
|
|
|
|
|
<el-input-number
|
|
|
|
|
:min="0"
|
|
|
|
|
:step="1"
|
|
|
|
|
v-model="form.workTime"
|
|
|
|
|
placeholder="请输入工作时长"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="工作中心" prop="workCenter" style="width:310px">
|
|
|
|
|
<el-form-item
|
|
|
|
|
label="工作中心"
|
|
|
|
|
prop="workCenter"
|
|
|
|
|
style="width: 310px"
|
|
|
|
|
>
|
|
|
|
|
<!-- <el-cascader
|
|
|
|
|
:show-all-levels="false"
|
|
|
|
|
:options="factoryOptions"
|
|
|
|
|
@ -200,12 +285,18 @@
|
|
|
|
|
style="width:400px"
|
|
|
|
|
></el-cascader> -->
|
|
|
|
|
<template>
|
|
|
|
|
<el-select v-model="form.workCenter" filterable placeholder="请选择" @change="selectWorkCenter" >
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="form.workCenter"
|
|
|
|
|
filterable
|
|
|
|
|
placeholder="请选择"
|
|
|
|
|
@change="selectWorkCenter"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in options1"
|
|
|
|
|
:key="item.factoryCode"
|
|
|
|
|
:label="item.factoryName"
|
|
|
|
|
:value="item.factoryCode">
|
|
|
|
|
:value="item.factoryCode"
|
|
|
|
|
>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</template>
|
|
|
|
|
@ -215,30 +306,67 @@
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="可多单运行" prop="sync">
|
|
|
|
|
<el-radio-group v-model="form.sync" disabled v-if="optType=='view'">
|
|
|
|
|
<el-radio-group
|
|
|
|
|
v-model="form.sync"
|
|
|
|
|
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>
|
|
|
|
|
>{{ dict.label }}</el-radio
|
|
|
|
|
>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
<el-radio-group v-model="form.sync" v-else>
|
|
|
|
|
<el-radio
|
|
|
|
|
v-for="dict in dict.type.sys_yes_no"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.value"
|
|
|
|
|
>{{dict.label}}</el-radio>
|
|
|
|
|
>{{ dict.label }}</el-radio
|
|
|
|
|
>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="16">
|
|
|
|
|
<el-col :span="16" style="display: none;">
|
|
|
|
|
<el-form-item label="线体设备" prop="equipment">
|
|
|
|
|
<el-input v-model="form.equipment" placeholder="请选择线体设备" >
|
|
|
|
|
<el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
|
|
|
|
|
<el-input v-model="form.equipment" placeholder="请选择线体设备">
|
|
|
|
|
<el-button
|
|
|
|
|
slot="append"
|
|
|
|
|
@click="handleSelectEquipment"
|
|
|
|
|
icon="el-icon-search"
|
|
|
|
|
></el-button>
|
|
|
|
|
</el-input>
|
|
|
|
|
<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="16">
|
|
|
|
|
<div class="tagbox">
|
|
|
|
|
<div class="tagboxlabel">线体设备</div>
|
|
|
|
|
<div class="tag" style="">
|
|
|
|
|
<el-tag
|
|
|
|
|
:key="index"
|
|
|
|
|
class="tagitem"
|
|
|
|
|
v-for="(tag, index) in selectMaterielListtag"
|
|
|
|
|
closable
|
|
|
|
|
:disable-transitions="false"
|
|
|
|
|
@close="handleClose(tag)"
|
|
|
|
|
>
|
|
|
|
|
{{ tag }}
|
|
|
|
|
</el-tag>
|
|
|
|
|
</div>
|
|
|
|
|
<el-button
|
|
|
|
|
slot="append"
|
|
|
|
|
class="button1"
|
|
|
|
|
@click="handleSelectEquipment"
|
|
|
|
|
icon="el-icon-search"
|
|
|
|
|
></el-button>
|
|
|
|
|
<ItemSelect
|
|
|
|
|
ref="itemSelect"
|
|
|
|
|
@onSelected="onItemSelectedEquipment"
|
|
|
|
|
>
|
|
|
|
|
</ItemSelect>
|
|
|
|
|
</div>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<!-- <el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
@ -260,29 +388,45 @@
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item label="工序SOP" prop="fileList">
|
|
|
|
|
<FileUpload v-model="form.fileList"/>
|
|
|
|
|
<FileUpload v-model="form.fileList" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item label="工序说明" prop="attention">
|
|
|
|
|
<el-input v-model="form.attention" type="textarea" placeholder="请输入内容" />
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="form.attention"
|
|
|
|
|
type="textarea"
|
|
|
|
|
placeholder="请输入内容"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
|
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="form.remark"
|
|
|
|
|
type="textarea"
|
|
|
|
|
placeholder="请输入内容"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form>
|
|
|
|
|
<el-divider content-position="center" v-if="form.processId !=null">操作步骤</el-divider>
|
|
|
|
|
<Processcontent v-if="form.processId !=null" :optType="optType" :processId="form.processId"></Processcontent>
|
|
|
|
|
<el-divider content-position="center" v-if="form.processId != null"
|
|
|
|
|
>操作步骤</el-divider
|
|
|
|
|
>
|
|
|
|
|
<Processcontent
|
|
|
|
|
v-if="form.processId != null"
|
|
|
|
|
:optType="optType"
|
|
|
|
|
:processId="form.processId"
|
|
|
|
|
></Processcontent>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
|
|
|
|
|
<el-button type="primary" @click="cancel" v-if="optType == 'view'"
|
|
|
|
|
>返回</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
|
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
@ -291,32 +435,42 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment,listFactory,getWorkCenterList} from "@/api/technology/process";
|
|
|
|
|
import {
|
|
|
|
|
listProcess,
|
|
|
|
|
getProcess,
|
|
|
|
|
delProcess,
|
|
|
|
|
addProcess,
|
|
|
|
|
updateProcess,
|
|
|
|
|
listEquipment,
|
|
|
|
|
getEquipment,
|
|
|
|
|
listFactory,
|
|
|
|
|
getWorkCenterList,
|
|
|
|
|
} from "@/api/technology/process";
|
|
|
|
|
import Processcontent from "./content.vue";
|
|
|
|
|
import ItemSelect from "./single.vue";
|
|
|
|
|
import { Message } from 'element-ui'
|
|
|
|
|
import { Message } from "element-ui";
|
|
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "Process",
|
|
|
|
|
dicts: ['sys_yes_no','split_merge'],
|
|
|
|
|
components: {Processcontent,ItemSelect},
|
|
|
|
|
dicts: ["sys_yes_no", "split_merge"],
|
|
|
|
|
components: { Processcontent, ItemSelect },
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
workCenter:[],
|
|
|
|
|
workCenter: [],
|
|
|
|
|
options1: [],
|
|
|
|
|
// workCenter: { multiple: true,checkStrictly: true , label:'factoryName',value:'factoryId',children:'children' },
|
|
|
|
|
checkEquipment:null,
|
|
|
|
|
checkEquipment: null,
|
|
|
|
|
//自动生成编码
|
|
|
|
|
autoGenFlag:false,
|
|
|
|
|
autoGenFlag: false,
|
|
|
|
|
optType: undefined,
|
|
|
|
|
// 遮罩层
|
|
|
|
|
loading: true,
|
|
|
|
|
// 选中数组
|
|
|
|
|
ids: [],
|
|
|
|
|
//最底层
|
|
|
|
|
ids1:[],
|
|
|
|
|
ids1: [],
|
|
|
|
|
// 非单个禁用
|
|
|
|
|
single: true,
|
|
|
|
|
// 非多个禁用
|
|
|
|
|
@ -324,36 +478,36 @@ export default {
|
|
|
|
|
// 显示搜索条件
|
|
|
|
|
showSearch: true,
|
|
|
|
|
// 总条数
|
|
|
|
|
total:0,
|
|
|
|
|
total: 0,
|
|
|
|
|
// 生产工序表格数据
|
|
|
|
|
processList:[],
|
|
|
|
|
equipmentList:[],
|
|
|
|
|
processList: [],
|
|
|
|
|
equipmentList: [],
|
|
|
|
|
// 工厂模型树选项
|
|
|
|
|
factoryOptions: [],
|
|
|
|
|
// 弹出层标题
|
|
|
|
|
title: "",
|
|
|
|
|
boundTitle:"",
|
|
|
|
|
boundTitle: "",
|
|
|
|
|
// 是否显示弹出层
|
|
|
|
|
open: false,
|
|
|
|
|
boundeEuipmentOpen:false,
|
|
|
|
|
equipmentTypeName : undefined,
|
|
|
|
|
boundeEuipmentOpen: false,
|
|
|
|
|
equipmentTypeName: undefined,
|
|
|
|
|
// 查询参数
|
|
|
|
|
queryParams: {
|
|
|
|
|
pageNum: 1,
|
|
|
|
|
pageSize: 10,
|
|
|
|
|
processCode: null,
|
|
|
|
|
processName: null,
|
|
|
|
|
enableFlag: null
|
|
|
|
|
enableFlag: null,
|
|
|
|
|
// workCenter: null
|
|
|
|
|
// factoryCode: null
|
|
|
|
|
},
|
|
|
|
|
queryEquipmentParams: {
|
|
|
|
|
equipmentTypeName :null,
|
|
|
|
|
equipmentTypeCode:null,
|
|
|
|
|
equipmentName :null,
|
|
|
|
|
equipmentCode:null,
|
|
|
|
|
equipmentId:'',
|
|
|
|
|
processId:null,
|
|
|
|
|
equipmentTypeName: null,
|
|
|
|
|
equipmentTypeCode: null,
|
|
|
|
|
equipmentName: null,
|
|
|
|
|
equipmentCode: null,
|
|
|
|
|
equipmentId: "",
|
|
|
|
|
processId: null,
|
|
|
|
|
pageNum: 1,
|
|
|
|
|
pageSize: 10,
|
|
|
|
|
},
|
|
|
|
|
@ -362,24 +516,26 @@ export default {
|
|
|
|
|
// 表单校验
|
|
|
|
|
rules: {
|
|
|
|
|
processCode: [
|
|
|
|
|
{ required: true, message: "工序编码不能为空", trigger: "blur" }
|
|
|
|
|
{ required: true, message: "工序编码不能为空", trigger: "blur" },
|
|
|
|
|
],
|
|
|
|
|
processName: [
|
|
|
|
|
{ required: true, message: "工序名称不能为空", trigger: "blur" }
|
|
|
|
|
{ required: true, message: "工序名称不能为空", trigger: "blur" },
|
|
|
|
|
],
|
|
|
|
|
enableFlag: [
|
|
|
|
|
{ required: true, message: "是否启用不能为空", trigger: "blur" }
|
|
|
|
|
{ required: true, message: "是否启用不能为空", trigger: "blur" },
|
|
|
|
|
],
|
|
|
|
|
splitMerge: [
|
|
|
|
|
{ required: true, message: "拆分&合并不能为空", trigger: "blur" }
|
|
|
|
|
{ required: true, message: "拆分&合并不能为空", trigger: "blur" },
|
|
|
|
|
],
|
|
|
|
|
sync: [
|
|
|
|
|
{ required: true, message: "可多单运行不能为空", trigger: "blur" }
|
|
|
|
|
{ required: true, message: "可多单运行不能为空", trigger: "blur" },
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
fileList:[],
|
|
|
|
|
equipmentId:'',
|
|
|
|
|
fileList: [],
|
|
|
|
|
equipmentId: "",
|
|
|
|
|
options: null,
|
|
|
|
|
// 新增-物料选中listtag
|
|
|
|
|
selectMaterielListtag: [],
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
@ -388,23 +544,27 @@ export default {
|
|
|
|
|
this.getTreeselect();
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
selectWorkCenter(){
|
|
|
|
|
selectWorkCenter() {
|
|
|
|
|
this.form.workshopCode = this.form.workCenter;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
activated(){
|
|
|
|
|
this.useTypeKey +=1
|
|
|
|
|
activated() {
|
|
|
|
|
this.useTypeKey += 1;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
handleEquipmentSelectionChange (val) {
|
|
|
|
|
this.equipmentList = val
|
|
|
|
|
handleEquipmentSelectionChange(val) {
|
|
|
|
|
this.equipmentList = val;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//中山榄菊日化实业有限公司 A001
|
|
|
|
|
getTreeselect() {
|
|
|
|
|
listFactory().then(response => {
|
|
|
|
|
listFactory().then((response) => {
|
|
|
|
|
this.factoryOptions = [];
|
|
|
|
|
const data = { factoryId: 1, factoryName: '中山榄菊日化实业有限公司', children: [] };
|
|
|
|
|
const data = {
|
|
|
|
|
factoryId: 1,
|
|
|
|
|
factoryName: "中山榄菊日化实业有限公司",
|
|
|
|
|
children: [],
|
|
|
|
|
};
|
|
|
|
|
data.children = this.handleTree(response.data, "factoryId", "parentId");
|
|
|
|
|
this.factoryOptions.push(data);
|
|
|
|
|
});
|
|
|
|
|
@ -413,7 +573,7 @@ export default {
|
|
|
|
|
/** 查询物料信息列表 */
|
|
|
|
|
getEquipmentList() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
listEquipment(this.queryEquipmentParams).then(response => {
|
|
|
|
|
listEquipment(this.queryEquipmentParams).then((response) => {
|
|
|
|
|
this.equipmentList = response.rows;
|
|
|
|
|
this.total = response.total;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
@ -446,21 +606,21 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// 生成表头序号
|
|
|
|
|
indexMethod(index){
|
|
|
|
|
return index+1 ;
|
|
|
|
|
indexMethod(index) {
|
|
|
|
|
return index + 1;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// 多选框选中数据
|
|
|
|
|
handleEquipmentSelectionChange(selection) {
|
|
|
|
|
this.ids = selection.map(item => item.equipmentId);
|
|
|
|
|
this.single = selection.length!==1;
|
|
|
|
|
this.ids = selection.map((item) => item.equipmentId);
|
|
|
|
|
this.single = selection.length !== 1;
|
|
|
|
|
this.multiple = !selection.length;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/** 查询生产工序列表 */
|
|
|
|
|
getList() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
listProcess(this.queryParams).then(response => {
|
|
|
|
|
listProcess(this.queryParams).then((response) => {
|
|
|
|
|
this.processList = response.rows;
|
|
|
|
|
this.total = response.total;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
@ -485,20 +645,20 @@ export default {
|
|
|
|
|
processCode: null,
|
|
|
|
|
processName: null,
|
|
|
|
|
attention: null,
|
|
|
|
|
enableFlag: 'Y',
|
|
|
|
|
enableFlag: "Y",
|
|
|
|
|
remark: null,
|
|
|
|
|
createBy: null,
|
|
|
|
|
createTime: null,
|
|
|
|
|
updateBy: null,
|
|
|
|
|
updateTime: null,
|
|
|
|
|
fileList:'',
|
|
|
|
|
equipmentTypeName:'',
|
|
|
|
|
equipmentId :null,
|
|
|
|
|
equipmentTypeName :null,
|
|
|
|
|
equipmentTypeCode:null,
|
|
|
|
|
equipmentName :null,
|
|
|
|
|
equipmentCode:null,
|
|
|
|
|
equipment:null,
|
|
|
|
|
fileList: "",
|
|
|
|
|
equipmentTypeName: "",
|
|
|
|
|
equipmentId: null,
|
|
|
|
|
equipmentTypeName: null,
|
|
|
|
|
equipmentTypeCode: null,
|
|
|
|
|
equipmentName: null,
|
|
|
|
|
equipmentCode: null,
|
|
|
|
|
equipment: null,
|
|
|
|
|
};
|
|
|
|
|
this.autoGenFlag = false;
|
|
|
|
|
this.resetForm("form");
|
|
|
|
|
@ -520,21 +680,22 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
// 多选框选中数据
|
|
|
|
|
handleSelectionChange(selection) {
|
|
|
|
|
this.ids = selection.map(item => item.processId);
|
|
|
|
|
this.ids1 = selection.map(item => item.processId);
|
|
|
|
|
this.single = selection.length!==1
|
|
|
|
|
this.multiple = !selection.length
|
|
|
|
|
this.ids = selection.map((item) => item.processId);
|
|
|
|
|
this.ids1 = selection.map((item) => item.processId);
|
|
|
|
|
this.single = selection.length !== 1;
|
|
|
|
|
this.multiple = !selection.length;
|
|
|
|
|
},
|
|
|
|
|
/** 新增按钮操作 */
|
|
|
|
|
handleAdd() {
|
|
|
|
|
this.reset();
|
|
|
|
|
getWorkCenterList().then(response =>{
|
|
|
|
|
getWorkCenterList().then((response) => {
|
|
|
|
|
this.options1 = response.rows;
|
|
|
|
|
console.log(this.options1);
|
|
|
|
|
});
|
|
|
|
|
this.open = true;
|
|
|
|
|
this.title = "添加生产工序";
|
|
|
|
|
this.optType = "add";
|
|
|
|
|
this.selectMaterielListtag = [];
|
|
|
|
|
},
|
|
|
|
|
/** 绑定设备操作 */
|
|
|
|
|
handleBoundeEuipment() {
|
|
|
|
|
@ -544,10 +705,10 @@ export default {
|
|
|
|
|
this.optType = "bound";
|
|
|
|
|
},
|
|
|
|
|
// 查询明细按钮操作
|
|
|
|
|
handleView(row){
|
|
|
|
|
handleView(row) {
|
|
|
|
|
this.reset();
|
|
|
|
|
const processId = row.processId || this.ids;
|
|
|
|
|
getProcess(processId).then(response => {
|
|
|
|
|
getProcess(processId).then((response) => {
|
|
|
|
|
this.form = response.data;
|
|
|
|
|
this.open = true;
|
|
|
|
|
this.title = "查看工序信息";
|
|
|
|
|
@ -557,23 +718,29 @@ export default {
|
|
|
|
|
/** 修改按钮操作 */
|
|
|
|
|
handleUpdate(row) {
|
|
|
|
|
this.reset();
|
|
|
|
|
const processId = row.processId || this.ids
|
|
|
|
|
getWorkCenterList().then(response =>{
|
|
|
|
|
this.selectMaterielListtag = [];
|
|
|
|
|
const processId = row.processId || this.ids;
|
|
|
|
|
getWorkCenterList().then((response) => {
|
|
|
|
|
this.options1 = response.rows;
|
|
|
|
|
console.log(this.options1);
|
|
|
|
|
});
|
|
|
|
|
getProcess(processId).then(response => {
|
|
|
|
|
getProcess(processId).then((response) => {
|
|
|
|
|
this.form = response.data;
|
|
|
|
|
// console.log(this.form.workCenter);
|
|
|
|
|
console.log(this.form);
|
|
|
|
|
if (this.form.equipment != "") {
|
|
|
|
|
this.selectMaterielListtag = JSON.parse(
|
|
|
|
|
JSON.stringify(this.form.equipment.split(","))
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
// this.form.workCenter = this.form.workCenter.split(',');
|
|
|
|
|
if(response.data.files != null){
|
|
|
|
|
if (response.data.files != null) {
|
|
|
|
|
var newFiles = [];
|
|
|
|
|
response.data.files.forEach(item =>{
|
|
|
|
|
response.data.files.forEach((item) => {
|
|
|
|
|
var newfile = {};
|
|
|
|
|
newfile.name = item.fileName;
|
|
|
|
|
newfile.url = item.fileAddress;
|
|
|
|
|
newFiles.push(newfile);
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
this.form.fileList = newFiles;
|
|
|
|
|
}
|
|
|
|
|
this.open = true;
|
|
|
|
|
@ -587,17 +754,17 @@ export default {
|
|
|
|
|
// console.log('workCENTER',this.form.workCenter);
|
|
|
|
|
// this.work = JSON.stringify(this.form.workCenter);
|
|
|
|
|
// this.form.workCenter = JSON.stringify(this.form.workCenter);
|
|
|
|
|
// console.log('2',this.form.workCenter);
|
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
|
console.log(this.form);
|
|
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
|
|
if (valid) {
|
|
|
|
|
if (this.form.processId != null) {
|
|
|
|
|
updateProcess(this.form).then(response => {
|
|
|
|
|
updateProcess(this.form).then((response) => {
|
|
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
|
|
this.open = false;
|
|
|
|
|
this.getList();
|
|
|
|
|
});
|
|
|
|
|
}else {
|
|
|
|
|
addProcess(this.form).then(response => {
|
|
|
|
|
} else {
|
|
|
|
|
addProcess(this.form).then((response) => {
|
|
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
|
|
this.open = false;
|
|
|
|
|
this.getList();
|
|
|
|
|
@ -610,18 +777,26 @@ export default {
|
|
|
|
|
/** 删除按钮操作 */
|
|
|
|
|
handleDelete(row) {
|
|
|
|
|
const processIds = row.processId || this.ids;
|
|
|
|
|
this.$modal.confirm('是否确认删除生产工序？').then(function() {
|
|
|
|
|
this.$modal
|
|
|
|
|
.confirm("是否确认删除生产工序？")
|
|
|
|
|
.then(function () {
|
|
|
|
|
return delProcess(processIds);
|
|
|
|
|
}).then(() => {
|
|
|
|
|
})
|
|
|
|
|
.then(() => {
|
|
|
|
|
this.getList();
|
|
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
|
|
}).catch(() => {});
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {});
|
|
|
|
|
},
|
|
|
|
|
/** 导出按钮操作 */
|
|
|
|
|
handleExport() {
|
|
|
|
|
this.download('technology/pro/process/export', {
|
|
|
|
|
...this.queryParams
|
|
|
|
|
}, `process_${new Date().getTime()}.xlsx`)
|
|
|
|
|
this.download(
|
|
|
|
|
"technology/pro/process/export",
|
|
|
|
|
{
|
|
|
|
|
...this.queryParams,
|
|
|
|
|
},
|
|
|
|
|
`process_${new Date().getTime()}.xlsx`
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
// 对象转成指定字符串分隔
|
|
|
|
|
listToString(list, separator) {
|
|
|
|
|
@ -630,35 +805,54 @@ export default {
|
|
|
|
|
for (let i in list) {
|
|
|
|
|
strs += list[i].url + separator;
|
|
|
|
|
}
|
|
|
|
|
return strs != '' ? strs.substr(0, strs.length - 1) : '';
|
|
|
|
|
return strs != "" ? strs.substr(0, strs.length - 1) : "";
|
|
|
|
|
},
|
|
|
|
|
// 新增—删除标签
|
|
|
|
|
handleClose(tag) {
|
|
|
|
|
this.selectMaterielListtag.splice(
|
|
|
|
|
this.selectMaterielListtag.indexOf(tag),
|
|
|
|
|
1
|
|
|
|
|
);
|
|
|
|
|
this.form.equipment = "";
|
|
|
|
|
var code = [];
|
|
|
|
|
this.selectMaterielListtag.forEach((item) => {
|
|
|
|
|
if(item){
|
|
|
|
|
code.push(item)
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log(code,this.selectMaterielListtag)
|
|
|
|
|
this.form.equipment = code.join(',');
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//新增 设备选择弹出框
|
|
|
|
|
onItemSelectedEquipment(obj){
|
|
|
|
|
if(this.form.equipment == null){
|
|
|
|
|
console.log("equipment是空，if获取的obj",obj);
|
|
|
|
|
console.log("device是空，if获取的equipment",this.form.equipment);
|
|
|
|
|
onItemSelectedEquipment(obj) {
|
|
|
|
|
if (this.form.equipment == null) {
|
|
|
|
|
console.log("equipment是空，if获取的obj", obj);
|
|
|
|
|
console.log("device是空，if获取的equipment", this.form.equipment);
|
|
|
|
|
this.form.equipment = obj;
|
|
|
|
|
}else{
|
|
|
|
|
if(obj != undefined && obj != null){
|
|
|
|
|
const a = obj.split(',');
|
|
|
|
|
const len = obj.split(',').length;
|
|
|
|
|
console.log('切割的数组',obj.split(','));
|
|
|
|
|
a.forEach(item => {
|
|
|
|
|
this.selectMaterielListtag = obj.split(",");
|
|
|
|
|
} else {
|
|
|
|
|
if (obj != undefined && obj != null) {
|
|
|
|
|
const a = obj.split(",");
|
|
|
|
|
const len = obj.split(",").length;
|
|
|
|
|
console.log("切割的数组", obj.split(","));
|
|
|
|
|
a.forEach((item) => {
|
|
|
|
|
this.checkEquipment = this.form.equipment.search(item) != -1;
|
|
|
|
|
console.log("check的值",this.checkEquipment);
|
|
|
|
|
if(this.checkEquipment == true){
|
|
|
|
|
console.log("重复添加",true);
|
|
|
|
|
Message.warning('您已经添加过该设备,请勿重复添加！！！');
|
|
|
|
|
}else if(this.checkEquipment == false){
|
|
|
|
|
this.form.equipment = this.form.equipment +","+item;
|
|
|
|
|
|
|
|
|
|
if (this.checkEquipment == true) {
|
|
|
|
|
console.log("重复添加", true);
|
|
|
|
|
|
|
|
|
|
Message.warning("您已经添加过该设备,请勿重复添加！！！");
|
|
|
|
|
} else if (this.checkEquipment == false) {
|
|
|
|
|
this.selectMaterielListtag.push(item);
|
|
|
|
|
this.form.equipment = this.form.equipment + "," + item;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
console.log("check的值", this.checkEquipment, item,this.form.equipment);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
//新增 设备选择弹出框
|
|
|
|
|
handleSelectEquipment(){
|
|
|
|
|
handleSelectEquipment() {
|
|
|
|
|
this.$refs.itemSelect.showFlag = true;
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
@ -671,3 +865,40 @@ export default {
|
|
|
|
|
// },
|
|
|
|
|
};
|
|
|
|
|
</script>
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
|
|
.tagbox {
|
|
|
|
|
display: flex;
|
|
|
|
|
/* overflow: scroll; */
|
|
|
|
|
position: relative;
|
|
|
|
|
width: 100%;
|
|
|
|
|
// padding-left: 26px;
|
|
|
|
|
margin-bottom: 15px;
|
|
|
|
|
.tagboxlabel {
|
|
|
|
|
width: 100px;
|
|
|
|
|
text-align: right;
|
|
|
|
|
vertical-align: middle;
|
|
|
|
|
font-size: 14px;
|
|
|
|
|
color: black;
|
|
|
|
|
line-height: 40px;
|
|
|
|
|
-webkit-box-sizing: border-box;
|
|
|
|
|
box-sizing: border-box;
|
|
|
|
|
margin-right: 12px;
|
|
|
|
|
}
|
|
|
|
|
.tag {
|
|
|
|
|
width: 82%;
|
|
|
|
|
border: 1px #dcdfe6 solid;
|
|
|
|
|
height: 70px;
|
|
|
|
|
padding: 5px 15px;
|
|
|
|
|
overflow-y: scroll;
|
|
|
|
|
.tagitem {
|
|
|
|
|
margin-left: 5px;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.button1 {
|
|
|
|
|
width: 57px;
|
|
|
|
|
height: 35px;
|
|
|
|
|
margin-left: 10px;
|
|
|
|
|
background: #F5F7FA;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
</style>
|
|
|
|
|
|
李靖
1 year ago