kelvin/wms-gj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

关闭点击遮罩关闭窗口

Browse Source
This commit is contained in:
liumingxiy 2024-11-14 10:45:43 +08:00
parent a3968276ca
commit 59de595e44
81 changed files with 1793 additions and 1448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/md/CONFIGURE/index.vue
View File

@ -138,7 +138,7 @@
/> />
<!-- 添加或修改盘点计划配置对话框 --> <!-- 添加或修改盘点计划配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="配置名称" prop="configureName"> <el-form-item label="配置名称" prop="configureName">
<el-input v-model="form.configureName" placeholder="请输入配置名称"/> <el-input v-model="form.configureName" placeholder="请输入配置名称"/>

2
src/views/md/ROUTE/index.vue
View File

@ -147,7 +147,7 @@
/> />
<!-- 添加或修改BOM头对话框 --> <!-- 添加或修改BOM头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="60%">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="BOM编码" prop="bomCode"> <el-form-item label="BOM编码" prop="bomCode">
<el-input v-model="form.bomCode" placeholder="请输入BOM编码"/> <el-input v-model="form.bomCode" placeholder="请输入BOM编码"/>

13
src/views/md/ROUTE/line.vue
View File

@ -76,12 +76,12 @@
/> />
<!-- 添加或修改物料入库单行对话框 --> <!-- 添加或修改物料入库单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" > <el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -176,10 +176,17 @@
</template> </template>
<script> <script>
import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline"; import {
addItemrecptline,
delItemrecptline,
getItemrecptline,
listItemrecptline,
updateItemrecptline
} from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue"; import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Itemrecptline", name: "Itemrecptline",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],

2
src/views/md/WMS_INVENTORY_PLAN/index.vue
View File

@ -206,7 +206,7 @@
/> />
<!-- 添加或修改盘点计划对话框 --> <!-- 添加或修改盘点计划对话框 -->
<el-dialog :title="title" :visible.sync="open" append-to-body width="90%"> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="90%">
<el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="80px">
<el-form-item label="是否复盘" prop="isag"> <el-form-item label="是否复盘" prop="isag">
<el-select v-model="form.isag" placeholder="请选择是否复盘" @change="handleIsAgChange"> <el-select v-model="form.isag" placeholder="请选择是否复盘" @change="handleIsAgChange">

17
src/views/mes/cal/plan/index.vue
View File

@ -85,14 +85,15 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="calplanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="calplanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="计划编号" align="center" prop="planCode" > <el-table-column label="计划编号" align="center" prop="planCode" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-hasPermi="['mes:cal:calplan:query']"
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:cal:calplan:query']" >{{ scope.row.planCode }}
>{{scope.row.planCode}}</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划名称" width="200px" align="center" prop="planName" :show-overflow-tooltip="true"/> <el-table-column label="计划名称" width="200px" align="center" prop="planName" :show-overflow-tooltip="true"/>
@ -157,7 +158,8 @@
/> />
<!-- 添加或修改排班计划对话框 --> <!-- 添加或修改排班计划对话框 -->
<el-dialog :title="title" v-loading="formLoading" :visible.sync="open" width="960px" append-to-body> <el-dialog v-loading="formLoading" :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body
width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -168,9 +170,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -272,10 +274,11 @@
</template> </template>
<script> <script>
import { listCalplan, getCalplan, delCalplan, addCalplan, updateCalplan } from "@/api/mes/cal/calplan"; import {addCalplan, delCalplan, getCalplan, listCalplan, updateCalplan} from "@/api/mes/cal/calplan";
import Shift from "./shift"; import Shift from "./shift";
import Team from "./team"; import Team from "./team";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Calplan", name: "Calplan",
dicts: ['mes_shift_method','mes_shift_type','mes_calendar_type','mes_order_status'], dicts: ['mes_shift_method','mes_shift_type','mes_calendar_type','mes_order_status'],

6
src/views/mes/cal/plan/shift.vue
View File

@ -74,12 +74,12 @@
/> />
<!-- 添加或修改计划班次对话框 --> <!-- 添加或修改计划班次对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="序号" prop="orderNum"> <el-form-item label="序号" prop="orderNum">
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" /> <el-input-number v-model="form.orderNum" :min="1" placeholder="请输入序号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -122,7 +122,7 @@
</template> </template>
<script> <script>
import { listShift, getShift, delShift, addShift, updateShift } from "@/api/mes/cal/shift"; import {addShift, delShift, getShift, listShift, updateShift} from "@/api/mes/cal/shift";
export default { export default {
name: "Shift", name: "Shift",

14
src/views/mes/cal/team/index.vue
View File

@ -87,7 +87,8 @@
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:cal:team:query']" v-hasPermi="['mes:cal:team:query']"
>{{scope.row.teamCode}}</el-button> >{{ scope.row.teamCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班组名称" align="center" prop="teamName" /> <el-table-column label="班组名称" align="center" prop="teamName" />
@ -126,7 +127,7 @@
/> />
<!-- 添加或修改班组对话框 --> <!-- 添加或修改班组对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -137,9 +138,9 @@
<el-col :span="3"> <el-col :span="3">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -164,7 +165,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -181,9 +182,10 @@
</template> </template>
<script> <script>
import { listTeam, getTeam, delTeam, addTeam, updateTeam } from "@/api/mes/cal/team"; import {addTeam, delTeam, getTeam, listTeam, updateTeam} from "@/api/mes/cal/team";
import Teammember from "./member"; import Teammember from "./member";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Team", name: "Team",
components: {Teammember}, components: {Teammember},

14
src/views/mes/dv/Inventory/InventoryRequest.vue
View File

@ -108,7 +108,7 @@
/> />
<!-- 添加或修改设备点检计划头对话框 --> <!-- 添加或修改设备点检计划头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -196,7 +196,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 选择点检计划--> <!-- 选择点检计划-->
<el-dialog :visible.sync="selecareaVisible" title="选择点检计划"> <el-dialog :close-on-click-modal="false" :visible.sync="selecareaVisible" title="选择点检计划">
<inventory-cmps v-if="selecareaVisible" @selecoInventoryTaskHandle="selecoInventoryTaskHandle"></inventory-cmps> <inventory-cmps v-if="selecareaVisible" @selecoInventoryTaskHandle="selecoInventoryTaskHandle"></inventory-cmps>
</el-dialog> </el-dialog>
</div> </div>
@ -204,13 +204,17 @@
<script> <script>
import { import {
addRequest, delRequest, delRequests, getRequest, addRequest,
listRequest, updateRequest delRequest,
delRequests,
getRequest,
listRequest,
updateRequest
} from "@/api/mes/dv/inventoryRequest"; } from "@/api/mes/dv/inventoryRequest";
import {listMdItem} from "@/api/mes/md/mdItem"; import {listMdItem} from "@/api/mes/md/mdItem";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import InventoryCmps from "@/components/wm/InventoryCmps.vue"; import InventoryCmps from "@/components/wm/InventoryCmps.vue";
export default { export default {
name: "InventoryRequest", name: "InventoryRequest",
components: {InventoryCmps}, components: {InventoryCmps},

11
src/views/mes/dv/Inventory/InventoryTask.vue
View File

@ -134,7 +134,7 @@
/> />
<!-- 添加或修改设备点检计划头对话框 --> <!-- 添加或修改设备点检计划头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -287,17 +287,18 @@
<script> <script>
import { import {
listDvsubject,
addMachinery, addMachinery,
getMachinery,
updateMachinery,
delMachinery, delMachinery,
delMachinerys, delMachinerys,
rechecklMachinerys getMachinery,
listDvsubject,
rechecklMachinerys,
updateMachinery
} from "@/api/mes/dv/inventoryTask"; } from "@/api/mes/dv/inventoryTask";
import {listMdItem} from "@/api/mes/md/mdItem"; import {listMdItem} from "@/api/mes/md/mdItem";
import {listQctemplate} from "@/api/mes/qc/qctemplate"; import {listQctemplate} from "@/api/mes/qc/qctemplate";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "InventoryTask", name: "InventoryTask",
dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'], dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'],

31
src/views/mes/dv/checkplan/index.vue
View File

@ -91,13 +91,14 @@
<el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="checkplanList" @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="计划编码" align="center" prop="planCode" > <el-table-column align="center" label="计划编码" prop="planCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:dv:checkplan:query']" v-hasPermi="['mes:dv:checkplan:query']"
>{{scope.row.planCode}}</el-button> >{{ scope.row.planCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划名称" align="center" width="200px" prop="planName" /> <el-table-column label="计划名称" align="center" width="200px" prop="planName" />
@ -116,7 +117,7 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="频率" align="center" prop="cycleType"> <el-table-column align="center" label="频率" prop="cycleType">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.cycleCount }} {{ scope.row.cycleCount }}
<dict-tag :options="dict.type.mes_cycle_type" :value="scope.row.cycleType"/> <dict-tag :options="dict.type.mes_cycle_type" :value="scope.row.cycleType"/>
@ -166,7 +167,7 @@
/> />
<!-- 添加或修改设备点检计划头对话框 --> <!-- 添加或修改设备点检计划头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -177,9 +178,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -257,12 +258,12 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-tabs type="border-card" v-if="form.planId != null"> <el-tabs v-if="form.planId != null" type="border-card">
<el-tab-pane label="设备清单"> <el-tab-pane label="设备清单">
<Checkmachinery ref="machinerylist" :optType="optType" :planId="form.planId"></Checkmachinery> <Checkmachinery ref="machinerylist" :optType="optType" :planId="form.planId"></Checkmachinery>
</el-tab-pane> </el-tab-pane>
@ -272,9 +273,14 @@
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保存</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保存
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.planId !=null">启用</el-button> </el-button>
<el-button type="success" @click="handleDeFinish" v-if="form.status =='FINISHED' && optType !='view' && form.planId !=null">停用</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' && form.planId !=null" type="success"
@click="handleFinish">启用
</el-button>
<el-button v-if="form.status =='FINISHED' && optType !='view' && form.planId !=null" type="success"
@click="handleDeFinish">停用
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -282,10 +288,11 @@
</template> </template>
<script> <script>
import { listCheckplan, getCheckplan, delCheckplan, addCheckplan, updateCheckplan } from "@/api/mes/dv/checkplan"; import {addCheckplan, delCheckplan, getCheckplan, listCheckplan, updateCheckplan} from "@/api/mes/dv/checkplan";
import Checkmachinery from "./machinery.vue" import Checkmachinery from "./machinery.vue"
import Checksubject from "./subject.vue" import Checksubject from "./subject.vue"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Checkplan", name: "Checkplan",
dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'], dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'],

14
src/views/mes/dv/machinery/index.vue
View File

@ -154,7 +154,8 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:dv:machinery:remove']" v-hasPermi="['mes:dv:machinery:remove']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -170,7 +171,7 @@
</el-row> </el-row>
<!-- 添加或修改设备对话框 --> <!-- 添加或修改设备对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -182,9 +183,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -246,7 +247,8 @@
</el-dialog> </el-dialog>
<!-- 物料导入对话框 --> <!-- 物料导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body
width="400px">
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="1"
@ -278,7 +280,7 @@
</template> </template>
<script> <script>
import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery"; import {addMachinery, delMachinery, getMachinery, listMachinery, updateMachinery} from "@/api/mes/dv/machinery";
import {listMachinerytype} from "@/api/mes/dv/machinerytype"; import {listMachinerytype} from "@/api/mes/dv/machinerytype";
import {listAllWorkshop} from "@/api/mes/md/workshop"; import {listAllWorkshop} from "@/api/mes/md/workshop";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"

13
src/views/mes/dv/machinerytype/index.vue
View File

@ -69,12 +69,13 @@
</el-table> </el-table>
<!-- 添加或修改设备类型对话框 --> <!-- 添加或修改设备类型对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="700px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="24" v-if="form.parentTypeId !== 0"> <el-col :span="24" v-if="form.parentTypeId !== 0">
<el-form-item label="父类型" prop="parentTypeId"> <el-form-item label="父类型" prop="parentTypeId">
<treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" /> <treeselect v-model="form.parentTypeId" :normalizer="normalizer" :options="machinerytypeOptions"
placeholder="请选择父类型"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -120,7 +121,13 @@
</template> </template>
<script> <script>
import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/dv/machinerytype"; import {
addMachinerytype,
delMachinerytype,
getMachinerytype,
listMachinerytype,
updateMachinerytype
} from "@/api/mes/dv/machinerytype";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";

20
src/views/mes/dv/repair/index.vue
View File

@ -158,7 +158,7 @@
/> />
<!-- 添加或修改设备维修单对话框 --> <!-- 添加或修改设备维修单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -169,9 +169,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -206,10 +206,10 @@
<el-form-item label="报修日期" prop="requireDate"> <el-form-item label="报修日期" prop="requireDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.requireDate" v-model="form.requireDate"
placeholder="请选择报修日期"
style="width: 187px" style="width: 187px"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
placeholder="请选择报修日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -262,19 +262,20 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider v-if="form.repairId !=null" content-position="center">维修内容</el-divider> <el-divider v-if="form.repairId !=null" content-position="center">维修内容</el-divider>
<el-card shadow="always" v-if="form.repairId !=null" class="box-card"> <el-card shadow="always" v-if="form.repairId !=null" class="box-card">
<Repairline ref="line" :repairId="form.repairId" :optType="optType"></Repairline> <Repairline ref="line" :optType="optType" :repairId="form.repairId"></Repairline>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="form.status =='PREPARE' && optType !='view'" @click="submitForm">提 交</el-button> <el-button type="primary" v-if="form.status =='PREPARE' && optType !='view'" @click="submitForm">提 交</el-button>
<el-button type="primary" v-if="form.status == 'APPROVING' && optType !='view'" @click="finish">完成维修</el-button> <el-button v-if="form.status == 'APPROVING' && optType !='view'" type="primary" @click="finish">完成维修
</el-button>
<el-button type="success" v-if="form.status == 'FINISHED' && optType !='view'" @click="confirm">验收通过</el-button> <el-button type="success" v-if="form.status == 'FINISHED' && optType !='view'" @click="confirm">验收通过</el-button>
<el-button type="danger" v-if="form.status == 'FINISHED' && optType !='view'" @click="unconfirm">不通过</el-button> <el-button type="danger" v-if="form.status == 'FINISHED' && optType !='view'" @click="unconfirm">不通过</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
@ -284,10 +285,11 @@
</template> </template>
<script> <script>
import { listRepair, getRepair, delRepair, addRepair, updateRepair } from "@/api/mes/dv/repair"; import {addRepair, delRepair, getRepair, listRepair, updateRepair} from "@/api/mes/dv/repair";
import MachinerySelectSingle from "@/components/machinerySelect/single.vue"; import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
import Repairline from './line.vue' import Repairline from './line.vue'
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Repair", name: "Repair",
dicts: ['mes_repair_result', 'mes_order_status'], dicts: ['mes_repair_result', 'mes_order_status'],

8
src/views/mes/dv/repair/line.vue
View File

@ -67,16 +67,16 @@
/> />
<!-- 添加或修改设备维修单行对话框 --> <!-- 添加或修改设备维修单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="subjectName"> <el-form-item label="项目名称" prop="subjectName">
<el-input v-model="form.subjectName" placeholder="请输入项目名称"/> <el-input v-model="form.subjectName" placeholder="请输入项目名称"/>
</el-form-item> </el-form-item>
<el-form-item label="故障描述" prop="malfunction"> <el-form-item label="故障描述" prop="malfunction">
<el-input v-model="form.malfunction" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.malfunction" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
<el-form-item label="故障描述资源" prop="malfunctionUrl"> <el-form-item label="故障描述资源" prop="malfunctionUrl">
<el-input type="textarea" v-model="form.malfunctionUrl" placeholder="请输入故障描述资源" /> <el-input v-model="form.malfunctionUrl" placeholder="请输入故障描述资源" type="textarea"/>
</el-form-item> </el-form-item>
<el-form-item label="维修情况" prop="repairDes"> <el-form-item label="维修情况" prop="repairDes">
<el-input v-model="form.repairDes" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.repairDes" type="textarea" placeholder="请输入内容" />
@ -91,7 +91,7 @@
</template> </template>
<script> <script>
import { listRepairline, getRepairline, delRepairline, addRepairline, updateRepairline } from "@/api/mes/dv/repairline"; import {addRepairline, delRepairline, getRepairline, listRepairline, updateRepairline} from "@/api/mes/dv/repairline";
export default { export default {
name: "Repairline", name: "Repairline",

11
src/views/mes/dv/subject/index.vue
View File

@ -124,7 +124,7 @@
/> />
<!-- 添加或修改设备点检保养项目对话框 --> <!-- 添加或修改设备点检保养项目对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -135,9 +135,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -172,7 +172,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="项目内容" prop="subjectContent"> <el-form-item label="项目内容" prop="subjectContent">
<el-input type="textarea" v-model="form.subjectContent" placeholder="请输入项目内容" /> <el-input v-model="form.subjectContent" placeholder="请输入项目内容" type="textarea"/>
</el-form-item> </el-form-item>
<el-form-item label="标准" prop="subjectStandard"> <el-form-item label="标准" prop="subjectStandard">
<el-input type="textarea" v-model="form.subjectStandard" placeholder="请输入标准" autosize/> <el-input type="textarea" v-model="form.subjectStandard" placeholder="请输入标准" autosize/>
@ -187,8 +187,9 @@
</template> </template>
<script> <script>
import { listDvsubject, getDvsubject, delDvsubject, addDvsubject, updateDvsubject } from "@/api/mes/dv/dvsubject"; import {addDvsubject, delDvsubject, getDvsubject, listDvsubject, updateDvsubject} from "@/api/mes/dv/dvsubject";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Dvsubject", name: "Dvsubject",
dicts: ['sys_yes_no', 'mes_dvsubject_type'], dicts: ['sys_yes_no', 'mes_dvsubject_type'],

4
src/views/mes/md/baseKnife/index.vue
View File

@ -127,7 +127,7 @@
/> />
<!-- 操作日志详细 --> <!-- 操作日志详细 -->
<el-dialog title="台账详细信息" :visible.sync="open" width="60%" append-to-body> <el-dialog :close-on-click-modal="false" :visible.sync="open" append-to-body title="台账详细信息" width="60%">
<el-form ref="form" :model="form" label-width="100px" size="mini"> <el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -247,7 +247,7 @@
</template> </template>
<script> <script>
import {listBaseKnife, getBaseKnife, delBaseKnife, addBaseKnife, updateBaseKnife} from "@/api/mes/md/baseKnife"; import {addBaseKnife, getBaseKnife, listBaseKnife, updateBaseKnife} from "@/api/mes/md/baseKnife";
import {resetBaseKnife} from "../../../../api/mes/md/baseKnife"; import {resetBaseKnife} from "../../../../api/mes/md/baseKnife";
import {listMdItem} from "@/api/mes/md/mdItem" import {listMdItem} from "@/api/mes/md/mdItem"

9
src/views/mes/md/bom/index.vue
View File

@ -172,12 +172,12 @@
</el-row> </el-row>
<!-- 添加或修改物料产品编码对话框 --> <!-- 添加或修改物料产品编码对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入物料编码" maxlength="64" /> <el-input v-model="form.itemCode" maxlength="64" placeholder="请输入物料编码"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@ -273,7 +273,8 @@
</el-dialog> </el-dialog>
<!-- 物料导入对话框 --> <!-- 物料导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body
width="400px">
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="1"
@ -305,7 +306,7 @@
</template> </template>
<script> <script>
import { listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/mes/md/mdItem"; import {addMdItem, delMdItem, getMdItem, listMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure"; import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";

12
src/views/mes/md/client/index.vue
View File

@ -181,7 +181,7 @@
/> />
<!-- 添加或修改客户对话框 --> <!-- 添加或修改客户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -192,9 +192,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -353,7 +353,8 @@
</el-dialog> </el-dialog>
<!-- 客户导入对话框 --> <!-- 客户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body
width="400px">
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="1"
@ -387,9 +388,10 @@
</template> </template>
<script> <script>
import { listClient, getClient, delClient, addClient, updateClient } from "@/api/mes/md/client"; import {addClient, delClient, getClient, listClient, updateClient} from "@/api/mes/md/client";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";
export default { export default {
name: "Client", name: "Client",
dicts: ['mes_client_type','sys_yes_no'], dicts: ['mes_client_type','sys_yes_no'],

4
src/views/mes/md/inOutType/index.vue
View File

@ -109,7 +109,7 @@
/> />
<!-- 添加或修改出入库类型对话框 --> <!-- 添加或修改出入库类型对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="类型编码" prop="code"> <el-form-item label="类型编码" prop="code">
<el-input v-model="form.code" placeholder="请输入类型编码"></el-input> <el-input v-model="form.code" placeholder="请输入类型编码"></el-input>
@ -136,7 +136,7 @@
</template> </template>
<script> <script>
import {listTYPE, getTYPE, delTYPE, addTYPE, updateTYPE} from "@/api/md/TYPE"; import {addTYPE, delTYPE, getTYPE, listTYPE, updateTYPE} from "@/api/md/TYPE";
export default { export default {
name: "TYPE", name: "TYPE",

14
src/views/mes/md/itemtype/index.vue
View File

@ -94,12 +94,13 @@
</el-table> </el-table>
<!-- 添加或修改物料分类对话框 --> <!-- 添加或修改物料分类对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24" v-if="form.parentTypeId !== 0"> <el-col :span="24" v-if="form.parentTypeId !== 0">
<el-form-item label="父分类" prop="parentTypeId"> <el-form-item label="父分类" prop="parentTypeId">
<treeselect v-model="form.parentTypeId" disabled = "disabled" :options="itemTypeOptions" :normalizer="normalizer" placeholder="请选择上级分类" /> <treeselect v-model="form.parentTypeId" :normalizer="normalizer" :options="itemTypeOptions"
disabled="disabled" placeholder="请选择上级分类"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -160,7 +161,14 @@
</template> </template>
<script> <script>
import { listItemType, getItemType, delItemType, addItemType, updateItemType, listItemTypeExcludeChild } from "@/api/mes/md/itemtype"; import {
addItemType,
delItemType,
getItemType,
listItemType,
listItemTypeExcludeChild,
updateItemType
} from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";

27
src/views/mes/md/mditem/components/itembom.vue
View File

@ -27,13 +27,13 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="物料编码" align="center" prop="bomItemCode" /> <el-table-column align="center" label="物料编码" prop="bomItemCode"/>
<el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" align="center" label="物料名称" prop="bomItemName"/>
<el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" align="center" label="规格" prop="bomItemSpec"/>
<el-table-column label="单位" width="60px" align="center" prop="unitOfMeasure" /> <el-table-column align="center" label="单位" prop="unitOfMeasure" width="60px"/>
<el-table-column label="使用比例" width="90px" align="center" prop="quantity" /> <el-table-column align="center" label="使用比例" prop="quantity" width="90px"/>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" align="center" label="备注" prop="remark"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -42,7 +42,8 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:mditem:edit']" v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -63,16 +64,16 @@
/> />
<!-- 添加或修改产品BOM关系对话框 --> <!-- 添加或修改产品BOM关系对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="BOM物料编码" prop="bomItemCode"> <el-form-item label="BOM物料编码" prop="bomItemCode">
<el-input v-model="form.bomItemCode" readonly placeholder="请输入BOM物料编码" /> <el-input v-model="form.bomItemCode" placeholder="请输入BOM物料编码" readonly/>
</el-form-item> </el-form-item>
<el-form-item label="BOM物料名称" prop="bomItemName"> <el-form-item label="BOM物料名称" prop="bomItemName">
<el-input v-model="form.bomItemName" readonly placeholder="请输入BOM物料名称" /> <el-input v-model="form.bomItemName" placeholder="请输入BOM物料名称" readonly/>
</el-form-item> </el-form-item>
<el-form-item label="BOM物料规格" prop="bomItemSpec"> <el-form-item label="BOM物料规格" prop="bomItemSpec">
<el-input v-model="form.bomItemSpec" readonly type="textarea" placeholder="请输入内容" /> <el-input v-model="form.bomItemSpec" placeholder="请输入内容" readonly type="textarea"/>
</el-form-item> </el-form-item>
<el-form-item label="BOM物料单位" prop="unitOfMeasure"> <el-form-item label="BOM物料单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" readonly placeholder="请输入BOM物料单位" /> <el-input v-model="form.unitOfMeasure" readonly placeholder="请输入BOM物料单位" />
@ -94,7 +95,7 @@
</template> </template>
<script> <script>
import { listBom, getBom, delBom, addBom, updateBom } from "@/api/mes/md/bom"; import {addBom, delBom, getBom, listBom, updateBom} from "@/api/mes/md/bom";
import ItemSelect from "@/components/itemSelect/index.vue"; import ItemSelect from "@/components/itemSelect/index.vue";
export default { export default {

15
src/views/mes/md/mditem/components/sip.vue
View File

@ -13,16 +13,16 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="header"> <div class="header">
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标题" prop="sipTitle"> <el-form-item label="标题" prop="sipTitle">
<el-input v-model="form.sipTitle" placeholder="请输入标题"></el-input> <el-input v-model="form.sipTitle" placeholder="请输入标题"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="展示顺序"> <el-form-item label="展示顺序">
<el-input-number :min="1" v-model="form.orderNum"></el-input-number> <el-input-number v-model="form.orderNum" :min="1"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="内容说明"> <el-form-item label="内容说明">
<el-input type="textarea" v-model="form.sipDescription" placeholder="请输入说明信息"></el-input> <el-input v-model="form.sipDescription" placeholder="请输入说明信息" type="textarea"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属工序" prop="processId"> <el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序"> <el-select v-model="form.processId" placeholder="请选择工序">
@ -35,7 +35,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="图片"> <el-form-item label="图片">
<ImageUpload :limit="1" :value="form.sipUrl" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload> <ImageUpload :fileSize="5" :limit="1" :value="form.sipUrl" @onRemoved="handleImgRemoved"
@onUploaded="handleImgUplaoded"></ImageUpload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -49,7 +50,8 @@
<el-card shadow="hover" :body-style="{pading: '10px'}"> <el-card shadow="hover" :body-style="{pading: '10px'}">
<el-popover> <el-popover>
<img :src="sipList[index].sipUrl" slot="reference" class="image"/> <img :src="sipList[index].sipUrl" slot="reference" class="image"/>
<el-image class="imagePreview" :src="sipList[index].sopUrl" :preview-src-list="imageList"></el-image> <el-image :preview-src-list="imageList" :src="sipList[index].sopUrl"
class="imagePreview"></el-image>
</el-popover> </el-popover>
<div style="text-align:center;padding-top:12px"> <div style="text-align:center;padding-top:12px">
<span> <span>
@ -64,9 +66,10 @@
</div> </div>
</template> </template>
<script> <script>
import { listSip, getSip, delSip, addSip, updateSip } from "@/api/mes/md/sip"; import {addSip, delSip, getSip, listSip, updateSip} from "@/api/mes/md/sip";
import ImageUpload from "@/components/ImageUpload/index.vue" import ImageUpload from "@/components/ImageUpload/index.vue"
import {listAllProcess} from "@/api/mes/pro/process"; import {listAllProcess} from "@/api/mes/pro/process";
export default{ export default{
name: "SOPTab", name: "SOPTab",
components: {ImageUpload}, components: {ImageUpload},

15
src/views/mes/md/mditem/components/sop.vue
View File

@ -13,16 +13,16 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="header"> <div class="header">
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标题" prop="sopTitle"> <el-form-item label="标题" prop="sopTitle">
<el-input v-model="form.sopTitle" placeholder="请输入标题"></el-input> <el-input v-model="form.sopTitle" placeholder="请输入标题"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="展示顺序"> <el-form-item label="展示顺序">
<el-input-number :min="1" v-model="form.orderNum"></el-input-number> <el-input-number v-model="form.orderNum" :min="1"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="内容说明"> <el-form-item label="内容说明">
<el-input type="textarea" v-model="form.sopDescription" placeholder="请输入说明信息"></el-input> <el-input v-model="form.sopDescription" placeholder="请输入说明信息" type="textarea"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属工序" prop="processId"> <el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序"> <el-select v-model="form.processId" placeholder="请选择工序">
@ -35,7 +35,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="图片"> <el-form-item label="图片">
<ImageUpload :limit="1" :value="form.sopUrl" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload> <ImageUpload :fileSize="5" :limit="1" :value="form.sopUrl" @onRemoved="handleImgRemoved"
@onUploaded="handleImgUplaoded"></ImageUpload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -49,7 +50,8 @@
<el-card shadow="hover" :body-style="{pading: '10px'}"> <el-card shadow="hover" :body-style="{pading: '10px'}">
<el-popover> <el-popover>
<img :src="sopList[index].sopUrl" slot="reference" class="image"/> <img :src="sopList[index].sopUrl" slot="reference" class="image"/>
<el-image class="imagePreview" :src="sopList[index].sopUrl" :preview-src-list="imageList"></el-image> <el-image :preview-src-list="imageList" :src="sopList[index].sopUrl"
class="imagePreview"></el-image>
</el-popover> </el-popover>
<div style="text-align:center;padding-top:12px"> <div style="text-align:center;padding-top:12px">
<span> <span>
@ -64,9 +66,10 @@
</div> </div>
</template> </template>
<script> <script>
import { listSop, getSop, delSop, addSop, updateSop } from "@/api/mes/md/sop"; import {addSop, delSop, getSop, listSop, updateSop} from "@/api/mes/md/sop";
import ImageUpload from "@/components/ImageUpload/index.vue" import ImageUpload from "@/components/ImageUpload/index.vue"
import {listAllProcess} from "@/api/mes/pro/process"; import {listAllProcess} from "@/api/mes/pro/process";
export default{ export default{
name: "SOPTab", name: "SOPTab",
components: {ImageUpload}, components: {ImageUpload},

9
src/views/mes/md/mditem/index.vue
View File

@ -199,7 +199,7 @@
</el-row> </el-row>
<!-- 添加或修改物料产品编码对话框 --> <!-- 添加或修改物料产品编码对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
@ -417,7 +417,8 @@
</el-dialog> </el-dialog>
<!-- 物料导入对话框 --> <!-- 物料导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body
width="400px">
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="1"
@ -452,7 +453,7 @@
</template> </template>
<script> <script>
import {listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/mes/md/mdItem"; import {addMdItem, delMdItem, getMdItem, listMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import ItemBom from "./components/itembom.vue"; import ItemBom from "./components/itembom.vue";
import SOPTab from "./components/sop.vue" import SOPTab from "./components/sop.vue"
@ -460,7 +461,7 @@ import SIPTab from "./components/sip.vue"
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure"; import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";
import {treeselect, getItemType} from "@/api/mes/md/itemtype"; import {getItemType, treeselect} from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {getBarcodeUrl} from "@/api/mes/wm/barcode";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";

11
src/views/mes/md/unitmeasure/index.vue
View File

@ -114,7 +114,7 @@
/> />
<!-- 添加或修改单位对话框 --> <!-- 添加或修改单位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="800px">
<el-form ref="form" :model="form" :rules="rules" label-width="150px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="单位名称" prop="measureName"> <el-form-item label="单位名称" prop="measureName">
<el-input v-model="form.measureName" placeholder="请输入单位名称"/> <el-input v-model="form.measureName" placeholder="请输入单位名称"/>
@ -158,7 +158,14 @@
</template> </template>
<script> <script>
import { listUnitmeasure,listPrimaryUnitmeasure, getUnitmeasure, delUnitmeasure, addUnitmeasure, updateUnitmeasure } from "@/api/mes/md/unitmeasure"; import {
addUnitmeasure,
delUnitmeasure,
getUnitmeasure,
listPrimaryUnitmeasure,
listUnitmeasure,
updateUnitmeasure
} from "@/api/mes/md/unitmeasure";
export default { export default {
name: "Unitmeasure", name: "Unitmeasure",

15
src/views/mes/md/vendor/index.vue vendored
View File

@ -134,7 +134,8 @@
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:md:vendor:query']" v-hasPermi="['mes:md:vendor:query']"
>{{scope.row.vendorCode}}</el-button> >{{ scope.row.vendorCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商名称" align="center" prop="vendorName" width="150px" :show-overflow-tooltip="true"/> <el-table-column label="供应商名称" align="center" prop="vendorName" width="150px" :show-overflow-tooltip="true"/>
@ -181,7 +182,7 @@
/> />
<!-- 添加或修改供应商对话框 --> <!-- 添加或修改供应商对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
@ -194,9 +195,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -364,7 +365,8 @@
</el-dialog> </el-dialog>
<!-- 供应商导入对话框 --> <!-- 供应商导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body
width="400px">
<el-upload <el-upload
ref="upload" ref="upload"
:limit="1" :limit="1"
@ -397,10 +399,11 @@
</template> </template>
<script> <script>
import { listVendor, getVendor, delVendor, addVendor, updateVendor } from "@/api/mes/md/vendor"; import {addVendor, delVendor, getVendor, listVendor, updateVendor} from "@/api/mes/md/vendor";
import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {getBarcodeUrl} from "@/api/mes/wm/barcode";
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Vendor", name: "Vendor",
dicts: ['sys_yes_no','mes_vendor_level'], dicts: ['sys_yes_no','mes_vendor_level'],

11
src/views/mes/md/workshop/index.vue
View File

@ -108,7 +108,7 @@
/> />
<!-- 添加或修改车间对话框 --> <!-- 添加或修改车间对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -118,10 +118,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-if="optType != 'view'"
v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -181,8 +181,9 @@
</template> </template>
<script> <script>
import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/mes/md/workshop"; import {addWorkshop, delWorkshop, getWorkshop, listWorkshop, updateWorkshop} from "@/api/mes/md/workshop";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Workshop", name: "Workshop",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],

11
src/views/mes/md/workstation/components/tool.vue
View File

@ -24,7 +24,7 @@
</el-table> </el-table>
<!-- 添加或修改工装夹具资源对话框 --> <!-- 添加或修改工装夹具资源对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="工装夹具类型" prop="toolTypeId"> <el-form-item label="工装夹具类型" prop="toolTypeId">
@ -50,8 +50,15 @@
</template> </template>
<script> <script>
import { listWorkstationtool, getWorkstationtool, delWorkstationtool, addWorkstationtool, updateWorkstationtool } from "@/api/mes/md/workstationtool"; import {
addWorkstationtool,
delWorkstationtool,
getWorkstationtool,
listWorkstationtool,
updateWorkstationtool
} from "@/api/mes/md/workstationtool";
import {listAllTooltype} from "@/api/mes/tm/tooltype" import {listAllTooltype} from "@/api/mes/tm/tooltype"
export default { export default {
name: "Workstationtool", name: "Workstationtool",
data() { data() {

11
src/views/mes/md/workstation/components/worker.vue
View File

@ -24,7 +24,7 @@
</el-table> </el-table>
<!-- 添加或修改人力资源对话框 --> <!-- 添加或修改人力资源对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="岗位" prop="postId"> <el-form-item label="岗位" prop="postId">
<el-select v-model="form.postId" placeholder="请选择岗位"> <el-select v-model="form.postId" placeholder="请选择岗位">
@ -50,8 +50,15 @@
</template> </template>
<script> <script>
import { listWorkstationworker, getWorkstationworker, delWorkstationworker, addWorkstationworker, updateWorkstationworker } from "@/api/mes/md/workstationworker"; import {
addWorkstationworker,
delWorkstationworker,
getWorkstationworker,
listWorkstationworker,
updateWorkstationworker
} from "@/api/mes/md/workstationworker";
import {listAllPost} from "@/api/system/post"; import {listAllPost} from "@/api/system/post";
export default { export default {
name: "Workstationworker", name: "Workstationworker",
data() { data() {

18
src/views/mes/md/workstation/index.vue
View File

@ -153,7 +153,7 @@
/> />
<!-- 添加或修改工作站对话框 --> <!-- 添加或修改工作站对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
@ -166,9 +166,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -263,7 +263,8 @@
<span>设备资源</span> <span>设备资源</span>
<el-button style="float:right; padding: 3px 0" @click="handleMachineryAdd" v-if="optType !='view'" type="text">新增</el-button> <el-button style="float:right; padding: 3px 0" @click="handleMachineryAdd" v-if="optType !='view'" type="text">新增</el-button>
</div> </div>
<WorkStationMachine ref="machineryList" :optType="optType" :workstationId="form.workstationId" style="align:center"></WorkStationMachine> <WorkStationMachine ref="machineryList" :optType="optType" :workstationId="form.workstationId"
style="align:center"></WorkStationMachine>
</el-card> </el-card>
</el-carousel-item> </el-carousel-item>
<el-carousel-item> <el-carousel-item>
@ -297,7 +298,13 @@
</template> </template>
<script> <script>
import { listWorkstation, getWorkstation, delWorkstation, addWorkstation, updateWorkstation } from "@/api/mes/md/workstation"; import {
addWorkstation,
delWorkstation,
getWorkstation,
listWorkstation,
updateWorkstation
} from "@/api/mes/md/workstation";
//设备资源选择与保存 //设备资源选择与保存
import WorkStationMachine from "./components/machine"; import WorkStationMachine from "./components/machine";
import MachinerySelectSingle from "@/components/machinerySelect/single.vue"; import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
@ -312,6 +319,7 @@ import {listAllProcess} from "@/api/mes/pro/process";
import {genCode} from "@/api/system/autocode/rule"; import {genCode} from "@/api/system/autocode/rule";
import {listAllWorkshop} from "@/api/mes/md/workshop"; import {listAllWorkshop} from "@/api/mes/md/workshop";
import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {getBarcodeUrl} from "@/api/mes/wm/barcode";
export default { export default {
name: "Workstation", name: "Workstation",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],

12
src/views/mes/pro/process/content.vue
View File

@ -82,12 +82,12 @@
/> />
<!-- 添加或修改生产工序内容对话框 --> <!-- 添加或修改生产工序内容对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="顺序编号" prop="orderNum"> <el-form-item label="顺序编号" prop="orderNum">
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入顺序编号" /> <el-input-number v-model="form.orderNum" :min="1" placeholder="请输入顺序编号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -132,7 +132,13 @@
</template> </template>
<script> <script>
import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/processcontent"; import {
addProcesscontent,
delProcesscontent,
getProcesscontent,
listProcesscontent,
updateProcesscontent
} from "@/api/mes/pro/processcontent";
export default { export default {
name: "Processcontent", name: "Processcontent",

10
src/views/mes/qc/defectrecord/index.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<el-dialog title="缺陷记录" <el-dialog title="缺陷记录"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :close-on-click-modal="false"
:modal= false :modal= false
width="80%" :visible.sync="showFlag"
center center
width="80%"
> >
<el-row :gutter="10" v-if="optType !='view'" class="mb8"> <el-row :gutter="10" v-if="optType !='view'" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
@ -24,7 +25,8 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>常见缺陷</el-button> >常见缺陷
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -82,7 +84,7 @@
</template> </template>
<script> <script>
import { listDefectrecord, getDefectrecord, delDefectrecord, addDefectrecord, updateDefectrecord } from "@/api/mes/qc/defectrecord"; import {delDefectrecord, listDefectrecord, updateDefectrecord} from "@/api/mes/qc/defectrecord";
export default { export default {
name: "Defectrecord", name: "Defectrecord",

14
src/views/mes/qc/ipqc/index.vue
View File

@ -107,13 +107,14 @@
<el-table v-loading="loading" :data="ipqcList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ipqcList" @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="检验单编号" width="150px" align="center" prop="ipqcCode" > <el-table-column align="center" label="检验单编号" prop="ipqcCode" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:qc:ipqc:query']" v-hasPermi="['mes:qc:ipqc:query']"
>{{scope.row.ipqcCode}}</el-button> >{{ scope.row.ipqcCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验类型" align="center" prop="ipqcType"> <el-table-column label="检验类型" align="center" prop="ipqcType">
@ -175,7 +176,7 @@
/> />
<!-- 添加或修改过程检验单对话框 --> <!-- 添加或修改过程检验单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -186,9 +187,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -383,11 +384,12 @@
</template> </template>
<script> <script>
import { listIpqc, getIpqc, delIpqc, addIpqc, updateIpqc } from "@/api/mes/qc/ipqc"; import {addIpqc, delIpqc, getIpqc, listIpqc, updateIpqc} from "@/api/mes/qc/ipqc";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue" import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import Ipqcline from "./line.vue" import Ipqcline from "./line.vue"
export default { export default {
name: "Ipqc", name: "Ipqc",
components: {WorkorderSelect,WorkstationSelect,Ipqcline}, components: {WorkorderSelect,WorkstationSelect,Ipqcline},

11
src/views/mes/qc/iqc/iqc.vue
View File

@ -215,7 +215,7 @@
/> />
<!-- 添加或修改来料检验单对话框 --> <!-- 添加或修改来料检验单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="1080px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -226,9 +226,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -400,12 +400,13 @@
</template> </template>
<script> <script>
import { listIqc, getIqc, delIqc, addIqc, updateIqc } from "@/api/mes/qc/iqc"; import {addIqc, delIqc, getIqc, listIqc, updateIqc} from "@/api/mes/qc/iqc";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import IqcLine from "./iqcline.vue"; import IqcLine from "./iqcline.vue";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import {getReport,getReport2} from "@/api/mes/report/report" import {getReport2} from "@/api/mes/report/report"
export default { export default {
name: "Iqc", name: "Iqc",
dicts: ['mes_qc_result','mes_order_status'], dicts: ['mes_qc_result','mes_order_status'],

22
src/views/mes/qc/oqc/index.vue
View File

@ -104,14 +104,15 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="oqcList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="oqcList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="出货检验单编号" width="150px" align="center" prop="oqcCode" > <el-table-column align="center" label="出货检验单编号" prop="oqcCode" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:qc:oqc:query']" v-hasPermi="['mes:qc:oqc:query']"
>{{scope.row.oqcCode}}</el-button> >{{ scope.row.oqcCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="验单名称" width="100px" align="center" prop="oqcName" :show-overflow-tooltip="true"/> <el-table-column label="验单名称" width="100px" align="center" prop="oqcName" :show-overflow-tooltip="true"/>
@ -180,7 +181,7 @@
/> />
<!-- 添加或修改出货检验单对话框 --> <!-- 添加或修改出货检验单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -192,9 +193,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -220,7 +221,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品名称" prop="itemName"> <el-form-item label="产品名称" prop="itemName">
<el-input readonly="readonly" v-model="form.itemName"></el-input> <el-input v-model="form.itemName" readonly="readonly"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -347,12 +348,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="严重缺陷率" prop="majRate"> <el-form-item label="严重缺陷率" prop="majRate">
<el-input readonly="readonly" v-model="form.majRate" /> <el-input v-model="form.majRate" readonly="readonly"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="轻微缺陷率" prop="minRate"> <el-form-item label="轻微缺陷率" prop="minRate">
<el-input readonly="readonly" v-model="form.minRate" /> <el-input v-model="form.minRate" readonly="readonly"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -374,11 +375,12 @@
</template> </template>
<script> <script>
import { listOqc, getOqc, delOqc, addOqc, updateOqc } from "@/api/mes/qc/oqc"; import {addOqc, delOqc, getOqc, listOqc, updateOqc} from "@/api/mes/qc/oqc";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import {genCode} from "@/api/system/autocode/rule"; import {genCode} from "@/api/system/autocode/rule";
import Oqcline from "./line.vue"; import Oqcline from "./line.vue";
export default { export default {
name: "Oqc", name: "Oqc",
dicts: ['mes_order_status','mes_qc_result'], dicts: ['mes_order_status','mes_qc_result'],

6
src/views/mes/qc/qcdefect/index.vue
View File

@ -123,12 +123,12 @@
/> />
<!-- 添加或修改常见缺陷对话框 --> <!-- 添加或修改常见缺陷对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="缺陷描述" prop="defectName"> <el-form-item label="缺陷描述" prop="defectName">
<el-input v-model="form.defectName" type="textarea" placeholder="请输入缺陷描述" /> <el-input v-model="form.defectName" placeholder="请输入缺陷描述" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -169,7 +169,7 @@
</template> </template>
<script> <script>
import { listQcdefect, getQcdefect, delQcdefect, addQcdefect, updateQcdefect } from "@/api/mes/qc/qcdefect"; import {addQcdefect, delQcdefect, getQcdefect, listQcdefect, updateQcdefect} from "@/api/mes/qc/qcdefect";
export default { export default {
name: "Qcdefect", name: "Qcdefect",

5
src/views/mes/qc/qcindex/index.vue
View File

@ -118,7 +118,7 @@
/> />
<!-- 添加或修改检测项对话框 --> <!-- 添加或修改检测项对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -178,8 +178,9 @@
</template> </template>
<script> <script>
import { listQcindex, getQcindex, delQcindex, addQcindex, updateQcindex } from "@/api/mes/qc/qcindex"; import {addQcindex, delQcindex, getQcindex, listQcindex, updateQcindex} from "@/api/mes/qc/qcindex";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Qcindex", name: "Qcindex",
dicts: ['mes_index_type'], dicts: ['mes_index_type'],

12
src/views/mes/qc/qctemplate/index.vue
View File

@ -134,7 +134,7 @@
/> />
<!-- 添加或修改检测模板对话框 --> <!-- 添加或修改检测模板对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -145,9 +145,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -164,7 +164,8 @@
<el-checkbox v-for="dict in dict.type.mes_qc_type" <el-checkbox v-for="dict in dict.type.mes_qc_type"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox> :value="dict.value">{{ dict.label }}
</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -214,10 +215,11 @@
</template> </template>
<script> <script>
import { listQctemplate, getQctemplate, delQctemplate, addQctemplate, updateQctemplate } from "@/api/mes/qc/qctemplate"; import {addQctemplate, delQctemplate, getQctemplate, listQctemplate, updateQctemplate} from "@/api/mes/qc/qctemplate";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import TemplateIndex from "./templateindex.vue" import TemplateIndex from "./templateindex.vue"
import TemplateProduct from "./templateproduct"; import TemplateProduct from "./templateproduct";
export default { export default {
name: "Qctemplate", name: "Qctemplate",
dicts: ['sys_yes_no','mes_qc_type'], dicts: ['sys_yes_no','mes_qc_type'],

13
src/views/mes/qc/qctemplate/templateindex.vue
View File

@ -79,13 +79,13 @@
/> />
<!-- 添加或修改检测模板-检测项对话框 --> <!-- 添加或修改检测模板-检测项对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检测项" prop="indexId"> <el-form-item label="检测项" prop="indexId">
<el-input v-model="form.indexName" placeholder="请选择检测项"> <el-input v-model="form.indexName" placeholder="请选择检测项">
<el-button slot="append" @click="handleSelectIndex" icon="el-icon-search"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSelectIndex"></el-button>
</el-input> </el-input>
<IndexSelect ref="indexSelect" @onSelected="onIndexSelected"></IndexSelect> <IndexSelect ref="indexSelect" @onSelected="onIndexSelected"></IndexSelect>
</el-form-item> </el-form-item>
@ -160,9 +160,16 @@
</template> </template>
<script> <script>
import { listTemplateindex, getTemplateindex, delTemplateindex, addTemplateindex, updateTemplateindex } from "@/api/mes/qc/templateindex"; import {
addTemplateindex,
delTemplateindex,
getTemplateindex,
listTemplateindex,
updateTemplateindex
} from "@/api/mes/qc/templateindex";
import IndexSelect from "@/components/qcindexSelect/single.vue"; import IndexSelect from "@/components/qcindexSelect/single.vue";
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure"; import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
export default { export default {
name: "Templateindex", name: "Templateindex",
dicts: ['mes_index_type'], dicts: ['mes_index_type'],

15
src/views/mes/qc/qctemplate/templateproduct.vue
View File

@ -88,13 +88,13 @@
/> />
<!-- 添加或修改检测模板-产品对话框 --> <!-- 添加或修改检测模板-产品对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品物料编码" prop="itemCode"> <el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码"> <el-input v-model="form.itemCode" placeholder="请输入产品物料编码">
<el-button slot="append" @click="handleSelectItem" icon="el-icon-search"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSelectItem"></el-button>
</el-input> </el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect> <ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-form-item> </el-form-item>
@ -157,7 +157,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -172,8 +172,15 @@
</template> </template>
<script> <script>
import { listTemplateproduct, getTemplateproduct, delTemplateproduct, addTemplateproduct, updateTemplateproduct } from "@/api/mes/qc/templateproduct"; import {
addTemplateproduct,
delTemplateproduct,
getTemplateproduct,
listTemplateproduct,
updateTemplateproduct
} from "@/api/mes/qc/templateproduct";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
name: "Templateproduct", name: "Templateproduct",
components: {ItemSelect}, components: {ItemSelect},

9
src/views/mes/tm/tool/index.vue
View File

@ -186,7 +186,7 @@
/> />
<!-- 添加或修改工装夹具清单对话框 --> <!-- 添加或修改工装夹具清单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -228,9 +228,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -304,9 +304,10 @@
</template> </template>
<script> <script>
import { listTool, getTool, delTool, addTool, updateTool } from "@/api/mes/tm/tool"; import {addTool, delTool, getTool, listTool, updateTool} from "@/api/mes/tm/tool";
import {listAllTooltype} from "@/api/mes/tm/tooltype" import {listAllTooltype} from "@/api/mes/tm/tooltype"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Tool", name: "Tool",
dicts: ['mes_tool_status', 'mes_mainten_type'], dicts: ['mes_tool_status', 'mes_mainten_type'],

18
src/views/mes/tm/tooltype/index.vue
View File

@ -80,14 +80,15 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="类型编码" align="center" prop="toolTypeCode" > <el-table-column align="center" label="类型编码" prop="toolTypeCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:tm:tooltype:query']" v-hasPermi="['mes:tm:tooltype:query']"
>{{scope.row.toolTypeCode}}</el-button> >{{ scope.row.toolTypeCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="类型名称" align="center" prop="toolTypeName" :show-overflow-tooltip="true"/> <el-table-column label="类型名称" align="center" prop="toolTypeName" :show-overflow-tooltip="true"/>
@ -139,7 +140,7 @@
/> />
<!-- 添加或修改工装夹具类型对话框 --> <!-- 添加或修改工装夹具类型对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -149,9 +150,9 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -200,7 +201,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -215,8 +216,9 @@
</template> </template>
<script> <script>
import { listTooltype, getTooltype, delTooltype, addTooltype, updateTooltype } from "@/api/mes/tm/tooltype"; import {addTooltype, delTooltype, getTooltype, listTooltype, updateTooltype} from "@/api/mes/tm/tooltype";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Tooltype", name: "Tooltype",
dicts: ['mes_mainten_type','sys_yes_no'], dicts: ['mes_mainten_type','sys_yes_no'],

9
src/views/mes/wm/area/index.vue
View File

@ -152,7 +152,7 @@
/> />
<!-- 添加或修改库位设置对话框 --> <!-- 添加或修改库位设置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
@ -236,22 +236,23 @@
</div> </div>
</el-dialog> </el-dialog>
<!--选择库区--> <!--选择库区-->
<el-dialog :visible.sync="selecocationVisible" title="选择库区"> <el-dialog :close-on-click-modal="false" :visible.sync="selecocationVisible" title="选择库区">
<selec-location-cmps @select="selecoLocationHandle"></selec-location-cmps> <selec-location-cmps @select="selecoLocationHandle"></selec-location-cmps>
</el-dialog> </el-dialog>
<!--选择库位--> <!--选择库位-->
<el-dialog :visible.sync="selecareaVisible" title="选择库位"> <el-dialog :close-on-click-modal="false" :visible.sync="selecareaVisible" title="选择库位">
<selec-area-cmps v-if="selecareaVisible" @selectArea="selecoAreaHandle"></selec-area-cmps> <selec-area-cmps v-if="selecareaVisible" @selectArea="selecoAreaHandle"></selec-area-cmps>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listArea, getArea, delArea, addArea, updateArea, changeFrozenState } from "@/api/mes/wm/area"; import {addArea, changeFrozenState, delArea, getArea, listArea, updateArea} from "@/api/mes/wm/area";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import BarcodeImg from "@/components/barcodeImg/index.vue" import BarcodeImg from "@/components/barcodeImg/index.vue"
import SelecLocationCmps from "@/components/wm/SelecLocationCmps.vue"; import SelecLocationCmps from "@/components/wm/SelecLocationCmps.vue";
import SelecAreaCmps from "@/components/wm/SelecAreaCmps.vue"; import SelecAreaCmps from "@/components/wm/SelecAreaCmps.vue";
export default { export default {
name: "Area", name: "Area",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],

17
src/views/mes/wm/barcode/batchprint.vue
View File

@ -1,11 +1,11 @@
<template> <template>
<el-dialog title="批量打印" <el-dialog title="批量打印"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :close-on-click-modal="false"
:modal=false :modal=false
width="80%" :visible.sync="showFlag"
center center
> width="80%">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="条码类型" prop="barcodeType"> <el-form-item label="条码类型" prop="barcodeType">
<el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型"> <el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型">
@ -36,10 +36,11 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="barcodeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="barcodeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="条码" align="center"> <el-table-column label="条码" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image @click="handleView(scope.row)" class="barcodeClass" fit="scale-down" :src="scope.row.barcodeUrl"> <el-image :src="scope.row.barcodeUrl" class="barcodeClass" fit="scale-down"
@click="handleView(scope.row)">
<div slot="error" class="image-slot"> <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i> <i class="el-icon-picture-outline"></i>
</div> </div>
@ -59,7 +60,7 @@
<el-table-column label="条码内容" align="center" prop="barcodeContent" /> <el-table-column label="条码内容" align="center" prop="barcodeContent" />
<el-table-column label="业务编码" align="center" prop="bussinessCode" /> <el-table-column label="业务编码" align="center" prop="bussinessCode" />
<el-table-column label="业务名称" align="center" prop="bussinessName" /> <el-table-column label="业务名称" align="center" prop="bussinessName" />
<el-table-column label="是否生效" align="center" prop="enableFlag" > <el-table-column align="center" label="是否生效" prop="enableFlag">
<template slot-scope="scope"> <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> </template>
@ -86,7 +87,8 @@
</template> </template>
<script> <script>
import { listBarcode, updateBarcode } from "@/api/mes/wm/barcode"; import {listBarcode} from "@/api/mes/wm/barcode";
export default { export default {
name: "BatchPrint", name: "BatchPrint",
dicts: ['sys_yes_no', 'mes_barcode_type','mes_barcode_formart'], dicts: ['sys_yes_no', 'mes_barcode_type','mes_barcode_formart'],
@ -167,4 +169,3 @@
} }
}; };
</script> </script>

11
src/views/mes/wm/barcode/config.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<el-dialog title="赋码设置" <el-dialog title="赋码设置"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :close-on-click-modal="false"
:modal=false :modal=false
width="80%" :visible.sync="showFlag"
center center
> width="80%">
<el-table v-loading="loading" :data="barcodeconfigList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="barcodeconfigList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="赋码类型" align="center" prop="barcodeType"> <el-table-column label="赋码类型" align="center" prop="barcodeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_type" :value="scope.row.barcodeType"/> <dict-tag :options="dict.type.mes_barcode_type" :value="scope.row.barcodeType"/>
@ -57,8 +57,9 @@
</template> </template>
<script> <script>
import { listBarcodeconfig, getBarcodeconfig, delBarcodeconfig, addBarcodeconfig, updateBarcodeconfig } from "@/api/mes/wm/barcodeconfig"; import {addBarcodeconfig, getBarcodeconfig, listBarcodeconfig, updateBarcodeconfig} from "@/api/mes/wm/barcodeconfig";
import ReportSelect from "@/components/reportSelect/single.vue"; import ReportSelect from "@/components/reportSelect/single.vue";
export default { export default {
name: "Barcodeconfig", name: "Barcodeconfig",
components: {ReportSelect}, components: {ReportSelect},

17
src/views/mes/wm/barcode/index.vue
View File

@ -81,10 +81,10 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="barcodeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="barcodeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="条码" align="center"> <el-table-column label="条码" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image @click="handleView(scope.row)" class="barcodeClass" fit="scale-down" :src="scope.row.barcodeUrl"> <el-image :src="scope.row.barcodeUrl" class="barcodeClass" fit="scale-down" @click="handleView(scope.row)">
<div slot="error" class="image-slot"> <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i> <i class="el-icon-picture-outline"></i>
</div> </div>
@ -138,7 +138,7 @@
/> />
<!-- 添加或修改条码清单对话框 --> <!-- 添加或修改条码清单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -311,14 +311,14 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <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-if="optType !='view' ">保 存</el-button> <el-button v-if="optType !='view' " type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -326,7 +326,7 @@
</template> </template>
<script> <script>
import { listBarcode, getBarcode, delBarcode, addBarcode, updateBarcode } from "@/api/mes/wm/barcode"; import {addBarcode, delBarcode, getBarcode, listBarcode, updateBarcode} from "@/api/mes/wm/barcode";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import PackageSelectSingle from "@/components/package/single.vue"; import PackageSelectSingle from "@/components/package/single.vue";
@ -335,7 +335,7 @@ import StockSelect from "@/components/stockSelect/single.vue"
import Barcodeconfig from "./config.vue" import Barcodeconfig from "./config.vue"
import BarcodeBatchPrint from "./batchprint.vue" import BarcodeBatchPrint from "./batchprint.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import { checkPermi } from "@/utils/permission.js";
export default { export default {
name: "Barcode", name: "Barcode",
dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'], dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'],
@ -541,7 +541,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
debugger; debugger;

4
src/views/mes/wm/inPlan/index.vue
View File

@ -125,7 +125,7 @@
>删除 >删除
</el-button> </el-button>
<!--下发操作对话框--> <!--下发操作对话框-->
<el-dialog :visible.sync="issueVisible" title="执行操作确认" width="30%"> <el-dialog :close-on-click-modal="false" :visible.sync="issueVisible" title="执行操作确认" width="30%">
<span>是否进行执行操作，该操作无法撤销</span> <span>是否进行执行操作，该操作无法撤销</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="issueVisible=false">取 消</el-button> <el-button @click="issueVisible=false">取 消</el-button>
@ -254,7 +254,7 @@
</template> </template>
<script> <script>
import {listPLAN, getPLAN, delPLAN, addPLAN, updatePLAN} from "@/api/wm/PLAN"; import {addPLAN, delPLAN, getPLAN, listPLAN, updatePLAN} from "@/api/wm/PLAN";
import {listTYPE} from "@/api/md/TYPE"; import {listTYPE} from "@/api/md/TYPE";
import {listMdItem} from "@/api/mes/md/mdItem" import {listMdItem} from "@/api/mes/md/mdItem"
import {listArea} from "@/api/mes/wm/area" import {listArea} from "@/api/mes/wm/area"

46
src/views/mes/wm/issue/index.vue
View File

@ -96,21 +96,22 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="issueheaderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="issueheaderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="领料单编号" align="center" width="150px" prop="issueCode" > <el-table-column align="center" label="领料单编号" prop="issueCode" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:wm:issueheader:query']" v-hasPermi="['mes:wm:issueheader:query']"
>{{scope.row.issueCode}}</el-button> >{{ scope.row.issueCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/> <el-table-column :show-overflow-tooltip="true" align="center" label="领料单名称" prop="issueName"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" /> <el-table-column align="center" label="生产工单" prop="workorderCode"/>
<el-table-column label="工作站" align="center" prop="workstationName" /> <el-table-column align="center" label="工作站" prop="workstationName"/>
<el-table-column label="客户编号" align="center" prop="clientCode" /> <el-table-column align="center" label="客户编号" prop="clientCode"/>
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column align="center" label="客户名称" prop="clientName"/>
<el-table-column label="领料日期" align="center" prop="issueDate" width="180"> <el-table-column label="领料日期" align="center" prop="issueDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d} {h}:{i}') }}</span> <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d} {h}:{i}') }}</span>
@ -160,7 +161,7 @@
/> />
<!-- 添加或修改生产领料单头对话框 --> <!-- 添加或修改生产领料单头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -171,9 +172,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -215,7 +216,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工作站名称" prop="workstationName"> <el-form-item label="工作站名称" prop="workstationName">
<el-input v-model="form.workstationName" readonly placeholder="请选择工作站" > <el-input v-model="form.workstationName" placeholder="请选择工作站" readonly>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -242,11 +243,13 @@
</el-form> </el-form>
<el-divider v-if="form.issueId !=null" content-position="center">物料信息</el-divider> <el-divider v-if="form.issueId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.issueId !=null" class="box-card"> <el-card shadow="always" v-if="form.issueId !=null" class="box-card">
<Issueline ref="line" :issueId="form.issueId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Issueline> <Issueline ref="line" :areaId="form.areaId" :issueId="form.issueId" :locationId="form.locationId"
:optType="optType" :warehouseId="form.warehouseId"></Issueline>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button v-if="optType =='view' || form.status !='PREPARE' " type="primary" @click="cancel">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">确 定
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -254,12 +257,20 @@
</template> </template>
<script> <script>
import { listIssueheader, getIssueheader, delIssueheader, addIssueheader, updateIssueheader, execute } from "@/api/mes/wm/issueheader"; import {
addIssueheader,
delIssueheader,
execute,
getIssueheader,
listIssueheader,
updateIssueheader
} from "@/api/mes/wm/issueheader";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue" import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import Issueline from "./line.vue"; import Issueline from "./line.vue";
export default { export default {
name: "Issueheader", name: "Issueheader",
dicts: ['mes_order_status'], dicts: ['mes_order_status'],
@ -355,7 +366,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

15
src/views/mes/wm/issue/line.vue
View File

@ -9,7 +9,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:wm:issueheader:add']" v-hasPermi="['mes:wm:issueheader:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -79,16 +80,17 @@
/> />
<!-- 添加或修改生产领料单行对话框 --> <!-- 添加或修改生产领料单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode"> <el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" > <el-input v-model="form.itemCode" placeholder="请选择产品物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId" @onSelected="onStockSelected"></StockSelect> <StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId"
@onSelected="onStockSelected"></StockSelect>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName"> <el-form-item label="产品物料名称" prop="itemName">
@ -157,8 +159,9 @@
</template> </template>
<script> <script>
import { listIssueline, getIssueline, delIssueline, addIssueline, updateIssueline } from "@/api/mes/wm/issueline"; import {addIssueline, delIssueline, getIssueline, listIssueline, updateIssueline} from "@/api/mes/wm/issueline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
export default { export default {
name: "Issueline", name: "Issueline",
components:{StockSelect}, components:{StockSelect},

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

@ -222,7 +222,7 @@
/> />
<!-- 添加或修改物料消耗记录对话框 --> <!-- 添加或修改物料消耗记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="生产工单ID" prop="workorderId"> <el-form-item label="生产工单ID" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID"/> <el-input v-model="form.workorderId" placeholder="请输入生产工单ID"/>
@ -290,7 +290,13 @@
</template> </template>
<script> <script>
import { listItemconsume, getItemconsume, delItemconsume, addItemconsume, updateItemconsume } from "@/api/mes/wm/itemconsume"; import {
addItemconsume,
delItemconsume,
getItemconsume,
listItemconsume,
updateItemconsume
} from "@/api/mes/wm/itemconsume";
export default { export default {

10
src/views/mes/wm/itemconsume/line.vue
View File

@ -240,7 +240,7 @@
/> />
<!-- 添加或修改物料消耗记录行对话框 --> <!-- 添加或修改物料消耗记录行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="消耗记录ID" prop="recordId"> <el-form-item label="消耗记录ID" prop="recordId">
<el-input v-model="form.recordId" placeholder="请输入消耗记录ID"/> <el-input v-model="form.recordId" placeholder="请输入消耗记录ID"/>
@ -309,7 +309,13 @@
</template> </template>
<script> <script>
import { listItemconsumeline, getItemconsumeline, delItemconsumeline, addItemconsumeline, updateItemconsumeline } from "@/api/mes/wm/itemconsumeline"; import {
addItemconsumeline,
delItemconsumeline,
getItemconsumeline,
listItemconsumeline,
updateItemconsumeline
} from "@/api/mes/wm/itemconsumeline";
export default { export default {
name: "Itemconsumeline", name: "Itemconsumeline",

32
src/views/mes/wm/itemrecpt/index.vue
View File

@ -94,7 +94,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="itemrecptList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="itemrecptList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="入库单编号" align="center" width="180px" prop="recptCode" > <el-table-column label="入库单编号" align="center" width="180px" prop="recptCode" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -105,14 +105,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/> <el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/>
<el-table-column label="供应商名称" align="center" prop="vendorName" :show-overflow-tooltip="true"/> <el-table-column :show-overflow-tooltip="true" align="center" label="供应商名称" prop="vendorName"/>
<el-table-column label="入库日期" align="center" prop="recptDate" width="180"> <el-table-column label="入库日期" align="center" prop="recptDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购订单号" align="center" prop="poCode" /> <el-table-column label="采购订单号" align="center" prop="poCode" />
<el-table-column label="单据状态" align="center" prop="status" > <el-table-column align="center" label="单据状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template> </template>
@ -156,7 +156,7 @@
/> />
<!-- 添加或修改物料入库单对话框 --> <!-- 添加或修改物料入库单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="1000px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -167,9 +167,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -184,9 +184,9 @@
<el-form-item label="入库日期" prop="recptDate"> <el-form-item label="入库日期" prop="recptDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.recptDate" v-model="form.recptDate"
placeholder="请选择入库日期"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
placeholder="请选择入库日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -245,7 +245,8 @@
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保 存
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -253,12 +254,20 @@
</template> </template>
<script> <script>
import { listItemrecpt, getItemrecpt, delItemrecpt, addItemrecpt, updateItemrecpt, confirmItemrecpt,execute } from "@/api/mes/wm/itemrecpt"; import {
addItemrecpt,
delItemrecpt,
execute,
getItemrecpt,
listItemrecpt,
updateItemrecpt
} from "@/api/mes/wm/itemrecpt";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue"; import IqcSelect from "@/components/iqcSelect/single.vue";
import Itemrecptline from "./line.vue"; import Itemrecptline from "./line.vue";
export default { export default {
name: "Itemrecpt", name: "Itemrecpt",
dicts:['mes_order_status'], dicts:['mes_order_status'],
@ -356,7 +365,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

16
src/views/mes/wm/itemrecpt/line.vue
View File

@ -76,12 +76,12 @@
/> />
<!-- 添加或修改物料入库单行对话框 --> <!-- 添加或修改物料入库单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" > <el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -176,10 +176,17 @@
</template> </template>
<script> <script>
import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline"; import {
addItemrecptline,
delItemrecptline,
getItemrecptline,
listItemrecptline,
updateItemrecptline
} from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue"; import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Itemrecptline", name: "Itemrecptline",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
@ -276,7 +283,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
debugger; debugger;

14
src/views/mes/wm/location/index.vue
View File

@ -104,7 +104,7 @@
/> />
<!-- 添加或修改库区设置对话框 --> <!-- 添加或修改库区设置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="140px"> <el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
@ -165,17 +165,25 @@
</div> </div>
</el-dialog> </el-dialog>
<!--选择库房--> <!--选择库房-->
<el-dialog :visible.sync="selectWareHouseVisible" title="选择库房"> <el-dialog :close-on-click-modal="false" :visible.sync="selectWareHouseVisible" title="选择库房">
<select-ware-house-cmps v-if="selectWareHouseVisible" @select="selectWareHouseHandle"></select-ware-house-cmps> <select-ware-house-cmps v-if="selectWareHouseVisible" @select="selectWareHouseHandle"></select-ware-house-cmps>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listLocation, getLocation, delLocation, addLocation, updateLocation, changeFrozenState} from "@/api/mes/wm/location"; import {
addLocation,
changeFrozenState,
delLocation,
getLocation,
listLocation,
updateLocation
} from "@/api/mes/wm/location";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import BarcodeImg from "@/components/barcodeImg/index.vue" import BarcodeImg from "@/components/barcodeImg/index.vue"
import SelectWareHouseCmps from "@/components/wm/SelectWareHouseCmps.vue"; import SelectWareHouseCmps from "@/components/wm/SelectWareHouseCmps.vue";
export default { export default {
name: "Location", name: "Location",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],

45
src/views/mes/wm/outsourceissue/index.vue
View File

@ -138,7 +138,7 @@
/> />
<!-- 添加或修改外协领料单头对话框 --> <!-- 添加或修改外协领料单头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -149,9 +149,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -227,11 +227,13 @@
</el-form> </el-form>
<el-divider v-if="form.issueId !=null" content-position="center">物料信息</el-divider> <el-divider v-if="form.issueId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.issueId !=null" class="box-card"> <el-card shadow="always" v-if="form.issueId !=null" class="box-card">
<Issueline ref="line" :issueId="form.issueId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Issueline> <Issueline ref="line" :areaId="form.areaId" :issueId="form.issueId" :locationId="form.locationId"
:optType="optType" :warehouseId="form.warehouseId"></Issueline>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button v-if="optType =='view' || form.status !='PREPARE' " type="primary" @click="cancel">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保 存
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -239,11 +241,19 @@
</template> </template>
<script> <script>
import { listOutsourceissue, getOutsourceissue, delOutsourceissue, addOutsourceissue, updateOutsourceissue, execute } from "@/api/mes/wm/outsourceissue"; import {
addOutsourceissue,
delOutsourceissue,
execute,
getOutsourceissue,
listOutsourceissue,
updateOutsourceissue
} from "@/api/mes/wm/outsourceissue";
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import Issueline from "./line.vue"; import Issueline from "./line.vue";
export default { export default {
name: "Outsourceissue", name: "Outsourceissue",
dicts: ['mes_order_status'], dicts: ['mes_order_status'],
@ -286,7 +296,23 @@ export default {
issueCode: null, issueCode: null,
issueName: null, issueName: null,
workorderId: null, workorderId: null,
workorderCode: null, vendorId: null, vendorCode: null, vendorName: null, vendorNick: null, warehouseId: null, warehouseCode: null, warehouseName: null, locationId: null, locationCode: null, locationName: null, areaId: null, areaCode: null, areaName: null, issueDate: null, status: null, }, workorderCode: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
warehouseId: null,
warehouseCode: null,
warehouseName: null,
locationId: null,
locationCode: null,
locationName: null,
areaId: null,
areaCode: null,
areaName: null,
issueDate: null,
status: null,
},
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
@ -322,7 +348,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

17
src/views/mes/wm/outsourceissue/line.vue
View File

@ -79,16 +79,17 @@
/> />
<!-- 添加或修改生产领料单行对话框 --> <!-- 添加或修改生产领料单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode"> <el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" > <el-input v-model="form.itemCode" placeholder="请选择产品物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId" @onSelected="onStockSelected"></StockSelect> <StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId"
@onSelected="onStockSelected"></StockSelect>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName"> <el-form-item label="产品物料名称" prop="itemName">
@ -157,7 +158,13 @@
</template> </template>
<script> <script>
import { listOutsourceissueline, getOutsourceissueline, delOutsourceissueline, addOutsourceissueline, updateOutsourceissueline } from "@/api/mes/wm/outsourceissueline"; import {
addOutsourceissueline,
delOutsourceissueline,
getOutsourceissueline,
listOutsourceissueline,
updateOutsourceissueline
} from "@/api/mes/wm/outsourceissueline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
export default { export default {

26
src/views/mes/wm/outsourcerecpt/line.vue
View File

@ -87,12 +87,12 @@
/> />
<!-- 添加或修改外协入库单行对话框 --> <!-- 添加或修改外协入库单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" > <el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -187,10 +187,17 @@
</template> </template>
<script> <script>
import { listOursourcerecptline, getOursourcerecptline, delOursourcerecptline, addOursourcerecptline, updateOursourcerecptline } from "@/api/mes/wm/oursourcerecptline"; import {
addOursourcerecptline,
delOursourcerecptline,
getOursourcerecptline,
listOursourcerecptline,
updateOursourcerecptline
} from "@/api/mes/wm/oursourcerecptline";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue"; import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Oursourcerecptline", name: "Oursourcerecptline",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
@ -287,7 +294,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
debugger; debugger;
@ -344,7 +352,15 @@ export default {
iqcId: null, iqcId: null,
iqcCode: null, iqcCode: null,
remark: null, remark: null,
attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form"); this.resetForm("form");

5
src/views/mes/wm/package/index.vue
View File

@ -130,7 +130,7 @@
/> />
<!-- 添加或修改装箱单对话框 --> <!-- 添加或修改装箱单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -167,7 +167,7 @@
</template> </template>
<script> <script>
import { listPackage, getPackage, delPackage, addPackage, updatePackage } from "@/api/mes/wm/package"; import {addPackage, delPackage, getPackage, listPackage, updatePackage} from "@/api/mes/wm/package";
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import Packageline from "./line.vue"; import Packageline from "./line.vue";
import SubPackage from "./subpackge.vue"; import SubPackage from "./subpackge.vue";
@ -175,6 +175,7 @@ import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Package", name: "Package",
dicts: ['mes_order_status'], dicts: ['mes_order_status'],

13
src/views/mes/wm/package/line.vue
View File

@ -34,7 +34,7 @@
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="装箱数量" align="center" prop="quantityPackage" /> <el-table-column label="装箱数量" align="center" prop="quantityPackage" />
<el-table-column label="生产工单编号" width="150px" align="center" prop="workorderCode" /> <el-table-column label="生产工单编号" width="150px" align="center" prop="workorderCode" />
<el-table-column label="批次号" align="center" prop="batchCode" /> <el-table-column align="center" label="批次号" prop="batchCode"/>
<el-table-column label="有效期" align="center" prop="expireDate" width="180"> <el-table-column label="有效期" align="center" prop="expireDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
@ -69,7 +69,7 @@
/> />
<!-- 添加或修改装箱明细对话框 --> <!-- 添加或修改装箱明细对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -132,8 +132,15 @@
</template> </template>
<script> <script>
import { listPackageline, getPackageline, delPackageline, addPackageline, updatePackageline } from "@/api/mes/wm/packageline"; import {
addPackageline,
delPackageline,
getPackageline,
listPackageline,
updatePackageline
} from "@/api/mes/wm/packageline";
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
export default { export default {
name: "Packageline", name: "Packageline",
components: { components: {

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

@ -222,7 +222,7 @@
/> />
<!-- 添加或修改产品产出记录对话框 --> <!-- 添加或修改产品产出记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="生产工单ID" prop="workorderId"> <el-form-item label="生产工单ID" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID"/> <el-input v-model="form.workorderId" placeholder="请输入生产工单ID"/>
@ -290,7 +290,13 @@
</template> </template>
<script> <script>
import { listProductproduce, getProductproduce, delProductproduce, addProductproduce, updateProductproduce } from "@/api/mes/wm/productproduce"; import {
addProductproduce,
delProductproduce,
getProductproduce,
listProductproduce,
updateProductproduce
} from "@/api/mes/wm/productproduce";
export default { export default {
name: "Productproduce", name: "Productproduce",

10
src/views/mes/wm/productproduce/line.vue
View File

@ -231,7 +231,7 @@
/> />
<!-- 添加或修改产品产出记录行对话框 --> <!-- 添加或修改产品产出记录行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="产出记录ID" prop="recordId"> <el-form-item label="产出记录ID" prop="recordId">
<el-input v-model="form.recordId" placeholder="请输入产出记录ID"/> <el-input v-model="form.recordId" placeholder="请输入产出记录ID"/>
@ -297,7 +297,13 @@
</template> </template>
<script> <script>
import { listProductproduceline, getProductproduceline, delProductproduceline, addProductproduceline, updateProductproduceline } from "@/api/mes/wm/productproduceline"; import {
addProductproduceline,
delProductproduceline,
getProductproduceline,
listProductproduceline,
updateProductproduceline
} from "@/api/mes/wm/productproduceline";
export default { export default {
name: "Productproduceline", name: "Productproduceline",

17
src/views/mes/wm/productrecpt/line.vue
View File

@ -33,7 +33,8 @@
@click="handleDelete" @click="handleDelete"
v-if="optType != 'view'" v-if="optType != 'view'"
v-hasPermi="['mes:wm:productrecpt:remove']" v-hasPermi="['mes:wm:productrecpt:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -80,7 +81,7 @@
/> />
<!-- 添加或修改产品入库记录行对话框 --> <!-- 添加或修改产品入库记录行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -88,7 +89,8 @@
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码"> <el-input v-model="form.itemCode" placeholder="请输入产品物料编码">
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
</el-input> </el-input>
<StockSelect ref="stockSelect" :workorderId="workorderId" :itemId="itemId" warehouseCode="XBK_VIRTUAL" @onSelected="onStockSelected"></StockSelect> <StockSelect ref="stockSelect" :itemId="itemId" :workorderId="workorderId" warehouseCode="XBK_VIRTUAL"
@onSelected="onStockSelected"></StockSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -148,9 +150,16 @@
</template> </template>
<script> <script>
import { listProductrecptline, getProductrecptline, delProductrecptline, addProductrecptline, updateProductrecptline } from "@/api/mes/wm/productrecptline"; import {
addProductrecptline,
delProductrecptline,
getProductrecptline,
listProductrecptline,
updateProductrecptline
} from "@/api/mes/wm/productrecptline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Productrecptline", name: "Productrecptline",
components:{ components:{

20
src/views/mes/wm/productsalse/index.vue
View File

@ -99,7 +99,7 @@
<el-table-column label="出库单名称" width="150px" align="center" prop="salseName" /> <el-table-column label="出库单名称" width="150px" align="center" prop="salseName" />
<el-table-column label="销售订单编号" width="120px" align="center" prop="soCode" /> <el-table-column label="销售订单编号" width="120px" align="center" prop="soCode" />
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column align="center" label="客户名称" prop="clientName"/>
<el-table-column label="出库日期" align="center" prop="salseDate" width="180"> <el-table-column label="出库日期" align="center" prop="salseDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.salseDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.salseDate, '{y}-{m}-{d}') }}</span>
@ -150,7 +150,7 @@
/> />
<!-- 添加或修改销售出库单对话框 --> <!-- 添加或修改销售出库单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -161,9 +161,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -221,7 +221,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -240,12 +240,20 @@
</template> </template>
<script> <script>
import { listProductsalse, getProductsalse, delProductsalse, addProductsalse, updateProductsalse,execute } from "@/api/mes/wm/productsalse"; import {
addProductsalse,
delProductsalse,
execute,
getProductsalse,
listProductsalse,
updateProductsalse
} from "@/api/mes/wm/productsalse";
import Productsalseline from "./line.vue" import Productsalseline from "./line.vue"
import OqcSelectSingle from "@/components/oqcSelect/single.vue" import OqcSelectSingle from "@/components/oqcSelect/single.vue"
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Productsalse", name: "Productsalse",
dicts: ['mes_order_status'], dicts: ['mes_order_status'],

13
src/views/mes/wm/productsalse/line.vue
View File

@ -77,7 +77,7 @@
/> />
<!-- 添加或修改产品销售出库行对话框 --> <!-- 添加或修改产品销售出库行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -102,7 +102,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="规格型号" prop="specification"> <el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.specification" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -186,9 +186,16 @@
</template> </template>
<script> <script>
import { listProductsalseline, getProductsalseline, delProductsalseline, addProductsalseline, updateProductsalseline } from "@/api/mes/wm/productsalseline"; import {
addProductsalseline,
delProductsalseline,
getProductsalseline,
listProductsalseline,
updateProductsalseline
} from "@/api/mes/wm/productsalseline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
import OqcSelectSingle from "@/components/oqcSelect/single.vue" import OqcSelectSingle from "@/components/oqcSelect/single.vue"
export default { export default {
name: "Productsalseline", name: "Productsalseline",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],

19
src/views/mes/wm/rtissue/index.vue
View File

@ -132,7 +132,7 @@
/> />
<!-- 添加或修改生产退料单头对话框 --> <!-- 添加或修改生产退料单头对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -143,9 +143,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -188,7 +188,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -198,8 +198,9 @@
<Rtissueline :rtId="form.rtId" :optType="optType"></Rtissueline> <Rtissueline :rtId="form.rtId" :optType="optType"></Rtissueline>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button v-if="optType =='view' || form.status !='PREPARE' " type="primary" @click="cancel">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保 存
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -207,11 +208,12 @@
</template> </template>
<script> <script>
import { listRtissue, getRtissue, delRtissue, addRtissue, updateRtissue, execute } from "@/api/mes/wm/rtissue"; import {addRtissue, delRtissue, execute, getRtissue, listRtissue, updateRtissue} from "@/api/mes/wm/rtissue";
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
import Rtissueline from "./line.vue"; import Rtissueline from "./line.vue";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Rtissue", name: "Rtissue",
dicts: ['mes_order_status'], dicts: ['mes_order_status'],
@ -299,7 +301,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

16
src/views/mes/wm/rtissue/line.vue
View File

@ -37,7 +37,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="rtissuelineList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="rtissuelineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="物料编码" width="120px" align="center" prop="itemCode" /> <el-table-column label="物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="物料名称" width="150px" align="center" prop="itemName" /> <el-table-column label="物料名称" width="150px" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
@ -78,7 +78,7 @@
/> />
<!-- 添加或修改生产退料单行对话框 --> <!-- 添加或修改生产退料单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -139,9 +139,16 @@
</template> </template>
<script> <script>
import { listRtissueline, getRtissueline, delRtissueline, addRtissueline, updateRtissueline } from "@/api/mes/wm/rtissueline"; import {
addRtissueline,
delRtissueline,
getRtissueline,
listRtissueline,
updateRtissueline
} from "@/api/mes/wm/rtissueline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Rtissueline", name: "Rtissueline",
components: {StockSelect}, components: {StockSelect},
@ -235,7 +242,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

15
src/views/mes/wm/rtsalse/index.vue
View File

@ -156,7 +156,7 @@
/> />
<!-- 添加或修改产品销售退货单对话框 --> <!-- 添加或修改产品销售退货单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -167,9 +167,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -254,7 +254,8 @@
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">确 定
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -262,11 +263,12 @@
</template> </template>
<script> <script>
import { listRtsalse, getRtsalse, delRtsalse, addRtsalse, updateRtsalse ,execute} from "@/api/mes/wm/rtsalse"; import {addRtsalse, delRtsalse, execute, getRtsalse, listRtsalse, updateRtsalse} from "@/api/mes/wm/rtsalse";
import Rtsalseline from "./line.vue"; import Rtsalseline from "./line.vue";
import ClientSelectSingle from "@/components/clientSelect/single.vue" import ClientSelectSingle from "@/components/clientSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Rtsalse", name: "Rtsalse",
dicts: ['mes_order_status'], dicts: ['mes_order_status'],
@ -372,7 +374,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

18
src/views/mes/wm/rtsalse/line.vue
View File

@ -26,7 +26,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="rtsalselineList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="rtsalselineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="产品编码" width="120" align="center" prop="itemCode" /> <el-table-column label="产品编码" width="120" align="center" prop="itemCode" />
<el-table-column label="产品名称" width="150" align="center" prop="itemName" /> <el-table-column label="产品名称" width="150" align="center" prop="itemName" />
<el-table-column label="规格型号" width="150" align="center" prop="specification" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" width="150" align="center" prop="specification" :show-overflow-tooltip="true"/>
@ -71,12 +71,12 @@
/> />
<!-- 添加或修改产品销售退货行对话框 --> <!-- 添加或修改产品销售退货行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品编码" prop="itemCode"> <el-form-item label="产品编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品" > <el-input v-model="form.itemCode" placeholder="请选择产品" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -132,9 +132,16 @@
</template> </template>
<script> <script>
import { listRtsalseline, getRtsalseline, delRtsalseline, addRtsalseline, updateRtsalseline } from "@/api/mes/wm/rtsalseline"; import {
addRtsalseline,
delRtsalseline,
getRtsalseline,
listRtsalseline,
updateRtsalseline
} from "@/api/mes/wm/rtsalseline";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Rtsalseline", name: "Rtsalseline",
components: {ItemSelect}, components: {ItemSelect},
@ -227,7 +234,8 @@ export default {
if (response.data) { if (response.data) {
this.warehouseOptions = response.data.filter((el) => { this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1; return el.warehouseCode.indexOf('VIR') == -1;
});; });
;
} }
this.warehouseOptions.map(w => { this.warehouseOptions.map(w => {
w.children.map(l => { w.children.map(l => {

23
src/views/mes/wm/rtvendor/index.vue
View File

@ -86,20 +86,21 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="rtvendorList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="rtvendorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="退货单编号" align="center" prop="rtCode" > <el-table-column align="center" label="退货单编号" prop="rtCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:wm:rtvendor:query']" v-hasPermi="['mes:wm:rtvendor:query']"
>{{scope.row.rtCode}}</el-button> >{{ scope.row.rtCode }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退货单名称" align="center" prop="rtName" /> <el-table-column label="退货单名称" align="center" prop="rtName" />
<el-table-column label="采购订单编号" align="center" prop="poCode" /> <el-table-column align="center" label="采购订单编号" prop="poCode"/>
<el-table-column label="供应商编码" align="center" prop="vendorCode" /> <el-table-column label="供应商编码" align="center" prop="vendorCode" />
<el-table-column label="供应商名称" align="center" width="150px" prop="vendorName" :show-overflow-tooltip="true"/> <el-table-column :show-overflow-tooltip="true" align="center" label="供应商名称" prop="vendorName" width="150px"/>
<el-table-column label="退货日期" align="center" prop="rtDate" width="180"> <el-table-column label="退货日期" align="center" prop="rtDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.rtDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.rtDate, '{y}-{m}-{d}') }}</span>
@ -149,7 +150,7 @@
/> />
<!-- 添加或修改供应商退货对话框 --> <!-- 添加或修改供应商退货对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -160,9 +161,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -230,7 +231,8 @@
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保 存
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -238,10 +240,11 @@
</template> </template>
<script> <script>
import { listRtvendor, getRtvendor, delRtvendor, addRtvendor, updateRtvendor,execute } from "@/api/mes/wm/rtvendor"; import {addRtvendor, delRtvendor, execute, getRtvendor, listRtvendor, updateRtvendor} from "@/api/mes/wm/rtvendor";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import Rtvendorline from "./line.vue" import Rtvendorline from "./line.vue"
export default { export default {
name: "Rtvendor", name: "Rtvendor",
components:{VendorSelect,Rtvendorline}, components:{VendorSelect,Rtvendorline},

18
src/views/mes/wm/rtvendor/line.vue
View File

@ -66,16 +66,17 @@
/> />
<!-- 添加或修改供应商退货行对话框 --> <!-- 添加或修改供应商退货行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode"> <el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" > <el-input v-model="form.itemCode" placeholder="请选择产品物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<StockSelect ref="stockSelect" :batchCode="batchCode" :vendorId="vendorId" @onSelected="onStockSelected"></StockSelect> <StockSelect ref="stockSelect" :batchCode="batchCode" :vendorId="vendorId"
@onSelected="onStockSelected"></StockSelect>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName"> <el-form-item label="产品物料名称" prop="itemName">
@ -144,8 +145,15 @@
</template> </template>
<script> <script>
import { listRtvendorline, getRtvendorline, delRtvendorline, addRtvendorline, updateRtvendorline } from "@/api/mes/wm/rtvendorline"; import {
addRtvendorline,
delRtvendorline,
getRtvendorline,
listRtvendorline,
updateRtvendorline
} from "@/api/mes/wm/rtvendorline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
export default { export default {
name: "Rtvendorline", name: "Rtvendorline",
components:{StockSelect}, components:{StockSelect},

7
src/views/mes/wm/sn/index.vue
View File

@ -113,12 +113,12 @@
/> />
<!-- 添加或修改SN码对话框 --> <!-- 添加或修改SN码对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" > <el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -159,8 +159,9 @@
</template> </template>
<script> <script>
import { listSn,list, getSn, delSn, addSn, updateSn } from "@/api/mes/wm/sn"; import {addSn, delSn, getSn, listSn} from "@/api/mes/wm/sn";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
name: "Sn", name: "Sn",
components :{ItemSelect}, components :{ItemSelect},

10
src/views/mes/wm/sn/sn.vue
View File

@ -23,7 +23,7 @@
<el-table-column label="产品名称" align="center" prop="itemName" /> <el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" /> <el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="批次号" align="center" prop="batchCode" /> <el-table-column align="center" label="批次号" prop="batchCode"/>
<el-table-column label="生成时间" align="center" prop="genDate" width="120"> <el-table-column label="生成时间" align="center" prop="genDate" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.rtDate, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span> <span>{{ parseTime(scope.row.rtDate, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
@ -40,12 +40,12 @@
/> />
<!-- 添加或修改SN码对话框 --> <!-- 添加或修改SN码对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" > <el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -86,8 +86,9 @@
</template> </template>
<script> <script>
import { listSn,list, getSn, delSn, addSn, updateSn } from "@/api/mes/wm/sn"; import {addSn, delSn, getSn, listSn} from "@/api/mes/wm/sn";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
name: "Sn", name: "Sn",
components :{ItemSelect}, components :{ItemSelect},
@ -232,4 +233,3 @@
} }
}; };
</script> </script>

14
src/views/mes/wm/stocktaking/index.vue
View File

@ -90,7 +90,7 @@
/> />
<!-- 添加或修改库存盘点记录对话框 --> <!-- 添加或修改库存盘点记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="盘点单编号" prop="takingCode"> <el-form-item label="盘点单编号" prop="takingCode">
<el-input v-model="form.takingCode" placeholder="请输入盘点单编号"/> <el-input v-model="form.takingCode" placeholder="请输入盘点单编号"/>
@ -140,7 +140,7 @@
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-tabs type="border-card" v-if="form.takingId != null"> <el-tabs v-if="form.takingId != null" type="border-card">
<el-tab-pane v-if="form.takingType=='OPEN'" label="盘点清单"> <el-tab-pane v-if="form.takingType=='OPEN'" label="盘点清单">
<TakingLine></TakingLine> <TakingLine></TakingLine>
</el-tab-pane> </el-tab-pane>
@ -157,9 +157,17 @@
</template> </template>
<script> <script>
import { listStocktaking, getStocktaking, delStocktaking, addStocktaking, updateStocktaking ,execute} from "@/api/mes/wm/stocktaking"; import {
addStocktaking,
delStocktaking,
execute,
getStocktaking,
listStocktaking,
updateStocktaking
} from "@/api/mes/wm/stocktaking";
import TakingLine from './line.vue'; import TakingLine from './line.vue';
import TakingResult from './result.vue'; import TakingResult from './result.vue';
export default { export default {
name: "Stocktaking", name: "Stocktaking",
components: {TakingLine,TakingResult}, components: {TakingLine,TakingResult},

10
src/views/mes/wm/stocktaking/line.vue
View File

@ -255,7 +255,7 @@
/> />
<!-- 添加或修改库存盘点明细对话框 --> <!-- 添加或修改库存盘点明细对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="报废单ID" prop="takingId"> <el-form-item label="报废单ID" prop="takingId">
<el-input v-model="form.takingId" placeholder="请输入报废单ID"/> <el-input v-model="form.takingId" placeholder="请输入报废单ID"/>
@ -332,7 +332,13 @@
</template> </template>
<script> <script>
import { listStocktakingline, getStocktakingline, delStocktakingline, addStocktakingline, updateStocktakingline } from "@/api/mes/wm/stocktakingline"; import {
addStocktakingline,
delStocktakingline,
getStocktakingline,
listStocktakingline,
updateStocktakingline
} from "@/api/mes/wm/stocktakingline";
export default { export default {
name: "Stocktakingline", name: "Stocktakingline",

10
src/views/mes/wm/stocktaking/result.vue
View File

@ -164,7 +164,7 @@
/> />
<!-- 添加或修改库存盘点结果对话框 --> <!-- 添加或修改库存盘点结果对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="盘点单ID" prop="takingId"> <el-form-item label="盘点单ID" prop="takingId">
<el-input v-model="form.takingId" placeholder="请输入盘点单ID"/> <el-input v-model="form.takingId" placeholder="请输入盘点单ID"/>
@ -208,7 +208,13 @@
</template> </template>
<script> <script>
import { listStocktakingresult, getStocktakingresult, delStocktakingresult, addStocktakingresult, updateStocktakingresult } from "@/api/mes/wm/stocktakingresult"; import {
addStocktakingresult,
delStocktakingresult,
getStocktakingresult,
listStocktakingresult,
updateStocktakingresult
} from "@/api/mes/wm/stocktakingresult";
export default { export default {
name: "Stocktakingresult", name: "Stocktakingresult",

12
src/views/mes/wm/transfer/index.vue
View File

@ -169,7 +169,7 @@
/> />
<!-- 添加或修改转移单对话框 --> <!-- 添加或修改转移单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -180,9 +180,9 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -278,7 +278,8 @@
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button> <el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">确 定
</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -286,10 +287,11 @@
</template> </template>
<script> <script>
import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer, execute} from "@/api/mes/wm/transfer"; import {addTransfer, delTransfer, execute, getTransfer, listTransfer, updateTransfer} from "@/api/mes/wm/transfer";
import {listWarehouse} from "@/api/mes/wm/warehouse"; import {listWarehouse} from "@/api/mes/wm/warehouse";
import {genCode} from "@/api/system/autocode/rule"; import {genCode} from "@/api/system/autocode/rule";
import Transferline from "./line.vue"; import Transferline from "./line.vue";
export default { export default {
name: "Transfer", name: "Transfer",
components: {Transferline}, components: {Transferline},

54
src/views/mes/wm/transfer/line.vue
View File

@ -29,23 +29,24 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="transferlineList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="transferlineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" type="selection" width="55"/>
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" /> <el-table-column align="center" label="产品物料编码" prop="itemCode" width="120px"/>
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" /> <el-table-column align="center" label="产品物料名称" prop="itemName" width="150px"/>
<el-table-column label="规格型号" align="center" prop="specification" /> <el-table-column align="center" label="规格型号" prop="specification"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column align="center" label="单位" prop="unitOfMeasure"/>
<el-table-column label="转移数量" align="center" prop="quantityTransfer" /> <el-table-column align="center" label="转移数量" prop="quantityTransfer"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" /> <el-table-column align="center" label="生产工单" prop="workorderCode"/>
<el-table-column label="供应商编码" width="100px" align="center" prop="vendorCode" /> <el-table-column align="center" label="供应商编码" prop="vendorCode" width="100px"/>
<el-table-column label="供应商简称" width="100px" align="center" prop="vendorNick" /> <el-table-column align="center" label="供应商简称" prop="vendorNick" width="100px"/>
<el-table-column label="批次号" width="150px" align="center" prop="batchCode" /> <el-table-column align="center" label="批次号" prop="batchCode" width="150px"/>
<el-table-column label="移出仓库" align="center" prop="fromWarehouseName" /> <el-table-column align="center" label="移出仓库" prop="fromWarehouseName"/>
<el-table-column label="移出库区" width="120px" align="center" prop="fromLocationName" /> <el-table-column align="center" label="移出库区" prop="fromLocationName" width="120px"/>
<el-table-column label="移出库位" align="center" prop="fromAreaName" /> <el-table-column align="center" label="移出库位" prop="fromAreaName"/>
<el-table-column label="移入仓库" align="center" prop="toWarehouseName" /> <el-table-column align="center" label="移入仓库" prop="toWarehouseName"/>
<el-table-column label="移入库区" width="120px" align="center" prop="toLocationName" /> <el-table-column align="center" label="移入库区" prop="toLocationName" width="120px"/>
<el-table-column label="移入库位" align="center" prop="toAreaName" /> <el-table-column align="center" label="移入库位" prop="toAreaName"/>
<el-table-column label="操作" v-if="optType != 'view'" width="120px" align="center" class-name="small-padding fixed-width"> <el-table-column v-if="optType != 'view'" align="center" class-name="small-padding fixed-width" label="操作"
width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -53,7 +54,8 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']" v-hasPermi="['mes:wm:transfer:edit']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -74,13 +76,13 @@
/> />
<!-- 添加或修改转移单行对话框 --> <!-- 添加或修改转移单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品物料" prop="itemCode"> <el-form-item label="产品物料" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="选择库存物资"> <el-input v-model="form.itemCode" placeholder="选择库存物资">
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<StockSelect ref="stockSelect" :warehouseId="fromWarehouseId" @onSelected="onStockSelected"></StockSelect> <StockSelect ref="stockSelect" :warehouseId="fromWarehouseId" @onSelected="onStockSelected"></StockSelect>
@ -159,9 +161,16 @@
</template> </template>
<script> <script>
import { listTransferline, getTransferline, delTransferline, addTransferline, updateTransferline } from "@/api/mes/wm/transferline"; import {
addTransferline,
delTransferline,
getTransferline,
listTransferline,
updateTransferline
} from "@/api/mes/wm/transferline";
import StockSelect from "@/components/stockSelect/single.vue" import StockSelect from "@/components/stockSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse" import {getTreeList} from "@/api/mes/wm/warehouse"
export default { export default {
name: "Transferline", name: "Transferline",
components: { components: {
@ -253,7 +262,8 @@ export default {
], ],
quantityTransfer: [ quantityTransfer: [
{required: true, message: "转移数量不能为空", trigger: "blur"} {required: true, message: "转移数量不能为空", trigger: "blur"}
], } ],
}
}; };
}, },
created() { created() {

14
src/views/mes/wm/warehouse/index.vue
View File

@ -116,7 +116,7 @@
/> />
<!-- 添加或修改库房设置对话框 --> <!-- 添加或修改库房设置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="960px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
@ -183,17 +183,25 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="selectWareHouseVisible" title="选择类型"> <el-dialog :close-on-click-modal="false" :visible.sync="selectWareHouseVisible" title="选择类型">
<in-out-type-cmps v-if="selectWareHouseVisible" @selectType="selectType"></in-out-type-cmps> <in-out-type-cmps v-if="selectWareHouseVisible" @selectType="selectType"></in-out-type-cmps>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeFrozenState } from "@/api/mes/wm/warehouse"; import {
addWarehouse,
changeFrozenState,
delWarehouse,
getWarehouse,
listWarehouse,
updateWarehouse
} from "@/api/mes/wm/warehouse";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import BarcodeImg from "@/components/barcodeImg/index.vue" import BarcodeImg from "@/components/barcodeImg/index.vue"
import InOutTypeCmps from "@/components/wm/InOutTypeCmps.vue"; import InOutTypeCmps from "@/components/wm/InOutTypeCmps.vue";
export default { export default {
name: "Warehouse", name: "Warehouse",
components: {InOutTypeCmps, BarcodeImg } , components: {InOutTypeCmps, BarcodeImg } ,

8
src/views/mes/wm/wmsInPlanDetailsEntity/index.vue
View File

@ -100,7 +100,7 @@
/> />
<!-- 添加或修改入库计划明细实体对话框 --> <!-- 添加或修改入库计划明细实体对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -113,10 +113,10 @@
<script> <script>
import { import {
listWmsInPlanDetailsEntity,
getWmsInPlanDetailsEntity,
delWmsInPlanDetailsEntity,
addWmsInPlanDetailsEntity, addWmsInPlanDetailsEntity,
delWmsInPlanDetailsEntity,
getWmsInPlanDetailsEntity,
listWmsInPlanDetailsEntity,
updateWmsInPlanDetailsEntity updateWmsInPlanDetailsEntity
} from "@/api/mes/wm/wmsInPlanDetailsEntity"; } from "@/api/mes/wm/wmsInPlanDetailsEntity";

13
src/views/mes/wm/wmsInTask/index.vue
View File

@ -119,7 +119,7 @@
/> />
<!-- 添加或修改入库任务对话框 --> <!-- 添加或修改入库任务对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.planInStatus"> <el-radio-group v-model="form.planInStatus">
@ -142,15 +142,14 @@
<script> <script>
import { import {
listWmsInTask,
getWmsInTask,
delWmsInTask,
addWmsInTask, addWmsInTask,
updateWmsInTask, delWmsInTask,
issueBatchWmsInTask getWmsInTask,
issueBatchWmsInTask,
listWmsInTask,
updateWmsInTask
} from "@/api/mes/wm/wmsInTask"; } from "@/api/mes/wm/wmsInTask";
import {listTYPE} from "@/api/md/TYPE"; import {listTYPE} from "@/api/md/TYPE";
import {addBaseKnife} from "@/api/mes/md/baseKnife";
export default { export default {
name: "WmsInTask", name: "WmsInTask",

4
src/vue/views/wm/ctBase/index.vue
View File

@ -96,7 +96,7 @@
/> />
<!-- 添加或修改料箱管理对话框 --> <!-- 添加或修改料箱管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="料箱状态：0-正常，1-绑定，2-解绑" prop="type"> <el-form-item label="料箱状态：0-正常，1-绑定，2-解绑" prop="type">
<el-select v-model="form.type" placeholder="请选择料箱状态：0-正常，1-绑定，2-解绑"> <el-select v-model="form.type" placeholder="请选择料箱状态：0-正常，1-绑定，2-解绑">
@ -113,7 +113,7 @@
</template> </template>
<script> <script>
import { listCtBase, getCtBase, delCtBase, addCtBase, updateCtBase } from "@/api/wm/ctBase"; import {addCtBase, delCtBase, getCtBase, listCtBase, updateCtBase} from "@/api/wm/ctBase";
export default { export default {
name: "CtBase", name: "CtBase",