Skip to content

P
pda-ui
Commit 7bf589f2 authored by chenzj's avatar chenzj
Browse files
Options

调拨料新增功能

parent 1bc7bdb0
Show whitespace changes
Inline Side-by-side
Showing with 925 additions and 16 deletions
src/components/workstationSelect/simpletableSingle.vue
View file @ 7bf589f2
......@@ -50,6 +50,7 @@
</el-table-column>
<el-table-column label="工作中心名称" align="center" prop="workstationName" />
<el-table-column label="工作中心地点" align="center" prop="workstationAddress" />
<el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="所在车间名称" align="center" prop="workshopName" />
<el-table-column label="所属工序" align="center" prop="processName" />
<el-table-column label="备注" align="center" prop="remark" />
......
src/views/mes/pro/allocation/allocationIndex.vue 0 → 100644
View file @ 7bf589f2
<template>
<div class="app-container">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">
新增</el-button>
<el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="物料编码" align="center" prop="sapItemCode" />
<el-table-column label="物料名称" align="center" prop="itemName" />
<el-table-column label="工作中心编码" align="center" prop="workstationCode" />
<el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="申请数量" align="center" prop="applyNum" />
<el-table-column width="100px" label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="{ $index}">
<el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改调拨料申请对话框 -->
<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="12">
<el-form-item label="产品编码" prop="sapItemCode">
<el-input v-model="form.sapItemCode" placeholder="请输入产品编码">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect" />
</el-input>
<itemSelect ref="brSelectpro" @onSelected="onItemSelect">
</itemSelect>
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="产品名称" prop="itemName">
<el-input disabled v-model="form.itemName" placeholder="请输入产品名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="12">
<el-form-item label="工作中心编码" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编码">
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect" />
</el-input>
</el-form-item>
<WorkstationSelect ref="brSelectworkstation"
@onSelected="val => onWorkstationSelect(val, 'workstation')"
:workstationCode="form.workstationCode">
</WorkstationSelect>
</el-col>
<el-col span="12">
<el-form-item label="工作单元" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="工作单元">
<el-button slot="append" icon="el-icon-search"
@click="$refs.codeSelect.showFlag = true"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<WorkstationSelect ref="brSelectworkstation"
@onSelected="val => onWorkstationSelect(val, 'workstation')"
:workstationCode="form.workstationCode">
</WorkstationSelect>
<codeSelect ref="codeSelect" :workstationId="form.workstationId"
@onSelected="val => onWorkstationSelect(val, 'unit')"></codeSelect>
<el-row>
<el-col span="12">
<el-form-item label="申请数量" prop="applyNum">
<el-input v-model="form.applyNum" placeholder="请输入申请数量" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!--
<pagination v-show="total > 0 && $attrs.optType !== 'add'" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> -->
</div>
</template>
<script>
import codeSelect from "./codeSelect.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
name: "TmToolRequestItem",
dicts: [
"warehouse_desc"
],
components: { ItemSelect, WorkstationSelect, codeSelect },
props: {
id: {
type: String,
default: ''
}
},
data() {
return {
// 遮罩层
loading: false,
// 选中数组
ids: [],
/**表格数据 */
tableData: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
optType: "add",
// 总条数
total: 0,
// 刀模版物料申请单表格数据
tmToolRequestItemList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
itemId: null,
sapItemCode: null,
itemName: null,
applyNum: null,
workstationCode: null,
workunitCode: null,
workstationCode: null,
workstationId: null,
workstationName: null,
},
// 表单参数
form: {
itemId: null,
sapItemCode: null,
itemName: null,
applyNum: null,
workstationCode: null,
workunitCode: null,
workstationCode: null,
workstationId: null,
workstationName: null,
},
currentRowIdx: undefined,
// 表单校验
rules: {
}
};
},
watch: {
},
created() {
if (this.$attrs.optType !== 'add') {
this.getList();
}
},
methods: {
// onItemSelect(list) {
// // console.log(list, 'list')
// const datas = list.map(item => {
// return {
// toolWarehouseId: item.toolWarehouseId,
// toolMachinesId: item.toolMachinesId,
// type: item.type,
// toolCode: item.toolCode,
// toolName: item.toolName,
// itemCode: item.itemCode,
// sapItemCode: item.sapItemCode,
// itemName: item.itemName,
// local: item.local,
// processId: Number(item.processId),
// processName: item.processName,
// warehouse: item.warehouse,
// warehouseDesc: item.warehouseDesc,
// }
// })
// this.tmToolRequestItemList = this.tmToolRequestItemList.concat(datas)
// this.$emit('sum')
// },
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加表体";
this.optType = "add";
},
handleItemSelect() {
this.$refs.brSelectpro.showFlag = true;
},
onItemSelect(row) {
if (row != undefined && row != null) {
this.form.itemId = row.itemId;
this.form.sapItemCode = row.sapItemCode;
this.form.itemName = row.itemName;
}
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.optType == "add") {
this.tableData.unshift({ ...this.form });
}
this.showFlag = false;
}
});
this.open = false;
},
handleWorkstationSelect() {
this.$refs.brSelectworkstation.showFlag = true;
},
onWorkstationSelect(row, type) {
console.log('row', type, row)
if (row != undefined && row != null) {
if (type === 'unit') {
// this.form.workunitName = row.workunitName
this.$set(this.form, 'workunitCode', row.workunitCode)
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
} else {
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
}
}
},
/**删除行 */
deleteRow(index) {
this.tableData.splice(index, 1);
},
handleRemove(row, index) {
console.log(row, index)
// this.tags.splice(this.tags.indexOf(tag), 1)
this.tmToolRequestItemList.splice(this.tmToolRequestItemList.indexOf(row), 1)
this.$emit('sum')
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
// 表单重置
reset() {
this.form = {
itemId: null,
sapItemCode: null,
itemName: null,
applyNum: null,
workunitId: null,
workunitName: null,
workunitCode: null,
workstationCode: null,
workstationId: null,
workstationName: null,
};
this.resetForm("form");
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.toolRequestItemId)
this.single = selection.length !== 1
this.multiple = !selection.length
}
}
};
</script>
\ No newline at end of file
src/views/mes/pro/allocation/arangeSelect.vue 0 → 100644
View file @ 7bf589f2
<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="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
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.arrangeId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="编排单号" align="center" prop="arrangeCode" :show-overflow-tooltip="true"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" :show-overflow-tooltip="true"/>
<el-table-column label="分组号" align="center" prop="groupCode" :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 { listArrange } from "@/api/mes/pro/arrange";
// import {listAllProcess} from "@/api/mes/pro/process";
export default {
name: "ProtaskSelect",
props: {
workorderId: null,
workorderCode: null,
processId: null,
processCode: null,
workstationId: null,
workstationCode: null,
arrangeCode: null,
btnShow: false
},
watch: {
arrangeCode(v){
if(v) {
this.queryParams.arrangeCode = v;
this.getList();
}
}
},
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,
arrangeCode: 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();
},
methods: {
/** 查询生产任务列表 */
getList() {
this.loading = true;
listArrange(this.queryParams).then(response => {
this.protaskList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
arrangeCode: null,
taskName: null,
workorderId: null,
workorderCode: null,
workorderName: null,
workstationId: null,
workstationCode: null,
workstationName: null,
routeId: null,
processId: null,
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,
}
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>
\ No newline at end of file
src/views/mes/pro/allocation/codeSelect.vue 0 → 100644
View file @ 7bf589f2
<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="90px">
<el-row>
<el-form-item label="工作中心编号" label-width="120" prop="workunitCode">
<el-input v-model="queryParams.workunitCode" placeholder="请输入工作单元编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作中心名称" label-width="120" prop="workunitName">
<el-input v-model="queryParams.workunitName" placeholder="请输入工作单元名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作中心编码" label-width="120" prop="workstationCode">
<el-input v-model="queryParams.workstationCode" 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-row>
<el-row>
<el-col :span="24"> </el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="workstationList" @current-change="handleCurrent"
@row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center">
<template v-slot="scope">
<el-radio v-model="selectedWorkstationId" :label="scope.row.workunitId"
@change="handleRowChange(scope.row)">{{ "" }}</el-radio>
</template>
</el-table-column>
<el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="工作中心编号" align="center" prop="workstationCode">
</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="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listWorkunits} from "@/api/mes/md/workunit";
// import { listAllProcess } from "@/api/mes/pro/process";
import { listAllWorkshop } from "@/api/mes/md/workshop";
export default {
name: "WorkstationSelect",
dicts: ["sys_yes_no"],
data() {
return {
// workstationId: this.workstationId,
showFlag: false,
// 遮罩层
loading: true,
// 选中数组
selectedWorkstationId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 工作中心表格数据
workstationList: [],
//车间选项
workshopOptions: [],
//工序选项
processOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
workstationCode: null,
workstationName: null,
workstationAddress: null,
workshopId: null,
workshopCode: null,
workshopName: null,
workstationId: null,
processCode: null,
processName: null,
enableFlag: null,
stdWorkingTime: null,
},
// 表单参数
form: {},
};
},
props: {
workstationId: {
type: Number | undefined,
default: undefined,
}, //外部传入的工序过滤条件
},
created() {
this.getList();
this.getWorkshops();
this.getProcess();
},
watch: {
workstationId: {
handler(val) {
this.queryParams.workstationId = val;
this.getList();
},
immediate: true,
},
},
methods: {
/** 查询工作中心列表 */
getList() {
this.loading = true;
listWorkunits(this.queryParams).then((response) => {
console.log(this.queryParams);
this.workstationList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//查询车间信息
getWorkshops() {
listAllWorkshop().then((response) => {
this.workshopOptions = response.data;
});
},
// //查询工序信息
// getProcess() {
// listAllProcess().then((response) => {
// this.processOptions = response.data;
// });
// },
// 取消按钮
cancel() {
this.showFlag=false;
this.resetQuery();
},
// 表单重置
reset() {
this.form = {
workstationId: null,
workstationCode: null,
workstationName: null,
workstationAddress: null,
workshopId: null,
workshopCode: null,
workshopName: null,
workstationId: null,
processCode: null,
processName: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
stdWorkingTime: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
workstationId: null,
workstationCode: null,
workstationName: null,
workstationAddress: null,
workshopId: null,
workshopCode: null,
workshopName: null,
workstationId: null,
processCode: null,
processName: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
stdWorkingTime: null,
};
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
if (row) {
this.selectedRows = row;
}
},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect() {
if (
this.selectedWorkstationId == null ||
this.selectedWorkstationId == 0
) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
\ No newline at end of file
src/views/mes/pro/allocation/index.vue
View file @ 7bf589f2
......@@ -27,6 +27,11 @@
placeholder="请选择需求日期">
</el-date-picker>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="daterangePurchaseDate" 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>
......@@ -103,7 +108,7 @@
</el-col>
<el-col span="12">
<el-form-item label="产品编码" prop="sapItemCode">
<el-input v-model="form.sapItemCode" placeholder="请输入产品编码">
<el-input v-model="form.sapItemCode" placeholder="请选择物料">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect" />
</el-input>
<itemSelect ref="brSelectpro" @onSelected="onItemSelect">
......@@ -158,6 +163,64 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 新增和详情对话框 -->
<el-dialog :title="title" :visible.sync="opens" width="950px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col span="12">
<el-form-item label="申请单号" prop="applyNo">
<el-input disabled v-model="form.applyNo" placeholder="自动生成" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务单号" prop="taskCode">
<el-input v-model="form.taskCode" placeholder="请选任务单号" readonly="readonly">
<el-button slot="append" icon="el-icon-search" @click="handleBrandSelect"
:disabled="form.allocationMaterialId"></el-button>
</el-input>
</el-form-item>
</el-col>
<BrandSelect ref="brSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected">
</BrandSelect>
<arangeSelect ref="arangeSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected">
</arangeSelect>
<el-col :span="12">
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号">
<el-button slot="append" icon="el-icon-search"
@click="$refs.arangeSelect.showFlag = true"
:disabled="form.allocationMaterialId"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间" prop="createTime">
<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-col>
<el-col :span="12">
<el-form-item label="需求日期" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择需求日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider content-position="center">调拨料表体</el-divider>
<el-card shadow="always" class="box-card">
<allocationIndex v-if="opens" ref="allocationRef" :quantity="form.requestNum" :id="form.toolWarehouseId"
:optType="optType"></allocationIndex>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button v-if="optType !== 'view'" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancels">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -166,6 +229,9 @@ import { genCode } from "@/api/system/autocode/rule";
import ItemSelect from "@/components/itemSelect/single.vue";
import TaskSelect from "@/components/TaskSelect/taskSelectSingle.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
import BrandSelect from "@/components/TaskSelect/sngle.vue";
import allocationIndex from './allocationIndex';
import arangeSelect from "./arangeSelect.vue";
import {
listProAllocationMaterial,
getProAllocationMaterial,
......@@ -175,7 +241,7 @@ import {
} from "@/api/mes/pro/proAllocationMaterial";
export default {
name: "ProAllocationMaterial",
components: { ItemSelect, TaskSelect, WorkstationSelect },
components: { ItemSelect, TaskSelect, WorkstationSelect, allocationIndex, BrandSelect, arangeSelect },
dicts: ['sys_yes_no'],
data() {
return {
......@@ -189,6 +255,13 @@ export default {
multiple: true,
// 显示搜索条件
showSearch: true,
//物料集合
itemList: [],
optType: null,
daterangePurchaseDate: [],
// 总条数
total: 0,
// 调拨料申请表格数据
......@@ -197,6 +270,9 @@ export default {
title: "",
// 是否显示弹出层
open: false,
opens: false,
// 查询参数
queryParams: {
pageNum: 1,
......@@ -204,13 +280,16 @@ export default {
applyNo: null,
sapItemCode: null,
itemName: null,
allocationMaterialId: null,
workstationId: null,
workstationCode: null,
taskId: null,
taskCode: null,
applyNum: null,
allocationNum: null,
windCase: null, endTime: null, startTime: null,
windCase: null,
endTime: null,
startTime: null,
},
// 表单参数
form: {},
......@@ -226,6 +305,11 @@ export default {
/** 查询调拨料申请列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listProAllocationMaterial(this.queryParams).then(response => {
this.ProAllocationMaterialList = response.rows;
this.total = response.total;
......@@ -237,13 +321,28 @@ export default {
this.open = false;
this.reset();
},
cancels() {
this.opens = false;
this.reset();
},
/** 生成编码 */
gCode() {
genCode("ALLOCATION_CODE").then((response) => {
this.form.applyNo = response;
});
},
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;
}
},
handleWorkstationSelect() {
......@@ -267,7 +366,6 @@ export default {
}
},
handleTaskSelect() {
this.$refs.brSelectTask.showFlag = true;
},
......@@ -295,7 +393,7 @@ export default {
windCase: null,
endTime: null,
startTime: null,
createBy: null,
createBy: 'admin',
createTime: null,
updateBy: null,
updateTime: null
......@@ -304,12 +402,14 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.daterangePurchaseDate = [];
this.handleQuery();
},
// 多选框选中数据
......@@ -321,7 +421,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.opens = true;
this.gCode();
this.title = "添加调拨料申请";
},
......@@ -337,16 +437,17 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.allocationMaterialId != null) {
updateProAllocationMaterial(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addProAllocationMaterial(this.form).then(response => {
{
const itemList = this.$refs.allocationRef.tableData;
const params = {
...this.form,
itemList,
};
addProAllocationMaterial(params).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......
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