Skip to content

M
mes-ui
Commit 06b10839 authored by zhuli's avatar zhuli
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents ca77c256 e90ff147
Show whitespace changes
Inline Side-by-side
Showing with 446 additions and 163 deletions
src/components/TaskSelect/sngle.vue 0 → 100644
View file @ 06b10839
<template>
<el-dialog title="生产任务选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="所属工作中心" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
placeholder="请输入工作中心编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
placeholder="请输入生产任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedTaskId" :label="scope.row.taskId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="任务编号" align="center" prop="taskCode" :show-overflow-tooltip="true"/>
<el-table-column label="编排单号" align="center" prop="arrangeCode" :show-overflow-tooltip="true"/>
<el-table-column label="工作中心编号" align="center" prop="workstationCode" :show-overflow-tooltip="true"/>
<el-table-column label="工作中心名称" align="center" prop="workstationName" :show-overflow-tooltip="true"/>
<el-table-column v-if="btnShow" label="操作" align="center" width="100px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:protask:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:protask:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<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 type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listProtask, getProtask, delProtask, addProtask, updateProtask } from "@/api/mes/pro/protask";
import {listAllProcess} from "@/api/mes/pro/process";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
export default {
name: "ProtaskSelect",
components: {WorkstationSelect},
props: {
workorderId: null,
workorderCode: null,
processId: null,
processCode: null,
workstationId: null,
workstationCode: null,
btnShow: false
},
watch: {
workorderId(v){
this.queryParams.workorderId = v;
}
},
data() {
return {
showFlag: false,
selectedTaskId: undefined,
selectedRow: undefined,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产任务表格数据
protaskList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
taskCode: null,
taskName: null,
workorderId: this.workorderId,
workorderCode: null,
workorderName: null,
workstationId: null,
workstationCode: null,
workstationName: null,
routeId: null,
processId: this.processId,
processCode: null,
processName: null,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantity: null,
quantityProduced: null,
quantityChanged: null,
clientId: null,
clientCode: null,
clientName: null,
clientNick: null,
startTime: null,
duration: null,
endTime: null,
colorCode: null,
requestDate: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
workstationId: [
{ required: true, message: "工作中心不能为空", trigger: "blur" }
],
quantity: [
{ required: true, message: "排产数量不能为空", trigger: "blur" }
],
startTime: [
{ required: true, message: "请选择开始生产日期",trigger: "blur"}
],
duration: [
{ required: true, message: "清输入估算的生产用时",trigger: "blur"}
]
}
};
},
created() {
this.getList();
this.getProcess();
},
methods: {
/** 查询生产任务列表 */
getList() {
this.loading = true;
listProtask(this.queryParams).then(response => {
this.protaskList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//查询工序信息
getProcess(){
listAllProcess().then( response =>{
this.processOptions = response.data;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//行双击选中
handleRowDbClick(row){
if(row){
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
debugger;
if(row){
this.selectedRow = row;
}
},
//确定选中
confirmSelect(){
if(this.selectedTaskId ==null || this.selectedTaskId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
};
</script>
src/views/mes/pro/allocation/index.vue
View file @ 06b10839
...@@ -240,7 +240,7 @@ export default { ...@@ -240,7 +240,7 @@ export default {
/** 生成编码 */ /** 生成编码 */
gCode() { gCode() {
genCode("ALLOCATION_CODE").then((response) => { genCode("ALLOCATION_CODE").then((response) => {
this.form.allocationMaterialCode = response; this.form.applyNo = response;
}); });
}, },
......
src/views/mes/pro/productionSolution/proofingApply.vue
View file @ 06b10839
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="成品物料号" prop="itemCode"> <el-form-item label="成品物料号" prop="sapItemCode">
<el-input v-model="queryParams.itemCode" placeholder="请输入成品物料号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.sapItemCode" placeholder="请输入成品物料号" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="成品物名称" prop="itemName"> <el-form-item label="成品物名称" prop="itemName">
<el-input v-model="queryParams.itemName" clearable placeholder="请输入成品物名称" @keyup.enter.native="handleQuery"> <el-input v-model="queryParams.itemName" placeholder="请输入成品物料号" clearable @keyup.enter.native="handleQuery" />
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="组件号" prop="groupCounter"> <el-form-item label="组件号" prop="groupCounter">
<el-input v-model="queryParams.groupCounter" clearable placeholder="请输入组件号" @keyup.enter.native="handleQuery"> <el-input v-model="queryParams.groupCounter" clearable placeholder="请输入组件号" @keyup.enter.native="handleQuery">
......
src/views/mes/pro/request/index.vue
View file @ 06b10839
...@@ -2,70 +2,30 @@ ...@@ -2,70 +2,30 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产品编号" prop="sapItemCode"> <el-form-item label="产品编号" prop="sapItemCode">
<el-input <el-input v-model="queryParams.sapItemCode" placeholder="请输入产品编号" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.sapItemCode"
placeholder="请输入产品编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="产品名称" prop="itemName"> <el-form-item label="产品名称" prop="itemName">
<el-input <el-input v-model="queryParams.itemName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.itemName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="编排单号" prop="arrangeCode"> <el-form-item label="编排单号" prop="arrangeCode">
<el-input <el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="领用数量" prop="applyNum"> <el-form-item label="领用数量" prop="applyNum">
<el-input <el-input v-model="queryParams.applyNum" placeholder="请输入领用数量" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.applyNum"
placeholder="请输入领用数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input <el-input v-model="queryParams.workorderCode" placeholder="请输入生产工单" clearable
v-model="queryParams.workorderCode" @keyup.enter.native="handleQuery" />
placeholder="请输入生产工单"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="createBy"> <el-form-item label="创建人" prop="createBy">
<el-input <el-input v-model="queryParams.createBy" placeholder="请输入创建人" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.createBy"
placeholder="请输入创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="申请单号" prop="applyNo"> <el-form-item label="申请单号" prop="applyNo">
<el-input <el-input v-model="queryParams.applyNo" placeholder="请输入申请单号" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.applyNo"
placeholder="请输入申请单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
v-model="daterangePurchaseDate" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -74,17 +34,11 @@ ...@@ -74,17 +34,11 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['pro:materialRequest:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['pro:materialRequest:add']">新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
...@@ -125,42 +79,37 @@ ...@@ -125,42 +79,37 @@
<el-table-column label="产品名称" align="center" prop="itemName" width="100" /> <el-table-column label="产品名称" align="center" prop="itemName" width="100" />
<el-table-column label="生产工单" align="center" prop="workorderCode" width="150" /> <el-table-column label="生产工单" align="center" prop="workorderCode" width="150" />
<el-table-column label="工作单元" align="center" prop="workunitName" width="100" /> <el-table-column label="工作单元" align="center" prop="workunitName" width="100" />
<el-table-column label="申请单号" align="center" prop="applyNo" width="150"/> <el-table-column label="申请单号" align="center" prop="applyNo" width="150" />
<el-table-column label="领料类型" align="center" prop="applyType"> <el-table-column label="领料类型" align="center" prop="applyType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType"/> <dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编排单号" align="center" prop="arrangeCode" width="150"/> <el-table-column label="编排单号" align="center" prop="arrangeCode" width="150" />
<el-table-column label="领用数量" align="center" prop="applyNum" /> <el-table-column label="领用数量" align="center" prop="applyNum" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="领料方式" align="center" prop="materialType"> <el-table-column label="领料方式" align="center" prop="materialType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.pro_material_from" :value="scope.row.materialType"/> <dict-tag :options="dict.type.pro_material_from" :value="scope.row.materialType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否结案" align="center" prop="windCase"> <el-table-column label="是否结案" align="center" prop="windCase">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.windCase"/> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.windCase" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已发放数量" align="center" prop="grantNum"/> <el-table-column label="已发放数量" align="center" prop="grantNum" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="需求日期" align="center" prop="startTime" width="180"/> <el-table-column label="需求日期" align="center" prop="startTime" width="180" />
<el-table-column label="预结束时间" align="center" prop="endTime" width="180"/> <el-table-column label="预结束时间" align="center" prop="endTime" width="180" />
<el-table-column label="操作" width="80" align="center" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" width="80" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
size="mini" v-hasPermi="['pro:materialRequest:view']">查看</el-button>
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
v-hasPermi="['pro:materialRequest:view']"
>查看</el-button>
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -179,59 +128,78 @@ ...@@ -179,59 +128,78 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改领料申请对话框 --> <!-- 添加或修改领料申请对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" <el-form ref="form" :model="form" :rules="rules" :disabled="form.materialRequestId && optType != 'edit'"
:model="form" label-width="100px">
:rules="rules"
:disabled="form.materialRequestId&&optType!='edit'"
label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="产品编号" prop="sapItemCode"> <el-form-item label="申请号" prop="applyNo">
<el-input v-model="form.sapItemCode" placeholder="请输入产品编号" /> <el-input v-model="form.applyNo" placeholder="请输入申请号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="产品名称" prop="itemName"> <el-form-item label="任务单号" prop="taskCode">
<el-input v-model="form.itemName" placeholder="请输入产品名称" /> <el-input v-model="form.taskCode" placeholder="请选任务单号" readonly="readonly">
<el-button slot="append" icon="el-icon-search" @click="handleBrandSelect"
:disabled="form.materialRequestId"></el-button>
</el-input>
</el-form-item>
</el-col>
<BrandSelect ref="brSelect" @onSelected="onBrandSelected"></BrandSelect>
<el-col :span="8">
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="领料类型" prop="applyType"> <el-form-item label="产品编号" prop="sapItemCode">
<el-select style="width:100%;" v-model="form.applyType" placeholder="请选择领用类型"> <el-input v-model="form.sapItemCode" placeholder="请选任务单号" readonly="readonly">
<el-option <el-button slot="append" icon="el-icon-search" @click="handleItemSelect"
v-for="dict in dict.type.pro_requisition_type" :disabled="form.materialRequestId"></el-button>
:key="dict.value" </el-input>
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <ItemSelect ref="ItemSelect" @onSelected="onItemSelected"></ItemSelect>
<el-form-item label="领用数量" prop="applyNum"> <el-col :span="8">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="申请数量" prop="applyNum">
<el-input v-model="form.applyNum" placeholder="请输入申请数量" /> <el-input v-model="form.applyNum" placeholder="请输入申请数量" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="编排单号" prop="arrangeCode"> <el-form-item label="工作中心" prop="workstationCode">
<el-input v-model="form.arrangeCode" type="textarea" placeholder="请输入编排单号" /> <el-input v-model="form.workstationCode" placeholder="工作中心" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"
:disabled="form.materialRequestId"></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelect"></WorkstationSelect>
<el-col :span="8">
<el-form-item label="工作单元" prop="workunitCode">
<el-select v-model="form.workunitCode" placeholder="请选择类型">
<el-option
v-for="dict in workunitTypeOptions"
:key="dict.workunitCode"
:label="dict.workunitName"
:value="dict.workunitCode"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建人" prop="createBy"> <el-form-item label="创建人" prop="createBy">
<el-input v-model="form.createBy" placeholder="请输入创始人" /> <el-input v-model="form.createBy" placeholder="请输入创始人" />
</el-form-item> </el-form-item>
...@@ -239,37 +207,42 @@ ...@@ -239,37 +207,42 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="申请时间" prop="createTime">
<el-input v-model="form.workorderCode" type="textarea" placeholder="请输入生产工单" /> <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择申请时间">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="需求日期" prop="startTime">
<el-date-picker clearable <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
v-model="form.createTime" placeholder="请选择需求日期">
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择异常时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType!='view'">确 定</el-button> <el-button type="primary" @click="submitForm" v-if="optType != 'view'">确 定</el-button>
<el-button @click="cancel" v-if="optType!='view'">取 消</el-button> <el-button @click="cancel" v-if="optType != 'view'">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest } from "@/api/mes/pro/request"; import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest } from "@/api/mes/pro/request";
import { genCode } from "@/api/system/autocode/rule";
import BrandSelect from "@/components/TaskSelect/sngle.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import { listWorkunit} from "@/api/mes/md/workunit";
export default { export default {
name: "MaterialRequest", name: "MaterialRequest",
dicts: ['pro_requisition_type','pro_material_from','sys_yes_no'], components: { BrandSelect,WorkstationSelect,ItemSelect },
dicts: ['pro_requisition_type', 'pro_material_from', 'sys_yes_no'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -286,6 +259,8 @@ export default { ...@@ -286,6 +259,8 @@ export default {
total: 0, total: 0,
// 领料申请表格数据 // 领料申请表格数据
materialRequestList: [], materialRequestList: [],
workunitTypeOptions: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
daterangePurchaseDate: [], daterangePurchaseDate: [],
...@@ -299,6 +274,8 @@ export default { ...@@ -299,6 +274,8 @@ export default {
itemId: null, itemId: null,
itemName: null, itemName: null,
taskId: null, taskId: null,
taskCode: null,
taskName: null,
arrangeCode: null, arrangeCode: null,
createTime: null, createTime: null,
applyNum: null, applyNum: null,
...@@ -308,7 +285,11 @@ export default { ...@@ -308,7 +285,11 @@ export default {
attr4: null, attr4: null,
workorderCode: null, workorderCode: null,
WorkunitName: null, WorkunitName: null,
workstationId: null,
workstationCode: null,
workstationName: null,
windCase: null, windCase: null,
createBy: null,
grantNum: null, grantNum: null,
}, },
// 表单参数 // 表单参数
...@@ -323,6 +304,56 @@ export default { ...@@ -323,6 +304,56 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
handleBrandSelect() {
this.$refs.brSelect.showFlag = true;
},
onBrandSelected(row) {
if (row != undefined && row != null) {
this.form.taskId = row.taskId;
this.form.taskCode = row.taskCode;
this.form.arrangeCode = row.arrangeCode;
this.form.taskName = row.taskName;
}
},
handleItemSelect() {
this.$refs.ItemSelect.showFlag = true;
},
onItemSelected(row) {
if (row != undefined && row != null) {
this.form.itemId = row.itemId;
this.form.sapItemCode = row.sapItemCode;
this.form.itemName = row.itemName;
}
},
handleWorkstationSelect() {
this.$refs.workstationSelect.showFlag = true;
},
onWorkstationSelect(row) {
if (row != undefined && row != null) {
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
const params = {
pageNum: 1,
pageSize: 1000,
workstationId: row.workstationId,
};
this.getTypeList(params);
}
},
getTypeList(params){
listWorkunit(params).then(response =>{
this.workunitTypeOptions = response.rows;
});
},
/** 查询领料申请列表 */ /** 查询领料申请列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -337,6 +368,11 @@ export default { ...@@ -337,6 +368,11 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
gCode() {
genCode("MATERIAL_REQUEST_CODE").then((response) => {
this.form.applyNo = response;
});
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -349,25 +385,32 @@ export default { ...@@ -349,25 +385,32 @@ export default {
materialRequestId: null, materialRequestId: null,
applyNo: null, applyNo: null,
itemId: null, itemId: null,
itemCode: null,
itemName: null, itemName: null,
taskId: null, taskId: null,
taskCode: null,
taskName: null,
applyNum: null, applyNum: null,
arrangeCode: null, arrangeCode: null,
workorderCode: null, workorderCode: null,
materialType: null, materialType: null,
WorkunitName: null, WorkunitName: null,
workstationId: null,
workstationCode: null,
workstationName: null,
createTime: null, createTime: null,
remark: null, remark: null,
attr1: null, attr1: null,
attr2: null, attr2: null,
attr3: null, attr3: null,
attr4: null, attr4: null,
createBy: null, createBy: "admin",
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
windCase: null, windCase: null,
grantNum: null, }; grantNum: null,
};
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -385,13 +428,14 @@ export default { ...@@ -385,13 +428,14 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.materialRequestId) this.ids = selection.map(item => item.materialRequestId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.gCode();
this.title = "添加领料申请"; this.title = "添加领料申请";
this.optType = "add"; this.optType = "add";
}, },
...@@ -403,11 +447,11 @@ export default { ...@@ -403,11 +447,11 @@ export default {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改领料申请"; this.title = "修改领料申请";
this.optType="edit"; this.optType = "edit";
}); });
}, },
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row){ handleView(row) {
this.reset(); this.reset();
const materialRequestId = row.materialRequestId || this.ids; const materialRequestId = row.materialRequestId || this.ids;
getMaterialRequest(materialRequestId).then(response => { getMaterialRequest(materialRequestId).then(response => {
...@@ -440,12 +484,12 @@ export default { ...@@ -440,12 +484,12 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const materialRequestIds = row.materialRequestId || this.ids; const materialRequestIds = row.materialRequestId || this.ids;
this.$modal.confirm('是否确认删除领料申请编号为"' + materialRequestIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除领料申请编号为"' + materialRequestIds + '"的数据项？').then(function () {
return delMaterialRequest(materialRequestIds); return delMaterialRequest(materialRequestIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment