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-item label="配置名称" prop="configureName">
<el-input v-model="form.configureName" placeholder="请输入配置名称"/>

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

@ -147,7 +147,7 @@
/>
<!-- 添加或修改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-item label="BOM编码" prop="bomCode">
<el-input v-model="form.bomCode" placeholder="请输入BOM编码"/>

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

@ -76,16 +76,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-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="itemName">
@ -176,10 +176,17 @@
</template>
<script>
import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import {
addItemrecptline,
delItemrecptline,
getItemrecptline,
listItemrecptline,
updateItemrecptline
} from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Itemrecptline",
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-item label="是否复盘" prop="isag">
<el-select v-model="form.isag" placeholder="请选择是否复盘" @change="handleIsAgChange">

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

@ -85,14 +85,15 @@
</el-row>
<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" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:cal:calplan:query']"
>{{scope.row.planCode}}</el-button>
<el-button
v-hasPermi="['mes:cal:calplan:query']"
type="text"
@click="handleView(scope.row)"
>{{ scope.row.planCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="计划名称" width="200px" align="center" prop="planName" :show-overflow-tooltip="true"/>
@ -147,7 +148,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -157,20 +158,21 @@
/>
<!-- 添加或修改排班计划对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="form.planCode" placeholder="请输入计划编号" />
<el-input v-model="form.planCode" placeholder="请输入计划编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -272,10 +274,11 @@
</template>
<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 Team from "./team";
import Team from "./team";
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Calplan",
dicts: ['mes_shift_method','mes_shift_type','mes_calendar_type','mes_order_status'],
@ -427,7 +430,7 @@ export default {
});
},
/** 提交按钮 */
submitForm() {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.planId != null) {

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

@ -64,7 +64,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -74,17 +74,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-row>
<el-col :span="12">
<el-form-item label="序号" prop="orderNum">
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班次名称" prop="shiftName">
<el-input v-model="form.shiftName" placeholder="请输入班次名称" />
<el-col :span="12">
<el-form-item label="序号" prop="orderNum">
<el-input-number v-model="form.orderNum" :min="1" placeholder="请输入序号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班次名称" prop="shiftName">
<el-input v-model="form.shiftName" placeholder="请输入班次名称"/>
</el-form-item>
</el-col>
</el-row>
@ -107,7 +107,7 @@
placeholder="请选择结束时间"
format ="HH:mm"
value-format="HH:mm"
>
>
</el-time-picker>
</el-form-item>
</el-col>
@ -122,7 +122,7 @@
</template>
<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 {
name: "Shift",

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

@ -83,11 +83,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="班组编号" align="center" prop="teamCode" >
<template slot-scope="scope">
<el-button
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:cal:team:query']"
>{{scope.row.teamCode}}</el-button>
>{{ scope.row.teamCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="班组名称" align="center" prop="teamName" />
@ -116,7 +117,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -126,20 +127,20 @@
/>
<!-- 添加或修改班组对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="班组编号" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入班组编号" />
<el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -164,9 +165,9 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.teamId !=null" content-position="center">项目组成员</el-divider>
@ -181,9 +182,10 @@
</template>
<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 {genCode} from "@/api/system/autocode/rule"
export default {
name: "Team",
components: {Teammember},

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

@ -108,16 +108,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-row>
<el-col :span="8">
<el-form-item label="结果编码" prop="requestCode">
<el-input v-model="form.requestCode" placeholder="请输入结果编码" />
<el-input v-model="form.requestCode" placeholder="请输入结果编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@ -196,7 +196,7 @@
</div>
</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>
</el-dialog>
</div>
@ -204,13 +204,17 @@
<script>
import {
addRequest, delRequest, delRequests, getRequest,
listRequest, updateRequest
addRequest,
delRequest,
delRequests,
getRequest,
listRequest,
updateRequest
} from "@/api/mes/dv/inventoryRequest";
import {listMdItem} from "@/api/mes/md/mdItem";
import {genCode} from "@/api/system/autocode/rule"
import InventoryCmps from "@/components/wm/InventoryCmps.vue";
export default {
name: "InventoryRequest",
components: {InventoryCmps},

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

@ -134,16 +134,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-row>
<el-col :span="8">
<el-form-item label="计划编码" prop="wmsInventoryCode">
<el-input v-model="form.wmsInventoryCode" placeholder="请输入计划编码" />
<el-input v-model="form.wmsInventoryCode" placeholder="请输入计划编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@ -287,17 +287,18 @@
<script>
import {
listDvsubject,
addMachinery,
getMachinery,
updateMachinery,
delMachinery,
delMachinerys,
rechecklMachinerys
getMachinery,
listDvsubject,
rechecklMachinerys,
updateMachinery
} from "@/api/mes/dv/inventoryTask";
import {listMdItem} from "@/api/mes/md/mdItem";
import {listQctemplate} from "@/api/mes/qc/qctemplate";
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "InventoryTask",
dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'],

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

@ -91,15 +91,16 @@
<el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange">
<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">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:dv:checkplan:query']"
>{{scope.row.planCode}}</el-button>
>{{ scope.row.planCode }}
</el-button>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="计划名称" align="center" width="200px" prop="planName" />
<el-table-column label="计划类型" align="center" width="120px" prop="planType">
<template slot-scope="scope">
@ -116,12 +117,12 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="频率" align="center" prop="cycleType">
<el-table-column align="center" label="频率" prop="cycleType">
<template slot-scope="scope">
{{scope.row.cycleCount}}
{{ scope.row.cycleCount }}
<dict-tag :options="dict.type.mes_cycle_type" :value="scope.row.cycleType"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
@ -156,7 +157,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -166,20 +167,20 @@
/>
<!-- 添加或修改设备点检计划头对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="计划编码" prop="planCode">
<el-input v-model="form.planCode" placeholder="请输入计划编码" />
<el-input v-model="form.planCode" placeholder="请输入计划编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -257,24 +258,29 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-if="form.planId != null">
<el-tab-pane label="设备清单">
<Checkmachinery ref="machinerylist" :optType="optType" :planId="form.planId" ></Checkmachinery>
<el-tabs v-if="form.planId != null" type="border-card">
<el-tab-pane label="设备清单">
<Checkmachinery ref="machinerylist" :optType="optType" :planId="form.planId"></Checkmachinery>
</el-tab-pane>
<el-tab-pane :label="form.planType=='CHECK'?'点检项目':'保养项目'">
<Checksubject ref="subjectlist" :optType="optType" :planId="form.planId" ></Checksubject>
<Checksubject ref="subjectlist" :optType="optType" :planId="form.planId"></Checksubject>
</el-tab-pane>
</el-tabs>
<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="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保存</el-button>
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.planId !=null">启用</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' " type="primary" @click="submitForm">保存
</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>
</div>
</el-dialog>
@ -282,10 +288,11 @@
</template>
<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 Checksubject from "./subject.vue"
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Checkplan",
dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'],
@ -319,7 +326,7 @@ export default {
planCode: null,
planName: null,
startDate: null,
endDate: null,
endDate: null,
cycleType: null,
cycleCount: null,
status: null
@ -457,24 +464,24 @@ export default {
handleFinish(){
if(this.form.planId != null && this.form.status =='PREPARE'){
this.form.status='FINISHED';
updateCheckplan(this.form).then(response => {
this.$modal.msgSuccess("已启用");
this.open = false;
this.getList();
},err =>{
this.form.status='PREPARE';
updateCheckplan(this.form).then(response => {
this.$modal.msgSuccess("已启用");
this.open = false;
this.getList();
}, err => {
this.form.status = 'PREPARE';
});
}
},
handleDeFinish(){
if(this.form.planId != null && this.form.status =='FINISHED'){
this.form.status='PREPARE';
updateCheckplan(this.form).then(response => {
this.$modal.msgSuccess("已停用");
this.open = false;
this.getList();
},err =>{
this.form.status='FINISHED';
updateCheckplan(this.form).then(response => {
this.$modal.msgSuccess("已停用");
this.open = false;
this.getList();
}, err => {
this.form.status = 'FINISHED';
});
}
},

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

@ -154,7 +154,8 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:dv:machinery:remove']"
>删除</el-button>
>删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -170,7 +171,7 @@
</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-row>
<el-col :span="8">
@ -180,11 +181,11 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -246,7 +247,8 @@
</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
ref="upload"
:limit="1"
@ -278,11 +280,11 @@
</template>
<script>
import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
import { listMachinerytype } from "@/api/mes/dv/machinerytype";
import { listAllWorkshop } from "@/api/mes/md/workshop";
import {addMachinery, delMachinery, getMachinery, listMachinery, updateMachinery} from "@/api/mes/dv/machinery";
import {listMachinerytype} from "@/api/mes/dv/machinerytype";
import {listAllWorkshop} from "@/api/mes/md/workshop";
import {genCode} from "@/api/system/autocode/rule"
import { getToken } from "@/utils/auth";
import {getToken} from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -457,7 +459,7 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
updateTime: null
};
this.autoGenFlag = false;
this.resetForm("form");
@ -592,4 +594,4 @@ export default {
}
}
};
</script>
</script>

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

@ -69,12 +69,13 @@
</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-row>
<el-col :span="24" v-if="form.parentTypeId !== 0">
<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-col>
</el-row>
@ -120,7 +121,13 @@
</template>
<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 "@riophae/vue-treeselect/dist/vue-treeselect.css";

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

@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备编码" prop="machineryCode">
<el-input
v-model="queryParams.machineryCode"
@ -148,7 +148,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -158,28 +158,28 @@
/>
<!-- 添加或修改设备维修单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="维修单编号" prop="repairCode">
<el-input v-model="form.repairCode" placeholder="请输入维修单编号" />
<el-input v-model="form.repairCode" placeholder="请输入维修单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="维修单名称" prop="repairName">
<el-input v-model="form.repairName" placeholder="请输入维修单名称" />
<el-input v-model="form.repairName" placeholder="请输入维修单名称"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -205,11 +205,11 @@
<el-col :span="8">
<el-form-item label="报修日期" prop="requireDate">
<el-date-picker clearable
v-model="form.requireDate"
style="width: 187px"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择报修日期">
v-model="form.requireDate"
placeholder="请选择报修日期"
style="width: 187px"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@ -262,19 +262,20 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.repairId !=null" content-position="center">维修内容</el-divider>
<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>
<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 == '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="danger" v-if="form.status == 'FINISHED' && optType !='view'" @click="unconfirm">不通过</el-button>
<el-button @click="cancel">取 消</el-button>
@ -284,10 +285,11 @@
</template>
<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 Repairline from './line.vue'
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Repair",
dicts: ['mes_repair_result', 'mes_order_status'],
@ -487,12 +489,12 @@ export default {
this.form.machineryBrand = row.machineryBrand;
},
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){
genCode('REPAIR_CODE').then(response =>{
handleAutoGenChange(autoGenFlag) {
if (autoGenFlag) {
genCode('REPAIR_CODE').then(response => {
this.form.repairCode = response;
});
}else{
} else {
this.form.repairCode = null;
}
}

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

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@ -35,7 +35,7 @@
</template>
</el-table-column>
<el-table-column label="故障描述资源" align="center" prop="malfunctionUrl" >
</el-table-column>
<el-table-column label="维修情况" align="center" prop="repairDes" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -57,7 +57,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -67,16 +67,16 @@
/>
<!-- 添加或修改设备维修单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-dialog :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-item label="项目名称" prop="subjectName">
<el-input v-model="form.subjectName" placeholder="请输入项目名称" />
</el-form-item>
<el-input v-model="form.subjectName" placeholder="请输入项目名称"/>
</el-form-item>
<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 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 label="维修情况" prop="repairDes">
<el-input v-model="form.repairDes" type="textarea" placeholder="请输入内容" />
@ -91,7 +91,7 @@
</template>
<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 {
name: "Repairline",

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

@ -114,7 +114,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -124,20 +124,20 @@
/>
<!-- 添加或修改设备点检保养项目对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="项目编码" prop="subjectCode">
<el-input v-model="form.subjectCode" placeholder="请输入项目编码" />
<el-input v-model="form.subjectCode" placeholder="请输入项目编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -171,8 +171,8 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="项目内容" prop="subjectContent">
<el-input type="textarea" v-model="form.subjectContent" placeholder="请输入项目内容" />
<el-form-item label="项目内容" prop="subjectContent">
<el-input v-model="form.subjectContent" placeholder="请输入项目内容" type="textarea"/>
</el-form-item>
<el-form-item label="标准" prop="subjectStandard">
<el-input type="textarea" v-model="form.subjectStandard" placeholder="请输入标准" autosize/>
@ -187,8 +187,9 @@
</template>
<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"
export default {
name: "Dvsubject",
dicts: ['sys_yes_no', 'mes_dvsubject_type'],

6
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-row>
<el-col :span="8">
@ -247,9 +247,9 @@
</template>
<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 {listMdItem } from "@/api/mes/md/mdItem"
import {listMdItem} from "@/api/mes/md/mdItem"
export default {
name: "BaseKnife",

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

@ -172,16 +172,16 @@
</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-row>
<el-col :span="8">
<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-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@ -273,7 +273,8 @@
</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
ref="upload"
:limit="1"
@ -305,11 +306,11 @@
</template>
<script>
import { listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {addMdItem, delMdItem, getMdItem, listMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule"
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/mes/md/itemtype";
import {getToken} from "@/utils/auth";
import {treeselect} from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";

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

@ -171,7 +171,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -181,20 +181,20 @@
/>
<!-- 添加或修改客户对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请输入客户编码" />
<el-input v-model="form.clientCode" placeholder="请输入客户编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -353,7 +353,8 @@
</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
ref="upload"
:limit="1"
@ -387,9 +388,10 @@
</template>
<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 { getToken } from "@/utils/auth";
import {getToken} from "@/utils/auth";
export default {
name: "Client",
dicts: ['mes_client_type','sys_yes_no'],
@ -663,7 +665,7 @@ export default {
});
}else{
this.form.clientCode = null;
}
}
}
}
};

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-item label="类型编码" prop="code">
<el-input v-model="form.code" placeholder="请输入类型编码"></el-input>
@ -136,7 +136,7 @@
</template>
<script>
import {listTYPE, getTYPE, delTYPE, addTYPE, updateTYPE} from "@/api/md/TYPE";
import {addTYPE, delTYPE, getTYPE, listTYPE, updateTYPE} from "@/api/md/TYPE";
export default {
name: "TYPE",

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

@ -94,12 +94,13 @@
</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-row>
<el-col :span="24" v-if="form.parentTypeId !== 0">
<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-col>
</el-row>
@ -160,7 +161,14 @@
</template>
<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 "@riophae/vue-treeselect/dist/vue-treeselect.css";

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

@ -27,13 +27,13 @@
</el-row>
<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" align="center" prop="bomItemCode" />
<el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" />
<el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" />
<el-table-column label="单位" width="60px" align="center" prop="unitOfMeasure" />
<el-table-column label="使用比例" width="90px" align="center" prop="quantity" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="物料编码" prop="bomItemCode"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="物料名称" prop="bomItemName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="规格" prop="bomItemSpec"/>
<el-table-column align="center" label="单位" prop="unitOfMeasure" width="60px"/>
<el-table-column align="center" label="使用比例" prop="quantity" width="90px"/>
<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'">
<template slot-scope="scope">
<el-button
@ -42,7 +42,8 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
@ -53,7 +54,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -63,16 +64,16 @@
/>
<!-- 添加或修改产品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-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 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 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 label="BOM物料单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" readonly placeholder="请输入BOM物料单位" />
@ -94,8 +95,8 @@
</template>
<script>
import { listBom, getBom, delBom, addBom, updateBom } from "@/api/mes/md/bom";
import ItemSelect from "@/components/itemSelect/index.vue";
import {addBom, delBom, getBom, listBom, updateBom} from "@/api/mes/md/bom";
import ItemSelect from "@/components/itemSelect/index.vue";
export default {
name: "Bom",
@ -228,11 +229,11 @@ components: { ItemSelect },
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
updateBom(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
updateBom(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
});
},

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

@ -13,17 +13,17 @@
</el-col>
</el-row>
<div class="header">
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标题" prop="sipTitle">
<el-input v-model="form.sipTitle" placeholder="请输入标题"></el-input>
</el-form-item>
<el-form-item label="展示顺序">
<el-input-number :min="1" v-model="form.orderNum"></el-input-number>
</el-form-item>
<el-form-item label="内容说明">
<el-input type="textarea" v-model="form.sipDescription" placeholder="请输入说明信息"></el-input>
</el-form-item>
<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-item label="标题" prop="sipTitle">
<el-input v-model="form.sipTitle" placeholder="请输入标题"></el-input>
</el-form-item>
<el-form-item label="展示顺序">
<el-input-number v-model="form.orderNum" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="内容说明">
<el-input v-model="form.sipDescription" placeholder="请输入说明信息" type="textarea"></el-input>
</el-form-item>
<el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-option
@ -34,9 +34,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="图片">
<ImageUpload :limit="1" :value="form.sipUrl" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>
</el-form-item>
<el-form-item label="图片">
<ImageUpload :fileSize="5" :limit="1" :value="form.sipUrl" @onRemoved="handleImgRemoved"
@onUploaded="handleImgUplaoded"></ImageUpload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">提 交</el-button>
@ -49,7 +50,8 @@
<el-card shadow="hover" :body-style="{pading: '10px'}">
<el-popover>
<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>
<div style="text-align:center;padding-top:12px">
<span>
@ -64,9 +66,10 @@
</div>
</template>
<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 {listAllProcess} from "@/api/mes/pro/process";
export default{
name: "SOPTab",
components: {ImageUpload},
@ -76,26 +79,26 @@ export default{
},
data(){
return {
title: "新增SIP信息",
loading: true,
open: false,
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{ required: true, message: "物料产品ID不能为空", trigger: "blur" }
],
},
// 产品SOP表格数据
sipList: [],
//用于图片预览的清单
imageList: [],
//工序选项
processOptions:[],
queryParams: {
itemId: this.itemId
}
title: "新增SIP信息",
loading: true,
open: false,
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{required: true, message: "物料产品ID不能为空", trigger: "blur"}
],
},
// 产品SOP表格数据
sipList: [],
//用于图片预览的清单
imageList: [],
//工序选项
processOptions: [],
queryParams: {
itemId: this.itemId
}
}
},
created(){
@ -136,7 +139,7 @@ export default{
processName: null,
sopTitle: null,
sopDescription: null,
sopUrl: null
sopUrl: null
};
this.resetForm("form");
},
@ -153,28 +156,28 @@ export default{
this.reset();
const sipId = row.sipId || this.ids
getSip(sipId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改产品SIP";
this.form = response.data;
this.open = true;
this.title = "修改产品SIP";
});
},
//图片上传成功
handleImgUplaoded(imgUrl){
this.form.sipUrl = imgUrl;
},
//图片移除
handleImgRemoved(imgUrl){
this.form.sipUrl = null;
},
//提交
submitForm(){
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.sipId != null) {
updateSip(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
//图片上传成功
handleImgUplaoded(imgUrl) {
this.form.sipUrl = imgUrl;
},
//图片移除
handleImgRemoved(imgUrl) {
this.form.sipUrl = null;
},
//提交
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.sipId != null) {
updateSip(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addSip(this.form).then(response => {
@ -228,4 +231,4 @@ export default{
width: 600px;
height: 500px;
}
</style>
</style>

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

@ -13,17 +13,17 @@
</el-col>
</el-row>
<div class="header">
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标题" prop="sopTitle">
<el-input v-model="form.sopTitle" placeholder="请输入标题"></el-input>
</el-form-item>
<el-form-item label="展示顺序">
<el-input-number :min="1" v-model="form.orderNum"></el-input-number>
</el-form-item>
<el-form-item label="内容说明">
<el-input type="textarea" v-model="form.sopDescription" placeholder="请输入说明信息"></el-input>
</el-form-item>
<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-item label="标题" prop="sopTitle">
<el-input v-model="form.sopTitle" placeholder="请输入标题"></el-input>
</el-form-item>
<el-form-item label="展示顺序">
<el-input-number v-model="form.orderNum" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="内容说明">
<el-input v-model="form.sopDescription" placeholder="请输入说明信息" type="textarea"></el-input>
</el-form-item>
<el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-option
@ -34,9 +34,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="图片">
<ImageUpload :limit="1" :value="form.sopUrl" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>
</el-form-item>
<el-form-item label="图片">
<ImageUpload :fileSize="5" :limit="1" :value="form.sopUrl" @onRemoved="handleImgRemoved"
@onUploaded="handleImgUplaoded"></ImageUpload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">提 交</el-button>
@ -49,7 +50,8 @@
<el-card shadow="hover" :body-style="{pading: '10px'}">
<el-popover>
<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>
<div style="text-align:center;padding-top:12px">
<span>
@ -64,9 +66,10 @@
</div>
</template>
<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 {listAllProcess} from "@/api/mes/pro/process";
export default{
name: "SOPTab",
components: {ImageUpload},
@ -76,26 +79,26 @@ export default{
},
data(){
return {
title: "新增SOP信息",
loading: true,
open: false,
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{ required: true, message: "物料产品ID不能为空", trigger: "blur" }
],
},
// 产品SOP表格数据
sopList: [],
//用于图片预览的清单
imageList: [],
//工序选项
processOptions:[],
queryParams: {
itemId: this.itemId
}
title: "新增SOP信息",
loading: true,
open: false,
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{required: true, message: "物料产品ID不能为空", trigger: "blur"}
],
},
// 产品SOP表格数据
sopList: [],
//用于图片预览的清单
imageList: [],
//工序选项
processOptions: [],
queryParams: {
itemId: this.itemId
}
}
},
created(){
@ -136,7 +139,7 @@ export default{
processName: null,
sopTitle: null,
sopDescription: null,
sopUrl: null
sopUrl: null
};
this.resetForm("form");
},
@ -165,8 +168,8 @@ export default{
},
//图片移除
handleImgRemoved(imgUrl){
console.log(imgUrl);
this.form.sopUrl = null;
console.log(imgUrl);
this.form.sopUrl = null;
},
//提交
submitForm(){
@ -230,4 +233,4 @@ export default{
width: 600px;
height: 500px;
}
</style>
</style>

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

@ -199,7 +199,7 @@
</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-row>
<el-col :span="14">
@ -417,7 +417,8 @@
</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
ref="upload"
:limit="1"
@ -452,7 +453,7 @@
</template>
<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 SOPTab from "./components/sop.vue"
@ -460,7 +461,7 @@ import SIPTab from "./components/sip.vue"
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule"
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 {getBarcodeUrl} from "@/api/mes/wm/barcode";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";

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

@ -114,17 +114,17 @@
/>
<!-- 添加或修改单位对话框 -->
<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-item label="单位名称" prop="measureName">
<el-input v-model="form.measureName" placeholder="请输入单位名称" />
<el-input v-model="form.measureName" placeholder="请输入单位名称"/>
</el-form-item>
<el-form-item label="单位简称" prop="measureCode">
<el-input v-model="form.measureCode" placeholder="请输入单位简称" />
<el-input v-model="form.measureCode" placeholder="请输入单位简称"/>
</el-form-item>
<!-- <el-form-item label="是否是主单位" prop="primaryFlag">-->
<!-- <el-radio-group v-model="form.primaryFlag">-->
<!-- <el-radio-->
<!-- <el-form-item label="是否是主单位" prop="primaryFlag">-->
<!-- <el-radio-group v-model="form.primaryFlag">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.sys_yes_no"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
@ -158,7 +158,14 @@
</template>
<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 {
name: "Unitmeasure",

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

@ -130,11 +130,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="供应商编码" align="center" prop="vendorCode" >
<template slot-scope="scope">
<el-button
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:vendor:query']"
>{{scope.row.vendorCode}}</el-button>
>{{ scope.row.vendorCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="供应商名称" align="center" prop="vendorName" width="150px" :show-overflow-tooltip="true"/>
@ -171,7 +172,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -181,22 +182,22 @@
/>
<!-- 添加或修改供应商对话框 -->
<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-row>
<el-col :span="14">
<el-row>
<el-col :span="20">
<el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" placeholder="请输入供应商编码" />
<el-input v-model="form.vendorCode" placeholder="请输入供应商编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -230,10 +231,10 @@
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="供应商简介" prop="vendorDes">
@ -364,7 +365,8 @@
</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
ref="upload"
:limit="1"
@ -397,10 +399,11 @@
</template>
<script>
import { listVendor, getVendor, delVendor, addVendor, updateVendor } from "@/api/mes/md/vendor";
import { getBarcodeUrl } from "@/api/mes/wm/barcode";
import { getToken } from "@/utils/auth";
import {addVendor, delVendor, getVendor, listVendor, updateVendor} from "@/api/mes/md/vendor";
import {getBarcodeUrl} from "@/api/mes/wm/barcode";
import {getToken} from "@/utils/auth";
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Vendor",
dicts: ['sys_yes_no','mes_vendor_level'],
@ -510,7 +513,7 @@ export default {
},
// 表单重置
reset() {
this.form = {
this.form = {
vendorId: null,
vendorCode: null,
vendorName: null,
@ -667,10 +670,10 @@ export default {
getBarcodeUrl(){
this.barcodeParams.bussinessId = this.form.vendorId;
this.barcodeParams.bussinessCode = this.form.vendorCode;
getBarcodeUrl(this.barcodeParams).then( response =>{
if(response.data != null){
this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM
}
getBarcodeUrl(this.barcodeParams).then(response => {
if (response.data != null) {
this.$set(this.form, 'barcodeUrl', response.data.barcodeUrl);//强制刷新DOM
}
});
},
//自动生成编码
@ -682,7 +685,7 @@ export default {
});
}else{
this.form.vendorCode = null;
}
}
}
}
};
@ -701,4 +704,4 @@ export default {
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
}
</style>
</style>

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

@ -98,7 +98,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -108,21 +108,21 @@
/>
<!-- 添加或修改车间对话框 -->
<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-row>
<el-col :span="12">
<el-form-item label="车间编码" prop="workshopCode">
<el-input v-model="form.workshopCode" placeholder="请输入车间编码" />
<el-input v-model="form.workshopCode" placeholder="请输入车间编码"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
<el-form-item label-width="80">
<el-switch v-if="optType != 'view'"
v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
</el-row>
@ -181,8 +181,9 @@
</template>
<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"
export default {
name: "Workshop",
dicts: ['sys_yes_no'],
@ -365,7 +366,7 @@ export default {
}else{
this.form.workshopCode = null;
}
}
}
};

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

@ -22,19 +22,19 @@
</template>
</el-table-column>
</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-item label="工装夹具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option
v-for="dict in toolTypeOptions"
:key="dict.toolTypeId"
:label="dict.toolTypeName"
:value="dict.toolTypeId"
></el-option>
<el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option
v-for="dict in toolTypeOptions"
:key="dict.toolTypeId"
:label="dict.toolTypeName"
:value="dict.toolTypeId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数量" prop="quantity">
@ -50,8 +50,15 @@
</template>
<script>
import { listWorkstationtool, getWorkstationtool, delWorkstationtool, addWorkstationtool, updateWorkstationtool } from "@/api/mes/md/workstationtool";
import { listAllTooltype } from "@/api/mes/tm/tooltype"
import {
addWorkstationtool,
delWorkstationtool,
getWorkstationtool,
listWorkstationtool,
updateWorkstationtool
} from "@/api/mes/md/workstationtool";
import {listAllTooltype} from "@/api/mes/tm/tooltype"
export default {
name: "Workstationtool",
data() {

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

@ -22,19 +22,19 @@
</template>
</el-table-column>
</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-item label="岗位" prop="postId">
<el-select v-model="form.postId" placeholder="请选择岗位">
<el-option
v-for="dict in postOptions"
:key="dict.postId"
:label="dict.postName"
:value="dict.postId"
></el-option>
</el-select>
<el-select v-model="form.postId" placeholder="请选择岗位">
<el-option
v-for="dict in postOptions"
:key="dict.postId"
:label="dict.postName"
:value="dict.postId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数量" prop="quantity">
@ -50,8 +50,15 @@
</template>
<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";
export default {
name: "Workstationworker",
data() {
@ -70,7 +77,7 @@ export default {
total: 0,
// 人力资源表格数据
workstationworkerList: [],
postOptions:[],
postOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层

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

@ -143,7 +143,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -153,22 +153,22 @@
/>
<!-- 添加或修改工作站对话框 -->
<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-row>
<el-col :span="14">
<el-row>
<el-col :span="16">
<el-form-item label="工作站编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作站编码" />
<el-input v-model="form.workstationCode" placeholder="请输入工作站编码"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -209,9 +209,9 @@
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col>
</el-row>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="所属工序" prop="processId">
@ -224,7 +224,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
@ -263,7 +263,8 @@
<span>设备资源</span>
<el-button style="float:right; padding: 3px 0" @click="handleMachineryAdd" v-if="optType !='view'" type="text">新增</el-button>
</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-carousel-item>
<el-carousel-item>
@ -297,7 +298,13 @@
</template>
<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 MachinerySelectSingle from "@/components/machinerySelect/single.vue";
@ -310,8 +317,9 @@ import WorkStationTool from "./components/tool";
import {getTreeList} from "@/api/mes/wm/warehouse"
import {listAllProcess} from "@/api/mes/pro/process";
import {genCode} from "@/api/system/autocode/rule";
import { listAllWorkshop } from "@/api/mes/md/workshop";
import { getBarcodeUrl } from "@/api/mes/wm/barcode";
import {listAllWorkshop} from "@/api/mes/md/workshop";
import {getBarcodeUrl} from "@/api/mes/wm/barcode";
export default {
name: "Workstation",
dicts: ['sys_yes_no'],
@ -414,7 +422,7 @@ export default {
],
processId: [
{ required: true, message: "请选择所属工序", trigger: "blur" }
]
]
}
};
},
@ -436,7 +444,7 @@ export default {
},
//查询车间信息
getWorkshops(){
listAllWorkshop().then( response => {
listAllWorkshop().then(response => {
this.workshopOptions = response.data;
});
},
@ -448,16 +456,16 @@ export default {
},
//获取仓库
getWarehouseList(){
getTreeList().then( response =>{
getTreeList().then(response => {
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -643,10 +651,10 @@ export default {
getBarcodeUrl(){
this.barcodeParams.bussinessId = this.form.workstationId;
this.barcodeParams.bussinessCode = this.form.workstationCode;
getBarcodeUrl(this.barcodeParams).then( response =>{
if(response.data != null){
this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM
}
getBarcodeUrl(this.barcodeParams).then(response => {
if (response.data != null) {
this.$set(this.form, 'barcodeUrl', response.data.barcodeUrl);//强制刷新DOM
}
});
},
}
@ -666,4 +674,4 @@ export default {
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
}
</style>
</style>

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

@ -72,7 +72,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -82,17 +82,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="120px">
<el-row >
<el-col :span="12">
<el-form-item label="顺序编号" prop="orderNum">
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入顺序编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="材料URL" prop="docUrl">
<el-input v-model="form.docUrl" placeholder="请输入材料URL" />
<el-row>
<el-col :span="12">
<el-form-item label="顺序编号" prop="orderNum">
<el-input-number v-model="form.orderNum" :min="1" placeholder="请输入顺序编号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="材料URL" prop="docUrl">
<el-input v-model="form.docUrl" placeholder="请输入材料URL"/>
</el-form-item>
</el-col>
</el-row>
@ -132,7 +132,13 @@
</template>
<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 {
name: "Processcontent",

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

@ -1,10 +1,11 @@
<template>
<el-dialog title="缺陷记录"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
v-if="showFlag"
:close-on-click-modal="false"
:modal= false
:visible.sync="showFlag"
center
width="80%"
>
<el-row :gutter="10" v-if="optType !='view'" class="mb8">
<el-col :span="1.5">
@ -24,8 +25,9 @@
size="mini"
:disabled="single"
@click="handleUpdate"
>常见缺陷</el-button>
</el-col>
>常见缺陷
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -37,14 +39,14 @@
</el-table-column>
<el-table-column label="缺陷等级" align="center" prop="defectLevel">
<template slot-scope="scope">
<el-select v-model="scope.row.defectLevel">
<el-option
v-for="dict in dict.type.mes_defect_level"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<el-select v-model="scope.row.defectLevel">
<el-option
v-for="dict in dict.type.mes_defect_level"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="缺陷数量" align="center" prop="defectQuantity" >
@ -65,7 +67,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -82,7 +84,7 @@
</template>
<script>
import { listDefectrecord, getDefectrecord, delDefectrecord, addDefectrecord, updateDefectrecord } from "@/api/mes/qc/defectrecord";
import {delDefectrecord, listDefectrecord, updateDefectrecord} from "@/api/mes/qc/defectrecord";
export default {
name: "Defectrecord",
@ -95,14 +97,14 @@ export default {
},
watch :{
qcId(){
this.queryParams.qcId = this.qcId;
this.queryParams.qcId = this.qcId;
},
qcType(){
this.queryParams.qcType = this.qcType;
},
lineId(){
this.queryParams.lineId = this.lineId;
}
}
},
data() {
return {
@ -201,7 +203,7 @@ export default {
delDefectrecord(recordIds).then(res=>{
that.getList();
});
}
}
}
})
});

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

@ -107,15 +107,16 @@
<el-table v-loading="loading" :data="ipqcList" @selection-change="handleSelectionChange">
<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">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:qc:ipqc:query']"
>{{scope.row.ipqcCode}}</el-button>
>{{ scope.row.ipqcCode }}
</el-button>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="检验类型" align="center" prop="ipqcType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_ipqc_type" :value="scope.row.ipqcType"/>
@ -143,7 +144,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -165,7 +166,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -175,20 +176,20 @@
/>
<!-- 添加或修改过程检验单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="检验单编号" prop="ipqcCode">
<el-input v-model="form.ipqcCode" placeholder="请输入检验单编号" />
<el-input v-model="form.ipqcCode" placeholder="请输入检验单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -213,13 +214,13 @@
</el-col>
<el-col :span="8">
<el-form-item label="工单编码" prop="workorderCode">
<el-input v-if="form.ipqcId == null" v-model="form.workorderCode" placeholder="请选择生产工单" >
<el-input v-if="form.ipqcId == null" v-model="form.workorderCode" placeholder="请选择生产工单">
<el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
</el-input>
<!--保存过则不允许修改工单，需要修改则删除重做-->
<el-input v-else v-model="form.workorderCode" >
<el-input v-else v-model="form.workorderCode">
</el-input>
</el-form-item>
</el-form-item>
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col>
<el-col :span="8">
@ -302,15 +303,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="不合格数" prop="quantityUnqualified">
<el-input v-model="form.quantityUnqualified" placeholder="请输入不合格数" />
<el-input v-model="form.quantityUnqualified" placeholder="请输入不合格数"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合格品数量" prop="quantityQualified">
<el-input v-model="form.quantityQualified" placeholder="请输入合格品数量" />
<el-input v-model="form.quantityQualified" placeholder="请输入合格品数量"/>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="致命缺陷数量" prop="crQuantity">
@ -330,7 +331,7 @@
</el-row>
</el-collapse-item>
</el-collapse>
<el-row>
<el-col :span="8">
<el-form-item label="检测日期" prop="inspectDate">
@ -368,7 +369,7 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider>
<el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider>
<el-card shadow="always" v-if="form.ipqcId !=null" class="box-card">
<Ipqcline ref=line :ipqcId="form.ipqcId" :optType="optType"></Ipqcline>
</el-card>
@ -383,11 +384,12 @@
</template>
<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 WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import Ipqcline from "./line.vue"
export default {
name: "Ipqc",
components: {WorkorderSelect,WorkstationSelect,Ipqcline},
@ -471,7 +473,7 @@ export default {
workstationCode: [
{ required: true, message: "请选择工作站", trigger: "blur" }
],
quantityCheck: [
{ required: true, message: "检测数量不能为空", trigger: "blur" }
],

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

@ -197,7 +197,7 @@
size="mini"
type="text"
icon="el-icon-delete"
@click="viewReport"
>
查看报表
@ -205,7 +205,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -215,20 +215,20 @@
/>
<!-- 添加或修改来料检验单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="检验单编号" prop="iqcCode">
<el-input v-model="form.iqcCode" placeholder="请输入来料检验单编号" />
<el-input v-model="form.iqcCode" placeholder="请输入来料检验单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -251,7 +251,7 @@
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
<!--如果已经保存过，则产品不允许再修改，需要修改就删除重做-->
<el-input v-else v-model="form.itemCode">
<el-input v-else v-model="form.itemCode">
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
@ -373,18 +373,18 @@
</el-col>
<el-col :span="8">
<el-form-item label="严重缺陷数量" prop="majQuantity">
<el-input v-model="form.majQuantity" readonly="readonly" />
<el-input v-model="form.majQuantity" readonly="readonly"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="轻微缺陷数量" prop="minQuantity">
<el-input v-model="form.minQuantity" readonly="readonly" />
<el-input v-model="form.minQuantity" readonly="readonly"/>
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<el-divider v-if="form.iqcId !=null" content-position="center">检测项</el-divider>
</el-collapse>
<el-divider v-if="form.iqcId !=null" content-position="center">检测项</el-divider>
<el-card shadow="always" v-if="form.iqcId !=null" class="box-card">
<IqcLine ref=line :iqcId="form.iqcId" :optType="optType"></IqcLine>
</el-card>
@ -400,12 +400,13 @@
</template>
<script>
import { listIqc, getIqc, delIqc, addIqc, updateIqc } from "@/api/mes/qc/iqc";
import ItemSelect from "@/components/itemSelect/single.vue";
import {addIqc, delIqc, getIqc, listIqc, updateIqc} from "@/api/mes/qc/iqc";
import ItemSelect from "@/components/itemSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
import IqcLine from "./iqcline.vue";
import {genCode} from "@/api/system/autocode/rule"
import {getReport,getReport2} from "@/api/mes/report/report"
import {getReport2} from "@/api/mes/report/report"
export default {
name: "Iqc",
dicts: ['mes_qc_result','mes_order_status'],
@ -480,7 +481,7 @@ export default {
iqcName: [
{ required: true, message: "来料检验单名称不能为空", trigger: "blur" }
],
vendorCode: [
{ required: true, message: "供应商不能为空", trigger: "blur" }
],
@ -677,7 +678,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
handleSelectVendor(){
@ -707,7 +708,7 @@ export default {
var reportName = "Test";
getReport2(reportName).then(res=>{
debugger;
let blob = new Blob([res],{type:'application/pdf'});
let blob = new Blob([res], {type: 'application/pdf'});
let href = URL.createObjectURL(blob);
console.log(href);
window.open(`/pdf/web/viewer.html?file=${encodeURIComponent(href)}`);

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

@ -104,30 +104,31 @@
</el-row>
<el-table v-loading="loading" :data="oqcList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="出货检验单编号" width="150px" align="center" prop="oqcCode" >
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="出货检验单编号" prop="oqcCode" width="150px">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:qc:oqc:query']"
>{{scope.row.oqcCode}}</el-button>
>{{ scope.row.oqcCode }}
</el-button>
</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="clientName" :show-overflow-tooltip="true"/>
<el-table-column label="批次号" align="center" prop="batchCode" />
<el-table-column label="产品编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="产品名称" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="发货数量" align="center" prop="quantityOut" />
<el-table-column label="检测数量" align="center" prop="quantityCheck" />
<el-table-column label="不合格数" align="center" prop="quantityUnqualified" />
<el-table-column label="检测结果" align="center" prop="checkResult" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_result" :value="scope.row.checkResult"/>
@ -170,7 +171,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -180,30 +181,30 @@
/>
<!-- 添加或修改出货检验单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="检验单编号" prop="oqcCode">
<el-input v-model="form.oqcCode" placeholder="请输入出货检验单编号" />
<el-input v-model="form.oqcCode" placeholder="请输入出货检验单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检验单名称" prop="oqcName">
<el-input v-model="form.oqcName" placeholder="请输入内容" />
<el-input v-model="form.oqcName" placeholder="请输入内容"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
@ -213,14 +214,14 @@
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
<!--如果已经保存过，则产品不允许再修改，需要修改就删除重做-->
<el-input v-else v-model="form.itemCode"/>
<el-input v-else v-model="form.itemCode"/>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
@ -347,19 +348,19 @@
</el-col>
<el-col :span="8">
<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-col>
<el-col :span="8">
<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-col>
</el-row>
</el-collapse-item>
</el-collapse>
</el-collapse>
</el-form>
<el-divider v-if="form.oqcId !=null" content-position="center">检测项</el-divider>
<el-divider v-if="form.oqcId !=null" content-position="center">检测项</el-divider>
<el-card shadow="always" v-if="form.oqcId !=null" class="box-card">
<Oqcline ref=line :oqcId="form.oqcId" :optType="optType"></Oqcline>
</el-card>
@ -374,11 +375,12 @@
</template>
<script>
import { listOqc, getOqc, delOqc, addOqc, updateOqc } from "@/api/mes/qc/oqc";
import ItemSelect from "@/components/itemSelect/single.vue";
import {addOqc, delOqc, getOqc, listOqc, updateOqc} from "@/api/mes/qc/oqc";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
import {genCode} from "@/api/system/autocode/rule";
import Oqcline from "./line.vue";
export default {
name: "Oqc",
dicts: ['mes_order_status','mes_qc_result'],
@ -447,19 +449,19 @@ export default {
// 表单校验
rules: {
oqcCode: [
{ required: true, message: "出货检验单编号不能为空", trigger: "blur" }
{required: true, message: "出货检验单编号不能为空", trigger: "blur"}
],
clientCode: [
{ required: true, message: "客户不能为空", trigger: "blur" }
],
{required: true, message: "客户不能为空", trigger: "blur"}
],
itemCode: [
{ required: true, message: "产品不能为空", trigger: "blur" }
{required: true, message: "产品不能为空", trigger: "blur"}
],
quantityOut: [
{ required: true, message: "发货数量不能为空", trigger: "blur" }
{required: true, message: "发货数量不能为空", trigger: "blur"}
],
quantityCheck: [
{ required: true, message: "本次检测数量不能为空", trigger: "blur" }
{required: true, message: "本次检测数量不能为空", trigger: "blur"}
],
outDate: [
{ required: true, message: "请选择出货日期", trigger: "blur" }
@ -637,7 +639,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
handleSelectClient(){

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

@ -113,7 +113,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -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-row>
<el-col :span="24">
<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-col>
</el-row>
@ -169,7 +169,7 @@
</template>
<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 {
name: "Qcdefect",

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

@ -118,16 +118,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="120px">
<el-row>
<el-col :span="8">
<el-form-item label="检测项编码" prop="indexCode">
<el-input v-model="form.indexCode" placeholder="请输入检测项编码" />
<el-input v-model="form.indexCode" placeholder="请输入检测项编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@ -178,8 +178,9 @@
</template>
<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"
export default {
name: "Qcindex",
dicts: ['mes_index_type'],

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

@ -97,7 +97,7 @@
<el-table-column label="检测模板名称" align="center" prop="templateName" />
<el-table-column label="检测种类" align="center" prop="qcTypesParam" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcTypesParam"/>
<dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcTypesParam"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag">
@ -124,7 +124,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -134,20 +134,20 @@
/>
<!-- 添加或修改检测模板对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="模板编号" prop="templateCode">
<el-input v-model="form.templateCode" placeholder="请输入模板编号" />
<el-input v-model="form.templateCode" placeholder="请输入模板编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -159,12 +159,13 @@
</el-row>
<el-row>
<el-col :span="18">
<el-form-item label="检测种类" prop="qcTypesParam">
<el-form-item label="检测种类" prop="qcTypesParam">
<el-checkbox-group v-model="form.qcTypesParam">
<el-checkbox v-for="dict in dict.type.mes_qc_type"
:key="dict.value"
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
:key="dict.value"
:label="dict.value"
:value="dict.value">{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
@ -214,10 +215,11 @@
</template>
<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 TemplateIndex from "./templateindex.vue"
import TemplateProduct from "./templateproduct";
export default {
name: "Qctemplate",
dicts: ['sys_yes_no','mes_qc_type'],

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

@ -79,17 +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-row>
<el-col :span="12">
<el-form-item label="检测项" prop="indexId">
<el-input v-model="form.indexName" placeholder="请选择检测项" >
<el-button slot="append" @click="handleSelectIndex" icon="el-icon-search"></el-button>
</el-input>
<IndexSelect ref="indexSelect" @onSelected="onIndexSelected" ></IndexSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检测项" prop="indexId">
<el-input v-model="form.indexName" placeholder="请选择检测项">
<el-button slot="append" icon="el-icon-search" @click="handleSelectIndex"></el-button>
</el-input>
<IndexSelect ref="indexSelect" @onSelected="onIndexSelected"></IndexSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检测刀具" prop="qcTool">
<el-input v-model="form.qcTool" placeholder="请输入检测刀具" />
@ -160,9 +160,16 @@
</template>
<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 { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
export default {
name: "Templateindex",
dicts: ['mes_index_type'],

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

@ -78,7 +78,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -88,17 +88,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="110px">
<el-row>
<el-col :span="12">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" >
<el-button slot="append" @click="handleSelectItem" icon="el-icon-search"></el-button>
</el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" ></ItemSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码">
<el-button slot="append" icon="el-icon-search" @click="handleSelectItem"></el-button>
</el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
@ -155,11 +155,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -172,14 +172,21 @@
</template>
<script>
import { listTemplateproduct, getTemplateproduct, delTemplateproduct, addTemplateproduct, updateTemplateproduct } from "@/api/mes/qc/templateproduct";
import ItemSelect from "@/components/itemSelect/single.vue";
import {
addTemplateproduct,
delTemplateproduct,
getTemplateproduct,
listTemplateproduct,
updateTemplateproduct
} from "@/api/mes/qc/templateproduct";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
name: "Templateproduct",
name: "Templateproduct",
components: {ItemSelect},
props:{
optType: null,
templateId: null
props: {
optType: null,
templateId: null
},
data() {
return {
@ -344,7 +351,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
}

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

@ -176,7 +176,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -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-row>
<el-col :span="12">
@ -228,9 +228,9 @@
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -304,9 +304,10 @@
</template>
<script>
import { listTool, getTool, delTool, addTool, updateTool } from "@/api/mes/tm/tool";
import { listAllTooltype } from "@/api/mes/tm/tooltype"
import {addTool, delTool, getTool, listTool, updateTool} from "@/api/mes/tm/tool";
import {listAllTooltype} from "@/api/mes/tm/tooltype"
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Tool",
dicts: ['mes_tool_status', 'mes_mainten_type'],
@ -466,7 +467,7 @@ export default {
this.reset();
const toolId = row.toolId || this.ids;
getTool(toolId).then(response => {
this.form = response.data;
this.form = response.data;
this.open = true;
this.title = "查看工装夹具信息";
this.optType = "view";

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

@ -79,15 +79,16 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="类型编码" align="center" prop="toolTypeCode" >
<el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="类型编码" prop="toolTypeCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:tm:tooltype:query']"
>{{scope.row.toolTypeCode}}</el-button>
>{{ scope.row.toolTypeCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="类型名称" align="center" prop="toolTypeName" :show-overflow-tooltip="true"/>
@ -129,7 +130,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -139,19 +140,19 @@
/>
<!-- 添加或修改工装夹具类型对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="类型编码" prop="toolTypeCode">
<el-input v-model="form.toolTypeCode" placeholder="请输入类型编码" />
<el-input v-model="form.toolTypeCode" placeholder="请输入类型编码"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
v-if="optType != 'view'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-col>
<el-col :span="12">
@ -193,16 +194,16 @@
</el-col>
<el-col :span="8" v-if="form.codeFlag=='Y'">
<el-form-item label="保养周期" prop="maintenPeriod">
<el-input v-model="form.maintenPeriod" placeholder="请输入保养周期" />
<el-input v-model="form.maintenPeriod" placeholder="请输入保养周期"/>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -215,8 +216,9 @@
</template>
<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"
export default {
name: "Tooltype",
dicts: ['mes_mainten_type','sys_yes_no'],

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

@ -152,14 +152,14 @@
/>
<!-- 添加或修改库位设置对话框 -->
<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-row>
<el-col :span="14">
<el-row>
<el-col :span="16">
<el-form-item label="库位编码" prop="areaCode">
<el-input v-model="form.areaCode" placeholder="请输入库位编码" />
<el-input v-model="form.areaCode" placeholder="请输入库位编码"/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -236,22 +236,23 @@
</div>
</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>
</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>
</el-dialog>
</div>
</template>
<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 BarcodeImg from "@/components/barcodeImg/index.vue"
import SelecLocationCmps from "@/components/wm/SelecLocationCmps.vue";
import SelecAreaCmps from "@/components/wm/SelecAreaCmps.vue";
export default {
name: "Area",
dicts: ['sys_yes_no'],

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

@ -1,21 +1,21 @@
<template>
<el-dialog title="批量打印"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
v-if="showFlag"
:close-on-click-modal="false"
:modal=false
:visible.sync="showFlag"
center
width="80%">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="条码类型" prop="barcodeType">
<el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型">
<el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型">
<el-option
v-for="dict in dict.type.mes_barcode_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.mes_barcode_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -36,21 +36,22 @@
</el-form>
<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">
<template slot-scope="scope">
<el-image @click="handleView(scope.row)" class="barcodeClass" fit="scale-down" :src="scope.row.barcodeUrl">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
<el-image :src="scope.row.barcodeUrl" class="barcodeClass" fit="scale-down"
@click="handleView(scope.row)">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="条码格式" align="center" prop="barcodeFormart">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_formart" :value="scope.row.barcodeFormart"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="条码类型" align="center" prop="barcodeType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_type" :value="scope.row.barcodeType"/>
@ -59,35 +60,36 @@
<el-table-column label="条码内容" align="center" prop="barcodeContent" />
<el-table-column label="业务编码" align="center" prop="bussinessCode" />
<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">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="生成时间" align="center" prop="createTime" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button @click="showFlag=false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listBarcode, updateBarcode } from "@/api/mes/wm/barcode";
export default {
<script>
import {listBarcode} from "@/api/mes/wm/barcode";
export default {
name: "BatchPrint",
dicts: ['sys_yes_no', 'mes_barcode_type','mes_barcode_formart'],
data() {
@ -167,4 +169,3 @@
}
};
</script>

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

@ -1,13 +1,13 @@
<template>
<el-dialog title="赋码设置"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
v-if="showFlag"
:close-on-click-modal="false"
:modal=false
:visible.sync="showFlag"
center
width="80%">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_type" :value="scope.row.barcodeType"/>
@ -40,7 +40,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -57,8 +57,9 @@
</template>
<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";
export default {
name: "Barcodeconfig",
components: {ReportSelect},

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

@ -81,21 +81,21 @@
</el-row>
<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">
<template slot-scope="scope">
<el-image @click="handleView(scope.row)" class="barcodeClass" fit="scale-down" :src="scope.row.barcodeUrl">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
<el-image :src="scope.row.barcodeUrl" class="barcodeClass" fit="scale-down" @click="handleView(scope.row)">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="条码格式" align="center" prop="barcodeFormart">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_formart" :value="scope.row.barcodeFormart"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="条码类型" align="center" prop="barcodeType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_type" :value="scope.row.barcodeType"/>
@ -128,7 +128,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -138,11 +138,11 @@
/>
<!-- 添加或修改条码清单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="条码格式" prop="barcodeFormart">
<el-form-item label="条码格式" prop="barcodeFormart">
<el-select v-model="form.barcodeFormart" placeholder="请选择条码格式">
<el-option
v-for="dict in dict.type.mes_barcode_formart"
@ -209,14 +209,14 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader> -->
<el-cascader v-model="warehouseInfo"
ref="warehouseRef"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -263,7 +263,7 @@
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"></WorkstationSelect>
</el-col>
<el-col :span="12">
<el-form-item label="工作站名称" prop="bussinessName">
@ -280,7 +280,7 @@
<el-button slot="append" icon="el-icon-search" @click="handleMaterialStockSelect"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" @onSelected="onMaterialStockSelected"> </StockSelect>
<StockSelect ref="stockSelect" @onSelected="onMaterialStockSelected"></StockSelect>
</el-col>
<el-col :span="16">
<el-form-item label="物资信息" prop="bussinessName">
@ -311,14 +311,14 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<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>
</div>
</el-dialog>
@ -326,8 +326,8 @@
</template>
<script>
import { listBarcode, getBarcode, delBarcode, addBarcode, updateBarcode } from "@/api/mes/wm/barcode";
import ItemSelect from "@/components/itemSelect/single.vue";
import {addBarcode, delBarcode, getBarcode, listBarcode, updateBarcode} from "@/api/mes/wm/barcode";
import ItemSelect from "@/components/itemSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
import PackageSelectSingle from "@/components/package/single.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
@ -335,7 +335,7 @@ import StockSelect from "@/components/stockSelect/single.vue"
import Barcodeconfig from "./config.vue"
import BarcodeBatchPrint from "./batchprint.vue"
import {getTreeList} from "@/api/mes/wm/warehouse"
import { checkPermi } from "@/utils/permission.js";
export default {
name: "Barcode",
dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'],
@ -537,21 +537,22 @@ export default {
},
//选择仓库、库区、库位
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
debugger;
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
debugger;
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -596,7 +597,7 @@ export default {
}
},
/**
* 选择库存
* 选择库存
*/
handleMaterialStockSelect(){
this.$refs.stockSelect.showFlag = true;

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

@ -125,7 +125,7 @@
>删除
</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 slot="footer" class="dialog-footer">
<el-button @click="issueVisible=false">取 消</el-button>
@ -254,7 +254,7 @@
</template>
<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 {listMdItem} from "@/api/mes/md/mdItem"
import {listArea} from "@/api/mes/wm/area"

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

@ -96,21 +96,22 @@
</el-row>
<el-table v-loading="loading" :data="issueheaderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="领料单编号" align="center" width="150px" prop="issueCode" >
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="领料单编号" prop="issueCode" width="150px">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:wm:issueheader:query']"
>{{scope.row.issueCode}}</el-button>
>{{ scope.row.issueCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" />
<el-table-column label="工作站" align="center" prop="workstationName" />
<el-table-column label="客户编号" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column :show-overflow-tooltip="true" align="center" label="领料单名称" prop="issueName"/>
<el-table-column align="center" label="生产工单" prop="workorderCode"/>
<el-table-column align="center" label="工作站" prop="workstationName"/>
<el-table-column align="center" label="客户编号" prop="clientCode"/>
<el-table-column align="center" label="客户名称" prop="clientName"/>
<el-table-column label="领料日期" align="center" prop="issueDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d} {h}:{i}') }}</span>
@ -120,7 +121,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -150,7 +151,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -160,20 +161,20 @@
/>
<!-- 添加或修改生产领料单头对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="领料单编号" prop="issueCode">
<el-input v-model="form.issueCode" placeholder="请输入领料单编号" />
<el-input v-model="form.issueCode" placeholder="请输入领料单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -205,33 +206,33 @@
</el-col>
<el-col :span="8">
<el-form-item label="工作站" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请选择工作站" >
<el-input v-model="form.workstationCode" placeholder="请选择工作站">
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"></WorkstationSelect>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="8">
<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-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户编号" >
<el-input v-model="form.clientCode" placeholder="请选择生产工单" >
<el-input v-model="form.clientCode" placeholder="请选择生产工单">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" >
<el-input v-model="form.clientName" placeholder="请选择生产工单" >
<el-form-item label="客户名称">
<el-input v-model="form.clientName" placeholder="请选择生产工单">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
@ -240,13 +241,15 @@
</el-col>
</el-row>
</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">
<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>
<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="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
<el-button v-if="optType =='view' || form.status !='PREPARE' " type="primary" @click="cancel">返回</el-button>
<el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">确 定
</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -254,12 +257,20 @@
</template>
<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 WorkorderSelect from "@/components/workorderSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
import Issueline from "./line.vue";
export default {
name: "Issueheader",
dicts: ['mes_order_status'],
@ -351,20 +362,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -414,7 +426,7 @@ export default {
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -447,9 +459,9 @@ export default {
getIssueheader(issueId).then(response => {
debugger;
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改生产领料单";
this.optType = "edit";
@ -461,9 +473,9 @@ export default {
const issueIds = row.issueId
getIssueheader(issueIds).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看领料单信息";
this.optType = "view";
@ -516,8 +528,8 @@ export default {
}, `issueheader_${new Date().getTime()}.xlsx`)
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
@ -540,7 +552,7 @@ export default {
this.$refs.woSelect.showFlag = true;
},
onWorkorderSelected(row){
if(row != undefined && row != null){
if (row != undefined && row != null) {
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;

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

@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div class="app-container">
<el-row v-if="optType != 'view'" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@ -9,7 +9,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['mes:wm:issueheader:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -69,7 +70,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -79,17 +80,18 @@
/>
<!-- 添加或修改生产领料单行对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" >
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId" @onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择产品物料编码" readonly="readonly">
<el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId"
@onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
@ -157,8 +159,9 @@
</template>
<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"
export default {
name: "Issueline",
components:{StockSelect},
@ -350,7 +353,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.warehouseId = obj.warehouseId;
this.form.warehouseCode = obj.warehouseCode;

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

@ -212,7 +212,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -222,16 +222,16 @@
/>
<!-- 添加或修改物料消耗记录对话框 -->
<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-item label="生产工单ID" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID" />
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID"/>
</el-form-item>
<el-form-item label="生产工单编码" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码"/>
</el-form-item>
<el-form-item label="生产工单名称" prop="workorderName">
<el-input v-model="form.workorderName" placeholder="请输入生产工单名称" />
<el-input v-model="form.workorderName" placeholder="请输入生产工单名称"/>
</el-form-item>
<el-form-item label="生产任务ID" prop="taskId">
<el-input v-model="form.taskId" placeholder="请输入生产任务ID" />
@ -290,7 +290,13 @@
</template>
<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 {

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

@ -230,7 +230,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -240,16 +240,16 @@
/>
<!-- 添加或修改物料消耗记录行对话框 -->
<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-item label="消耗记录ID" prop="recordId">
<el-input v-model="form.recordId" placeholder="请输入消耗记录ID" />
<el-input v-model="form.recordId" placeholder="请输入消耗记录ID"/>
</el-form-item>
<el-form-item label="库存ID" prop="materialStockId">
<el-input v-model="form.materialStockId" placeholder="请输入库存ID" />
<el-input v-model="form.materialStockId" placeholder="请输入库存ID"/>
</el-form-item>
<el-form-item label="产品物料ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入产品物料ID" />
<el-input v-model="form.itemId" placeholder="请输入产品物料ID"/>
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
@ -309,7 +309,13 @@
</template>
<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 {
name: "Itemconsumeline",

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

@ -94,7 +94,7 @@
</el-row>
<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" >
<template slot-scope="scope">
<el-button
@ -105,18 +105,18 @@
</template>
</el-table-column>
<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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<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">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -146,7 +146,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -156,20 +156,20 @@
/>
<!-- 添加或修改物料入库单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="入库单编号" prop="recptCode">
<el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
<el-input v-model="form.recptCode" placeholder="请输入入库单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -180,13 +180,13 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8">
<el-form-item label="入库日期" prop="recptDate">
<el-date-picker clearable
v-model="form.recptDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库日期">
v-model="form.recptDate"
placeholder="请选择入库日期"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@ -220,17 +220,17 @@
<el-col :span="8">
<el-form-item label="入库仓库">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
@ -239,13 +239,14 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.recptId !=null" class="box-card">
<Itemrecptline ref=line :recptId="form.recptId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Itemrecptline>
</el-card>
<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="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>
</div>
</el-dialog>
@ -253,12 +254,20 @@
</template>
<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 {genCode} from "@/api/system/autocode/rule"
import VendorSelect from "@/components/vendorSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
import Itemrecptline from "./line.vue";
export default {
name: "Itemrecpt",
dicts:['mes_order_status'],
@ -352,20 +361,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -407,7 +417,7 @@ export default {
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -440,9 +450,9 @@ export default {
const recptIds = row.recptId
getItemrecpt(recptIds).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看入库单信息";
this.optType = "view";
@ -453,16 +463,16 @@ export default {
this.reset();
const recptId = row.recptId || this.ids
getItemrecpt(recptId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改物料入库单";
this.optType = "edit";
});
},
//执行入库
handleExecute(row){
const recptIds = row.recptId || this.ids;
@ -573,4 +583,4 @@ export default {
flex: 0 1 54%;
order: 1;
}
</style>
</style>

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

@ -66,7 +66,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -76,16 +76,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-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="itemName">
@ -127,7 +127,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -176,10 +176,17 @@
</template>
<script>
import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import {
addItemrecptline,
delItemrecptline,
getItemrecptline,
listItemrecptline,
updateItemrecptline
} from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Itemrecptline",
dicts: ['sys_yes_no'],
@ -272,21 +279,22 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
debugger;
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
debugger;
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -379,9 +387,9 @@ export default {
const lineId = row.lineId || this.ids
getItemrecptline(lineId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改物料入库单行";
});
@ -397,7 +405,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
//IQC检验单选择

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

@ -104,17 +104,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="140px">
<el-row>
<el-col :span="14">
<el-row>
<el-col :span="16">
<el-form-item label="库区编码" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入库区编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="14">
<el-row>
<el-col :span="16">
<el-form-item label="库区编码" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入库区编码"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
@ -165,17 +165,25 @@
</div>
</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>
</el-dialog>
</div>
</template>
<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 BarcodeImg from "@/components/barcodeImg/index.vue"
import SelectWareHouseCmps from "@/components/wm/SelectWareHouseCmps.vue";
export default {
name: "Location",
dicts: ['sys_yes_no'],

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

@ -98,7 +98,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -128,7 +128,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -138,20 +138,20 @@
/>
<!-- 添加或修改外协领料单头对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="发料单编号" prop="issueCode">
<el-input v-model="form.issueCode" placeholder="请输入发料单编号" />
<el-input v-model="form.issueCode" placeholder="请输入发料单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -178,7 +178,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -194,7 +194,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="外协工单" prop="workorderCode">
@ -211,12 +211,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商名称" >
<el-input v-model="form.vendorName" placeholder="请选择外协工单" >
<el-form-item label="供应商名称">
<el-input v-model="form.vendorName" placeholder="请选择外协工单">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
@ -225,13 +225,15 @@
</el-col>
</el-row>
</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">
<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>
<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="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button v-if="optType =='view' || form.status !='PREPARE' " type="primary" @click="cancel">返回</el-button>
<el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保 存
</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -239,11 +241,19 @@
</template>
<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 {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
import Issueline from "./line.vue";
export default {
name: "Outsourceissue",
dicts: ['mes_order_status'],
@ -283,22 +293,38 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
issueCode: null,
issueName: 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, },
issueCode: null,
issueName: 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,
},
// 表单参数
form: {},
// 表单校验
rules: {
issueCode: [
{ required: true, message: "发料单编号不能为空", trigger: "blur" }
],
{required: true, message: "发料单编号不能为空", trigger: "blur"}
],
issueName: [
{ required: true, message: "发料单名称不能为空", trigger: "blur" }
{required: true, message: "发料单名称不能为空", trigger: "blur"}
],
workorderCode: [
{ required: true, message: "请选择外协工单", trigger: "blur" }
{required: true, message: "请选择外协工单", trigger: "blur"}
]
}
};
@ -318,20 +344,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -346,37 +373,37 @@ export default {
// 表单重置
reset() {
this.form = {
issueId: null,
issueCode: null,
issueName: 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: new Date(),
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
issueId: null,
issueCode: null,
issueName: 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: new Date(),
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -449,9 +476,9 @@ export default {
const issueIds = row.issueId
getOutsourceissue(issueIds).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看外协发料单信息";
this.optType = "view";

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

@ -69,7 +69,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -79,17 +79,18 @@
/>
<!-- 添加或修改生产领料单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" >
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId" @onSelected="onStockSelected"></StockSelect>
</el-col>
<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-row>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择产品物料编码" readonly="readonly">
<el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId"
@onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
@ -157,7 +158,13 @@
</template>
<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"
export default {
@ -348,7 +355,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.warehouseId = obj.warehouseId;
this.form.warehouseCode = obj.warehouseCode;

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

@ -77,7 +77,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -87,16 +87,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-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="itemName">
@ -138,7 +138,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -187,10 +187,17 @@
</template>
<script>
import { listOursourcerecptline, getOursourcerecptline, delOursourcerecptline, addOursourcerecptline, updateOursourcerecptline } from "@/api/mes/wm/oursourcerecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import {
addOursourcerecptline,
delOursourcerecptline,
getOursourcerecptline,
listOursourcerecptline,
updateOursourcerecptline
} from "@/api/mes/wm/oursourcerecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Oursourcerecptline",
dicts: ['sys_yes_no'],
@ -251,16 +258,16 @@ export default {
areaCode: null,
areaName: null,
expireDate: null,
},
},
// 表单参数
form: {},
// 表单校验
rules: {
itemCode: [
{ required: true, message: "产品物料不能为空", trigger: "blur" }
{required: true, message: "产品物料不能为空", trigger: "blur"}
],
quantityRecived: [
{ required: true, message: "入库数量不能为空", trigger: "blur" }
{required: true, message: "入库数量不能为空", trigger: "blur"}
],
warehouseId:[
{ required: true, message: "请选择入库的仓库" }
@ -283,21 +290,22 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
debugger;
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
debugger;
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -306,8 +314,8 @@ export default {
});
},
//选择仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
@ -321,34 +329,42 @@ export default {
// 表单重置
reset() {
this.form = {
lineId: null,
recptId: this.recptId,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantityRecived: null,
batchCode: null,
warehouseId: this.warehouseId,
warehouseCode: null,
warehouseName: null,
locationId: this.locationId,
locationCode: null,
locationName: null,
areaId: this.areaId,
areaCode: null,
areaName: null,
expireDate: null,
iqcCheck: 'N',
iqcId: null,
iqcCode: null,
remark: null,
attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
lineId: null,
recptId: this.recptId,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantityRecived: null,
batchCode: null,
warehouseId: this.warehouseId,
warehouseCode: null,
warehouseName: null,
locationId: this.locationId,
locationCode: null,
locationName: null,
areaId: this.areaId,
areaCode: null,
areaName: null,
expireDate: null,
iqcCheck: 'N',
iqcId: null,
iqcCode: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
@ -423,7 +439,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
//IQC检验单选择

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

@ -130,14 +130,14 @@
/>
<!-- 添加或修改装箱单对话框 -->
<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-row>
<el-col :span="12">
<el-row>
<el-col :span="24">
<el-form-item label="料箱编码" prop="code">
<el-input v-model="form.code" placeholder="请输入料箱编码" />
<el-input v-model="form.code" placeholder="请输入料箱编码"/>
</el-form-item>
</el-col>
</el-row>
@ -167,14 +167,15 @@
</template>
<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 Packageline from "./line.vue";
import SubPackage from "./subpackge.vue";
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule"
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Package",
dicts: ['mes_order_status'],

17
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="quantityPackage" />
<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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
@ -59,7 +59,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -69,12 +69,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-row>
<el-col :span="8">
<el-form-item label="生产工单编号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编号" >
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编号">
<el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
</el-input>
</el-form-item>
@ -132,8 +132,15 @@
</template>
<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"
export default {
name: "Packageline",
components: {

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

@ -212,7 +212,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -222,16 +222,16 @@
/>
<!-- 添加或修改产品产出记录对话框 -->
<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-item label="生产工单ID" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID" />
<el-input v-model="form.workorderId" placeholder="请输入生产工单ID"/>
</el-form-item>
<el-form-item label="生产工单编码" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码"/>
</el-form-item>
<el-form-item label="生产工单名称" prop="workorderName">
<el-input v-model="form.workorderName" placeholder="请输入生产工单名称" />
<el-input v-model="form.workorderName" placeholder="请输入生产工单名称"/>
</el-form-item>
<el-form-item label="生产任务ID" prop="taskId">
<el-input v-model="form.taskId" placeholder="请输入生产任务ID" />
@ -290,7 +290,13 @@
</template>
<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 {
name: "Productproduce",

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

@ -221,7 +221,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -231,16 +231,16 @@
/>
<!-- 添加或修改产品产出记录行对话框 -->
<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-item label="产出记录ID" prop="recordId">
<el-input v-model="form.recordId" placeholder="请输入产出记录ID" />
<el-input v-model="form.recordId" placeholder="请输入产出记录ID"/>
</el-form-item>
<el-form-item label="产品物料ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入产品物料ID" />
<el-input v-model="form.itemId" placeholder="请输入产品物料ID"/>
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码"/>
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
@ -297,7 +297,13 @@
</template>
<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 {
name: "Productproduceline",

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

@ -33,8 +33,9 @@
@click="handleDelete"
v-if="optType != 'view'"
v-hasPermi="['mes:wm:productrecpt:remove']"
>删除</el-button>
</el-col>
>删除
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -70,7 +71,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -80,15 +81,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-row>
<el-col :span="8">
<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-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-col>
<el-col :span="8">
@ -126,7 +128,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -148,9 +150,16 @@
</template>
<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 {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Productrecptline",
components:{
@ -243,16 +252,16 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
getTreeList().then(response => {
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -378,15 +387,15 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.quantityRecived = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
}
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];

60
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="120px" align="center" prop="soCode" />
<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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.salseDate, '{y}-{m}-{d}') }}</span>
@ -136,11 +136,11 @@
v-if="scope.row.status == 'PREPARE'"
v-hasPermi="['mes:wm:productsalse:edit']"
>执行出库</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -150,20 +150,20 @@
/>
<!-- 添加或修改销售出库单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="出库单编号" prop="salseCode">
<el-input v-model="form.salseCode" placeholder="请输入出库单编号" />
<el-input v-model="form.salseCode" placeholder="请输入出库单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -221,12 +221,12 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.salseId !=null" content-position="center">物料信息</el-divider>
<el-divider v-if="form.salseId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.salseId !=null" class="box-card">
<Productsalseline ref="line" :salseId="form.salseId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Productsalseline>
</el-card>
@ -240,12 +240,20 @@
</template>
<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 OqcSelectSingle from "@/components/oqcSelect/single.vue"
import ClientSelect from "@/components/clientSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Productsalse",
dicts: ['mes_order_status'],
@ -340,16 +348,16 @@ export default {
},
//获取仓库信息
getWarehouseList(){
getTreeList().then( response =>{
getTreeList().then(response => {
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -357,8 +365,8 @@ export default {
});
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
@ -428,9 +436,9 @@ export default {
const salseId = row.salseId
getProductsalse(salseId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看出库单信息";
this.optType = "view";

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

@ -67,7 +67,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -77,16 +77,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-row>
<el-col :span="8">
<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-input>
</el-form-item>
<StockSelect ref="stockSelect" @onSelected="onStockSelected"></StockSelect>
<StockSelect ref="stockSelect" @onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品名称" prop="itemName">
@ -102,9 +102,9 @@
<el-row>
<el-col :span="24">
<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-col>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -186,9 +186,16 @@
</template>
<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 OqcSelectSingle from "@/components/oqcSelect/single.vue"
export default {
name: "Productsalseline",
dicts: ['sys_yes_no'],
@ -404,7 +411,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.workorderId = obj.workorderId;
this.form.workorderCode = obj.workorderCode;

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

@ -92,7 +92,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" width="150px" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -122,7 +122,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -132,20 +132,20 @@
/>
<!-- 添加或修改生产退料单头对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="退料单编号" prop="rtCode">
<el-input v-model="form.rtCode" placeholder="请输入退料单编号" />
<el-input v-model="form.rtCode" placeholder="请输入退料单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -170,7 +170,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -188,18 +188,19 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.rtId !=null" content-position="center">物料信息</el-divider>
<el-divider v-if="form.rtId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.rtId !=null" class="box-card">
<Rtissueline :rtId="form.rtId" :optType="optType"></Rtissueline>
</el-card>
<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="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button v-if="optType =='view' || form.status !='PREPARE' " type="primary" @click="cancel">返回</el-button>
<el-button v-if="form.status =='PREPARE' && optType !='view' " type="primary" @click="submitForm">保 存
</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -207,11 +208,12 @@
</template>
<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 Rtissueline from "./line.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Rtissue",
dicts: ['mes_order_status'],
@ -295,20 +297,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -349,7 +352,7 @@ export default {
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -381,9 +384,9 @@ export default {
const rtIds = row.rtId
getItemrecpt(rtIds).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看生产退料单信息";
this.optType = "view";
@ -395,9 +398,9 @@ export default {
const rtId = row.rtId || this.ids
getRtissue(rtId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改生产退料单头";
this.optType = "edit";
@ -409,9 +412,9 @@ export default {
const rtId = row.rtId
getRtissue(rtId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看退料单信息";
this.optType = "view";
@ -464,8 +467,8 @@ export default {
}, `rtissue_${new Date().getTime()}.xlsx`)
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];

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

@ -18,7 +18,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
@click="handleUpdate"
v-hasPermi="['mes:wm:rtissue:edit']"
>修改</el-button>
</el-col>
@ -37,7 +37,7 @@
</el-row>
<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="150px" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
@ -68,7 +68,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -78,12 +78,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-row>
<el-col :span="8">
<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-input>
</el-form-item>
@ -124,7 +124,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -139,9 +139,16 @@
</template>
<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 {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Rtissueline",
components: {StockSelect},
@ -231,20 +238,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -319,9 +327,9 @@ export default {
const lineId = row.lineId || this.ids
getRtissueline(lineId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改生产退料单行";
});
@ -368,25 +376,25 @@ export default {
},
//物料选择弹出框
onStockSelected(obj){
if(obj != undefined && obj != null){
if(obj != undefined && obj != null) {
this.form.materialStockId = obj.materialStockId;
this.form.itemId = obj.itemId;
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.quantityRt = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
}
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
debugger;
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
this.form.areaId = obj[2];
}
},
}

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

@ -47,7 +47,7 @@
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -146,7 +146,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -156,20 +156,20 @@
/>
<!-- 添加或修改产品销售退货单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="退货单编号" prop="rtCode">
<el-input v-model="form.rtCode" placeholder="请输入退货单编号" />
<el-input v-model="form.rtCode" placeholder="请输入退货单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -216,7 +216,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -248,13 +248,14 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.rtId !=null" content-position="center">产品信息</el-divider>
<el-divider v-if="form.rtId !=null" content-position="center">产品信息</el-divider>
<el-card shadow="always" v-if="form.rtId !=null" class="box-card">
<Rtsalseline :rtId="form.rtId" :optType="optType"></Rtsalseline>
</el-card>
<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="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>
</div>
</el-dialog>
@ -262,11 +263,12 @@
</template>
<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 ClientSelectSingle from "@/components/clientSelect/single.vue"
import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Rtsalse",
dicts: ['mes_order_status'],
@ -368,20 +370,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -478,9 +481,9 @@ export default {
const rtIds = row.rtId
getRtsalse(rtIds).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看销售退货单信息";
this.optType = "view";
@ -502,9 +505,9 @@ export default {
const rtId = row.rtId || this.ids
getRtsalse(rtId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改销售退货单";
this.optType = "add";

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

@ -26,7 +26,7 @@
</el-row>
<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="150" align="center" prop="itemName" />
<el-table-column label="规格型号" width="150" align="center" prop="specification" :show-overflow-tooltip="true"/>
@ -61,7 +61,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -71,28 +71,28 @@
/>
<!-- 添加或修改产品销售退货行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-dialog :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-row>
<el-col :span="8">
<el-form-item label="产品编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品" >
<el-form-item label="产品编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择产品" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
<el-input v-model="form.itemName" placeholder="请输入产品物料名称"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位"/>
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="规格型号" prop="specification">
@ -117,7 +117,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -132,9 +132,16 @@
</template>
<script>
import { listRtsalseline, getRtsalseline, delRtsalseline, addRtsalseline, updateRtsalseline } from "@/api/mes/wm/rtsalseline";
import ItemSelect from "@/components/itemSelect/single.vue";
import {
addRtsalseline,
delRtsalseline,
getRtsalseline,
listRtsalseline,
updateRtsalseline
} from "@/api/mes/wm/rtsalseline";
import ItemSelect from "@/components/itemSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Rtsalseline",
components: {ItemSelect},
@ -223,20 +230,21 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
});;
}
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
getTreeList().then(response => {
if (response.data) {
this.warehouseOptions = response.data.filter((el) => {
return el.warehouseCode.indexOf('VIR') == -1;
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
;
}
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -244,8 +252,8 @@ export default {
});
},
//选择默认的仓库、库区、库位
handleWarehouseChanged(obj){
if(obj !=null){
handleWarehouseChanged(obj) {
if (obj != null) {
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
this.form.areaId = obj[2];
@ -262,7 +270,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
// 取消按钮

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

@ -86,20 +86,21 @@
</el-row>
<el-table v-loading="loading" :data="rtvendorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="退货单编号" align="center" prop="rtCode" >
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="退货单编号" prop="rtCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:wm:rtvendor:query']"
>{{scope.row.rtCode}}</el-button>
>{{ scope.row.rtCode }}
</el-button>
</template>
</el-table-column>
</el-table-column>
<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" 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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.rtDate, '{y}-{m}-{d}') }}</span>
@ -109,7 +110,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -139,7 +140,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -149,20 +150,20 @@
/>
<!-- 添加或修改供应商退货对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="退货单编号" prop="rtCode">
<el-input v-model="form.rtCode" placeholder="请输入退货单编号" />
<el-input v-model="form.rtCode" placeholder="请输入退货单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -224,13 +225,14 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.rtId !=null" content-position="center">物料信息</el-divider>
<el-divider v-if="form.rtId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.rtId !=null" class="box-card">
<Rtvendorline ref=line :rtId="form.rtId" :batchCode="form.batchCdoe" :vendorId="form.vendorId" :optType="optType"></Rtvendorline>
</el-card>
<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="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>
</div>
</el-dialog>
@ -238,10 +240,11 @@
</template>
<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 VendorSelect from "@/components/vendorSelect/single.vue";
import Rtvendorline from "./line.vue"
export default {
name: "Rtvendor",
components:{VendorSelect,Rtvendorline},

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

@ -56,7 +56,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -66,17 +66,18 @@
/>
<!-- 添加或修改供应商退货行对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" >
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :batchCode="batchCode" :vendorId="vendorId" @onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择产品物料编码" readonly="readonly">
<el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :batchCode="batchCode" :vendorId="vendorId"
@onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
@ -144,8 +145,15 @@
</template>
<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"
export default {
name: "Rtvendorline",
components:{StockSelect},
@ -337,7 +345,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.warehouseId = obj.warehouseId;
this.form.warehouseCode = obj.warehouseCode;

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

@ -103,7 +103,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -113,16 +113,16 @@
/>
<!-- 添加或修改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-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="itemName">
@ -159,8 +159,9 @@
</template>
<script>
import { listSn,list, getSn, delSn, addSn, updateSn } from "@/api/mes/wm/sn";
import ItemSelect from "@/components/itemSelect/single.vue";
import {addSn, delSn, getSn, listSn} from "@/api/mes/wm/sn";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
name: "Sn",
components :{ItemSelect},
@ -243,7 +244,7 @@ export default {
},
//点开查看界面
handleView(row){
},
/** 新增按钮操作 */
handleAdd() {
@ -284,7 +285,7 @@ export default {
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport(row) {
handleExport(row) {
this.queryParams.itemCode = row.itemCode;
this.queryParams.gen_date = row.genDate;
this.download('/mes/wm/sn/export', {
@ -302,7 +303,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
}

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

@ -14,7 +14,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="snList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="SN" align="center" prop="snCode" />
@ -23,14 +23,14 @@
<el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" />
<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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.rtDate, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -38,18 +38,18 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改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-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码" readonly="readonly">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"></ItemSelect>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="itemName">
@ -84,11 +84,12 @@
</el-dialog>
</div>
</template>
<script>
import { listSn,list, getSn, delSn, addSn, updateSn } from "@/api/mes/wm/sn";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
<script>
import {addSn, delSn, getSn, listSn} from "@/api/mes/wm/sn";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
name: "Sn",
components :{ItemSelect},
data() {
@ -169,7 +170,7 @@
},
//点开查看界面
handleView(row){
},
/** 新增按钮操作 */
handleAdd() {
@ -226,10 +227,9 @@
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
}
};
</script>

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

@ -10,7 +10,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="盘点单编号" prop="takingCode">
<el-input
v-model="queryParams.takingCode"
@ -80,7 +80,7 @@
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="单据状态" align="center" prop="status" />
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -90,17 +90,17 @@
/>
<!-- 添加或修改库存盘点记录对话框 -->
<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-item label="盘点单编号" prop="takingCode">
<el-input v-model="form.takingCode" placeholder="请输入盘点单编号" />
<el-input v-model="form.takingCode" placeholder="请输入盘点单编号"/>
</el-form-item>
<el-form-item label="盘点单名称" prop="takingName">
<el-input v-model="form.takingName" placeholder="请输入盘点单名称" />
<el-input v-model="form.takingName" placeholder="请输入盘点单名称"/>
</el-form-item>
<el-form-item label="盘点日期" prop="takingDate">
<el-date-picker clearable
v-model="form.takingDate"
v-model="form.takingDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择盘点日期">
@ -140,12 +140,12 @@
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</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="盘点清单">
<TakingLine></TakingLine>
</el-tab-pane>
<el-tab-pane label="盘点结果">
<TakingResult></TakingResult>
<TakingResult></TakingResult>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
@ -157,9 +157,17 @@
</template>
<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 TakingResult from './result.vue';
export default {
name: "Stocktaking",
components: {TakingLine,TakingResult},

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

@ -245,7 +245,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -255,16 +255,16 @@
/>
<!-- 添加或修改库存盘点明细对话框 -->
<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-item label="报废单ID" prop="takingId">
<el-input v-model="form.takingId" placeholder="请输入报废单ID" />
<el-input v-model="form.takingId" placeholder="请输入报废单ID"/>
</el-form-item>
<el-form-item label="库存ID" prop="materialStockId">
<el-input v-model="form.materialStockId" placeholder="请输入库存ID" />
<el-input v-model="form.materialStockId" placeholder="请输入库存ID"/>
</el-form-item>
<el-form-item label="产品物料ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入产品物料ID" />
<el-input v-model="form.itemId" placeholder="请输入产品物料ID"/>
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
@ -332,7 +332,13 @@
</template>
<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 {
name: "Stocktakingline",

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

@ -154,7 +154,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -164,16 +164,16 @@
/>
<!-- 添加或修改库存盘点结果对话框 -->
<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-item label="盘点单ID" prop="takingId">
<el-input v-model="form.takingId" placeholder="请输入盘点单ID" />
<el-input v-model="form.takingId" placeholder="请输入盘点单ID"/>
</el-form-item>
<el-form-item label="产品物料ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入产品物料ID" />
<el-input v-model="form.itemId" placeholder="请输入产品物料ID"/>
</el-form-item>
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
<el-input v-model="form.itemCode" placeholder="请输入产品物料编码"/>
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
@ -208,7 +208,13 @@
</template>
<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 {
name: "Stocktakingresult",

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

@ -120,7 +120,7 @@
size="mini"
type="text"
icon="el-icon-video-play"
v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'INNER')"
v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'INNER')"
@click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>执行转移</el-button>
@ -128,7 +128,7 @@
size="mini"
type="text"
icon="el-icon-video-play"
v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'OUTER')"
v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'OUTER')"
@click="handleTransOut(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>执行移出</el-button>
@ -136,7 +136,7 @@
size="mini"
type="text"
icon="el-icon-video-play"
v-if="(scope.row.status =='CONFIRMED' && scope.row.transferType == 'OUTER')"
v-if="(scope.row.status =='CONFIRMED' && scope.row.transferType == 'OUTER')"
@click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>执行移入</el-button>
@ -159,7 +159,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -169,20 +169,20 @@
/>
<!-- 添加或修改转移单对话框 -->
<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-row>
<el-col :span="8">
<el-form-item label="转移单编号" prop="transferCode">
<el-input v-model="form.transferCode" placeholder="请输入转移单编号" />
<el-input v-model="form.transferCode" placeholder="请输入转移单编号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
v-if="optType != 'view' && form.status =='PREPARE'"
active-color="#13ce66"
active-text="自动生成" @change="handleAutoGenChange(autoGenFlag)">
</el-switch>
</el-form-item>
</el-col>
@ -272,13 +272,14 @@
</el-row>
</el-form>
<el-divider v-if="form.transferId !=null" content-position="center">物料信息</el-divider>
<el-divider v-if="form.transferId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.transferId !=null" class="box-card">
<Transferline ref=line :transferId="form.transferId" :fromWarehouseId="form.fromWarehouseId" :toWarehouseId="form.toWarehouseId" :optType="optType"></Transferline>
</el-card>
<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="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>
</div>
</el-dialog>
@ -286,10 +287,11 @@
</template>
<script>
import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer, execute} from "@/api/mes/wm/transfer";
import {listWarehouse} from "@/api/mes/wm/warehouse";
import {addTransfer, delTransfer, execute, getTransfer, listTransfer, updateTransfer} from "@/api/mes/wm/transfer";
import {listWarehouse} from "@/api/mes/wm/warehouse";
import {genCode} from "@/api/system/autocode/rule";
import Transferline from "./line.vue";
export default {
name: "Transfer",
components: {Transferline},
@ -297,8 +299,8 @@ export default {
data() {
return {
//自动生成编码
autoGenFlag:false,
optType: undefined,
autoGenFlag: false,
optType: undefined,
// 遮罩层
loading: true,
// 选中数组
@ -328,23 +330,23 @@ export default {
// 表单校验
rules: {
transferCode: [
{ required: true, message: "转移单编号不能为空", trigger: "blur" }
],
{required: true, message: "转移单编号不能为空", trigger: "blur"}
],
transferName: [
{ required: true, message: "转移单名称不能为空", trigger: "blur" }
],
{required: true, message: "转移单名称不能为空", trigger: "blur"}
],
transferType: [
{ required: true, message: "转移单类型不能为空", trigger: "blur" }
{required: true, message: "转移单类型不能为空", trigger: "blur"}
],
transferDate: [
{ required: true, message: "请选择转移时间", trigger: "blur" }
{required: true, message: "请选择转移时间", trigger: "blur"}
],
fromWarehouseId: [
{ required: true, message: "请选择转出仓库", trigger: "blur" }
{required: true, message: "请选择转出仓库", trigger: "blur"}
],
toWarehouseId: [
{ required: true, message: "请选择转入仓库", trigger: "blur" }
]
]
}
};
},
@ -376,30 +378,30 @@ export default {
// 表单重置
reset() {
this.form = {
transferId: null,
transferCode: null,
transferName: null,
transferType: "INNER",
destination: null,
carrier: null,
bookingNote: null,
fromWarehouseId: null,
fromWarehouseCode: null,
fromWarehouseName: null,
toWarehouseId: null,
toWarehouseCode: null,
toWarehouseName: null,
transferDate: null,
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
transferId: null,
transferCode: null,
transferName: null,
transferType: "INNER",
destination: null,
carrier: null,
bookingNote: null,
fromWarehouseId: null,
fromWarehouseCode: null,
fromWarehouseName: null,
toWarehouseId: null,
toWarehouseCode: null,
toWarehouseName: null,
transferDate: null,
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.resetForm("form");
@ -425,14 +427,14 @@ export default {
this.reset();
this.open = true;
this.title = "添加转移单";
this.optType = "add";
this.optType = "add";
},
// 查询明细按钮操作
handleView(row){
this.reset();
const transferId = row.transferId
getTransfer(transferId).then(response => {
this.form = response.data;
this.form = response.data;
this.open = true;
this.title = "查看转移单信息";
this.optType = "view";
@ -446,7 +448,7 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改转移单";
this.optType = "edit";
this.optType = "edit";
});
},
/** 提交按钮 */
@ -473,7 +475,7 @@ export default {
handleTransOut(row){
const transferId = row.transferId
getTransfer(transferId).then(response => {
this.form = response.data;
this.form = response.data;
this.form.status = 'CONFIRMED';
updateTransfer(this.form).then(response => {
this.$modal.msgSuccess("修改成功");

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

@ -12,7 +12,7 @@
v-hasPermi="['mes:wm:transfer:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@ -29,23 +29,24 @@
</el-row>
<el-table v-loading="loading" :data="transferlineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="转移数量" align="center" prop="quantityTransfer" />
<el-table-column label="生产工单" align="center" prop="workorderCode" />
<el-table-column label="供应商编码" width="100px" align="center" prop="vendorCode" />
<el-table-column label="供应商简称" width="100px" align="center" prop="vendorNick" />
<el-table-column label="批次号" width="150px" align="center" prop="batchCode" />
<el-table-column label="移出仓库" align="center" prop="fromWarehouseName" />
<el-table-column label="移出库区" width="120px" align="center" prop="fromLocationName" />
<el-table-column label="移出库位" align="center" prop="fromAreaName" />
<el-table-column label="移入仓库" align="center" prop="toWarehouseName" />
<el-table-column label="移入库区" width="120px" align="center" prop="toLocationName" />
<el-table-column label="移入库位" align="center" prop="toAreaName" />
<el-table-column label="操作" v-if="optType != 'view'" width="120px" align="center" class-name="small-padding fixed-width">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="产品物料编码" prop="itemCode" width="120px"/>
<el-table-column align="center" label="产品物料名称" prop="itemName" width="150px"/>
<el-table-column align="center" label="规格型号" prop="specification"/>
<el-table-column align="center" label="单位" prop="unitOfMeasure"/>
<el-table-column align="center" label="转移数量" prop="quantityTransfer"/>
<el-table-column align="center" label="生产工单" prop="workorderCode"/>
<el-table-column align="center" label="供应商编码" prop="vendorCode" width="100px"/>
<el-table-column align="center" label="供应商简称" prop="vendorNick" width="100px"/>
<el-table-column align="center" label="批次号" prop="batchCode" width="150px"/>
<el-table-column align="center" label="移出仓库" prop="fromWarehouseName"/>
<el-table-column align="center" label="移出库区" prop="fromLocationName" width="120px"/>
<el-table-column align="center" label="移出库位" prop="fromAreaName"/>
<el-table-column align="center" label="移入仓库" prop="toWarehouseName"/>
<el-table-column align="center" label="移入库区" prop="toLocationName" width="120px"/>
<el-table-column align="center" label="移入库位" prop="toAreaName"/>
<el-table-column v-if="optType != 'view'" align="center" class-name="small-padding fixed-width" label="操作"
width="120px">
<template slot-scope="scope">
<el-button
size="mini"
@ -53,7 +54,8 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
@ -64,7 +66,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -74,16 +76,16 @@
/>
<!-- 添加或修改转移单行对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-dialog :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-row>
<el-col :span="8">
<el-form-item label="产品物料" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="选择库存物资" >
<el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
<el-input v-model="form.itemCode" placeholder="选择库存物资">
<el-button slot="append" icon="el-icon-search" @click="handleSelectStock"></el-button>
</el-input>
</el-form-item>
<StockSelect ref="stockSelect" :warehouseId="fromWarehouseId" @onSelected="onStockSelected"></StockSelect>
<StockSelect ref="stockSelect" :warehouseId="fromWarehouseId" @onSelected="onStockSelected"></StockSelect>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName">
@ -132,7 +134,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleToWarehouseChanged"
>
>
</el-cascader>
</el-form-item>
</el-col>
@ -159,9 +161,16 @@
</template>
<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 {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Transferline",
components: {
@ -206,54 +215,55 @@ export default {
pageNum: 1,
pageSize: 10,
transferId: this.transferId,
materialStockId: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantityTransfer: null,
quantityMax: null,
workorderId: null,
workorderCode: null,
batchCode: null,
fromWarehouseId:null,
fromWarehouseCode: null,
fromWarehouseName: null,
fromLocationId: null,
fromLocationCode: null,
fromLocationName: null,
fromAreaId: null,
fromAreaCode: null,
fromAreaName: null,
toWarehouseId: null,
toWarehouseCode: null,
toWarehouseName: null,
toLocationId: null,
toLocationCode: null,
toLocationName: null,
toAreaId: null,
toAreaCode: null,
toAreaName: null,
expireDate: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
materialStockId: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantityTransfer: null,
quantityMax: null,
workorderId: null,
workorderCode: null,
batchCode: null,
fromWarehouseId: null,
fromWarehouseCode: null,
fromWarehouseName: null,
fromLocationId: null,
fromLocationCode: null,
fromLocationName: null,
fromAreaId: null,
fromAreaCode: null,
fromAreaName: null,
toWarehouseId: null,
toWarehouseCode: null,
toWarehouseName: null,
toLocationId: null,
toLocationCode: null,
toLocationName: null,
toAreaId: null,
toAreaCode: null,
toAreaName: null,
expireDate: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
itemCode: [
{ required: true, message: "请选择移出的物资", trigger: "blur" }
],
{required: true, message: "请选择移出的物资", trigger: "blur"}
],
toWarehouseId: [
{ required: true, message: "请指定移入仓库", trigger: "blur" }
],
{required: true, message: "请指定移入仓库", trigger: "blur"}
],
quantityTransfer: [
{ required: true, message: "转移数量不能为空", trigger: "blur" }
], }
{required: true, message: "转移数量不能为空", trigger: "blur"}
],
}
};
},
created() {
@ -271,16 +281,16 @@ export default {
});
},
getWarehouseList(){
getTreeList().then( response =>{
getTreeList().then(response => {
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
this.warehouseOptions.map(w => {
w.children.map(l => {
let lstr = JSON.stringify(l.children).replace(/locationId/g, 'lId').replace(/areaId/g, 'pId').replace(/areaName/g, 'pName');
l.children = JSON.parse(lstr);
});
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr);
let wstr = JSON.stringify(w.children).replace(/warehouseId/g, 'wId').replace(/locationId/g, 'pId').replace(/locationName/g, 'pName');
w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -295,50 +305,50 @@ export default {
// 表单重置
reset() {
this.form = {
lineId: null,
transferId: this.transferId,
materialStockId: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantityTransfer: null,
workorderId: null,
workorderCode: null,
batchCode: null,
fromWarehouseId: this.fromWarehouseId,
fromWarehouseCode: null,
fromWarehouseName: null,
fromLocationId: null,
fromLocationCode: null,
fromLocationName: null,
fromAreaId: null,
fromAreaCode: null,
fromAreaName: null,
toWarehouseId: this.toWarehouseId,
toWarehouseCode: null,
toWarehouseName: null,
toLocationId: null,
toLocationCode: null,
toLocationName: null,
toAreaId: null,
toAreaCode: null,
toAreaName: null,
expireDate: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
lineId: null,
transferId: this.transferId,
materialStockId: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantityTransfer: null,
workorderId: null,
workorderCode: null,
batchCode: null,
fromWarehouseId: this.fromWarehouseId,
fromWarehouseCode: null,
fromWarehouseName: null,
fromLocationId: null,
fromLocationCode: null,
fromLocationName: null,
fromAreaId: null,
fromAreaCode: null,
fromAreaName: null,
toWarehouseId: this.toWarehouseId,
toWarehouseCode: null,
toWarehouseName: null,
toLocationId: null,
toLocationCode: null,
toLocationName: null,
toAreaId: null,
toAreaCode: null,
toAreaName: null,
expireDate: null,
vendorId: null,
vendorCode: null,
vendorName: null,
vendorNick: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
@ -370,9 +380,9 @@ export default {
const lineId = row.lineId || this.ids
getTransferline(lineId).then(response => {
this.form = response.data;
this.fromWarehouse = response.data.fromWarehouseName+" / "+response.data.fromLocationName+" / "+response.data.fromAreaName;
this.warehouseInfo[0] = response.data.toWarehouseId;
this.warehouseInfo[1] = response.data.toLocationId;
this.fromWarehouse = response.data.fromWarehouseName + " / " + response.data.fromLocationName + " / " + response.data.fromAreaName;
this.warehouseInfo[0] = response.data.toWarehouseId;
this.warehouseInfo[1] = response.data.toLocationId;
this.warehouseInfo[2] = response.data.toAreaId;
this.open = true;
this.title = "修改转移单行";
@ -380,9 +390,9 @@ export default {
},
/** 提交按钮 */
submitForm() {
debugger;
debugger;
this.$refs["form"].validate(valid => {
if (valid) {
if (valid) {
if (this.form.lineId != null) {
updateTransferline(this.form).then(response => {
@ -423,7 +433,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.quantityTransfer = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
@ -440,13 +450,13 @@ export default {
this.form.vendorCode = obj.vendorCode;
this.form.vendorName = obj.vendorName;
this.form.workorderId = obj.workorderId;
this.form.workorderCode = obj.workorderCode;
this.fromWarehouse = obj.warehouseName +" / "+ obj.locationName +" / "+ obj.areaName;
this.form.workorderCode = obj.workorderCode;
this.fromWarehouse = obj.warehouseName + " / " + obj.locationName + " / " + obj.areaName;
}
},
//选择默认的仓库、库区、库位
handleToWarehouseChanged(obj){
if(obj !=null){
handleToWarehouseChanged(obj) {
if (obj != null) {
this.form.toWarehouseId = obj[0];
this.form.toLocationId = obj[1];
this.form.toAreaId = obj[2];

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

@ -116,14 +116,14 @@
/>
<!-- 添加或修改库房设置对话框 -->
<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-row>
<el-col :span="14">
<el-row>
<el-col :span="16">
<el-form-item label="库房编码" prop="warehouseCode">
<el-input v-model="form.warehouseCode" placeholder="请输入库房编码" />
<el-input v-model="form.warehouseCode" placeholder="请输入库房编码"/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -183,17 +183,25 @@
<el-button @click="cancel">取 消</el-button>
</div>
</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>
</el-dialog>
</div>
</template>
<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 BarcodeImg from "@/components/barcodeImg/index.vue"
import InOutTypeCmps from "@/components/wm/InOutTypeCmps.vue";
export default {
name: "Warehouse",
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>
<div slot="footer" class="dialog-footer">
@ -113,10 +113,10 @@
<script>
import {
listWmsInPlanDetailsEntity,
getWmsInPlanDetailsEntity,
delWmsInPlanDetailsEntity,
addWmsInPlanDetailsEntity,
delWmsInPlanDetailsEntity,
getWmsInPlanDetailsEntity,
listWmsInPlanDetailsEntity,
updateWmsInPlanDetailsEntity
} 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-item label="状态">
<el-radio-group v-model="form.planInStatus">
@ -142,15 +142,14 @@
<script>
import {
listWmsInTask,
getWmsInTask,
delWmsInTask,
addWmsInTask,
updateWmsInTask,
issueBatchWmsInTask
delWmsInTask,
getWmsInTask,
issueBatchWmsInTask,
listWmsInTask,
updateWmsInTask
} from "@/api/mes/wm/wmsInTask";
import {listTYPE} from "@/api/md/TYPE";
import {addBaseKnife} from "@/api/mes/md/baseKnife";
export default {
name: "WmsInTask",

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

@ -86,7 +86,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -96,11 +96,11 @@
/>
<!-- 添加或修改料箱管理对话框 -->
<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-item label="料箱状态：0-正常，1-绑定，2-解绑" prop="type">
<el-select v-model="form.type" placeholder="请选择料箱状态：0-正常，1-绑定，2-解绑">
<el-option label="请选择字典生成" value="" />
<el-option label="请选择字典生成" value=""/>
</el-select>
</el-form-item>
</el-form>
@ -113,7 +113,7 @@
</template>
<script>
import { listCtBase, getCtBase, delCtBase, addCtBase, updateCtBase } from "@/api/wm/ctBase";
import {addCtBase, delCtBase, getCtBase, listCtBase, updateCtBase} from "@/api/wm/ctBase";
export default {
name: "CtBase",